diff --git a/packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch b/packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch index 96f01ce..92e0837 100644 --- a/packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch +++ b/packages/rke2-calico/generated-changes/patch/templates/crs/custom-resources.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/templates/crs/custom-resources.yaml +++ charts/templates/crs/custom-resources.yaml -@@ -6,6 +6,27 @@ +@@ -6,6 +6,28 @@ {{ $secrets = append $secrets $item }} {{ end }} {{ $_ := set $installSpec "imagePullSecrets" $secrets }} @@ -13,7 +13,8 @@ +{{ $myIP4Dict := dict "natOutgoing" "Enabled" "encapsulation" "VXLAN" "cidr" .Values.global.clusterCIDRv4 }} +{{ if not (empty .Values.global.clusterCIDRv6) }} +{{ $myIP6Dict := dict "natOutgoing" "Enabled" "encapsulation" "VXLAN" "cidr" .Values.global.clusterCIDRv6 }} -+{{ $finalIpPoolList := append $myIP4Dict $myIP6Dict }} ++{{ $ipPoolList := list $myIP4Dict }} ++{{ $finalIpPoolList := append $ipPoolList $myIP6Dict }} +{{ $_ := set $calicoNetwork "ipPools" $finalIpPoolList }} +{{ else }} +{{ $finalIpPoolList := list $myIP4Dict }} diff --git a/packages/rke2-calico/package.yaml b/packages/rke2-calico/package.yaml index 3d61661..7023675 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.23.1/tigera-operator-v3.23.1.tgz -packageVersion: 02 +packageVersion: 03 additionalCharts: - workingDir: charts-crd crdOptions: