diff --git a/internal/process/provisioning/create_runtime_resource_step.go b/internal/process/provisioning/create_runtime_resource_step.go index aaf2ac01cc..66ff6e5b46 100644 --- a/internal/process/provisioning/create_runtime_resource_step.go +++ b/internal/process/provisioning/create_runtime_resource_step.go @@ -220,7 +220,7 @@ func (s *CreateRuntimeResourceStep) providerValues(operation *internal.Operation ProvisioningParameters: operation.ProvisioningParameters, } case broker.PreviewPlanID: - p = &provider.AWSInputProvider{ + p = &provider.AzureInputProvider{ MultiZone: s.config.MultiZoneCluster, ProvisioningParameters: operation.ProvisioningParameters, } diff --git a/internal/process/provisioning/create_runtime_resource_step_test.go b/internal/process/provisioning/create_runtime_resource_step_test.go index 288f94cb05..619bd43e53 100644 --- a/internal/process/provisioning/create_runtime_resource_step_test.go +++ b/internal/process/provisioning/create_runtime_resource_step_test.go @@ -430,7 +430,7 @@ func TestCreateRuntimeResourceStep_Defaults_Preview_SingleZone_ActualCreation(t err := imv1.AddToScheme(scheme.Scheme) - instance, operation := fixInstanceAndOperation(broker.PreviewPlanID, "eu-west-2", "platform-region") + instance, operation := fixInstanceAndOperation(broker.PreviewPlanID, "westeurope", "platform-region") assertInsertions(t, memoryStorage, instance, operation) kimConfig := fixKimConfig("preview", false) @@ -459,10 +459,10 @@ func TestCreateRuntimeResourceStep_Defaults_Preview_SingleZone_ActualCreation(t assertLabelsKIMDriven(t, operation, runtime) assertSecurity(t, runtime) - assert.Equal(t, "aws", runtime.Spec.Shoot.Provider.Type) - assert.Equal(t, "eu-west-2", runtime.Spec.Shoot.Region) + assert.Equal(t, "azure", runtime.Spec.Shoot.Provider.Type) + assert.Equal(t, "westeurope", runtime.Spec.Shoot.Region) assert.Equal(t, "production", string(runtime.Spec.Shoot.Purpose)) - assertWorkers(t, runtime.Spec.Shoot.Provider.Workers, "m6i.large", 20, 3, 1, 0, 1, []string{"eu-west-2a", "eu-west-2b", "eu-west-2c"}) + assertWorkers(t, runtime.Spec.Shoot.Provider.Workers, "Standard_D2s_v5", 20, 3, 1, 0, 1, []string{"1", "2", "3"}) _, err = memoryStorage.Instances().GetByID(operation.InstanceID) assert.NoError(t, err) @@ -476,7 +476,7 @@ func TestCreateRuntimeResourceStep_Defaults_Preview_SingleZone_ActualCreation_Wi err := imv1.AddToScheme(scheme.Scheme) - instance, operation := fixInstanceAndOperation(broker.PreviewPlanID, "eu-west-2", "platform-region") + instance, operation := fixInstanceAndOperation(broker.PreviewPlanID, "westeurope", "platform-region") assertInsertions(t, memoryStorage, instance, operation) kimConfig := fixKimConfig("preview", false) @@ -505,10 +505,10 @@ func TestCreateRuntimeResourceStep_Defaults_Preview_SingleZone_ActualCreation_Wi assertLabelsKIMDriven(t, operation, runtime) assertSecurity(t, runtime) - assert.Equal(t, "aws", runtime.Spec.Shoot.Provider.Type) - assert.Equal(t, "eu-west-2", runtime.Spec.Shoot.Region) + assert.Equal(t, "azure", runtime.Spec.Shoot.Provider.Type) + assert.Equal(t, "westeurope", runtime.Spec.Shoot.Region) assert.Equal(t, "production", string(runtime.Spec.Shoot.Purpose)) - assertWorkers(t, runtime.Spec.Shoot.Provider.Workers, "m6i.large", 20, 3, 1, 0, 1, []string{"eu-west-2a", "eu-west-2b", "eu-west-2c"}) + assertWorkers(t, runtime.Spec.Shoot.Provider.Workers, "Standard_D2s_v5", 20, 3, 1, 0, 1, []string{"1", "2", "3"}) // then retry _, repeat, err = step.Run(operation, entry) @@ -525,10 +525,10 @@ func TestCreateRuntimeResourceStep_Defaults_Preview_SingleZone_ActualCreation_Wi assertLabelsKIMDriven(t, operation, runtime) assertSecurity(t, runtime) - assert.Equal(t, "aws", runtime.Spec.Shoot.Provider.Type) - assert.Equal(t, "eu-west-2", runtime.Spec.Shoot.Region) + assert.Equal(t, "azure", runtime.Spec.Shoot.Provider.Type) + assert.Equal(t, "westeurope", runtime.Spec.Shoot.Region) assert.Equal(t, "production", string(runtime.Spec.Shoot.Purpose)) - assertWorkers(t, runtime.Spec.Shoot.Provider.Workers, "m6i.large", 20, 3, 1, 0, 1, []string{"eu-west-2a", "eu-west-2b", "eu-west-2c"}) + assertWorkers(t, runtime.Spec.Shoot.Provider.Workers, "Standard_D2s_v5", 20, 3, 1, 0, 1, []string{"1", "2", "3"}) _, err = memoryStorage.Instances().GetByID(operation.InstanceID) assert.NoError(t, err) @@ -542,7 +542,7 @@ func TestCreateRuntimeResourceStep_Defaults_Preview_MultiZone_ActualCreation(t * err := imv1.AddToScheme(scheme.Scheme) - instance, operation := fixInstanceAndOperation(broker.PreviewPlanID, "eu-west-2", "platform-region") + instance, operation := fixInstanceAndOperation(broker.PreviewPlanID, "westeurope", "platform-region") assertInsertions(t, memoryStorage, instance, operation) kimConfig := fixKimConfig("preview", false) @@ -571,10 +571,10 @@ func TestCreateRuntimeResourceStep_Defaults_Preview_MultiZone_ActualCreation(t * assertLabelsKIMDriven(t, operation, runtime) assertSecurity(t, runtime) - assert.Equal(t, "aws", runtime.Spec.Shoot.Provider.Type) - assert.Equal(t, "eu-west-2", runtime.Spec.Shoot.Region) + assert.Equal(t, "azure", runtime.Spec.Shoot.Provider.Type) + assert.Equal(t, "westeurope", runtime.Spec.Shoot.Region) assert.Equal(t, "production", string(runtime.Spec.Shoot.Purpose)) - assertWorkers(t, runtime.Spec.Shoot.Provider.Workers, "m6i.large", 20, 3, 3, 0, 3, []string{"eu-west-2a", "eu-west-2b", "eu-west-2c"}) + assertWorkers(t, runtime.Spec.Shoot.Provider.Workers, "Standard_D2s_v5", 20, 3, 3, 0, 3, []string{"1", "2", "3"}) _, err = memoryStorage.Instances().GetByID(operation.InstanceID) assert.NoError(t, err)