Skip to content

Commit 9e58a98

Browse files
make sure to also pass cloud instance name to CCM (#937)
1 parent aa27d28 commit 9e58a98

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

pkg/controller/controlplane/valuesprovider.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import (
4242
apisazure "github.com/gardener/gardener-extension-provider-azure/pkg/apis/azure"
4343
azureapihelper "github.com/gardener/gardener-extension-provider-azure/pkg/apis/azure/helper"
4444
"github.com/gardener/gardener-extension-provider-azure/pkg/azure"
45+
azureclient "github.com/gardener/gardener-extension-provider-azure/pkg/azure/client"
4546
"github.com/gardener/gardener-extension-provider-azure/pkg/features"
4647
"github.com/gardener/gardener-extension-provider-azure/pkg/internal"
4748
)
@@ -476,6 +477,13 @@ func getConfigChartValues(infraStatus *apisazure.InfrastructureStatus, cp *exten
476477
"maxNodes": maxNodes,
477478
}
478479

480+
cloudConfiguration, err := azureclient.CloudConfiguration(nil, &cluster.Shoot.Spec.Region)
481+
if err != nil {
482+
return nil, err
483+
}
484+
485+
values["cloud"] = cloudInstanceName(*cloudConfiguration)
486+
479487
if infraStatus.Networks.VNet.ResourceGroup != nil {
480488
values["vnetResourceGroup"] = *infraStatus.Networks.VNet.ResourceGroup
481489
}
@@ -487,6 +495,17 @@ func getConfigChartValues(infraStatus *apisazure.InfrastructureStatus, cp *exten
487495
return appendMachineSetValues(values, infraStatus), nil
488496
}
489497

498+
func cloudInstanceName(cloudConfiguration apisazure.CloudConfiguration) string {
499+
switch {
500+
case cloudConfiguration.Name == apisazure.AzureChinaCloudName:
501+
return "AZURECHINACLOUD"
502+
case cloudConfiguration.Name == apisazure.AzureGovCloudName:
503+
return "AZUREUSGOVERNMENT"
504+
default:
505+
return "AZUREPUBLICCLOUD"
506+
}
507+
}
508+
490509
func appendMachineSetValues(values map[string]interface{}, infraStatus *apisazure.InfrastructureStatus) map[string]interface{} {
491510
values["vmType"] = "standard"
492511
if azureapihelper.IsVmoRequired(infraStatus) {

pkg/controller/controlplane/valuesprovider_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ var _ = Describe("ValuesProvider", func() {
166166
"routeTableName": "route-table-name",
167167
"securityGroupName": "security-group-name-workers",
168168
"vmType": "standard",
169+
"cloud": "AZUREPUBLICCLOUD",
169170
}
170171
})
171172

0 commit comments

Comments
 (0)