--- charts-original/templates/crs/custom-resources.yaml +++ charts/templates/crs/custom-resources.yaml @@ -6,6 +6,10 @@ {{ $secrets = append $secrets $item }} {{ end }} {{ $_ := set $installSpec "imagePullSecrets" $secrets }} +{{ $defaultipPools := get .Values.installation.calicoNetwork "ipPools" | first }} +{{ $defaultCIDR := get $defaultipPools "cidr" }} +{{ $finalCIDR := coalesce .Values.global.clusterCIDR $defaultCIDR }} +{{ $_ := set $defaultipPools "cidr" $finalCIDR }} apiVersion: operator.tigera.io/v1 kind: Installation