2024-01-05 09:54:45 +00:00
|
|
|
--- charts-original/templates/config.yaml
|
|
|
|
|
+++ charts/templates/config.yaml
|
2024-01-24 11:02:00 +00:00
|
|
|
@@ -29,19 +29,19 @@
|
2024-01-05 09:54:45 +00:00
|
|
|
}
|
|
|
|
|
net-conf.json: |
|
|
|
|
|
{
|
|
|
|
|
-{{- if .Values.podCidr }}
|
|
|
|
|
- "Network": {{ .Values.podCidr | quote }},
|
|
|
|
|
+{{- if .Values.global.clusterCIDRv4 }}
|
|
|
|
|
+ "Network": {{ .Values.global.clusterCIDRv4 | quote }},
|
|
|
|
|
{{- else }}
|
|
|
|
|
"EnableIPv4": false,
|
|
|
|
|
{{- end }}
|
|
|
|
|
-{{- if .Values.podCidrv6 }}
|
|
|
|
|
- "IPv6Network": {{ .Values.podCidrv6 | quote }},
|
|
|
|
|
+{{- if .Values.global.clusterCIDRv6 }}
|
|
|
|
|
+ "IPv6Network": {{ .Values.global.clusterCIDRv6 | quote }},
|
|
|
|
|
"EnableIPv6": true,
|
|
|
|
|
{{- end }}
|
|
|
|
|
"Backend": {
|
2024-01-24 11:02:00 +00:00
|
|
|
{{- if eq .Values.flannel.backend "vxlan" }}
|
|
|
|
|
-{{- if .Values.flannel.backendPort }}
|
|
|
|
|
- "Port": {{ .Values.flannel.backendPort }},
|
|
|
|
|
+{{- if .Values.flannel.vxlanBackendPort }}
|
|
|
|
|
+ "Port": {{ .Values.flannel.vxlanBackendPort }},
|
|
|
|
|
{{- end }}
|
|
|
|
|
{{- if .Values.flannel.vni }}
|
|
|
|
|
"VNI": {{ .Values.flannel.vni }},
|
|
|
|
|
@@ -56,7 +56,7 @@
|
|
|
|
|
"MTU": {{ .Values.flannel.mtu }},
|
|
|
|
|
{{- end }}
|
|
|
|
|
{{- if .Values.flannel.macPrefix }}
|
|
|
|
|
- "MacPrefix": {{ .Values.flannel.macPrefix }},
|
|
|
|
|
+ "MacPrefix": {{ .Values.flannel.macPrefix | quote }},
|
|
|
|
|
{{- end }}
|
|
|
|
|
"Type": {{ .Values.flannel.backend | quote }}
|
|
|
|
|
{{- else if eq .Values.flannel.backend "wireguard" }}
|
