andata
/
rke2-charts
mirror of https://git.rancher.io/rke2-charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #382 from thomasferrandiz/calico-nodeAddressAutodetectionV4 

set nodeAddressAutodetectionV4.firstFound explicitly in calico chart and update calico to v3.26.3
pull/383/head
thomasferrandiz 2023-11-16 09:53:34 +01:00 committed by GitHub
parent f88d1b5495 e3e7ce8f07
commit 6a49b02b93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/rke2-calico/generated-changes/patch/Chart.yaml.patch
View File

@ -10,6 +10,6 @@
- https://github.com/projectcalico/calico/tree/master/calico/_includes/charts/tigera-operator - https://github.com/projectcalico/calico/tree/master/calico/_includes/charts/tigera-operator
- https://github.com/tigera/operator - https://github.com/tigera/operator
- https://github.com/projectcalico/calico - https://github.com/projectcalico/calico
version: v3.26.1 version: v3.26.3
+annotations: +annotations:
+ catalog.cattle.io/namespace: tigera-operator + catalog.cattle.io/namespace: tigera-operator

7
packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch
View File

@ -1,6 +1,6 @@
--- charts-original/templates/crs/custom-resources.yaml --- charts-original/templates/crs/custom-resources.yaml
+++ charts/templates/crs/custom-resources.yaml +++ charts/templates/crs/custom-resources.yaml
@@ -6,6 +6,28 @@ @@ -6,6 +6,33 @@
{{ $secrets = append $secrets $item }} {{ $secrets = append $secrets $item }}
{{ end }} {{ end }}
{{ $_ := set $installSpec "imagePullSecrets" $secrets }} {{ $_ := set $installSpec "imagePullSecrets" $secrets }}
@ -25,6 +25,11 @@
+{{ $finalIpPoolList := list $myIP6Dict }} +{{ $finalIpPoolList := list $myIP6Dict }}
+{{ $_ := set $calicoNetwork "ipPools" $finalIpPoolList }} +{{ $_ := set $calicoNetwork "ipPools" $finalIpPoolList }}
+{{ end }} +{{ end }}
+{{ if empty .Values.installation.calicoNetwork.nodeAddressAutodetectionV4 }}
+{{ $calicoNetwork := get .Values.installation "calicoNetwork" }}
+{{ $autodetect := dict "firstFound" true }}
+{{ $_ := set $calicoNetwork "nodeAddressAutodetectionV4" $autodetect }}
+{{ end }}
+{{ end }} +{{ end }}
apiVersion: operator.tigera.io/v1 apiVersion: operator.tigera.io/v1

4
packages/rke2-calico/generated-changes/patch/values.yaml.patch
View File

@ -32,13 +32,13 @@
tigeraOperator: tigeraOperator:
- image: tigera/operator - image: tigera/operator
+ image: rancher/mirrored-calico-operator + image: rancher/mirrored-calico-operator
version: v1.30.4 version: v1.30.7
- registry: quay.io - registry: quay.io
+ registry: docker.io + registry: docker.io
calicoctl: calicoctl:
- image: docker.io/calico/ctl - image: docker.io/calico/ctl
+ image: rancher/mirrored-calico-ctl + image: rancher/mirrored-calico-ctl
tag: v3.26.1 tag: v3.26.3
+ +
+global: +global:
+ systemDefaultRegistry: "" + systemDefaultRegistry: ""

4
packages/rke2-calico/package.yaml
View File

@ -1,5 +1,5 @@
url: https://github.com/projectcalico/calico/releases/download/v3.26.1/tigera-operator-v3.26.1.tgz url: https://github.com/projectcalico/calico/releases/download/v3.26.3/tigera-operator-v3.26.3.tgz
packageVersion: 01 packageVersion: 00
additionalCharts: additionalCharts:
- workingDir: charts-crd - workingDir: charts-crd
crdOptions: crdOptions:

2
packages/rke2-calico/templates/crd-template/Chart.yaml
View File

@ -1,5 +1,5 @@
apiVersion: v1 apiVersion: v1
version: v3.26.1 version: v3.26.3
description: Installs the CRDs for rke2-calico description: Installs the CRDs for rke2-calico
name: rke2-calico-crd name: rke2-calico-crd
type: application type: application