Add condition for Calico BGP resources

ironcore-dev · Oct 9, 2024 · ecb378f · ecb378f
1 parent 4680dee
commit ecb378f
Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/charts/internal/shoot-system-components/charts/calico-bgp/templates/bgpconfiguration.yaml b/charts/internal/shoot-system-components/charts/calico-bgp/templates/bgpconfiguration.yaml
@@ -1,11 +1,12 @@
+{{- if .Values.bgp.enabled }}
 apiVersion: crd.projectcalico.org/v1
 kind: BGPConfiguration
 metadata:
   name: default
 spec:
   logSeverityScreen: {{ .Values.bgp.logSeverityScreen }}
   nodeToNodeMeshEnabled: {{ .Values.bgp.nodeToNodeMeshEnabled }}
-  asNumber: {{ required ".Values.bgp.asNumber is required" .Values.bgp.asNumber }}
+  asNumber: {{ .Values.bgp.asNumber }}
   {{- if .Values.bgp.serviceLoadBalancerIPs }}
   serviceLoadBalancerIPs:
   {{- range $cidr := .Values.bgp.serviceLoadBalancerIPs }}
@@ -26,4 +27,4 @@ spec:
   {{- end }}
   listenPort: {{ .Values.bgp.listenPort }}
   bindMode: {{ .Values.bgp.bindMode }}
-
+{{- end }}
diff --git a/charts/internal/shoot-system-components/charts/calico-bgp/templates/bgppeer.yaml b/charts/internal/shoot-system-components/charts/calico-bgp/templates/bgppeer.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.bgp.enabled }}
 {{- if .Values.bgp.bgpPeer }}
 {{- range $peer := .Values.bgp.bgpPeer }}
 ---
@@ -6,10 +7,11 @@ kind: BGPPeer
 metadata:
   name: bgppeer-{{ $peer.asNumber }}-{{ $peer.peerIP }}
 spec:
-  asNumber: {{ required ".peer.asNumber is required" $peer.asNumber }}
+  asNumber: {{ $peer.asNumber }}
   {{- if $peer.nodeSelector }}
   nodeSelector: {{ $peer.nodeSelector }}
   {{- end }}
-  peerIP: {{ required ".peer.peerIP is required" $peer.peerIP }}
+  peerIP: {{ $peer.peerIP }}
+{{- end }}
 {{- end }}
 {{- end }}
diff --git a/pkg/controller/controlplane/valuesprovider.go b/pkg/controller/controlplane/valuesprovider.go
@@ -391,6 +391,9 @@ func getCalicoBgpChartValues(
 	if cpConfig.LoadBalancerConfig == nil || cpConfig.LoadBalancerConfig.CalicoBgpConfig == nil {
 		return map[string]any{
 			"enabled": false,
+			"bgp": map[string]any{
+				"enabled": false,
+			},
 		}, nil
 	}
 
@@ -438,6 +441,7 @@ func getCalicoBgpChartValues(
 	return map[string]any{
 		"enabled": true,
 		"bgp": map[string]any{
+			"enabled":                true,
 			"asNumber":               cpConfig.LoadBalancerConfig.CalicoBgpConfig.ASNumber,
 			"serviceLoadBalancerIPs": serviceLbIPs,
 			"serviceExternalIPs":     serviceExtIPs,