Skip to content

Set override_path = true to namespaced hosts.toml entries in hosts.toml #10765

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

Open
rahulbabu95 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Set override_path = true to namespaced hosts.toml entries in hosts.toml #10765

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
12 changes: 8 additions & 4 deletions internal/test/registrymirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ func RegistryMirrorConfigFilesInsecureSkipVerify() []bootstrapv1beta2.File {
{
Content: `server = "https://0.0.0.0:5000"

[host."https://0.0.0.0:5000"]
[host."https://0.0.0.0:5000/v2"]
capabilities = ["pull", "resolve"]
override_path = true
skip_verify = true
`,
Owner: "root:root",
Expand All @@ -61,8 +62,9 @@ func RegistryMirrorConfigFilesInsecureSkipVerify() []bootstrapv1beta2.File {
{
Content: `server = "https://public.ecr.aws"

[host."https://0.0.0.0:5000"]
[host."https://0.0.0.0:5000/v2"]
capabilities = ["pull", "resolve"]
override_path = true
skip_verify = true
`,
Owner: "root:root",
Expand Down Expand Up @@ -90,8 +92,9 @@ func RegistryMirrorConfigFilesInsecureSkipVerifyAndCACert() []bootstrapv1beta2.F
{
Content: `server = "https://0.0.0.0:5000"

[host."https://0.0.0.0:5000"]
[host."https://0.0.0.0:5000/v2"]
capabilities = ["pull", "resolve"]
override_path = true
ca = "/etc/containerd/certs.d/0.0.0.0:5000/ca.crt"
skip_verify = true
`,
Expand All @@ -101,8 +104,9 @@ func RegistryMirrorConfigFilesInsecureSkipVerifyAndCACert() []bootstrapv1beta2.F
{
Content: `server = "https://public.ecr.aws"

[host."https://0.0.0.0:5000"]
[host."https://0.0.0.0:5000/v2"]
capabilities = ["pull", "resolve"]
override_path = true
ca = "/etc/containerd/certs.d/0.0.0.0:5000/ca.crt"
skip_verify = true
`,
Expand Down
1 change: 1 addition & 0 deletions pkg/clusterapi/config/hosts.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ server = "https://{{ .server }}"

[host."https://{{ .host }}"]
capabilities = ["pull", "resolve"]
override_path = true
{{- if .registryCACert }}
ca = "/etc/containerd/certs.d/{{ .mirrorBase }}/ca.crt"
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion pkg/clusterapi/registry_mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func registryMirrorConfig(registryMirrorConfig *v1alpha1.RegistryMirrorConfigura
}

// Mirror base hosts.toml
mirrorBaseContent, err := hostsFileContent(registryMirror, registryMirror.BaseRegistry, registryMirror.BaseRegistry)
mirrorBaseContent, err := hostsFileContent(registryMirror, registryMirror.BaseRegistry, containerd.ToAPIEndpoint(registryMirror.BaseRegistry))
if err != nil {
return nil, err
}
Expand Down
25 changes: 16 additions & 9 deletions pkg/clusterapi/registry_mirror_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ var registryMirrorTests = []struct {
Owner: "root:root",
Content: `server = "https://1.2.3.4:443"

[host."https://1.2.3.4:443"]
[host."https://1.2.3.4:443/v2"]
capabilities = ["pull", "resolve"]
override_path = true
ca = "/etc/containerd/certs.d/1.2.3.4:443/ca.crt"
`,
},
Expand All @@ -70,6 +71,7 @@ var registryMirrorTests = []struct {

[host."https://1.2.3.4:443/v2/curated-packages"]
capabilities = ["pull", "resolve"]
override_path = true
ca = "/etc/containerd/certs.d/1.2.3.4:443/ca.crt"
`,
},
Expand All @@ -80,6 +82,7 @@ var registryMirrorTests = []struct {

[host."https://1.2.3.4:443/v2/eks-anywhere"]
capabilities = ["pull", "resolve"]
override_path = true
ca = "/etc/containerd/certs.d/1.2.3.4:443/ca.crt"
`,
},
Expand Down Expand Up @@ -113,8 +116,9 @@ var registryMirrorTests = []struct {
Owner: "root:root",
Content: `server = "https://1.2.3.4:443"

[host."https://1.2.3.4:443"]
[host."https://1.2.3.4:443/v2"]
capabilities = ["pull", "resolve"]
override_path = true
skip_verify = true
`,
},
Expand All @@ -123,17 +127,18 @@ var registryMirrorTests = []struct {
Owner: "root:root",
Content: `server = "https://public.ecr.aws"

[host."https://1.2.3.4:443"]
[host."https://1.2.3.4:443/v2"]
capabilities = ["pull", "resolve"]
override_path = true
skip_verify = true
`,
},
},
wantRegistryConfig: bootstrapv1beta2.RegistryMirrorConfiguration{
Endpoint: "1.2.3.4:443",
Endpoint: "1.2.3.4:443/v2",
},
wantRegistryConfigEtcd: &etcdbootstrapv1.RegistryMirrorConfiguration{
Endpoint: "1.2.3.4:443",
Endpoint: "1.2.3.4:443/v2",
},
},
{
Expand Down Expand Up @@ -162,8 +167,9 @@ var registryMirrorTests = []struct {
Owner: "root:root",
Content: `server = "https://1.2.3.4:443"

[host."https://1.2.3.4:443"]
[host."https://1.2.3.4:443/v2"]
capabilities = ["pull", "resolve"]
override_path = true
ca = "/etc/containerd/certs.d/1.2.3.4:443/ca.crt"
skip_verify = true
`,
Expand All @@ -173,19 +179,20 @@ var registryMirrorTests = []struct {
Owner: "root:root",
Content: `server = "https://public.ecr.aws"

[host."https://1.2.3.4:443"]
[host."https://1.2.3.4:443/v2"]
capabilities = ["pull", "resolve"]
override_path = true
ca = "/etc/containerd/certs.d/1.2.3.4:443/ca.crt"
skip_verify = true
`,
},
},
wantRegistryConfig: bootstrapv1beta2.RegistryMirrorConfiguration{
Endpoint: "1.2.3.4:443",
Endpoint: "1.2.3.4:443/v2",
CACert: "xyz",
},
wantRegistryConfigEtcd: &etcdbootstrapv1.RegistryMirrorConfiguration{
Endpoint: "1.2.3.4:443",
Endpoint: "1.2.3.4:443/v2",
CACert: "xyz",
},
},
Expand Down
1 change: 1 addition & 0 deletions pkg/executables/config/hosts.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ server = "https://{{.Server}}"

[host."https://{{.Host}}"]
capabilities = ["pull", "resolve"]
override_path = true
{{- if .CACertPath }}
ca = "{{.CACertPath}}"
{{- else }}
Expand Down
2 changes: 1 addition & 1 deletion pkg/executables/kind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ func (k *Kind) setupRegistryMirror(clusterSpec *cluster.Spec, registryMirror *re
// Setup configuration for the mirror registry
err := setupRegistryConfig(RegistryConfig{
Server: mirrorBase,
Host: mirrorBase,
Host: containerd.ToAPIEndpoint(mirrorBase),
CACertPath: mountedCACertPath,
AuthHeader: authHeader,
OutputDir: filepath.Join(certsBasePath, mirrorBase),
Expand Down
1 change: 1 addition & 0 deletions pkg/executables/testdata/hosts_toml_insecure_public_ecr_aws.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ server = "https://public.ecr.aws"

[host."https://registry-mirror.test:443/v2/eks-anywhere"]
capabilities = ["pull", "resolve"]
override_path = true
skip_verify = true
3 changes: 2 additions & 1 deletion pkg/executables/testdata/hosts_toml_insecure_registry_mirror.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
server = "https://registry-mirror.test:443"

[host."https://registry-mirror.test:443"]
[host."https://registry-mirror.test:443/v2"]
capabilities = ["pull", "resolve"]
override_path = true
skip_verify = true
1 change: 1 addition & 0 deletions pkg/executables/testdata/hosts_toml_with_auth_783794618700_dkr_ecr.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ server = "https://783794618700.dkr.ecr.us-west-2.amazonaws.com"

[host."https://registry-mirror.test:443/v2/curated-packages"]
capabilities = ["pull", "resolve"]
override_path = true
skip_verify = true
[host."https://registry-mirror.test:443/v2/curated-packages".header]
authorization = "Basic dXNlcm5hbWU6cGFzc3dvcmQ="
1 change: 1 addition & 0 deletions pkg/executables/testdata/hosts_toml_with_auth_public_ecr_aws.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ server = "https://public.ecr.aws"

[host."https://registry-mirror.test:443/v2/eks-anywhere"]
capabilities = ["pull", "resolve"]
override_path = true
skip_verify = true
[host."https://registry-mirror.test:443/v2/eks-anywhere".header]
authorization = "Basic dXNlcm5hbWU6cGFzc3dvcmQ="
5 changes: 3 additions & 2 deletions pkg/executables/testdata/hosts_toml_with_auth_registry_mirror.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
server = "https://registry-mirror.test:443"

[host."https://registry-mirror.test:443"]
[host."https://registry-mirror.test:443/v2"]
capabilities = ["pull", "resolve"]
override_path = true
skip_verify = true
[host."https://registry-mirror.test:443".header]
[host."https://registry-mirror.test:443/v2".header]
authorization = "Basic dXNlcm5hbWU6cGFzc3dvcmQ="
3 changes: 2 additions & 1 deletion pkg/executables/testdata/hosts_toml_with_ca_public_ecr_aws.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
server = "https://public.ecr.aws"

[host."https://registry-mirror.test:443"]
[host."https://registry-mirror.test:443/v2"]
capabilities = ["pull", "resolve"]
override_path = true
ca = "/etc/containerd/certs.d/registry-mirror.test:443/ca.crt"
3 changes: 2 additions & 1 deletion pkg/executables/testdata/hosts_toml_with_ca_registry_mirror.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
server = "https://registry-mirror.test:443"

[host."https://registry-mirror.test:443"]
[host."https://registry-mirror.test:443/v2"]
capabilities = ["pull", "resolve"]
override_path = true
ca = "/etc/containerd/certs.d/registry-mirror.test:443/ca.crt"
8 changes: 5 additions & 3 deletions pkg/providers/cloudstack/config/template-cp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,10 @@ spec:
path: "/etc/containerd/config_append.toml"
- content: |
server = "https://{{ .mirrorBase }}"
[host."https://{{ .mirrorBase }}"]

[host."https://{{ .mirrorBaseAPIEndpoint }}"]
capabilities = ["pull", "resolve"]
override_path = true
{{- if or .registryCACert .insecureSkip }}
{{- if .registryCACert }}
ca = "/etc/containerd/certs.d/{{ .mirrorBase }}/ca.crt"
Expand All @@ -300,9 +301,10 @@ spec:
{{- range $orig, $mirror := .registryMirrorMap }}
- content: |
server = "https://{{ $orig }}"

[host."https://{{ $mirror }}"]
capabilities = ["pull", "resolve"]
override_path = true
{{- if or $.registryCACert $.insecureSkip }}
{{- if $.registryCACert }}
ca = "/etc/containerd/certs.d/{{ $.mirrorBase }}/ca.crt"
Expand Down
8 changes: 5 additions & 3 deletions pkg/providers/cloudstack/config/template-md.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ spec:
path: "/etc/containerd/config_append.toml"
- content: |
server = "https://{{ .mirrorBase }}"
[host."https://{{ .mirrorBase }}"]

[host."https://{{ .mirrorBaseAPIEndpoint }}"]
capabilities = ["pull", "resolve"]
override_path = true
{{- if or .registryCACert .insecureSkip }}
{{- if .registryCACert }}
ca = "/etc/containerd/certs.d/{{ .mirrorBase }}/ca.crt"
Expand All @@ -90,9 +91,10 @@ spec:
{{- range $orig, $mirror := .registryMirrorMap }}
- content: |
server = "https://{{ $orig }}"

[host."https://{{ $mirror }}"]
capabilities = ["pull", "resolve"]
override_path = true
{{- if or $.registryCACert $.insecureSkip }}
{{- if $.registryCACert }}
ca = "/etc/containerd/certs.d/{{ $.mirrorBase }}/ca.crt"
Expand Down
2 changes: 2 additions & 0 deletions pkg/providers/cloudstack/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ func buildTemplateMapCP(clusterSpec *cluster.Spec) (map[string]interface{}, erro
registryMirror := registrymirror.FromCluster(clusterSpec.Cluster)
values["registryMirrorMap"] = containerd.ToAPIEndpoints(registryMirror.NamespacedRegistryMap)
values["mirrorBase"] = registryMirror.BaseRegistry
values["mirrorBaseAPIEndpoint"] = containerd.ToAPIEndpoint(registryMirror.BaseRegistry)
values["insecureSkip"] = registryMirror.InsecureSkipVerify
values["publicMirror"] = containerd.ToAPIEndpoint(registryMirror.CoreEKSAMirror())
if len(registryMirror.CACertContent) > 0 {
Expand Down Expand Up @@ -408,6 +409,7 @@ func buildTemplateMapMD(clusterSpec *cluster.Spec, workerNodeGroupConfiguration
registryMirror := registrymirror.FromCluster(clusterSpec.Cluster)
values["registryMirrorMap"] = containerd.ToAPIEndpoints(registryMirror.NamespacedRegistryMap)
values["mirrorBase"] = registryMirror.BaseRegistry
values["mirrorBaseAPIEndpoint"] = containerd.ToAPIEndpoint(registryMirror.BaseRegistry)
values["insecureSkip"] = registryMirror.InsecureSkipVerify
if len(registryMirror.CACertContent) > 0 {
values["registryCACert"] = registryMirror.CACertContent
Expand Down
10 changes: 6 additions & 4 deletions pkg/providers/docker/config/template-cp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,10 @@ spec:
path: "/etc/containerd/config_append.toml"
- content: |
server = "https://{{ .mirrorBase }}"
[host."https://{{ .mirrorBase }}"]

[host."https://{{ .mirrorBaseAPIEndpoint }}"]
capabilities = ["pull", "resolve"]
override_path = true
{{- if or .registryCACert .insecureSkip }}
{{- if .registryCACert }}
ca = "/etc/containerd/certs.d/{{ .mirrorBase }}/ca.crt"
Expand All @@ -198,17 +199,18 @@ spec:
{{- end }}
{{- end }}
{{- if .registryAuth }}
[host."https://{{ .mirrorBase }}".header]
[host."https://{{ .mirrorBaseAPIEndpoint }}".header]
authorization = "Basic {{ printf "%s:%s" .registryUsername .registryPassword | b64enc }}"
{{- end }}
owner: root:root
path: "/etc/containerd/certs.d/{{ .mirrorBase }}/hosts.toml"
{{- range $orig, $mirror := .registryMirrorMap }}
- content: |
server = "https://{{ $orig }}"

[host."https://{{ $mirror }}"]
capabilities = ["pull", "resolve"]
override_path = true
{{- if or $.registryCACert $.insecureSkip }}
{{- if $.registryCACert }}
ca = "/etc/containerd/certs.d/{{ $.mirrorBase }}/ca.crt"
Expand Down
10 changes: 6 additions & 4 deletions pkg/providers/docker/config/template-md.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@ spec:
path: "/etc/containerd/config_append.toml"
- content: |
server = "https://{{ .mirrorBase }}"
[host."https://{{ .mirrorBase }}"]

[host."https://{{ .mirrorBaseAPIEndpoint }}"]
capabilities = ["pull", "resolve"]
override_path = true
{{- if or .registryCACert .insecureSkip }}
{{- if .registryCACert }}
ca = "/etc/containerd/certs.d/{{ .mirrorBase }}/ca.crt"
Expand All @@ -72,17 +73,18 @@ spec:
{{- end }}
{{- end }}
{{- if .registryAuth }}
[host."https://{{ .mirrorBase }}".header]
[host."https://{{ .mirrorBaseAPIEndpoint }}".header]
authorization = "Basic {{ printf "%s:%s" .registryUsername .registryPassword | b64enc }}"
{{- end }}
owner: root:root
path: "/etc/containerd/certs.d/{{ .mirrorBase }}/hosts.toml"
{{- range $orig, $mirror := .registryMirrorMap }}
- content: |
server = "https://{{ $orig }}"

[host."https://{{ $mirror }}"]
capabilities = ["pull", "resolve"]
override_path = true
{{- if or $.registryCACert $.insecureSkip }}
{{- if $.registryCACert }}
ca = "/etc/containerd/certs.d/{{ $.mirrorBase }}/ca.crt"
Expand Down
1 change: 1 addition & 0 deletions pkg/providers/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@ func populateRegistryMirrorValues(clusterSpec *cluster.Spec, values map[string]i
registryMirror := registrymirror.FromCluster(clusterSpec.Cluster)
values["registryMirrorMap"] = containerd.ToAPIEndpoints(registryMirror.NamespacedRegistryMap)
values["mirrorBase"] = registryMirror.BaseRegistry
values["mirrorBaseAPIEndpoint"] = containerd.ToAPIEndpoint(registryMirror.BaseRegistry)
values["insecureSkip"] = registryMirror.InsecureSkipVerify
values["publicMirror"] = containerd.ToAPIEndpoint(registryMirror.CoreEKSAMirror())
if len(registryMirror.CACertContent) > 0 {
Expand Down
Loading
Loading