diff --git a/packages/rke2-canal/charts/Chart.yaml b/packages/rke2-canal/charts/Chart.yaml index 9e05ab487..da27f77e1 100644 --- a/packages/rke2-canal/charts/Chart.yaml +++ b/packages/rke2-canal/charts/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: rke2-canal description: Install Canal Network Plugin. -version: v3.25.1-build20230512 -appVersion: v3.25.1 +version: v3.26.1-build20230802 +appVersion: v3.26.1 home: https://www.projectcalico.org/ keywords: - canal diff --git a/packages/rke2-canal/charts/templates/config.yaml b/packages/rke2-canal/charts/templates/config.yaml index 1510a034a..1d9b723f2 100644 --- a/packages/rke2-canal/charts/templates/config.yaml +++ b/packages/rke2-canal/charts/templates/config.yaml @@ -14,6 +14,8 @@ data: # default route. canal_iface: {{ .Values.flannel.iface | quote }} + canal_iface_regex: {{ .Values.flannel.regexIface | quote }} + # Whether or not to masquerade traffic to destinations not within # the pod network. masquerade: {{ .Values.calico.masquerade | quote }} diff --git a/packages/rke2-canal/charts/templates/daemonset.yaml b/packages/rke2-canal/charts/templates/daemonset.yaml index 5227a1b58..69f58739b 100644 --- a/packages/rke2-canal/charts/templates/daemonset.yaml +++ b/packages/rke2-canal/charts/templates/daemonset.yaml @@ -256,6 +256,11 @@ spec: configMapKeyRef: name: {{ .Release.Name }}-config key: canal_iface + - name: FLANNELD_IFACE_REGEX + valueFrom: + configMapKeyRef: + name: {{ .Release.Name }}-config + key: canal_iface_regex - name: FLANNELD_IP_MASQ valueFrom: configMapKeyRef: diff --git a/packages/rke2-canal/charts/values.yaml b/packages/rke2-canal/charts/values.yaml index 646a3f34f..a912b19cd 100644 --- a/packages/rke2-canal/charts/values.yaml +++ b/packages/rke2-canal/charts/values.yaml @@ -8,11 +8,13 @@ flannel: # kube-flannel image image: repository: rancher/hardened-flannel - tag: v0.22.0-build20230612 + tag: v0.22.1-build20230802 # The interface used by canal for host <-> host communication. # If left blank, then the interface is chosen using the node's # default route. iface: "" + # A regulare expression used to match the interface + regexIface: "" # kube-flannel command arguments args: - "--ip-masq" @@ -59,19 +61,19 @@ calico: # CNI installation image. cniImage: repository: rancher/hardened-calico - tag: v3.25.1-build20230607 + tag: v3.26.1-build20230802 # Canal node image. nodeImage: repository: rancher/hardened-calico - tag: v3.25.1-build20230607 + tag: v3.26.1-build20230802 # Flexvol Image. flexvolImage: repository: rancher/hardened-calico - tag: v3.25.1-build20230607 + tag: v3.26.1-build20230802 # kubecontroller image kubeControllerImage: repository: rancher/hardened-calico - tag: v3.25.1-build20230607 + tag: v3.26.1-build20230802 # Datastore type for canal. It can be either kuberentes or etcd. datastoreType: kubernetes diff --git a/packages/rke2-canal/package.yaml b/packages/rke2-canal/package.yaml index b2f642983..226026f1f 100644 --- a/packages/rke2-canal/package.yaml +++ b/packages/rke2-canal/package.yaml @@ -1,2 +1,2 @@ url: local -packageVersion: 04 +packageVersion: 00