From dc2a4324e8a798320ad2b2626e0b24cb41e65bb2 Mon Sep 17 00:00:00 2001 From: Micke Lisinge Date: Mon, 23 Sep 2024 22:03:37 +0200 Subject: [PATCH] Match Multus ConfigMap name in DaemonSet Signed-off-by: Micke Lisinge --- packages/rke2-multus/charts/templates/daemonSet.yaml | 4 ++-- packages/rke2-multus/package.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/rke2-multus/charts/templates/daemonSet.yaml b/packages/rke2-multus/charts/templates/daemonSet.yaml index 6b1e7a1c8..7e305b512 100755 --- a/packages/rke2-multus/charts/templates/daemonSet.yaml +++ b/packages/rke2-multus/charts/templates/daemonSet.yaml @@ -117,7 +117,7 @@ spec: mountPath: /host/opt/cni/bin {{- if .Values.manifests.configMap }} - name: multus-cfg - mountPath: /tmp/multus-conf/00-multus.conf.template + mountPath: /tmp/multus-conf/00-multus.conf subPath: "cni-conf.json" {{- end }} volumes: @@ -130,6 +130,6 @@ spec: {{- if .Values.manifests.configMap }} - name: multus-cfg configMap: - name: {{ .Release.Name }}-{{ .Chart.Name }}-{{ .Chart.Version }}-config + name: {{ .Release.Name }}-{{ .Chart.Version }}-config {{- end }} {{- end }} diff --git a/packages/rke2-multus/package.yaml b/packages/rke2-multus/package.yaml index 6fa84777e..22e14ad84 100644 --- a/packages/rke2-multus/package.yaml +++ b/packages/rke2-multus/package.yaml @@ -1,3 +1,3 @@ url: local workingDir: charts -packageVersion: 01 +packageVersion: 02