From f51879f95daee7ff0cffd87460e5274610c3c639 Mon Sep 17 00:00:00 2001
From: Markus Rudy <mr@edgeless.systems>
Date: Mon, 5 May 2025 07:31:10 +0200
Subject: [PATCH] terraform-provider: pass ServiceCIDR from resource to chart
 loader (#3793)

---
 .../internal/provider/cluster_resource.go                      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/terraform-provider-constellation/internal/provider/cluster_resource.go b/terraform-provider-constellation/internal/provider/cluster_resource.go
index c002ccad5..d8921476c 100644
--- a/terraform-provider-constellation/internal/provider/cluster_resource.go
+++ b/terraform-provider-constellation/internal/provider/cluster_resource.go
@@ -1093,6 +1093,7 @@ func (r *ClusterResource) apply(ctx context.Context, data *ClusterResourceModel,
 		DeployCSIDriver:     microserviceCfg.CSIDriver,
 		masterSecret:        secrets.masterSecret,
 		serviceAccURI:       serviceAccURI,
+		serviceCIDR:         networkCfg.IPCidrService.ValueString(),
 	}
 	if csp == cloudprovider.OpenStack {
 		payload.openStackHelmValues = &helm.OpenStackValues{
@@ -1267,6 +1268,7 @@ type applyHelmChartsPayload struct {
 	masterSecret        uri.MasterSecret         // master secret of the cluster.
 	serviceAccURI       string                   // URI of the service account used within the cluster.
 	openStackHelmValues *helm.OpenStackValues    // OpenStack-specific Helm values.
+	serviceCIDR         string                   // CIDR used for k8s services - needed for CoreDNS chart.
 }
 
 // applyHelmCharts applies the Helm charts to the cluster.
@@ -1288,6 +1290,7 @@ func (r *ClusterResource) applyHelmCharts(ctx context.Context, applier *constell
 		// The user has previously been warned about this when planning a microservice version change.
 		AllowDestructive: helm.AllowDestructive,
 		OpenStackValues:  payload.openStackHelmValues,
+		ServiceCIDR:      payload.serviceCIDR,
 	}
 
 	if err := applier.AnnotateCoreDNSResources(ctx); err != nil {