Skip to content

Commit 07fa119

Browse files
gardener-github-actions[bot]github-actions[bot]hebelsan
authored
🤖 Chore: Auto-update container image versions (#1509)
* Chore: Auto-update image versions * Remove ccm 1.34 support * Update load balancer controller charts * Put back comments in image.yaml * Harmonize load-balancer-controller rbac fields --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Alexander Hebel <a.hebelsun@gmail.com>
1 parent bbe46a6 commit 07fa119

4 files changed

Lines changed: 327 additions & 284 deletions

File tree

charts/internal/seed-controlplane/charts/aws-load-balancer-controller/templates/deployment.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,12 @@ spec:
157157
{{- if kindIs "bool" .Values.disableIngressGroupNameAnnotation }}
158158
- --disable-ingress-group-name-annotation={{ .Values.disableIngressGroupNameAnnotation }}
159159
{{- end }}
160+
{{- if kindIs "bool" .Values.tolerateNonExistentBackendService }}
161+
- --tolerate-non-existent-backend-service={{ .Values.tolerateNonExistentBackendService }}
162+
{{- end }}
163+
{{- if kindIs "bool" .Values.tolerateNonExistentBackendAction }}
164+
- --tolerate-non-existent-backend-action={{ .Values.tolerateNonExistentBackendAction }}
165+
{{- end }}
160166
{{- if .Values.defaultSSLPolicy }}
161167
- --default-ssl-policy={{ .Values.defaultSSLPolicy }}
162168
{{- end }}
@@ -172,6 +178,9 @@ spec:
172178
{{- if kindIs "bool" .Values.enableBackendSecurityGroup }}
173179
- --enable-backend-security-group={{ .Values.enableBackendSecurityGroup }}
174180
{{- end }}
181+
{{- if kindIs "bool" .Values.enableManageBackendSecurityGroupRules }}
182+
- --enable-manage-backend-security-group-rules={{ .Values.enableManageBackendSecurityGroupRules }}
183+
{{- end }}
175184
{{- if .Values.backendSecurityGroup }}
176185
- --backend-security-group={{ .Values.backendSecurityGroup }}
177186
{{- end }}
@@ -181,6 +190,15 @@ spec:
181190
{{- if .Values.controllerConfig.featureGates }}
182191
- --feature-gates={{ include "aws-load-balancer-controller.convertMapToCsv" .Values.controllerConfig.featureGates | trimSuffix "," }}
183192
{{- end }}
193+
{{- if .Values.serviceTargetENISGTags }}
194+
- --service-target-eni-security-group-tags={{ .Values.serviceTargetENISGTags }}
195+
{{- end }}
196+
{{- if .Values.loadBalancerClass }}
197+
- --load-balancer-class={{ .Values.loadBalancerClass }}
198+
{{- end }}
199+
{{- if .Values.vpcTags }}
200+
- --aws-vpc-tags={{ include "aws-load-balancer-controller.convertMapToCsv" .Values.vpcTags | trimSuffix "," }}
201+
{{- end }}
184202
# start provider-aws-specific
185203
- --kubeconfig=/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig/kubeconfig
186204
- --leader-election-namespace=kube-system

charts/internal/seed-controlplane/charts/aws-load-balancer-controller/values.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,12 @@ disableIngressClassAnnotation: true
198198
# disableIngressGroupNameAnnotation disables the usage of alb.ingress.kubernetes.io/group.name annotation, false by default
199199
disableIngressGroupNameAnnotation:
200200

201+
# tolerateNonExistentBackendService is a “graceful tolerance mode” for broken or in-flight changes, false by default
202+
tolerateNonExistentBackendService:
203+
204+
# tolerateNonExistentBackendAction gives the option for a “graceful degradation” behavior, false by default
205+
tolerateNonExistentBackendAction:
206+
201207
# defaultSSLPolicy specifies the default SSL policy to use for TLS/HTTPS listeners
202208
defaultSSLPolicy:
203209

@@ -268,6 +274,9 @@ enableEndpointSlices:
268274
# enableBackendSecurityGroup enables shared security group for backend traffic (default true)
269275
enableBackendSecurityGroup:
270276

277+
# enableManageBackendSecurityGroupRules enables managing rules of the backend security group (default false)
278+
enableManageBackendSecurityGroupRules:
279+
271280
# backendSecurityGroup specifies backend security group id (default controller auto create backend security group)
272281
backendSecurityGroup:
273282

@@ -281,6 +290,15 @@ controllerConfig:
281290
# ServiceTypeLoadBalancerOnly: true
282291
# EndpointsFailOpen: true
283292

293+
# serviceTargetENISGTags extra tags used by the controller when finding the target ENI security group to which it should add inbound rules.
294+
serviceTargetENISGTags:
295+
296+
# loadBalancerClass specifies the load balancer class to watch for
297+
loadBalancerClass:
298+
299+
# Instead of (or in addition to) explicitly setting --aws-vpc-id, you can provide tags used to filter the correct VPC(s)
300+
vpcTags:
301+
284302
# objectSelector for webhook
285303
objectSelector:
286304
matchExpressions:

charts/internal/shoot-system-components/charts/aws-load-balancer-controller/templates/rbac.yaml

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,20 @@ metadata:
77
labels:
88
{{- include "aws-load-balancer-controller.labels" . | nindent 4 }}
99
rules:
10-
- apiGroups:
11-
- ""
12-
resources:
13-
- configmaps
14-
verbs:
15-
- create
16-
- apiGroups:
17-
- ""
18-
resources:
19-
- configmaps
20-
resourceNames:
21-
- aws-load-balancer-controller-leader
22-
verbs:
23-
- get
24-
- update
25-
- patch
26-
- apiGroups:
27-
- "coordination.k8s.io"
28-
resources:
29-
- leases
30-
verbs:
31-
- create
32-
- apiGroups:
33-
- "coordination.k8s.io"
34-
resources:
35-
- leases
36-
resourceNames:
37-
- aws-load-balancer-controller-leader
38-
verbs:
39-
- get
40-
- update
41-
- patch
10+
- apiGroups: [""]
11+
resources: [configmaps]
12+
verbs: [create]
13+
- apiGroups: [""]
14+
resources: [configmaps]
15+
resourceNames: [aws-load-balancer-controller-leader]
16+
verbs: [get, patch, update]
17+
- apiGroups: [ "coordination.k8s.io" ]
18+
resources: [ leases ]
19+
verbs: [ create ]
20+
- apiGroups: [ "coordination.k8s.io" ]
21+
resources: [ leases ]
22+
resourceNames: [ aws-load-balancer-controller-leader ]
23+
verbs: [ get, update, patch ]
4224
---
4325
apiVersion: rbac.authorization.k8s.io/v1
4426
kind: RoleBinding

0 commit comments

Comments
 (0)