From 7e238c5922a93fbb277e29ba66bbb6256348f4a2 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Wed, 26 Jul 2023 17:59:55 +0200 Subject: [PATCH] Update flannel and flannel-cni version Signed-off-by: Manuel Buil --- Documentation/kube-flannel-psp.yml | 9 +++------ Documentation/kube-flannel.yml | 9 +++------ .../kustomization/kube-flannel-psp/kube-flannel-psp.yml | 9 +++------ .../kustomization/kube-flannel-psp/kustomization.yaml | 2 +- .../kustomization/kube-flannel/kube-flannel.yml | 9 +++------ .../kustomization/kube-flannel/kustomization.yaml | 2 +- chart/kube-flannel/Chart.yaml | 4 ++-- chart/kube-flannel/values.yaml | 4 ++-- 8 files changed, 18 insertions(+), 30 deletions(-) diff --git a/Documentation/kube-flannel-psp.yml b/Documentation/kube-flannel-psp.yml index c30dc7dfd4..037b816b23 100644 --- a/Documentation/kube-flannel-psp.yml +++ b/Documentation/kube-flannel-psp.yml @@ -166,8 +166,7 @@ spec: serviceAccountName: flannel initContainers: - name: install-cni-plugin - image: docker.io/flannel/flannel-cni-plugin:v1.1.2 - #image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v1.1.2 + image: docker.io/flannel/flannel-cni-plugin:v1.2.0 command: - cp args: @@ -178,8 +177,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: docker.io/flannel/flannel:v0.22.0 - #image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0 + image: docker.io/flannel/flannel:v0.22.1 command: - cp args: @@ -193,8 +191,7 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - image: docker.io/flannel/flannel:v0.22.0 - #image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0 + image: docker.io/flannel/flannel:v0.22.1 command: - /opt/bin/flanneld args: diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml index 967ef25a2f..c974d47963 100644 --- a/Documentation/kube-flannel.yml +++ b/Documentation/kube-flannel.yml @@ -139,8 +139,7 @@ spec: serviceAccountName: flannel initContainers: - name: install-cni-plugin - image: docker.io/flannel/flannel-cni-plugin:v1.1.2 - #image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v1.1.2 + image: docker.io/flannel/flannel-cni-plugin:v1.2.0 command: - cp args: @@ -151,8 +150,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: docker.io/flannel/flannel:v0.22.0 - #image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0 + image: docker.io/flannel/flannel:v0.22.1 command: - cp args: @@ -166,8 +164,7 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - image: docker.io/flannel/flannel:v0.22.0 - #image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0 + image: docker.io/flannel/flannel:v0.22.1 command: - /opt/bin/flanneld args: diff --git a/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml b/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml index c30dc7dfd4..037b816b23 100644 --- a/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml +++ b/Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml @@ -166,8 +166,7 @@ spec: serviceAccountName: flannel initContainers: - name: install-cni-plugin - image: docker.io/flannel/flannel-cni-plugin:v1.1.2 - #image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v1.1.2 + image: docker.io/flannel/flannel-cni-plugin:v1.2.0 command: - cp args: @@ -178,8 +177,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: docker.io/flannel/flannel:v0.22.0 - #image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0 + image: docker.io/flannel/flannel:v0.22.1 command: - cp args: @@ -193,8 +191,7 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - image: docker.io/flannel/flannel:v0.22.0 - #image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0 + image: docker.io/flannel/flannel:v0.22.1 command: - /opt/bin/flanneld args: diff --git a/Documentation/kustomization/kube-flannel-psp/kustomization.yaml b/Documentation/kustomization/kube-flannel-psp/kustomization.yaml index fbe46473cb..966b4661f0 100644 --- a/Documentation/kustomization/kube-flannel-psp/kustomization.yaml +++ b/Documentation/kustomization/kube-flannel-psp/kustomization.yaml @@ -6,4 +6,4 @@ resources: - kube-flannel-psp.yml images: - name: docker.io/flannel/flannel - newTag: v0.22.0 + newTag: v0.22.1 diff --git a/Documentation/kustomization/kube-flannel/kube-flannel.yml b/Documentation/kustomization/kube-flannel/kube-flannel.yml index 2bed60a831..7660df4405 100644 --- a/Documentation/kustomization/kube-flannel/kube-flannel.yml +++ b/Documentation/kustomization/kube-flannel/kube-flannel.yml @@ -130,8 +130,7 @@ spec: serviceAccountName: flannel initContainers: - name: install-cni-plugin - image: docker.io/flannel/flannel-cni-plugin:v1.1.2 - #image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v1.1.2 + image: docker.io/flannel/flannel-cni-plugin:v1.2.0 command: - cp args: @@ -142,8 +141,7 @@ spec: - name: cni-plugin mountPath: /opt/cni/bin - name: install-cni - image: docker.io/flannel/flannel:v0.22.0 - #image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0 + image: docker.io/flannel/flannel:v0.22.1 command: - cp args: @@ -157,8 +155,7 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - image: docker.io/flannel/flannel:v0.22.0 - #image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0 + image: docker.io/flannel/flannel:v0.22.1 command: - /opt/bin/flanneld args: diff --git a/Documentation/kustomization/kube-flannel/kustomization.yaml b/Documentation/kustomization/kube-flannel/kustomization.yaml index b64a0931b3..0d4739d515 100644 --- a/Documentation/kustomization/kube-flannel/kustomization.yaml +++ b/Documentation/kustomization/kube-flannel/kustomization.yaml @@ -6,4 +6,4 @@ resources: - kube-flannel.yml images: - name: docker.io/flannel/flannel - newTag: v0.22.0 + newTag: v0.22.1 diff --git a/chart/kube-flannel/Chart.yaml b/chart/kube-flannel/Chart.yaml index 067a1e96dc..0894e3e62f 100644 --- a/chart/kube-flannel/Chart.yaml +++ b/chart/kube-flannel/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v1 -appVersion: v0.22.0 +appVersion: v0.22.1 description: Install Flannel Network Plugin. keywords: - Flannel name: flannel sources: - https://github.com/flannel-io/flannel -version: v0.22.0 +version: v0.22.1 diff --git a/chart/kube-flannel/values.yaml b/chart/kube-flannel/values.yaml index cacf3691c7..3a1aa19dcc 100644 --- a/chart/kube-flannel/values.yaml +++ b/chart/kube-flannel/values.yaml @@ -9,10 +9,10 @@ flannel: # kube-flannel image image: repository: docker.io/flannel/flannel - tag: v0.22.0 + tag: v0.22.1 image_cni: repository: docker.io/flannel/flannel-cni-plugin - tag: v1.1.2 + tag: v1.2.0 # flannel command arguments args: - "--ip-masq"