Skip to content

Conversation

hfrog
Copy link

@hfrog hfrog commented Sep 26, 2024

Hello,
There are excessive spaces in the containerd config, after migration from erb to epp, for example:

Notice: /Stage[main]/Kubernetes::Packages/File[/etc/containerd/config.toml]/content: 
--- /etc/containerd/config.toml	2024-07-02 14:20:33.212621272 +0300
+++ /tmp/puppet-file20240926-537795-obvp67	2024-09-26 10:54:52.958956200 +0300
@@ -102,23 +102,23 @@
       conf_template = ""
     [plugins."io.containerd.grpc.v1.cri".registry]
       [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
-        [plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
-          endpoint = ["k8s-docker.artifactory.our.domain"]
...
-        [plugins."io.containerd.grpc.v1.cri".registry.mirrors."gitlab-registry.our.domain"]
-          endpoint = ["gitlab-registry-remote.artifactory.our.domain"]
-      [plugins."io.containerd.grpc.v1.cri".registry.configs]
-        [plugins."io.containerd.grpc.v1.cri".registry.configs."gitlab-registry-remote.artifactory.our.domain".auth]
-          username = "gitlab-registry-artifactory"
-          password = "xxx"
-    [plugins."io.containerd.grpc.v1.cri".image_decryption]
+                    [plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
+                  endpoint = ["k8s-docker.artifactory.our.domain"]
+                                  [plugins."io.containerd.grpc.v1.cri".registry.mirrors."registry.k8s.io"]
...
+                  endpoint = ["gitlab-registry-remote.artifactory.our.domain"]
+                          [plugins."io.containerd.grpc.v1.cri".registry.configs]
+                                                                                [plugins."io.containerd.grpc.v1.cri".registry.configs."gitlab-registry.our.domain".auth]
+                  username = "gitlab-registry-artifactory"
+                          password = "xxx"
+                                                                                                                      [plugins."io.containerd.grpc.v1.cri".image_decryption]

This PR fixes it.

@hfrog hfrog requested review from bastelfreak, deric and a team as code owners September 26, 2024 12:10
@CLAassistant
Copy link

CLAassistant commented Sep 26, 2024

CLA assistant check
All committers have signed the CLA.

@deric
Copy link
Collaborator

deric commented Jan 15, 2025

@hfrog Could you please rebase the PR?

@hfrog hfrog force-pushed the fix_containerd_config_spaces branch from ad31ef0 to a05af7e Compare January 15, 2025 11:31
@hfrog
Copy link
Author

hfrog commented Jan 15, 2025

@hfrog Could you please rebase the PR?

Done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants