Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-11 00:10:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

terraform-provider: pass ServiceCIDR from resource to chart loader (#3793)

Browse source
This commit is contained in:
Markus Rudy 2025-05-05 07:31:10 +02:00 • committed by GitHub
parent 740752a60a
commit f51879f95d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
terraform-provider-constellation/internal/provider/cluster_resource.go
View file

@ -1093,6 +1093,7 @@ func (r *ClusterResource) apply(ctx context.Context, data *ClusterResourceModel,
DeployCSIDriver: microserviceCfg.CSIDriver, DeployCSIDriver: microserviceCfg.CSIDriver,
masterSecret: secrets.masterSecret, masterSecret: secrets.masterSecret,
serviceAccURI: serviceAccURI, serviceAccURI: serviceAccURI,
serviceCIDR: networkCfg.IPCidrService.ValueString(),
} }
if csp == cloudprovider.OpenStack { if csp == cloudprovider.OpenStack {
payload.openStackHelmValues = &helm.OpenStackValues{ payload.openStackHelmValues = &helm.OpenStackValues{
@ -1267,6 +1268,7 @@ type applyHelmChartsPayload struct {
masterSecret uri.MasterSecret // master secret of the cluster. masterSecret uri.MasterSecret // master secret of the cluster.
serviceAccURI string // URI of the service account used within the cluster. serviceAccURI string // URI of the service account used within the cluster.
openStackHelmValues *helm.OpenStackValues // OpenStack-specific Helm values. 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. // 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. // The user has previously been warned about this when planning a microservice version change.
AllowDestructive: helm.AllowDestructive, AllowDestructive: helm.AllowDestructive,
OpenStackValues: payload.openStackHelmValues, OpenStackValues: payload.openStackHelmValues,
ServiceCIDR: payload.serviceCIDR,
} }
if err := applier.AnnotateCoreDNSResources(ctx); err != nil { if err := applier.AnnotateCoreDNSResources(ctx); err != nil {