From 615a93f88cb68604ef0b3d4c8770615af5c97060 Mon Sep 17 00:00:00 2001 From: Rafael da Fonseca Date: Mon, 10 Jun 2024 18:12:38 +0100 Subject: [PATCH] Fix pull-kops-e2e-cni-cilium-eni flake due to OutOfpods (max 35 due to instance size eni restrictions) Signed-off-by: Rafael da Fonseca --- .../create_cluster/cilium-eni/expected-v1alpha2.yaml | 8 ++++---- tests/integration/create_cluster/cilium-eni/options.yaml | 6 +++++- upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml b/tests/integration/create_cluster/cilium-eni/expected-v1alpha2.yaml index 961fa4ce3eee3..bf362ccafc348 100644 --- 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 index aa379db8feae1..31f403d8f27ee 100644 --- 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 \ No newline at end of file +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 index 070251339638c..5f9b80c2998b5 100644 --- 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,