Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade AWS LBC to v2.4.6 #15030

Merged
merged 2 commits into from
Jan 21, 2023
Merged

Upgrade AWS LBC to v2.4.6 #15030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97977c7
Upgrade AWS LBC to v2.4.6
johngmyers Jan 21, 2023
d3147c0
hack/update-expected.sh
johngmyers Jan 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
labels:
addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io
Expand Down Expand Up @@ -136,6 +136,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
scheme:
description: Scheme defines the scheme for all Ingresses that belong
to IngressClass with this IngressClassParams.
Expand Down Expand Up @@ -165,20 +166,14 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

---

apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
labels:
addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io
Expand Down Expand Up @@ -524,6 +519,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
serviceRef:
description: serviceRef is a reference to a Kubernetes Service and
ServicePort.
Expand Down Expand Up @@ -570,12 +566,6 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

---

Expand Down Expand Up @@ -836,7 +826,6 @@ metadata:
spec:
ports:
- port: 443
protocol: TCP
targetPort: 9443
selector:
app.kubernetes.io/component: controller
Expand Down Expand Up @@ -890,7 +879,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-load-balancer-controller.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: amazon/aws-alb-ingress-controller:v2.4.5
image: public.ecr.aws/eks/aws-load-balancer-controller:v2.4.6
livenessProbe:
failureThreshold: 2
httpGet:
Expand All @@ -905,6 +894,9 @@ spec:
name: webhook-server
protocol: TCP
resources:
limits:
cpu: 200m
memory: 500Mi
requests:
cpu: 100m
memory: 200Mi
Expand Down
2 changes: 1 addition & 1 deletion ...cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: ee9b625b6f7b60088c907e96e5d87bc391f5a35417723c3d9ce13684d3800be1
manifestHash: 2ea476c06cd69a04a9b0da9d5d77a20876e247e9e6a4888743c126f39e325bf8
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
24 changes: 8 additions & 16 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
labels:
addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io
Expand Down Expand Up @@ -136,6 +136,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
scheme:
description: Scheme defines the scheme for all Ingresses that belong
to IngressClass with this IngressClassParams.
Expand Down Expand Up @@ -165,20 +166,14 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

---

apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
labels:
addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io
Expand Down Expand Up @@ -524,6 +519,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
serviceRef:
description: serviceRef is a reference to a Kubernetes Service and
ServicePort.
Expand Down Expand Up @@ -570,12 +566,6 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

---

Expand Down Expand Up @@ -836,7 +826,6 @@ metadata:
spec:
ports:
- port: 443
protocol: TCP
targetPort: 9443
selector:
app.kubernetes.io/component: controller
Expand Down Expand Up @@ -890,7 +879,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-load-balancer-controller.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: amazon/aws-alb-ingress-controller:v2.4.5
image: public.ecr.aws/eks/aws-load-balancer-controller:v2.4.6
livenessProbe:
failureThreshold: 2
httpGet:
Expand All @@ -905,6 +894,9 @@ spec:
name: webhook-server
protocol: TCP
resources:
limits:
cpu: 200m
memory: 500Mi
requests:
cpu: 100m
memory: 200Mi
Expand Down
2 changes: 1 addition & 1 deletion ...ster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: ee9b625b6f7b60088c907e96e5d87bc391f5a35417723c3d9ce13684d3800be1
manifestHash: 2ea476c06cd69a04a9b0da9d5d77a20876e247e9e6a4888743c126f39e325bf8
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
24 changes: 8 additions & 16 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
labels:
addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io
Expand Down Expand Up @@ -136,6 +136,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
scheme:
description: Scheme defines the scheme for all Ingresses that belong
to IngressClass with this IngressClassParams.
Expand Down Expand Up @@ -165,20 +166,14 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

---

apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
labels:
addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io
Expand Down Expand Up @@ -524,6 +519,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
serviceRef:
description: serviceRef is a reference to a Kubernetes Service and
ServicePort.
Expand Down Expand Up @@ -570,12 +566,6 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

---

Expand Down Expand Up @@ -836,7 +826,6 @@ metadata:
spec:
ports:
- port: 443
protocol: TCP
targetPort: 9443
selector:
app.kubernetes.io/component: controller
Expand Down Expand Up @@ -904,7 +893,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-load-balancer-controller.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: amazon/aws-alb-ingress-controller:v2.4.5
image: public.ecr.aws/eks/aws-load-balancer-controller:v2.4.6
livenessProbe:
failureThreshold: 2
httpGet:
Expand All @@ -919,6 +908,9 @@ spec:
name: webhook-server
protocol: TCP
resources:
limits:
cpu: 200m
memory: 500Mi
requests:
cpu: 100m
memory: 200Mi
Expand Down
2 changes: 1 addition & 1 deletion ...er/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: 11496be318917da3ff3ebcc92709c83ae4ba795eb21692f8cb896ba9505588a3
manifestHash: b9154598ba9b2edf30fd9919d2057c4cf170cae4caed9e9d3202c3d2184ecd6a
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
24 changes: 8 additions & 16 deletions ...ct_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
labels:
addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io
Expand Down Expand Up @@ -136,6 +136,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
scheme:
description: Scheme defines the scheme for all Ingresses that belong
to IngressClass with this IngressClassParams.
Expand Down Expand Up @@ -165,20 +166,14 @@ spec:
served: true
storage: true
subresources: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

---

apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
labels:
addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io
Expand Down Expand Up @@ -524,6 +519,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
serviceRef:
description: serviceRef is a reference to a Kubernetes Service and
ServicePort.
Expand Down Expand Up @@ -570,12 +566,6 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

---

Expand Down Expand Up @@ -836,7 +826,6 @@ metadata:
spec:
ports:
- port: 443
protocol: TCP
targetPort: 9443
selector:
app.kubernetes.io/component: controller
Expand Down Expand Up @@ -890,7 +879,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-load-balancer-controller.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: amazon/aws-alb-ingress-controller:v2.4.5
image: public.ecr.aws/eks/aws-load-balancer-controller:v2.4.6
livenessProbe:
failureThreshold: 2
httpGet:
Expand All @@ -905,6 +894,9 @@ spec:
name: webhook-server
protocol: TCP
resources:
limits:
cpu: 200m
memory: 500Mi
requests:
cpu: 100m
memory: 200Mi
Expand Down
2 changes: 1 addition & 1 deletion ...er/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml
manifestHash: ee9b625b6f7b60088c907e96e5d87bc391f5a35417723c3d9ce13684d3800be1
manifestHash: 2ea476c06cd69a04a9b0da9d5d77a20876e247e9e6a4888743c126f39e325bf8
name: aws-load-balancer-controller.addons.k8s.io
needsPKI: true
selector:
Expand Down
Loading