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

Added felixConfig values to be added from values.yaml file #369

Merged
merged 1 commit into from
Aug 28, 2023
Merged

Added felixConfig values to be added from values.yaml file #369

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
16 changes: 6 additions & 10 deletions packages/rke2-calico/generated-changes/overlay/templates/felixconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
{{ $felixConfig | toYaml | indent 2 }}
4 changes: 1 addition & 3 deletions packages/rke2-calico/generated-changes/patch/values.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

certs:
node:
@@ -40,9 +53,30 @@
@@ -40,9 +53,28 @@

# Image and registry configuration for the tigera/operator pod.
tigeraOperator:
Expand Down Expand Up @@ -56,7 +56,5 @@
+ featureDetectOverride: "ChecksumOffloadBroken=true"
+ healthPort: 9099
+ defaultEndpointToHostAction: "Drop"
+ failsafeInboundHostPorts: ""
+ failsafeOutboundHostPorts: ""
Comment on lines -59 to -60
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you remove these two, they will not be able to be set via helm

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes you can with the new logic you can specify whatever value you want through helm.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, got it, thanks. The problem is that in Rancher UI, users will not be able to see what parameters can be changed, only the ones in values. So it is good if we keep the most common ones

+ logSeveritySys: "Info"
+ xdpEnabled: true
2 changes: 1 addition & 1 deletion packages/rke2-calico/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down