Skip to content

Commit 2212107

Browse files
committed
Add Azure Stack as a valid environment
Adds AzureStack as a valid cloud environment. The value "AzureStackCloud" corresponds to the name expected by the azure autorest package, which will expect a environment configuration file to be found at a path specified by the environment variable AZURE_ENVIRONMENT_FILEPATH. See: https://github.com/Azure/go-autorest/blob/main/autorest/azure/environments.go#L300-L302
1 parent 46be8d1 commit 2212107

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

api/v1beta1/types_class.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ type AzureClusterClassSpec struct {
4848
// - GermanCloud: "AzureGermanCloud"
4949
// - PublicCloud: "AzurePublicCloud"
5050
// - USGovernmentCloud: "AzureUSGovernmentCloud"
51+
// - StackCloud: "AzureStackCloud"
5152
//
5253
// Note that values other than the default must also be accompanied by corresponding changes to the
5354
// aso-controller-settings Secret to configure ASO to refer to the non-Public cloud. ASO currently does
@@ -186,6 +187,7 @@ type AzureManagedControlPlaneClassSpec struct {
186187
// - PublicCloud: "AzurePublicCloud"
187188
// - USGovernmentCloud: "AzureUSGovernmentCloud"
188189
//
190+
//
189191
// Note that values other than the default must also be accompanied by corresponding changes to the
190192
// aso-controller-settings Secret to configure ASO to refer to the non-Public cloud. ASO currently does
191193
// not support referring to multiple different clouds in a single installation. The following fields must

azure/defaults.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ const (
4444
ChinaCloudName = "AzureChinaCloud"
4545
// USGovernmentCloudName is the name of the Azure US Government cloud.
4646
USGovernmentCloudName = "AzureUSGovernmentCloud"
47+
// StackCloudName is the name for Azure Stack hybrid cloud environments.
48+
StackCloudName = "AzureStackCloud"
4749
)
4850

4951
const (

config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ spec:
9292
- GermanCloud: "AzureGermanCloud"
9393
- PublicCloud: "AzurePublicCloud"
9494
- USGovernmentCloud: "AzureUSGovernmentCloud"
95+
- StackCloud: "AzureStackCloud"
9596
9697
Note that values other than the default must also be accompanied by corresponding changes to the
9798
aso-controller-settings Secret to configure ASO to refer to the non-Public cloud. ASO currently does

config/crd/bases/infrastructure.cluster.x-k8s.io_azureclustertemplates.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ spec:
6565
- GermanCloud: "AzureGermanCloud"
6666
- PublicCloud: "AzurePublicCloud"
6767
- USGovernmentCloud: "AzureUSGovernmentCloud"
68+
- StackCloud: "AzureStackCloud"
6869
6970
Note that values other than the default must also be accompanied by corresponding changes to the
7071
aso-controller-settings Secret to configure ASO to refer to the non-Public cloud. ASO currently does

0 commit comments

Comments
 (0)