diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index 10d6fd80..8a88b8db 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -227,18 +227,6 @@ spec: - ["LABEL=ephemeral", "/ephemeral"] - ["/ephemeral/kubelet", "/var/lib/kubelet", "none", "bind,nofail"] - ["/ephemeral/containerd", "/var/lib/containerd", "none", "bind,nofail"] - {{- $sec := lookup "v1" "Secret" $.Release.Namespace (printf "%s-patch-containerd" $.Release.Name) }} - {{- if $sec }} - files: - {{- range $key, $_ := $sec.data }} - - path: /etc/containerd/certs.d/{{ trimSuffix ".toml" $key }}/hosts.toml - contentFrom: - secret: - name: {{ $.Release.Name }}-patch-containerd - key: {{ $key }} - permissions: "0400" - {{- end }} - {{- end }} preKubeadmCommands: - KUBELET_VERSION={{ include "kubernetes.versionMap" $}} /usr/bin/update-k8s.sh || true - sed -i 's|root:x:|root::|' /etc/passwd diff --git a/packages/apps/kubernetes/templates/copy-patch-containerd.yaml b/packages/apps/kubernetes/templates/copy-patch-containerd.yaml deleted file mode 100644 index 43345276..00000000 --- a/packages/apps/kubernetes/templates/copy-patch-containerd.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- $sourceSecret := lookup "v1" "Secret" "cozy-system" "patch-containerd" }} -{{- if $sourceSecret }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ .Release.Name }}-patch-containerd - namespace: {{ .Release.Namespace }} -type: {{ $sourceSecret.type }} -data: -{{- range $key, $value := $sourceSecret.data }} - {{ printf "%s: %s" $key ($value | quote) | indent 2 }} -{{- end }} -{{- end }}