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

Jump to bottom

Uncomment values and update to v0.24.1 #396

Merged
merged 1 commit into from
Jan 17, 2024
Merged

Uncomment values and update to v0.24.1 #396

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
2 changes: 1 addition & 1 deletion packages/rke2-flannel/generated-changes/patch/Chart.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
sources:
-- https://github.com/flannel-io/flannel
+- https://github.com/rancher/rke2-charts
version: v0.24.0
version: v0.24.1
45 changes: 40 additions & 5 deletions packages/rke2-flannel/generated-changes/patch/values.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
# kube-flannel image
image:
- repository: docker.io/flannel/flannel
- tag: v0.24.0
- tag: v0.24.1
+ repository: rancher/hardened-flannel
+ tag: v0.24.0-build20240108
+ tag: v0.24.1-build20240117
image_cni:
- repository: docker.io/flannel/flannel-cni-plugin
- tag: v1.2.0
Expand All @@ -26,10 +26,45 @@
# flannel command arguments
args:
- "--ip-masq"
@@ -50,3 +42,10 @@
#tunnelMode: "separate"
@@ -25,28 +17,35 @@
# Documentation at https://github.com/flannel-io/flannel/blob/master/Documentation/backends.md
backend: "vxlan"
# Port used by the backend 0 means default value (VXLAN: 8472, Wireguard: 51821, UDP: 8285)
- #backendPort: 0
+ backendPort: 0
# MTU to use for outgoing packets (VXLAN and Wiregurad) if not defined the MTU of the external interface is used.
- #mtu: 1500
+ mtu: 1500
#
# VXLAN Configs:
#
# VXLAN Identifier to be used. On Linux default is 1.
- #vni: 1
+ vni: 1
# Enable VXLAN Group Based Policy (Default false)
- #GBP: false
+ GBP: false
# Enable direct routes (default is false)
- #directRouting: false
+ directRouting: false
# MAC prefix to be used on Windows. (Defaults is 0E-2A)
- #macPrefix: "0E-2A"
+ macPrefix: "0E-2A"
#
# Wireguard Configs:
#
# UDP listen port used with IPv6
- #backendPortv6: 51821
+ backendPortv6: 51821
# Pre shared key to use
- #psk: 0
+ psk: 0
# IP version to use on Wireguard
- #tunnelMode: "separate"
+ tunnelMode: "separate"
# Persistent keep interval to use
#keepaliveInterval: 0
- #keepaliveInterval: 0
+ keepaliveInterval: 0
+ #
+
+global:
Expand Down
6 changes: 2 additions & 4 deletions packages/rke2-flannel/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
url: https://github.com/flannel-io/flannel.git
subdirectory: chart/kube-flannel
commit: v0.24.0
packageVersion: 01
url: https://github.com/flannel-io/flannel/releases/download/v0.24.1/flannel.tgz
packageVersion: 00