Skip to content

Commit db77b04

Browse files
Merge pull request #733 from mgfritch/flannel-v0.72.1
Update flannel chart v0.27.100
2 parents 5e5685c + a5bd848 commit db77b04

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

packages/rke2-flannel/generated-changes/patch/Chart.yaml.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
sources:
1010
-- https://github.com/flannel-io/flannel
1111
+- https://github.com/rancher/rke2-charts
12-
version: v0.27.0
12+
version: v0.27.1

packages/rke2-flannel/generated-changes/patch/templates/daemonset.yaml.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- charts-original/templates/daemonset.yaml
22
+++ charts/templates/daemonset.yaml
3-
@@ -33,20 +33,13 @@
3+
@@ -37,20 +37,13 @@
44
{{- end }}
55
serviceAccountName: flannel
66
initContainers:
@@ -25,7 +25,7 @@
2525
command:
2626
- cp
2727
args:
28-
@@ -58,10 +51,9 @@
28+
@@ -62,10 +55,9 @@
2929
mountPath: /etc/cni/net.d
3030
- name: flannel-cfg
3131
mountPath: /etc/kube-flannel/
@@ -37,16 +37,16 @@
3737
command:
3838
- "/opt/bin/flanneld"
3939
{{- range .Values.flannel.args }}
40-
@@ -72,7 +64,7 @@
41-
cpu: "100m"
42-
memory: "50Mi"
40+
@@ -76,7 +68,7 @@
41+
{{- toYaml . | trim | nindent 10 }}
42+
{{- end }}
4343
securityContext:
4444
- privileged: false
4545
+ privileged: true
4646
capabilities:
4747
add: ["NET_ADMIN", "NET_RAW"]
4848
env:
49-
@@ -93,44 +85,14 @@
49+
@@ -99,44 +91,14 @@
5050
mountPath: /etc/kube-flannel/
5151
- name: xtables-lock
5252
mountPath: /run/xtables.lock

packages/rke2-flannel/generated-changes/patch/values.yaml.patch

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
# kube-flannel image
1616
image:
1717
- repository: ghcr.io/flannel-io/flannel
18-
- tag: v0.27.0
18+
- tag: v0.27.1
1919
+ repository: rancher/hardened-flannel
20-
+ tag: v0.27.0-build20250611
20+
+ tag: v0.27.1-build20250710
2121
image_cni:
2222
- repository: ghcr.io/flannel-io/flannel-cni-plugin
2323
- tag: v1.7.1-flannel1
@@ -63,9 +63,9 @@
6363
}
6464
]
6565
}
66-
@@ -83,16 +77,18 @@
67-
# General daemonset configs
68-
#
66+
@@ -87,17 +81,19 @@
67+
cpu: 100m
68+
memory: 50Mi
6969
tolerations:
7070
- - effect: NoExecute
7171
- operator: Exists
@@ -81,6 +81,7 @@
8181
+ - key: "node-role.kubernetes.io/etcd"
8282
+ operator: "Exists"
8383
+ effect: "NoExecute"
84+
nodeSelector: {}
8485

8586
-netpol:
8687
- enabled: false

packages/rke2-flannel/package.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
url: https://github.com/flannel-io/flannel/releases/download/v0.27.0/flannel.tgz
2-
packageVersion: 01
1+
url: https://github.com/flannel-io/flannel/releases/download/v0.27.1/flannel.tgz
2+
packageVersion: 00

0 commit comments

Comments
 (0)