From 3e64875d5322bfe76e1c317dc2b84fd433880c33 Mon Sep 17 00:00:00 2001
From: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
Date: Thu, 12 May 2022 12:17:16 +0200
Subject: [PATCH] Fixed dualstack config

Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
---
 .../patch/templates/crs/custom-resources.yaml.patch   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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 43abe6e..207e4d3 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 }}
@@ -16,14 +16,15 @@
 +*/}}
 +{{ if not (empty .Values.global.clusterCIDRv6) }}
 +{{ $myIP6Dict := dict "natOutgoing" "Enabled" "encapsulation" "VXLAN" "cidr" .Values.global.clusterCIDRv6 }}
-+{{ $finalIpPoolList := list $myIP6Dict }}
++{{ $calicoNetwork := get .Values.installation "calicoNetwork" }}
 +{{ if not (empty .Values.global.clusterCIDRv4) }}
 +{{ $allIpPools := get .Values.installation.calicoNetwork "ipPools" }}
 +{{ $finalIpPoolList := append $allIpPools $myIP6Dict }}
-+{{ end }}
-+{{ $calicoNetwork := get .Values.installation "calicoNetwork" }}
 +{{ $_ := set $calicoNetwork "ipPools" $finalIpPoolList }}
-+{{ $_ := set $calicoNetwork "bgp" "Enabled" }}
++{{ else }}
++{{ $finalIpPoolList := list $myIP6Dict }}
++{{ $_ := set $calicoNetwork "ipPools" $finalIpPoolList }}
++{{ end }}
 +{{ end }}
  
  apiVersion: operator.tigera.io/v1