@@ -1093,6 +1093,7 @@ func (r *ClusterResource) apply(ctx context.Context, data *ClusterResourceModel,
1093
1093
DeployCSIDriver : microserviceCfg .CSIDriver ,
1094
1094
masterSecret : secrets .masterSecret ,
1095
1095
serviceAccURI : serviceAccURI ,
1096
+ serviceCIDR : networkCfg .IPCidrService .ValueString (),
1096
1097
}
1097
1098
if csp == cloudprovider .OpenStack {
1098
1099
payload .openStackHelmValues = & helm.OpenStackValues {
@@ -1267,6 +1268,7 @@ type applyHelmChartsPayload struct {
1267
1268
masterSecret uri.MasterSecret // master secret of the cluster.
1268
1269
serviceAccURI string // URI of the service account used within the cluster.
1269
1270
openStackHelmValues * helm.OpenStackValues // OpenStack-specific Helm values.
1271
+ serviceCIDR string // CIDR used for k8s services - needed for CoreDNS chart.
1270
1272
}
1271
1273
1272
1274
// applyHelmCharts applies the Helm charts to the cluster.
@@ -1288,6 +1290,7 @@ func (r *ClusterResource) applyHelmCharts(ctx context.Context, applier *constell
1288
1290
// The user has previously been warned about this when planning a microservice version change.
1289
1291
AllowDestructive : helm .AllowDestructive ,
1290
1292
OpenStackValues : payload .openStackHelmValues ,
1293
+ ServiceCIDR : payload .serviceCIDR ,
1291
1294
}
1292
1295
1293
1296
if err := applier .AnnotateCoreDNSResources (ctx ); err != nil {
0 commit comments