From d07e56d09cb3412eab783970bccd2f3f6d4d2819 Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Tue, 11 Feb 2025 11:02:04 -0800 Subject: [PATCH] fix: don't generate empty _default containerd mirror file --- .../generic/mutation/mirrors/containerd_files.go | 5 +++++ .../generic/mutation/mirrors/containerd_files_test.go | 11 ++--------- pkg/handlers/generic/mutation/mirrors/inject_test.go | 6 ------ 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/pkg/handlers/generic/mutation/mirrors/containerd_files.go b/pkg/handlers/generic/mutation/mirrors/containerd_files.go index 8faff58e8..b0aedce3e 100644 --- a/pkg/handlers/generic/mutation/mirrors/containerd_files.go +++ b/pkg/handlers/generic/mutation/mirrors/containerd_files.go @@ -112,6 +112,11 @@ func generateContainerdDefaultHostsFile( inputs = append(inputs, input) } + // No need to generate the file if there are no mirrors. + if len(inputs) == 0 { + return nil, nil + } + var b bytes.Buffer err := containerdDefaultHostsConfigurationTemplate.Execute(&b, inputs) if err != nil { diff --git a/pkg/handlers/generic/mutation/mirrors/containerd_files_test.go b/pkg/handlers/generic/mutation/mirrors/containerd_files_test.go index 5748c93e1..b2abc61cf 100644 --- a/pkg/handlers/generic/mutation/mirrors/containerd_files_test.go +++ b/pkg/handlers/generic/mutation/mirrors/containerd_files_test.go @@ -134,15 +134,8 @@ func Test_generateContainerdDefaultHostsFile(t *testing.T) { CACert: "myregistrycert", }, }, - want: &cabpkv1.File{ - Path: "/etc/containerd/certs.d/_default/hosts.toml", - Owner: "", - Permissions: "0600", - Encoding: "", - Append: false, - Content: ` -`, - }, + want: nil, + wantErr: nil, }, } diff --git a/pkg/handlers/generic/mutation/mirrors/inject_test.go b/pkg/handlers/generic/mutation/mirrors/inject_test.go index b10a69ed2..f0bee8a64 100644 --- a/pkg/handlers/generic/mutation/mirrors/inject_test.go +++ b/pkg/handlers/generic/mutation/mirrors/inject_test.go @@ -162,9 +162,6 @@ var _ = Describe("Generate Global mirror patches", func() { Operation: "add", Path: "/spec/template/spec/kubeadmConfigSpec/files", ValueMatcher: gomega.HaveExactElements( - gomega.HaveKeyWithValue( - "path", "/etc/containerd/certs.d/_default/hosts.toml", - ), gomega.HaveKeyWithValue( "path", "/etc/containerd/certs.d/registry.example.com/ca.crt", ), @@ -323,9 +320,6 @@ var _ = Describe("Generate Global mirror patches", func() { Operation: "add", Path: "/spec/template/spec/files", ValueMatcher: gomega.HaveExactElements( - gomega.HaveKeyWithValue( - "path", "/etc/containerd/certs.d/_default/hosts.toml", - ), gomega.HaveKeyWithValue( "path", "/etc/containerd/certs.d/registry.example.com:5050/ca.crt", ),