Fix pull-kops-e2e-cni-cilium-eni flake due to OutOfpods (max 35 due t…

…o instance size eni restrictions) Signed-off-by: Rafael da Fonseca <[email protected]>
kubernetes · Jun 10, 2024 · 615a93f · 615a93f
1 parent a7dbaac
commit 615a93f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml
@@ -71,10 +71,10 @@ metadata:
     kops.k8s.io/cluster: minimal.example.com
   name: control-plane-us-test-1a
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20240426
   instanceMetadata:
     httpTokens: required
-  machineType: m3.medium
+  machineType: c6g.xlarge
   maxSize: 1
   minSize: 1
   role: Master
@@ -91,11 +91,11 @@ metadata:
     kops.k8s.io/cluster: minimal.example.com
   name: nodes-us-test-1a
 spec:
-  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240426
+  image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20240426
   instanceMetadata:
     httpPutResponseHopLimit: 1
     httpTokens: required
-  machineType: t2.medium
+  machineType: c6g.xlarge
   maxSize: 1
   minSize: 1
   role: Node

diff --git a/tests/integration/create_cluster/cilium-eni/options.yaml b/tests/integration/create_cluster/cilium-eni/options.yaml
@@ -3,4 +3,8 @@ Zones:
 - us-test-1a
 CloudProvider: aws
 Networking: cilium-eni
-KubernetesVersion: v1.26.0
+KubernetesVersion: v1.26.0
+NodeSizes:
+- c6g.xlarge
+ControlPlaneSizes:
+- c6g.xlarge
diff --git a/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go b/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go
@@ -356,7 +356,7 @@ func (c *MockAWSCloud) DescribeInstanceType(instanceType string) (*ec2types.Inst
 				ec2types.ArchitectureTypeX8664,
 			},
 		}
-	case "a1.large", "m6g.xlarge":
+	case "a1.large", "m6g.xlarge", "c6g.xlarge":
 		info.ProcessorInfo = &ec2types.ProcessorInfo{
 			SupportedArchitectures: []ec2types.ArchitectureType{
 				ec2types.ArchitectureTypeArm64,