Skip to content

Commit

Permalink
Use windows values and fix mac bug
Browse files Browse the repository at this point in the history
Signed-off-by: Manuel Buil <[email protected]>
  • Loading branch information
manuelbuil committed Jan 25, 2024
1 parent 135e66a commit 75976be
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- charts-original/templates/config.yaml
+++ charts/templates/config.yaml
@@ -29,13 +29,13 @@
@@ -29,19 +29,19 @@
}
net-conf.json: |
{
Expand All @@ -18,3 +18,20 @@
"EnableIPv6": true,
{{- end }}
"Backend": {
{{- if eq .Values.flannel.backend "vxlan" }}
-{{- if .Values.flannel.backendPort }}
- "Port": {{ .Values.flannel.backendPort }},
+{{- if .Values.flannel.vxlanBackendPort }}
+ "Port": {{ .Values.flannel.vxlanBackendPort }},
{{- end }}
{{- if .Values.flannel.vni }}
"VNI": {{ .Values.flannel.vni }},
@@ -56,7 +56,7 @@
"MTU": {{ .Values.flannel.mtu }},
{{- end }}
{{- if .Values.flannel.macPrefix }}
- "MacPrefix": {{ .Values.flannel.macPrefix }},
+ "MacPrefix": {{ .Values.flannel.macPrefix | quote }},
{{- end }}
"Type": {{ .Values.flannel.backend | quote }}
{{- else if eq .Values.flannel.backend "wireguard" }}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# flannel command arguments
args:
- "--ip-masq"
@@ -25,28 +17,35 @@
@@ -25,28 +17,36 @@
# 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)
Expand All @@ -40,7 +40,7 @@
#
# VXLAN Identifier to be used. On Linux default is 1.
- #vni: 1
+ vni: 1
+ vni: 4096
# Enable VXLAN Group Based Policy (Default false)
- #GBP: false
+ GBP: false
Expand All @@ -50,6 +50,7 @@
# MAC prefix to be used on Windows. (Defaults is 0E-2A)
- #macPrefix: "0E-2A"
+ macPrefix: "0E-2A"
+ vxlanBackendPort: 4789
#
# Wireguard Configs:
#
Expand Down
2 changes: 1 addition & 1 deletion packages/rke2-flannel/package.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
url: https://github.com/flannel-io/flannel/releases/download/v0.24.2/flannel.tgz
packageVersion: 00
packageVersion: 01

0 comments on commit 75976be

Please sign in to comment.