Pass CNI confDir and binDir through to whereabouts pod env

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
rancher · Oct 21, 2024 · 8186c74 · 8186c74
1 parent 977679c
commit 8186c74
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
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
diff --git a/packages/rke2-whereabouts/charts/templates/daemonset.yaml b/packages/rke2-whereabouts/charts/templates/daemonset.yaml
@@ -55,13 +55,17 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          - name: CNI_CONF_DIR
+            value: /host{{ .Values.cniConf.confDir }}
+          - name: CNI_BIN_DIR
+            value: /host{{ .Values.cniConf.binDir }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
           - name: cnibin
-            mountPath: /host/opt/cni/bin
+            mountPath: /host{{ .Values.cniConf.binDir }}
           - name: cni-net-dir
-            mountPath: /host/etc/cni/net.d
+            mountPath: /host{{ .Values.cniConf.confDir }}
           - name: cron-scheduler-configmap
             mountPath: /cron-schedule
       volumes: