puppetlabs-kubernetes icon indicating copy to clipboard operation
puppetlabs-kubernetes copied to clipboard

Fix containerd/config.toml spaces

Open hfrog opened this issue 1 year ago • 1 comments

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 avatar Sep 26 '24 12:09 hfrog

CLA assistant check
All committers have signed the CLA.

CLAassistant avatar Sep 26 '24 12:09 CLAassistant

@hfrog Could you please rebase the PR?

deric avatar Jan 15 '25 10:01 deric

@hfrog Could you please rebase the PR?

Done

hfrog avatar Jan 15 '25 11:01 hfrog