Merge pull request #526 from micke/patch-1

Set Multus ConfigMap name so that it matches DaemonSet
rancher · Sep 27, 2024 · 5463055 · 5463055
2 parents af7c7c9 + dc2a432
commit 5463055
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -1,3 +1,3 @@
 url: local
 workingDir: charts
-packageVersion: 01
+packageVersion: 02