[kube-flannel-capi] rename cni conf

sapcc · Jun 21, 2024 · 11a3da1 · 11a3da1
1 parent f4223f1
commit 11a3da1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/system/kube-flannel-capi/Chart.yaml b/system/kube-flannel-capi/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 description: flannel CNI
 name: kube-flannel-capi
-version: 0.1.3
+version: 0.1.4
diff --git a/system/kube-flannel-capi/templates/daemonset.yaml b/system/kube-flannel-capi/templates/daemonset.yaml
@@ -45,8 +45,8 @@ spec:
         - cp
         args:
         - -f
-        - /tmp/flannel/flannel-cni.conf
-        - /etc/cni/net.d/flannel-cni.conf
+        - /tmp/flannel/cni-conf.json
+        - /etc/cni/net.d/10-flannel.conflist
         volumeMounts:
         - name: flannel-cfg
           mountPath: /tmp/flannel/

diff --git a/system/kube-flannel-capi/templates/flannel.yaml b/system/kube-flannel-capi/templates/flannel.yaml
@@ -8,7 +8,7 @@ metadata:
     tier: node
     app: flannel
 data:
-  flannel-cni.conf: |
+  cni-conf.json: |
     {
       "name": "cbr0",
       "cniVersion": "0.3.1",