From 97977c7a87a7aa3f8e6ebb7823f033c15925c9f1 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Fri, 20 Jan 2023 19:30:45 -0800 Subject: [PATCH 1/2] Upgrade AWS LBC to v2.4.6 --- .../k8s-1.19.yaml.template | 226 ++++++++++++------ 1 file changed, 155 insertions(+), 71 deletions(-) diff --git a/upup/models/cloudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml.template b/upup/models/cloudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml.template index 86d060a444..5cf22f1fd4 100644 --- a/upup/models/cloudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml.template +++ b/upup/models/cloudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml.template @@ -1,10 +1,10 @@ {{- with .CloudProvider.AWS.LoadBalancerController }} -# sourced from https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.4.0/v2_4_0_full.yaml +# sourced from https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.4.6/v2_4_6_full.yaml 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: app.kubernetes.io/name: aws-load-balancer-controller @@ -40,10 +40,14 @@ spec: description: IngressClassParams is the Schema for the IngressClassParams API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' type: string metadata: type: object @@ -51,7 +55,8 @@ spec: description: IngressClassParamsSpec defines the desired state of IngressClassParams properties: group: - description: Group defines the IngressGroup for all Ingresses that belong to IngressClass with this IngressClassParams. + description: Group defines the IngressGroup for all Ingresses that + belong to IngressClass with this IngressClassParams. properties: name: description: Name is the name of IngressGroup. @@ -60,13 +65,16 @@ spec: - name type: object ipAddressType: - description: IPAddressType defines the ip address type for all Ingresses that belong to IngressClass with this IngressClassParams. + description: IPAddressType defines the ip address type for all Ingresses + that belong to IngressClass with this IngressClassParams. enum: - ipv4 - dualstack type: string loadBalancerAttributes: - description: LoadBalancerAttributes define the custom attributes to LoadBalancers for all Ingress that that belong to IngressClass with this IngressClassParams. + description: LoadBalancerAttributes define the custom attributes to + LoadBalancers for all Ingress that that belong to IngressClass with + this IngressClassParams. items: description: Attributes defines custom attributes on resources. properties: @@ -82,21 +90,33 @@ spec: type: object type: array namespaceSelector: - description: NamespaceSelector restrict the namespaces of Ingresses that are allowed to specify the IngressClass with this IngressClassParams. * if absent or present but empty, it selects all namespaces. + description: NamespaceSelector restrict the namespaces of Ingresses + that are allowed to specify the IngressClass with this IngressClassParams. + * if absent or present but empty, it selects all namespaces. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. + description: matchExpressions is a list of label selector requirements. + The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. + description: A label selector requirement is a selector that + contains values, a key, and an operator that relates the key + and values. properties: key: - description: key is the label key that the selector applies to. + description: key is the label key that the selector applies + to. type: string operator: - description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. + description: operator represents a key's relationship to + a set of values. Valid operators are In, NotIn, Exists + and DoesNotExist. type: string values: - description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. + description: values is an array of string values. If the + operator is In or NotIn, the values array must be non-empty. + If the operator is Exists or DoesNotExist, the values + array must be empty. This array is replaced during a strategic + merge patch. items: type: string type: array @@ -108,17 +128,24 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. + description: matchLabels is a map of {key,value} pairs. A single + {key,value} in the matchLabels map is equivalent to an element + of matchExpressions, whose key field is "key", the operator + is "In", and the values array contains only "value". The requirements + 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. + description: Scheme defines the scheme for all Ingresses that belong + to IngressClass with this IngressClassParams. enum: - internal - internet-facing type: string tags: - description: Tags defines list of Tags on AWS resources provisioned for Ingresses that belong to IngressClass with this IngressClassParams. + description: Tags defines list of Tags on AWS resources provisioned + for Ingresses that belong to IngressClass with this IngressClassParams. items: description: Tag defines a AWS Tag on resources. properties: @@ -138,18 +165,12 @@ 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: app.kubernetes.io/name: aws-load-balancer-controller @@ -190,10 +211,14 @@ spec: description: TargetGroupBinding is the Schema for the TargetGroupBinding API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' type: string metadata: type: object @@ -201,28 +226,37 @@ spec: description: TargetGroupBindingSpec defines the desired state of TargetGroupBinding properties: networking: - description: networking provides the networking setup for ELBV2 LoadBalancer to access targets in TargetGroup. + description: networking provides the networking setup for ELBV2 LoadBalancer + to access targets in TargetGroup. properties: ingress: - description: List of ingress rules to allow ELBV2 LoadBalancer to access targets in TargetGroup. + description: List of ingress rules to allow ELBV2 LoadBalancer + to access targets in TargetGroup. items: properties: from: - description: List of peers which should be able to access the targets in TargetGroup. At least one NetworkingPeer should be specified. + description: List of peers which should be able to access + the targets in TargetGroup. At least one NetworkingPeer + should be specified. items: - description: NetworkingPeer defines the source/destination peer for networking rules. + description: NetworkingPeer defines the source/destination + peer for networking rules. properties: ipBlock: - description: IPBlock defines an IPBlock peer. If specified, none of the other fields can be set. + description: IPBlock defines an IPBlock peer. If specified, + none of the other fields can be set. properties: cidr: - description: CIDR is the network CIDR. Both IPV4 or IPV6 CIDR are accepted. + description: CIDR is the network CIDR. Both IPV4 + or IPV6 CIDR are accepted. type: string required: - cidr type: object securityGroup: - description: SecurityGroup defines a SecurityGroup peer. If specified, none of the other fields can be set. + description: SecurityGroup defines a SecurityGroup + peer. If specified, none of the other fields can + be set. properties: groupID: description: GroupID is the EC2 SecurityGroupID. @@ -233,17 +267,25 @@ spec: type: object type: array ports: - description: List of ports which should be made accessible on the targets in TargetGroup. If ports is empty or unspecified, it defaults to all ports with TCP. + description: List of ports which should be made accessible + on the targets in TargetGroup. If ports is empty or unspecified, + it defaults to all ports with TCP. items: properties: port: anyOf: - type: integer - type: string - description: The port which traffic must match. When NodePort endpoints(instance TargetType) is used, this must be a numerical port. When Port endpoints(ip TargetType) is used, this can be either numerical or named port on pods. if port is unspecified, it defaults to all ports. + description: The port which traffic must match. When + NodePort endpoints(instance TargetType) is used, + this must be a numerical port. When Port endpoints(ip + TargetType) is used, this can be either numerical + or named port on pods. if port is unspecified, it + defaults to all ports. x-kubernetes-int-or-string: true protocol: - description: The protocol which traffic must match. If protocol is unspecified, it defaults to TCP. + description: The protocol which traffic must match. + If protocol is unspecified, it defaults to TCP. enum: - TCP - UDP @@ -257,7 +299,8 @@ spec: type: array type: object serviceRef: - description: serviceRef is a reference to a Kubernetes Service and ServicePort. + description: serviceRef is a reference to a Kubernetes Service and + ServicePort. properties: name: description: Name is the name of the Service. @@ -273,10 +316,12 @@ spec: - port type: object targetGroupARN: - description: targetGroupARN is the Amazon Resource Name (ARN) for the TargetGroup. + description: targetGroupARN is the Amazon Resource Name (ARN) for + the TargetGroup. type: string targetType: - description: targetType is the TargetType of TargetGroup. If unspecified, it will be automatically inferred. + description: targetType is the TargetType of TargetGroup. If unspecified, + it will be automatically inferred. enum: - instance - ip @@ -325,10 +370,14 @@ spec: description: TargetGroupBinding is the Schema for the TargetGroupBinding API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' type: string metadata: type: object @@ -336,35 +385,46 @@ spec: description: TargetGroupBindingSpec defines the desired state of TargetGroupBinding properties: ipAddressType: - description: ipAddressType specifies whether the target group is of type IPv4 or IPv6. If unspecified, it will be automatically inferred. + description: ipAddressType specifies whether the target group is of + type IPv4 or IPv6. If unspecified, it will be automatically inferred. enum: - ipv4 - ipv6 type: string networking: - description: networking defines the networking rules to allow ELBV2 LoadBalancer to access targets in TargetGroup. + description: networking defines the networking rules to allow ELBV2 + LoadBalancer to access targets in TargetGroup. properties: ingress: - description: List of ingress rules to allow ELBV2 LoadBalancer to access targets in TargetGroup. + description: List of ingress rules to allow ELBV2 LoadBalancer + to access targets in TargetGroup. items: - description: NetworkingIngressRule defines a particular set of traffic that is allowed to access TargetGroup's targets. + description: NetworkingIngressRule defines a particular set + of traffic that is allowed to access TargetGroup's targets. properties: from: - description: List of peers which should be able to access the targets in TargetGroup. At least one NetworkingPeer should be specified. + description: List of peers which should be able to access + the targets in TargetGroup. At least one NetworkingPeer + should be specified. items: - description: NetworkingPeer defines the source/destination peer for networking rules. + description: NetworkingPeer defines the source/destination + peer for networking rules. properties: ipBlock: - description: IPBlock defines an IPBlock peer. If specified, none of the other fields can be set. + description: IPBlock defines an IPBlock peer. If specified, + none of the other fields can be set. properties: cidr: - description: CIDR is the network CIDR. Both IPV4 or IPV6 CIDR are accepted. + description: CIDR is the network CIDR. Both IPV4 + or IPV6 CIDR are accepted. type: string required: - cidr type: object securityGroup: - description: SecurityGroup defines a SecurityGroup peer. If specified, none of the other fields can be set. + description: SecurityGroup defines a SecurityGroup + peer. If specified, none of the other fields can + be set. properties: groupID: description: GroupID is the EC2 SecurityGroupID. @@ -375,18 +435,27 @@ spec: type: object type: array ports: - description: List of ports which should be made accessible on the targets in TargetGroup. If ports is empty or unspecified, it defaults to all ports with TCP. + description: List of ports which should be made accessible + on the targets in TargetGroup. If ports is empty or unspecified, + it defaults to all ports with TCP. items: - description: NetworkingPort defines the port and protocol for networking rules. + description: NetworkingPort defines the port and protocol + for networking rules. properties: port: anyOf: - type: integer - type: string - description: The port which traffic must match. When NodePort endpoints(instance TargetType) is used, this must be a numerical port. When Port endpoints(ip TargetType) is used, this can be either numerical or named port on pods. if port is unspecified, it defaults to all ports. + description: The port which traffic must match. When + NodePort endpoints(instance TargetType) is used, + this must be a numerical port. When Port endpoints(ip + TargetType) is used, this can be either numerical + or named port on pods. if port is unspecified, it + defaults to all ports. x-kubernetes-int-or-string: true protocol: - description: The protocol which traffic must match. If protocol is unspecified, it defaults to TCP. + description: The protocol which traffic must match. + If protocol is unspecified, it defaults to TCP. enum: - TCP - UDP @@ -400,21 +469,32 @@ spec: type: array type: object nodeSelector: - description: node selector for instance type target groups to only register certain nodes + description: node selector for instance type target groups to only + register certain nodes properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. + description: matchExpressions is a list of label selector requirements. + The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. + description: A label selector requirement is a selector that + contains values, a key, and an operator that relates the key + and values. properties: key: - description: key is the label key that the selector applies to. + description: key is the label key that the selector applies + to. type: string operator: - description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. + description: operator represents a key's relationship to + a set of values. Valid operators are In, NotIn, Exists + and DoesNotExist. type: string values: - description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. + description: values is an array of string values. If the + operator is In or NotIn, the values array must be non-empty. + If the operator is Exists or DoesNotExist, the values + array must be empty. This array is replaced during a strategic + merge patch. items: type: string type: array @@ -426,11 +506,17 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. + description: matchLabels is a map of {key,value} pairs. A single + {key,value} in the matchLabels map is equivalent to an element + of matchExpressions, whose key field is "key", the operator + is "In", and the values array contains only "value". The requirements + are ANDed. type: object type: object + x-kubernetes-map-type: atomic serviceRef: - description: serviceRef is a reference to a Kubernetes Service and ServicePort. + description: serviceRef is a reference to a Kubernetes Service and + ServicePort. properties: name: description: Name is the name of the Service. @@ -446,11 +532,13 @@ spec: - port type: object targetGroupARN: - description: targetGroupARN is the Amazon Resource Name (ARN) for the TargetGroup. + description: targetGroupARN is the Amazon Resource Name (ARN) for + the TargetGroup. minLength: 1 type: string targetType: - description: targetType is the TargetType of TargetGroup. If unspecified, it will be automatically inferred. + description: targetType is the TargetType of TargetGroup. If unspecified, + it will be automatically inferred. enum: - instance - ip @@ -472,12 +560,6 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- apiVersion: v1 kind: ServiceAccount @@ -704,7 +786,6 @@ spec: ports: - port: 443 targetPort: 9443 - protocol: TCP selector: app.kubernetes.io/component: controller app.kubernetes.io/name: aws-load-balancer-controller @@ -764,7 +845,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: amazon/aws-alb-ingress-controller:{{ or .Version "v2.4.5" }} + image: public.ecr.aws/eks/aws-load-balancer-controller:{{ or .Version "v2.4.6" }} livenessProbe: failureThreshold: 2 httpGet: @@ -779,6 +860,9 @@ spec: name: webhook-server protocol: TCP resources: + limits: + cpu: 200m + memory: 500Mi requests: cpu: 100m memory: 200Mi From d3147c0a600bc05c60fb4b6e92ef7e46cd0bcd65 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Fri, 20 Jan 2023 20:00:39 -0800 Subject: [PATCH 2/2] hack/update-expected.sh --- ...-controller.addons.k8s.io-k8s-1.19_content | 24 +++++++------------ ...nimal.example.com-addons-bootstrap_content | 2 +- ...-controller.addons.k8s.io-k8s-1.19_content | 24 +++++++------------ ...nimal.example.com-addons-bootstrap_content | 2 +- ...-controller.addons.k8s.io-k8s-1.19_content | 24 +++++++------------ ...nimal.example.com-addons-bootstrap_content | 2 +- ...-controller.addons.k8s.io-k8s-1.19_content | 24 +++++++------------ ...nimal.example.com-addons-bootstrap_content | 2 +- ...-controller.addons.k8s.io-k8s-1.19_content | 24 +++++++------------ ...nimal.example.com-addons-bootstrap_content | 2 +- ...-controller.addons.k8s.io-k8s-1.19_content | 24 +++++++------------ ...nimal.example.com-addons-bootstrap_content | 2 +- ...-controller.addons.k8s.io-k8s-1.19_content | 24 +++++++------------ ...nimal.example.com-addons-bootstrap_content | 2 +- ...-controller.addons.k8s.io-k8s-1.19_content | 24 +++++++------------ ...nimal.example.com-addons-bootstrap_content | 2 +- 16 files changed, 72 insertions(+), 136 deletions(-) diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content index ced3c99872..fe93f7061d 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content @@ -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 @@ -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. @@ -165,12 +166,6 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -178,7 +173,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 @@ -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. @@ -570,12 +566,6 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -836,7 +826,6 @@ metadata: spec: ports: - port: 443 - protocol: TCP targetPort: 9443 selector: app.kubernetes.io/component: controller @@ -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: @@ -905,6 +894,9 @@ spec: name: webhook-server protocol: TCP resources: + limits: + cpu: 200m + memory: 500Mi requests: cpu: 100m memory: 200Mi diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 4bc662a0a2..f252708786 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -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: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content index ced3c99872..fe93f7061d 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content @@ -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 @@ -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. @@ -165,12 +166,6 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -178,7 +173,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 @@ -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. @@ -570,12 +566,6 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -836,7 +826,6 @@ metadata: spec: ports: - port: 443 - protocol: TCP targetPort: 9443 selector: app.kubernetes.io/component: controller @@ -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: @@ -905,6 +894,9 @@ spec: name: webhook-server protocol: TCP resources: + limits: + cpu: 200m + memory: 500Mi requests: cpu: 100m memory: 200Mi diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index ca77ed87b6..badbcc9452 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -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: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content index 385e76bfa1..fd7102228f 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content @@ -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 @@ -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. @@ -165,12 +166,6 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -178,7 +173,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 @@ -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. @@ -570,12 +566,6 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -836,7 +826,6 @@ metadata: spec: ports: - port: 443 - protocol: TCP targetPort: 9443 selector: app.kubernetes.io/component: controller @@ -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: @@ -919,6 +908,9 @@ spec: name: webhook-server protocol: TCP resources: + limits: + cpu: 200m + memory: 500Mi requests: cpu: 100m memory: 200Mi diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index ba613aeb49..4124039cf0 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -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: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content index ced3c99872..fe93f7061d 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content @@ -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 @@ -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. @@ -165,12 +166,6 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -178,7 +173,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 @@ -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. @@ -570,12 +566,6 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -836,7 +826,6 @@ metadata: spec: ports: - port: 443 - protocol: TCP targetPort: 9443 selector: app.kubernetes.io/component: controller @@ -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: @@ -905,6 +894,9 @@ spec: name: webhook-server protocol: TCP resources: + limits: + cpu: 200m + memory: 500Mi requests: cpu: 100m memory: 200Mi diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index b5ffbf938b..0b7eaf9944 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -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: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content index ced3c99872..fe93f7061d 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content @@ -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 @@ -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. @@ -165,12 +166,6 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -178,7 +173,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 @@ -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. @@ -570,12 +566,6 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -836,7 +826,6 @@ metadata: spec: ports: - port: 443 - protocol: TCP targetPort: 9443 selector: app.kubernetes.io/component: controller @@ -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: @@ -905,6 +894,9 @@ spec: name: webhook-server protocol: TCP resources: + limits: + cpu: 200m + memory: 500Mi requests: cpu: 100m memory: 200Mi diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 96edcf3f5e..ba83764f99 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -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: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content index ced3c99872..fe93f7061d 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content @@ -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 @@ -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. @@ -165,12 +166,6 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -178,7 +173,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 @@ -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. @@ -570,12 +566,6 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -836,7 +826,6 @@ metadata: spec: ports: - port: 443 - protocol: TCP targetPort: 9443 selector: app.kubernetes.io/component: controller @@ -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: @@ -905,6 +894,9 @@ spec: name: webhook-server protocol: TCP resources: + limits: + cpu: 200m + memory: 500Mi requests: cpu: 100m memory: 200Mi diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 0335afb451..8c08fec39e 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -171,7 +171,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: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content index 4709309f92..eaeae93fbd 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content @@ -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 @@ -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. @@ -165,12 +166,6 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -178,7 +173,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 @@ -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. @@ -570,12 +566,6 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -836,7 +826,6 @@ metadata: spec: ports: - port: 443 - protocol: TCP targetPort: 9443 selector: app.kubernetes.io/component: controller @@ -900,7 +889,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - 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: @@ -915,6 +904,9 @@ spec: name: webhook-server protocol: TCP resources: + limits: + cpu: 200m + memory: 500Mi requests: cpu: 100m memory: 200Mi diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 32ae9be671..e5c9081dc0 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -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: e0ba7f668afaa9a6a77a12734e122f64c63c04fb6055362cd175d27cd494e81a + manifestHash: d656ecff1afebab268a7efb26250535878d3219f705b892cc8ec528eee00965e name: aws-load-balancer-controller.addons.k8s.io needsPKI: true selector: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content index 4709309f92..eaeae93fbd 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content @@ -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 @@ -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. @@ -165,12 +166,6 @@ spec: served: true storage: true subresources: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -178,7 +173,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 @@ -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. @@ -570,12 +566,6 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] --- @@ -836,7 +826,6 @@ metadata: spec: ports: - port: 443 - protocol: TCP targetPort: 9443 selector: app.kubernetes.io/component: controller @@ -900,7 +889,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - 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: @@ -915,6 +904,9 @@ spec: name: webhook-server protocol: TCP resources: + limits: + cpu: 200m + memory: 500Mi requests: cpu: 100m memory: 200Mi diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 9e058c1fee..467f306777 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -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: e0ba7f668afaa9a6a77a12734e122f64c63c04fb6055362cd175d27cd494e81a + manifestHash: d656ecff1afebab268a7efb26250535878d3219f705b892cc8ec528eee00965e name: aws-load-balancer-controller.addons.k8s.io needsPKI: true selector: