feat(t8s-cluster/management-cluster): replace harbor mirror syntax wi…

…th standard OCI syntax (#532)
teutonet · Sep 11, 2023 · 7e4af4e · 7e4af4e
1 parent 5332ca8
commit 7e4af4e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.../t8s-cluster/templates/management-cluster/clusterClass/kubeadmConfigTemplate/_helpers.tpl b/.../t8s-cluster/templates/management-cluster/clusterClass/kubeadmConfigTemplate/_helpers.tpl
@@ -28,23 +28,32 @@
 {{- define "t8s-cluster.clusterClass.containerdConfig.containerRegistryProxyConfigs" -}}
   {{- $_ := set . "Values" .context.Values -}}
   {{- $defaultProxiedRegistries := list
-    "docker.io"
     "gcr.io"
     "ghcr.io"
-    "hub.docker.com"
     "k8s.gcr.io"
+    "nvcr.io"
     "quay.io"
     "registry.gitlab.com"
     "registry.k8s.io"
     "registry.opensource.zalan.do"
     "registry.teuto.io"
-    "index.docker.io"
     -}}
   {{- $proxiedRegistries := concat $defaultProxiedRegistries (.Values.containerRegistryProxy.additionallyProxiedRegistries | default list) | sortAlpha | uniq -}}
   {{- range $registry := $proxiedRegistries }}
 - content: |-
-    {{ printf `[host."%s%s"]` $.Values.containerRegistryProxy.proxyRegistryEndpoint $registry }}
+    server = {{ printf "https://%s" $registry | quote }}
+    {{ printf `[host."%s"]` $.Values.containerRegistryProxy.proxyRegistryEndpoint }}
       capabilities = ["pull", "resolve"]
   path: {{ printf `/etc/containerd/registries.conf.d/%s/hosts.toml` $registry }}
-  {{- end -}}
+  {{- end }}
+- content: |-
+    server = "registry-1.docker.io"
+    {{ printf `[host."%s"]` $.Values.containerRegistryProxy.proxyRegistryEndpoint }}
+      capabilities = ["pull", "resolve"]
+  path: /etc/containerd/registries.conf.d/docker.io/hosts.toml
+- content: |- # this only works with containerd >=1.7.0, that's why the above still exists
+    server = "*"
+    {{ printf `[host."%s"]` $.Values.containerRegistryProxy.proxyRegistryEndpoint }}
+      capabilities = ["pull", "resolve"]
+  path: /etc/containerd/registries.conf.d/_default/hosts.toml
 {{- end -}}
diff --git a/charts/t8s-cluster/values.yaml b/charts/t8s-cluster/values.yaml
@@ -62,7 +62,7 @@ bastion:
 
 containerRegistryProxy:
   additionallyProxiedRegistries: []
-  proxyRegistryEndpoint: https://harbor.teuto.net/v2/
+  proxyRegistryEndpoint: https://mirror.teuto.net
 
 sshKeyName: null