Skip to content

Commit b7fcdff

Browse files
committed
fix: efs e2e test breaking
The EFS e2e test was breaking for 2 reasons: 1. Running out if disk space on the control plane nodes. It only had 8Gb so this has been increased to 16gb 2.The workload being deployed to test EFS was using centos with has been discontinued for a long time now. So changed to use Ubuntu Also small updates to logging for the ELB test. Signed-off-by: Richard Case <[email protected]>
1 parent 5b02ba0 commit b7fcdff

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

test/e2e/data/e2e_conf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,4 +241,4 @@ intervals:
241241
default/wait-deployment-ready: ["5m", "10s"]
242242
default/wait-loadbalancer-ready: ["5m", "30s"]
243243
default/wait-classic-elb-health-check-short: ["1m", "10s"]
244-
default/wait-classic-elb-health-check-long: ["10m", "10s"]
244+
default/wait-classic-elb-health-check-long: ["15m", "30s"]

test/e2e/data/infrastructure-aws/withoutclusterclass/kustomize_sources/efs-support/patches/efs-support.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,13 @@ spec:
1515
spec:
1616
rootVolume:
1717
size: 16
18+
---
19+
kind: AWSMachineTemplate
20+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
21+
metadata:
22+
name: "${CLUSTER_NAME}-control-plane"
23+
spec:
24+
template:
25+
spec:
26+
rootVolume:
27+
size: 16

test/e2e/shared/aws_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func CheckClassicElbHealthCheck(input CheckClassicElbHealthCheckInput, intervals
196196
}
197197

198198
if *lb.HealthCheck.Target != input.ExpectedTarget {
199-
return fmt.Errorf("health check target does not match expected target")
199+
return fmt.Errorf("health check target %s does not match expected target %s", *lb.HealthCheck.Target, input.ExpectedTarget)
200200
}
201201

202202
return nil

test/e2e/suites/unmanaged/helpers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ func createPodWithEFSMount(clusterClient crclient.Client) {
539539
Containers: []corev1.Container{
540540
{
541541
Name: "app",
542-
Image: "centos",
542+
Image: "ubuntu",
543543
Command: []string{"/bin/sh"},
544544
Args: []string{"-c", "while true; do echo $(date -u) >> /data/out; sleep 5; done"},
545545
VolumeMounts: []corev1.VolumeMount{

0 commit comments

Comments
 (0)