Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare to update to v0.26.4 #2178

Merged
merged 1 commit into from
Feb 4, 2025
Merged

Prepare to update to v0.26.4 #2178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Documentation/kube-flannel-psp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: ghcr.io/flannel-io/flannel:v0.26.3
image: ghcr.io/flannel-io/flannel:v0.26.4
command:
- cp
args:
Expand All @@ -191,7 +191,7 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: ghcr.io/flannel-io/flannel:v0.26.3
image: ghcr.io/flannel-io/flannel:v0.26.4
command:
- /opt/bin/flanneld
args:
Expand Down
4 changes: 2 additions & 2 deletions Documentation/kube-flannel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: ghcr.io/flannel-io/flannel:v0.26.3
image: ghcr.io/flannel-io/flannel:v0.26.4
command:
- cp
args:
Expand All @@ -158,7 +158,7 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: ghcr.io/flannel-io/flannel:v0.26.3
image: ghcr.io/flannel-io/flannel:v0.26.4
command:
- /opt/bin/flanneld
args:
Expand Down
4 changes: 2 additions & 2 deletions Documentation/kustomization/kube-flannel-psp/kube-flannel-psp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: ghcr.io/flannel-io/flannel:v0.26.3
image: ghcr.io/flannel-io/flannel:v0.26.4
command:
- cp
args:
Expand All @@ -191,7 +191,7 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: ghcr.io/flannel-io/flannel:v0.26.3
image: ghcr.io/flannel-io/flannel:v0.26.4
command:
- /opt/bin/flanneld
args:
Expand Down
4 changes: 2 additions & 2 deletions Documentation/kustomization/kube-flannel/kube-flannel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ spec:
- name: cni-plugin
mountPath: /opt/cni/bin
- name: install-cni
image: ghcr.io/flannel-io/flannel:v0.26.3
image: ghcr.io/flannel-io/flannel:v0.26.4
command:
- cp
args:
Expand All @@ -149,7 +149,7 @@ spec:
mountPath: /etc/kube-flannel/
containers:
- name: kube-flannel
image: ghcr.io/flannel-io/flannel:v0.26.3
image: ghcr.io/flannel-io/flannel:v0.26.4
command:
- /opt/bin/flanneld
args:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/kustomization/kube-flannel/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ resources:
- kube-flannel.yml
images:
- name: ghcr.io/flannel-io/flannel
newTag: v0.26.3
newTag: v0.26.4
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ ARCH=$(uname -m)
x86_64) ARCH="amd64";;
esac
mkdir -p /opt/cni/bin
curl -O -L https://github.com/containernetworking/plugins/releases/download/v1.6.0/cni-plugins-linux-$ARCH-v1.6.0.tgz
tar -C /opt/cni/bin -xzf cni-plugins-linux-$ARCH-v1.6.0.tgz
curl -O -L https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-$ARCH-v1.6.2.tgz
tar -C /opt/cni/bin -xzf cni-plugins-linux-$ARCH-v1.6.2.tgz
```

Flannel requires the br_netfilter module to start and from version 1.30 kubeadm doesn't check if the module is installed and Flannel will not rightly start in case the module is missing.
Expand Down
4 changes: 2 additions & 2 deletions chart/kube-flannel/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
appVersion: v0.26.3
appVersion: v0.26.4
description: Install Flannel Network Plugin.
keywords:
- Flannel
name: flannel
sources:
- https://github.com/flannel-io/flannel
version: v0.26.3
version: v0.26.4
4 changes: 2 additions & 2 deletions chart/kube-flannel/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ flannel:
# kube-flannel image
image:
repository: ghcr.io/flannel-io/flannel
tag: v0.26.3
tag: v0.26.4
image_cni:
repository: ghcr.io/flannel-io/flannel-cni-plugin
tag: v1.6.2-flannel1
Expand Down Expand Up @@ -70,4 +70,4 @@ netpol:
- "--v=2"
image:
repository: registry.k8s.io/networking/kube-network-policies
tag: v0.4.0
tag: v0.7.0
2 changes: 1 addition & 1 deletion e2e/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG SLES="registry.suse.com/suse/sle15:15.4"
FROM ${SLES} AS k3s
ARG ARCH
ARG K3S_VERSION="v1.29.8+k3s1"
ARG CNI_VERSION="v1.6.0"
ARG CNI_VERSION="v1.6.2"
RUN set -x \
&& zypper -n in \
ca-certificates \
Expand Down
Loading