diff --git a/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml b/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml index 312037710..3d46f9ba1 100644 --- a/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml +++ b/packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml @@ -1,15 +1,11 @@ +{{ $felixConfig := dict }} +{{ range $key, $value := .Values.felixConfiguration }} +{{ $_ := set $felixConfig $key $value }} +{{ end }} + apiVersion: crd.projectcalico.org/v1 kind: FelixConfiguration metadata: name: default spec: - wireguardEnabled: {{ .Values.felixConfiguration.wireguardEnabled }} - featureDetectOverride: {{ .Values.felixConfiguration.featureDetectOverride }} - healthPort: {{ .Values.felixConfiguration.healthPort }} - defaultEndpointToHostAction: {{ .Values.felixConfiguration.defaultEndpointToHostAction }} - failsafeInboundHostPorts: {{ .Values.felixConfiguration.failsafeInboundHostPorts }} - failsafeOutboundHostPorts: {{ .Values.felixConfiguration.failsafeOutboundHostPorts }} - iptablesRefreshInterval: {{ .Values.felixConfiguration.iptablesRefreshInterval }} - iptablesBackend: {{ .Values.felixConfiguration.iptablesBackend }} - logSeveritySys: {{ .Values.felixConfiguration.logSeveritySys }} - xdpEnabled: {{ .Values.felixConfiguration.xdpEnabled }} \ No newline at end of file +{{ $felixConfig | toYaml | indent 2 }} diff --git a/packages/rke2-calico/generated-changes/patch/values.yaml.patch b/packages/rke2-calico/generated-changes/patch/values.yaml.patch index 344e1ccba..a023199de 100644 --- a/packages/rke2-calico/generated-changes/patch/values.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/values.yaml.patch @@ -26,7 +26,7 @@ certs: node: -@@ -40,9 +53,30 @@ +@@ -40,9 +53,28 @@ # Image and registry configuration for the tigera/operator pod. tigeraOperator: @@ -56,7 +56,5 @@ + featureDetectOverride: "ChecksumOffloadBroken=true" + healthPort: 9099 + defaultEndpointToHostAction: "Drop" -+ failsafeInboundHostPorts: "" -+ failsafeOutboundHostPorts: "" + logSeveritySys: "Info" + xdpEnabled: true diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml index 813e1c888..51555ce2e 100644 --- a/packages/rke2-calico/package.yaml +++ b/packages/rke2-calico/package.yaml @@ -1,5 +1,5 @@ url: https://github.com/projectcalico/calico/releases/download/v3.26.1/tigera-operator-v3.26.1.tgz -packageVersion: 00 +packageVersion: 01 additionalCharts: - workingDir: charts-crd crdOptions: