Skip to content

Commit 25ea655

Browse files
henriquesantanatihenriquesantanati
authored
Merge branch 'kubernetes-sigs:main' into main
2 parents 14b0731 + ff35f66 commit 25ea655

File tree

11 files changed

+65
-21
lines changed

11 files changed

+65
-21
lines changed

‎.github/workflows/deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
- id: govulncheck
2323
uses: golang/govulncheck-action@v1
2424
with:
25-
go-version-input: 1.21.4
25+
go-version-input: 1.21.5
2626
go-version-file: go.mod

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MAKEFILE_PATH = $(dir $(realpath -s $(firstword $(MAKEFILE_LIST))))
44
# Image URL to use all building/pushing image targets
55
IMG ?= public.ecr.aws/eks/aws-load-balancer-controller:v2.6.1
66
# Image URL to use for builder stage in Docker build
7-
BUILD_IMAGE ?= public.ecr.aws/docker/library/golang:1.21.4
7+
BUILD_IMAGE ?= public.ecr.aws/docker/library/golang:1.21.5
88
# Image URL to use for base layer in Docker build
99
BASE_IMAGE ?= public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2023-09-06-1694026927.2
1010
IMG_PLATFORM ?= linux/amd64,linux/arm64

‎OWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ approvers:
77
- M00nF1sh
88
- kishorj
99
- johngmyers
10+
- oliviassss
1011
reviewers:
1112
- M00nF1sh
1213
- kishorj

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ require (
135135
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
136136
go.uber.org/atomic v1.7.0 // indirect
137137
go.uber.org/multierr v1.6.0 // indirect
138-
golang.org/x/crypto v0.14.0 // indirect
138+
golang.org/x/crypto v0.17.0 // indirect
139139
golang.org/x/net v0.17.0 // indirect
140140
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
141141
golang.org/x/sync v0.2.0 // indirect
142-
golang.org/x/sys v0.13.0 // indirect
143-
golang.org/x/term v0.13.0 // indirect
144-
golang.org/x/text v0.13.0 // indirect
142+
golang.org/x/sys v0.15.0 // indirect
143+
golang.org/x/term v0.15.0 // indirect
144+
golang.org/x/text v0.14.0 // indirect
145145
golang.org/x/tools v0.9.3 // indirect
146146
google.golang.org/appengine v1.6.7 // indirect
147147
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -671,8 +671,8 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
671671
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
672672
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
673673
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
674-
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
675-
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
674+
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
675+
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
676676
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
677677
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
678678
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -855,13 +855,13 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
855855
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
856856
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
857857
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
858-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
859-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
858+
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
859+
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
860860
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
861861
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
862862
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
863-
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
864-
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
863+
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
864+
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
865865
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
866866
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
867867
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -872,8 +872,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
872872
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
873873
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
874874
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
875-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
876-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
875+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
876+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
877877
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
878878
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
879879
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎helm/aws-load-balancer-controller/templates/hpa.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{{- if .Values.autoscaling.enabled }}
2+
{{- if (semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion)}}
3+
apiVersion: autoscaling/v2
4+
{{- else }}
5+
apiVersion: autoscaling/v2beta2
6+
{{- end }}
7+
kind: HorizontalPodAutoscaler
8+
metadata:
9+
name: {{ include "aws-load-balancer-controller.fullname" . }}
10+
namespace: {{ .Release.Namespace }}
11+
labels:
12+
{{- include "aws-load-balancer-controller.labels" . | nindent 4 }}
13+
annotations:
14+
{{- .Values.annotations | toYaml | nindent 4 }}
15+
spec:
16+
scaleTargetRef:
17+
apiVersion: apps/v1
18+
kind: Deployment
19+
name: {{ include "aws-load-balancer-controller.fullname" . }}
20+
minReplicas: {{ .Values.autoscaling.minReplicas }}
21+
maxReplicas: {{ required "A valid .Values.autoscaling.maxReplicas value is required" .Values.autoscaling.maxReplicas }}
22+
metrics:
23+
{{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
24+
- type: Resource
25+
resource:
26+
name: cpu
27+
target:
28+
averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
29+
type: Utilization
30+
{{- end }}
31+
{{- if .Values.autoscaling.autoscaleBehavior }}
32+
behavior: {{ toYaml .Values.autoscaling.autoscaleBehavior | nindent 4 }}
33+
{{- end }}
34+
{{- end }}

‎helm/aws-load-balancer-controller/values.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ imagePullSecrets: []
1313
nameOverride: ""
1414
fullnameOverride: ""
1515

16+
autoscaling:
17+
enabled: false
18+
minReplicas: 1
19+
maxReplicas: 5
20+
targetCPUUtilizationPercentage: 80
21+
1622
serviceAccount:
1723
# Specifies whether a service account should be created
1824
create: true

‎pkg/service/model_build_load_balancer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (t *defaultModelBuildTask) buildLoadBalancerSpec(ctx context.Context, schem
5757
if err != nil {
5858
return elbv2model.LoadBalancerSpec{}, err
5959
}
60-
securityGropus, err := t.buildLoadBalancerSecurityGroups(ctx, existingLB, ipAddressType)
60+
securityGroups, err := t.buildLoadBalancerSecurityGroups(ctx, existingLB, ipAddressType)
6161
if err != nil {
6262
return elbv2model.LoadBalancerSpec{}, err
6363
}
@@ -78,7 +78,7 @@ func (t *defaultModelBuildTask) buildLoadBalancerSpec(ctx context.Context, schem
7878
Type: elbv2model.LoadBalancerTypeNetwork,
7979
Scheme: &scheme,
8080
IPAddressType: &ipAddressType,
81-
SecurityGroups: securityGropus,
81+
SecurityGroups: securityGroups,
8282
SubnetMappings: subnetMappings,
8383
LoadBalancerAttributes: lbAttributes,
8484
Tags: tags,

‎scripts/lib/eksctl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ eksctl::delete_cluster() {
124124

125125
echo "deleting cluster ${cluster_name}"
126126
if ! ${EKSCTL_BINARY} delete cluster \
127-
-f "${cluster_config}" \
127+
-f "${cluster_config}" --disable-nodegroup-eviction \
128128
--wait; then
129129
echo "unable to delete cluster ${cluster_name}"
130130
return 1

‎scripts/run-e2e-test.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function toggle_windows_scheduling(){
2828
done
2929
}
3030

31-
TEST_ID=$(date +%s)
31+
TEST_ID=$(date +%s)-$((RANDOM % 1000))
3232
echo "TEST_ID: $TEST_ID"
3333
ROLE_NAME="aws-load-balancer-controller-$TEST_ID"
3434
POLICY_NAME="AWSLoadBalancerControllerIAMPolicy-$TEST_ID"
@@ -159,9 +159,12 @@ function install_controller_for_adc_regions() {
159159

160160
function enable_primary_ipv6_address() {
161161
echo "enable primary ipv6 address for the ec2 instance"
162-
ENI_IDS=$(aws ec2 describe-instances --filters "Name=tag:aws:eks:cluster-name,Values=$CLUSTER_NAME" --query "Reservations[].Instances[].NetworkInterfaces[].NetworkInterfaceId" --output text)
162+
ENI_IDS=$(aws ec2 describe-instances --region $REGION --filters "Name=tag:aws:eks:cluster-name,Values=$CLUSTER_NAME" --query "Reservations[].Instances[].NetworkInterfaces[].NetworkInterfaceId" --output text)
163+
ENI_COUNT=$(echo "$ENI_IDS" | wc -w)
164+
echo "found $ENI_COUNT ENIs: $ENI_IDS"
163165
for ENI_ID in $ENI_IDS; do
164-
aws ec2 modify-network-interface-attribute --network-interface-id $ENI_ID --enable-primary-ipv6 || true
166+
echo "enable primary ipv6 address for ENI $ENI_ID"
167+
aws ec2 modify-network-interface-attribute --region $REGION --network-interface-id $ENI_ID --enable-primary-ipv6
165168
done
166169
}
167170

‎test/framework/utils/poll.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ const (
1313
// IngressReconcileTimeout is the timeout we expected the controller finishes reconcile for Ingresses.
1414
IngressReconcileTimeout = 1 * time.Minute
1515
// IngressDNSAvailableWaitTimeout is the timeout we expect the DNS records of ALB to be propagated.
16-
IngressDNSAvailableWaitTimeout = 3 * time.Minute
16+
IngressDNSAvailableWaitTimeout = 5 * time.Minute
1717
)

0 commit comments

Comments
 (0)