From fbb17fbb56228f1d6a3cbd91b1c1c6b26473b836 Mon Sep 17 00:00:00 2001 From: Pieszka Date: Fri, 9 Aug 2024 15:12:25 +0200 Subject: [PATCH] setting for all except sap-converged-cloud setting worker name and volume size and type volume size from parameters test updated --- .../provisioning/create_runtime_resource_step.go | 11 ++++++++++- internal/provider/aws.go | 6 ++++++ internal/provider/aws_test.go | 8 ++++++++ internal/provider/azure.go | 8 ++++++++ internal/provider/azure_test.go | 12 ++++++++++++ internal/provider/gcp.go | 4 ++++ internal/provider/model.go | 5 +++-- internal/provider/sap-converged-cloud.go | 1 + 8 files changed, 52 insertions(+), 3 deletions(-) diff --git a/internal/process/provisioning/create_runtime_resource_step.go b/internal/process/provisioning/create_runtime_resource_step.go index 54b857e13..163826e0b 100644 --- a/internal/process/provisioning/create_runtime_resource_step.go +++ b/internal/process/provisioning/create_runtime_resource_step.go @@ -143,9 +143,11 @@ func (s *CreateRuntimeResourceStep) updateRuntimeResourceObject(runtime *imv1.Ru runtime.Spec.Shoot.SecretBindingName = *operation.ProvisioningParameters.Parameters.TargetSecret runtime.Spec.Shoot.ControlPlane.HighAvailability = s.createHighAvailabilityConfiguration() runtime.Spec.Shoot.EnforceSeedLocation = operation.ProvisioningParameters.Parameters.ShootAndSeedSameRegion - runtime.Spec.Security = s.createSecurityConfiguration(operation) runtime.Spec.Shoot.Networking = s.createNetworkingConfiguration(operation) runtime.Spec.Shoot.Kubernetes = s.createKubernetesConfiguration(operation) + + runtime.Spec.Security = s.createSecurityConfiguration(operation) + return nil } @@ -190,10 +192,13 @@ func (s *CreateRuntimeResourceStep) createShootProvider(operation *internal.Oper max := int32(DefaultIfParamNotSet(values.DefaultAutoScalerMax, operation.ProvisioningParameters.Parameters.AutoScalerMax)) min := int32(DefaultIfParamNotSet(values.DefaultAutoScalerMin, operation.ProvisioningParameters.Parameters.AutoScalerMin)) + volumeSize := int32(DefaultIfParamNotSet(values.VolumeSizeGb, operation.ProvisioningParameters.Parameters.VolumeSizeGb)) + providerObj := imv1.Provider{ Type: values.ProviderType, Workers: []gardener.Worker{ { + Name: "cpu-worker-0", Machine: gardener.Machine{ Type: DefaultIfParamNotSet(values.DefaultMachineType, operation.ProvisioningParameters.Parameters.MachineType), Image: &gardener.ShootMachineImage{ @@ -206,6 +211,10 @@ func (s *CreateRuntimeResourceStep) createShootProvider(operation *internal.Oper MaxSurge: &maxSurge, MaxUnavailable: &maxUnavailable, Zones: values.Zones, + Volume: &gardener.Volume{ + Type: ptr.String(values.DiskType), + VolumeSize: string(volumeSize), + }, }, }, } diff --git a/internal/provider/aws.go b/internal/provider/aws.go index e8591af45..ab6b64517 100644 --- a/internal/provider/aws.go +++ b/internal/provider/aws.go @@ -37,6 +37,8 @@ func (p *AWSInputProvider) Provide() Values { DefaultMachineType: DefaultAWSMachineType, Region: region, Purpose: PurposeProduction, + VolumeSizeGb: 50, + DiskType: "gp2", } } @@ -72,6 +74,8 @@ func (p *AWSTrialInputProvider) Provide() Values { DefaultMachineType: machineType, Region: region, Purpose: PurposeEvaluation, + VolumeSizeGb: 50, + DiskType: "gp2", } } @@ -107,6 +111,8 @@ func (p *AWSFreemiumInputProvider) Provide() Values { DefaultMachineType: machineType, Region: region, Purpose: PurposeEvaluation, + VolumeSizeGb: 50, + DiskType: "gp2", } } diff --git a/internal/provider/aws_test.go b/internal/provider/aws_test.go index f946a6c89..12be57ad3 100644 --- a/internal/provider/aws_test.go +++ b/internal/provider/aws_test.go @@ -35,6 +35,8 @@ func TestAWSDefaults(t *testing.T) { DefaultMachineType: "m6i.large", Region: "eu-central-1", Purpose: "production", + VolumeSizeGb: 50, + DiskType: "gp2", }, values) } @@ -68,6 +70,8 @@ func TestAWSSpecific(t *testing.T) { DefaultMachineType: "m6i.large", Region: "ap-southeast-1", Purpose: "production", + VolumeSizeGb: 50, + DiskType: "gp2", }, values) } @@ -96,6 +100,8 @@ func TestAWSTrialDefaults(t *testing.T) { DefaultMachineType: "m5.xlarge", Region: "eu-central-1", Purpose: "evaluation", + VolumeSizeGb: 50, + DiskType: "gp2", }, values) } @@ -128,6 +134,8 @@ func TestAWSTrialSpecific(t *testing.T) { DefaultMachineType: "m5.xlarge", Region: "ap-southeast-1", Purpose: "evaluation", + VolumeSizeGb: 50, + DiskType: "gp2", }, values) } diff --git a/internal/provider/azure.go b/internal/provider/azure.go index c63ad8b7b..0fbbfbb32 100644 --- a/internal/provider/azure.go +++ b/internal/provider/azure.go @@ -41,6 +41,8 @@ func (p *AzureInputProvider) Provide() Values { DefaultMachineType: DefaultAzureMachineType, Region: region, Purpose: PurposeProduction, + DiskType: "Standard_LRS", + VolumeSizeGb: 50, } } @@ -78,6 +80,8 @@ func (p *AzureTrialInputProvider) Provide() Values { DefaultMachineType: machineType, Region: region, Purpose: PurposeEvaluation, + DiskType: "Standard_LRS", + VolumeSizeGb: 50, } } @@ -120,6 +124,8 @@ func (p *AzureLiteInputProvider) Provide() Values { DefaultMachineType: machineType, Region: region, Purpose: PurposeEvaluation, + DiskType: "Standard_LRS", + VolumeSizeGb: 50, } } @@ -153,6 +159,8 @@ func (p *AzureFreemiumInputProvider) Provide() Values { DefaultMachineType: machineType, Region: region, Purpose: PurposeEvaluation, + DiskType: "Standard_LRS", + VolumeSizeGb: 50, } } diff --git a/internal/provider/azure_test.go b/internal/provider/azure_test.go index 478313629..97d93a595 100644 --- a/internal/provider/azure_test.go +++ b/internal/provider/azure_test.go @@ -34,6 +34,8 @@ func TestAzureDefaults(t *testing.T) { DefaultMachineType: "Standard_D2s_v5", Region: "eastus", Purpose: "production", + DiskType: "Standard_LRS", + VolumeSizeGb: 50, }, values) } @@ -62,6 +64,8 @@ func TestAzureTrialDefaults(t *testing.T) { DefaultMachineType: "Standard_D4s_v5", Region: "switzerlandnorth", Purpose: "evaluation", + DiskType: "Standard_LRS", + VolumeSizeGb: 50, }, values) } @@ -89,6 +93,8 @@ func TestAzureLiteDefaults(t *testing.T) { DefaultMachineType: "Standard_D4s_v5", Region: "eastus", Purpose: "evaluation", + DiskType: "Standard_LRS", + VolumeSizeGb: 50, }, values) } @@ -122,6 +128,8 @@ func TestAzureSpecific(t *testing.T) { DefaultMachineType: "Standard_D2s_v5", Region: "uksouth", Purpose: "production", + DiskType: "Standard_LRS", + VolumeSizeGb: 50, }, values) } @@ -156,6 +164,8 @@ func TestAzureTrialSpecific(t *testing.T) { DefaultMachineType: "Standard_D4s_v5", Region: "southeastasia", Purpose: "evaluation", + DiskType: "Standard_LRS", + VolumeSizeGb: 50, }, values) } @@ -188,5 +198,7 @@ func TestAzureLiteSpecific(t *testing.T) { DefaultMachineType: "Standard_D4s_v5", Region: "uksouth", Purpose: "evaluation", + DiskType: "Standard_LRS", + VolumeSizeGb: 50, }, values) } diff --git a/internal/provider/gcp.go b/internal/provider/gcp.go index 1f540de4d..5122daef0 100644 --- a/internal/provider/gcp.go +++ b/internal/provider/gcp.go @@ -32,6 +32,8 @@ func (p *GCPInputProvider) Provide() Values { DefaultMachineType: DefaultGCPMachineType, Region: region, Purpose: PurposeProduction, + VolumeSizeGb: 50, + DiskType: "pd-standard", } } @@ -63,6 +65,8 @@ func (p *GCPTrialInputProvider) Provide() Values { DefaultMachineType: DefaultGCPTrialMachineType, Region: region, Purpose: PurposeEvaluation, + VolumeSizeGb: 30, + DiskType: "pd-standard", } } diff --git a/internal/provider/model.go b/internal/provider/model.go index c681b6016..caba56910 100644 --- a/internal/provider/model.go +++ b/internal/provider/model.go @@ -4,12 +4,13 @@ package provider type Values struct { DefaultAutoScalerMax int DefaultAutoScalerMin int - ZonesCount int //TODO do we need this as separate value? + ZonesCount int Zones []string ProviderType string DefaultMachineType string Region string Purpose string //TODO default per landscape in configuration - + VolumeSizeGb int + DiskType string // todo: add other plan specific values } diff --git a/internal/provider/sap-converged-cloud.go b/internal/provider/sap-converged-cloud.go index 2e37e7193..117e7ceb6 100644 --- a/internal/provider/sap-converged-cloud.go +++ b/internal/provider/sap-converged-cloud.go @@ -33,6 +33,7 @@ func (p *SapConvergedCloudInputProvider) Provide() Values { DefaultMachineType: DefaultSapConvergedCloudMachineType, Region: region, Purpose: PurposeProduction, + DiskType: "", } }