Skip to content

fix: don't generate empty _default containerd mirror file #1042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2025
Merged

fix: don't generate empty _default containerd mirror file #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/handlers/generic/mutation/mirrors/containerd_files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 2 additions & 9 deletions pkg/handlers/generic/mutation/mirrors/containerd_files_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}
Expand Down
6 changes: 0 additions & 6 deletions pkg/handlers/generic/mutation/mirrors/inject_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
),
Expand Down Expand Up @@ -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",
),
Expand Down
Loading