Skip to content

Commit 4ab12a3

Browse files
author
Martin Linkhorst
committed
use defaults similar to legacy behaviour
1 parent 5a052d6 commit 4ab12a3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cluster/manifests/aws-load-balancer-controller/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ spec:
2727
- --feature-gates=ServiceTypeLoadBalancerOnly=true
2828
- --webhook-cert-file=admission-controller.pem
2929
- --webhook-key-file=admission-controller-key.pem
30+
- --default-load-balancer-scheme=internet-facing
31+
- --default-target-type=ip
3032
image: container-registry.zalando.net/teapot/aws-load-balancer-controller:v2.12.0-main-1.patched
3133
livenessProbe:
3234
failureThreshold: 2

test/e2e/external_dns.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ var _ = describe("External DNS creation", func() {
131131
Annotations: map[string]string{
132132
"service.beta.kubernetes.io/aws-load-balancer-type": "external",
133133
"service.beta.kubernetes.io/aws-load-balancer-ip-address-type": "dualstack",
134-
"service.beta.kubernetes.io/aws-load-balancer-nlb-target-type": "ip",
135-
"service.beta.kubernetes.io/aws-load-balancer-scheme": "internet-facing",
136134
externalDNSAnnotation: hostName,
137135
},
138136
}

test/e2e/run_e2e.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ if [ "$e2e" = true ]; then
205205
# some tests are skipped for zalando-aws because they only apply to zalando-eks
206206
SKIPPED_TESTS+=(
207207
"Authorization via admission-controller \[RBAC\] \[Zalando\]"
208-
# "Should create DNS entry via Service and AWS Load Balancer Controller \[Zalando\]" # Depends on availability of AWS Load Balancer Controller in the cluster.
208+
"Should create DNS entry via Service and AWS Load Balancer Controller \[Zalando\]" # Depends on availability of AWS Load Balancer Controller in the cluster.
209209
)
210210
fi
211211

@@ -216,7 +216,7 @@ if [ "$e2e" = true ]; then
216216
"Should audit API calls to create, update, patch, delete pods. \[Audit\] \[Zalando\]"
217217
"should validate permissions for \[Authorization\] \[RBAC\] \[Zalando\]" # TODO: Remains skipped until we remove the older RBAC setup
218218
"should creating a working mysql cluster" # upstream test which does not work with IPv6
219-
# "Should create DNS entry via Service and AWS Cloud Provider \[Zalando\]" # Legacy Service Type LoadBalancer controller doesn't support IPv6.
219+
"Should create DNS entry via Service and AWS Cloud Provider \[Zalando\]" # Legacy Service Type LoadBalancer controller doesn't support IPv6.
220220
)
221221
fi
222222

0 commit comments

Comments
 (0)