Update flannel version and values on canal

Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
pull/329/head
Roberto Bonafiglia 2023-03-09 15:14:22 +01:00 committed by Roberto Bonafiglia
parent c764f63d43
commit cb1ca9218d
3 changed files with 71 additions and 11 deletions

View File

@ -89,16 +89,51 @@ data:
"EnableIPv6": true,
{{- end }}
"Backend": {
{{- if .Values.flannel.backendPort }}
{{- if eq .Values.flannel.backend "vxlan" }}
"Type": {{ .Values.flannel.backend | quote }},
"Port": {{ .Values.flannel.backendPort }}
{{- else if eq .Values.flannel.backend "wireguard" }}
"Type": {{ .Values.flannel.backend | quote }},
"ListenPort": {{ .Values.flannel.backendPort }}
{{- else }}
"Type": {{ .Values.flannel.backend | quote }}
{{- if .Values.flannel.backendPort }}
"Port": {{ .Values.flannel.backendPort }},
{{- end }}
{{- if .Values.flannel.vni }}
"VNI": {{ .Values.flannel.vni }},
{{- end }}
{{- if .Values.flannel.GBP }}
"GBP": {{ .Values.flannel.GBP }},
{{- end }}
{{- if .Values.flannel.directRouting }}
"DirectRouting": {{ .Values.flannel.directRouting }},
{{- end }}
{{- if .Values.flannel.mtu }}
"MTU": {{ .Values.flannel.mtu }},
{{- end }}
{{- if .Values.flannel.macPrefix }}
"MacPrefix": {{ .Values.flannel.macPrefix | quote }},
{{- end }}
"Type": {{ .Values.flannel.backend | quote }}
{{- else if eq .Values.flannel.backend "wireguard" }}
{{- if .Values.flannel.backendPort }}
"ListenPort": {{ .Values.flannel.backendPort }},
{{- end }}
{{- if .Values.flannel.backendPortv6 }}
"ListenPortV6": {{ .Values.flannel.backendPortv6 }},
{{- end }}
{{- if .Values.flannel.psk }}
"PSK": {{ .Values.flannel.psk }},
{{- end }}
{{- if .Values.flannel.mtu }}
"MTU": {{ .Values.flannel.mtu }},
{{- end }}
{{- if .Values.flannel.tunnelMode }}
"Mode": {{ .Values.flannel.tunnelMode | quote }},
{{- end }}
{{- if .Values.flannel.keepaliveInterval }}
"PersistentKeepaliveInterval": {{ .Values.flannel.keepaliveInterval }},
{{- end }}
"Type": {{ .Values.flannel.backend | quote }}
{{- else if eq .Values.flannel.backend "udp" }}
{{- if .Values.flannel.backendPort }}
"Port": {{ .Values.flannel.backendPort }},
{{- end }}
"Type": {{ .Values.flannel.backend | quote }}
{{- else }}
"Type": {{ .Values.flannel.backend | quote }}
{{- end }}

View File

@ -8,7 +8,7 @@ flannel:
# kube-flannel image
image:
repository: rancher/hardened-flannel
tag: v0.21.1-build20230208
tag: v0.21.3-build20230308
# The interface used by canal for host <-> host communication.
# If left blank, then the interface is chosen using the node's
# default route.
@ -20,7 +20,32 @@ flannel:
# Backend for kube-flannel. Backend should not be changed
# at runtime.
backend: "vxlan"
backendPort: 0 # When 0 use default port
# Port used by the backend 0 means default value (VXLAN: 8472, Wireguard: 51821, UDP: 8285)
backendPort: 0
# MTU to use for outgoing packets (VXLAN and Wireguard) if not defined the MTU of the external interface is used.
#mtu: 0
#
# VXLAN Configs:
#
# VXLAN Identifier to be used. On Linux default is 1.
#vni: 1
# Enable VXLAN Group Based Policy (Default false)
GBP: false
# Enable direct routes (default is false)
directRouting: false
# MAC prefix to be used on Windows. (Defaults is 0E-2A)
#macPrefix: "0E-2A"
#
# Wireguard Configs:
#
# UDP listen port used with IPv6
backendPortv6: 0
# Pre shared key to use
psk: 0
# IP version to use on Wireguard
#tunnelMode: "separate"
# Persistent keep interval to use
keepaliveInterval: 0
calico:
# CNI installation image.

View File

@ -1,2 +1,2 @@
url: local
packageVersion: 01
packageVersion: 02