[release/v1.56] Fix E2E tests for AWS (#1604)

* Fix E2E tests for AWS

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>

* remove custom AMI from rhel os

Signed-off-by: Moath Qasim <moad.qassem@gmail.com>

---------

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
Signed-off-by: Moath Qasim <moad.qassem@gmail.com>
Co-authored-by: Moath Qasim <moad.qassem@gmail.com>

Author: ahmedwaleedmalik

docs/cloud-provider.md

@@ -57,7 +57,7 @@ region: "eu-central-1"
 # avaiability zone for the instance
 availabilityZone: "eu-central-1a"
 # vpc id for the instance
-vpcId: "vpc-819f62e9"
+vpcId: "vpc-079f7648481a11e77"
 # subnet id for the instance
 subnetId: "subnet-2bff4f43"
 # enable public IP assignment, default is true

examples/aws-machinedeployment.yaml

@@ -52,7 +52,7 @@ spec:
                 key: secretAccessKey
             region: "eu-central-1"
             availabilityZone: "eu-central-1a"
-            vpcId: "vpc-819f62e9"
+            vpcId: "vpc-079f7648481a11e77"
             subnetId: "subnet-2bff4f43"
             instanceType: "t2.micro"
             instanceProfile: "kubernetes-v1"

pkg/apis/cluster/v1alpha1/conversions/testdata/clusterv1alpha1machineWithProviderConfig/aws.yaml

@@ -27,7 +27,7 @@ spec:
         subnetId: subnet-2bff4f43
         tags:
           KubernetesCluster: 6qsm86c2d
-        vpcId: vpc-819f62e9
+        vpcId: vpc-079f7648481a11e77
       operatingSystem: flatcar
       operatingSystemSpec:
         disableAutoUpdate: true

pkg/apis/cluster/v1alpha1/conversions/testdata/machinesv1alpha1machine/aws.yaml

@@ -16,7 +16,7 @@ spec:
       secretAccessKey: "val"
       region: "eu-central-1"
       availabilityZone: "eu-central-1a"
-      vpcId: "vpc-819f62e9"
+      vpcId: "vpc-079f7648481a11e77"
       subnetId: "subnet-2bff4f43"
       instanceType: "t2.micro"
       diskSize: 50

pkg/apis/cluster/v1alpha1/conversions/testdata/migrated_clusterv1alpha1machine/aws.yaml

@@ -22,7 +22,7 @@ spec:
         subnetId: subnet-2bff4f43
         tags:
           KubernetesCluster: 6qsm86c2d
-        vpcId: vpc-819f62e9
+        vpcId: vpc-079f7648481a11e77
       operatingSystem: flatcar
       operatingSystemSpec:
         disableAutoUpdate: true

pkg/apis/cluster/v1alpha1/conversions/testdata/migrated_clusterv1alpha1machineWithProviderConfig/aws.yaml

@@ -30,7 +30,7 @@ spec:
         subnetId: subnet-2bff4f43
         tags:
           KubernetesCluster: 6qsm86c2d
-        vpcId: vpc-819f62e9
+        vpcId: vpc-079f7648481a11e77
       operatingSystem: flatcar
       operatingSystemSpec:
         disableAutoUpdate: true

test/e2e/provisioning/helper.go

@@ -206,12 +206,10 @@ func testScenario(t *testing.T, testCase scenario, cloudProvider string, testPar
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< OS_DISK_SIZE >>=%v", 0))
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< DATA_DISK_SIZE >>=%v", 0))
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< CUSTOM-IMAGE >>=%v", "rhel-8-1-custom"))
-		scenarioParams = append(scenarioParams, fmt.Sprintf("<< AMI >>=%s", "ami-08c04369895785ac4"))
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< MAX_PRICE >>=%s", "0.08"))
 	} else {
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< OS_DISK_SIZE >>=%v", 30))
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< DATA_DISK_SIZE >>=%v", 30))
-		scenarioParams = append(scenarioParams, fmt.Sprintf("<< AMI >>=%s", ""))
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< DISK_SIZE >>=%v", 25))
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< CUSTOM-IMAGE >>=%v", ""))
 		scenarioParams = append(scenarioParams, fmt.Sprintf("<< MAX_PRICE >>=%s", "0.03"))

test/e2e/provisioning/testdata/machinedeployment-aws-arm-machines.yaml

@@ -30,15 +30,14 @@ spec:
             secretAccessKey: << AWS_SECRET_ACCESS_KEY >>
             region: "eu-central-1"
             availabilityZone: "eu-central-1a"
-            vpcId: "vpc-819f62e9"
+            vpcId: "vpc-079f7648481a11e77"
             instanceType: "a1.medium"
             instanceProfile: "kubernetes-v1"
             diskSize: 50
             diskType: "gp2"
             ebsVolumeEncrypted: false
-            ami: "<< AMI >>"
             securityGroupIDs:
-              - "sg-a2c195ca"
+              - "sg-0f1f62df28fb378b7"
             tags:
               # you have to set this flag to real clusterID when running against our dev or prod
               # otherwise you might have issues with your nodes not joining the cluster

test/e2e/provisioning/testdata/machinedeployment-aws-ebs-encryption-enabled.yaml

@@ -30,14 +30,14 @@ spec:
             secretAccessKey: << AWS_SECRET_ACCESS_KEY >>
             region: "eu-central-1"
             availabilityZone: "eu-central-1a"
-            vpcId: "vpc-819f62e9"
+            vpcId: "vpc-079f7648481a11e77"
             instanceType: "t2.medium"
             instanceProfile: "kubernetes-v1"
             diskSize: 50
             diskType: "gp2"
             ebsVolumeEncrypted: true
             securityGroupIDs:
-              - "sg-a2c195ca"
+              - "sg-0f1f62df28fb378b7"
             tags:
               # you have to set this flag to real clusterID when running against our dev or prod
               # otherwise you might have issues with your nodes not joining the cluster

test/e2e/provisioning/testdata/machinedeployment-aws-spot-instances.yaml

@@ -30,19 +30,18 @@ spec:
             secretAccessKey: << AWS_SECRET_ACCESS_KEY >>
             region: "eu-central-1"
             availabilityZone: "eu-central-1a"
-            vpcId: "vpc-819f62e9"
+            vpcId: "vpc-079f7648481a11e77"
             instanceType: "t2.medium"
             instanceProfile: "kubernetes-v1"
             diskSize: 50
             diskType: "gp2"
             ebsVolumeEncrypted: false
-            ami: "<< AMI >>"
             isSpotInstance: true
             spotInstanceConfig:
               maxPrice: "<< MAX_PRICE >>"
               persistentRequest: false
             securityGroupIDs:
-              - "sg-a2c195ca"
+              - "sg-0f1f62df28fb378b7"
             tags:
               # you have to set this flag to real clusterID when running against our dev or prod
               # otherwise you might have issues with your nodes not joining the cluster

test/e2e/provisioning/testdata/machinedeployment-aws.yaml

@@ -32,15 +32,14 @@ spec:
             assumeRoleExternalID: "<< AWS_ASSUME_ROLE_EXTERNAL_ID >>"
             region: "eu-central-1"
             availabilityZone: "eu-central-1a"
-            vpcId: "vpc-819f62e9"
+            vpcId: "vpc-079f7648481a11e77"
             instanceType: "t2.medium"
             instanceProfile: "kubernetes-v1"
             diskSize: 50
             diskType: "gp2"
             ebsVolumeEncrypted: false
-            ami: "<< AMI >>"
             securityGroupIDs:
-              - "sg-a2c195ca"
+              - "sg-0f1f62df28fb378b7"
             tags:
               # you have to set this flag to real clusterID when running against our dev or prod
               # otherwise you might have issues with your nodes not joining the cluster