mirror of https://git.rancher.io/rke2-charts
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
--- charts-original/templates/daemonset.yaml
|
||
|
|
+++ charts/templates/daemonset.yaml
|
||
|
|
@@ -32,19 +32,13 @@
|
||
|
|
effect: NoSchedule
|
||
|
|
serviceAccountName: flannel
|
||
|
|
initContainers:
|
||
|
|
- - name: install-cni-plugin
|
||
|
|
- image: {{ .Values.flannel.image_cni.repository }}:{{ .Values.flannel.image_cni.tag }}
|
||
|
|
- command:
|
||
|
|
- - cp
|
||
|
|
- args:
|
||
|
|
- - -f
|
||
|
|
- - /flannel
|
||
|
|
- - /opt/cni/bin/flannel
|
||
|
|
+ - name: install-cni-plugins
|
||
|
|
+ image: {{ template "system_default_registry" . }}{{ .Values.flannel.image_cni.repository }}:{{ .Values.flannel.image_cni.tag }}
|
||
|
|
volumeMounts:
|
||
|
|
- name: cni-plugin
|
||
|
|
- mountPath: /opt/cni/bin
|
||
|
|
+ mountPath: /host/opt/cni/bin
|
||
|
|
- name: install-cni
|
||
|
|
- image: {{ .Values.flannel.image.repository }}:{{ .Values.flannel.image.tag }}
|
||
|
|
+ image: {{ template "system_default_registry" . }}{{ .Values.flannel.image.repository }}:{{ .Values.flannel.image.tag }}
|
||
|
|
command:
|
||
|
|
- cp
|
||
|
|
args:
|
||
|
|
@@ -58,7 +52,7 @@
|
||
|
|
mountPath: /etc/kube-flannel/
|
||
|
|
containers:
|
||
|
|
- name: kube-flannel
|
||
|
|
- image: {{ .Values.flannel.image.repository }}:{{ .Values.flannel.image.tag }}
|
||
|
|
+ image: {{ template "system_default_registry" . }}{{ .Values.flannel.image.repository }}:{{ .Values.flannel.image.tag }}
|
||
|
|
command:
|
||
|
|
- "/opt/bin/flanneld"
|
||
|
|
{{- range .Values.flannel.args }}
|
||
|
|
@@ -97,6 +91,7 @@
|
||
|
|
- name: cni-plugin
|
||
|
|
hostPath:
|
||
|
|
path: /opt/cni/bin
|
||
|
|
+ type: DirectoryOrCreate
|
||
|
|
- name: cni
|
||
|
|
hostPath:
|
||
|
|
path: /etc/cni/net.d
|