Use custom CLM

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>

cluster/config-defaults.yaml

@@ -1199,11 +1199,6 @@ role_sync_controller_enabled: "false"
 eks: "false"
 eks_control_plane_logging: "false"
 eks_ip_family: "ipv4"
-
-# prefix delegation can only be configured for ipv4. For ipv6 it can only be
-# true.
-aws_vpc_cni_prefix_delegation: "true"
-aws_vpc_cni_custom_networking: "false"
 eks_zalando_iam_aws_proxy_cpu: "100m"
 eks_zalando_iam_aws_proxy_memory: "512Mi"
 eks_zalando_iam_aws_proxy_hpa_max_replicas: "10"
@@ -1213,6 +1208,10 @@ eks_okta_identity_provider: "true"
 
 # prefix delegation can only be configured for ipv4. For ipv6 it can only be true.
 aws_vpc_cni_prefix_delegation: "true"
+# enable custom networking for the AWS VPC CNI. This assumes that a custom CIDR
+# range is available in the VPC and that there are dedicated subnets for the
+# custom CIDR.
+aws_vpc_cni_custom_networking: "false"
 # enable network policy enforcement in the cluster.
 aws_vpc_cni_enable_network_policy: "false"
 # specify the network policy enforcement mode.

test/e2e/Dockerfile

@@ -21,7 +21,7 @@ RUN chmod +x /usr/bin/kubectl
 COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo
 
 # copy CLM
-COPY --from=container-registry.zalando.net/teapot/cluster-lifecycle-manager:latest /clm /usr/bin/clm
+COPY --from=container-registry-test.zalando.net/teapot/cluster-lifecycle-manager:pr-830-1 /clm /usr/bin/clm
 COPY --from=container-registry.zalando.net/teapot/aws-account-creator:latest /aws-account-creator /usr/bin/aws-account-creator
 
 ADD . /workdir