diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content index 7a5fc15eae4a7..4a6f05672466b 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 909e0792df112..60abe7033a3ed 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: 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 eaef319c45e30..2035a7305b146 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,611 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 + labels: + addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io + app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: aws-load-balancer-controller + k8s-addon: aws-load-balancer-controller.addons.k8s.io + name: albtargetcontrolconfigs.elbv2.k8s.aws +spec: + group: elbv2.k8s.aws + names: + kind: ALBTargetControlConfig + listKind: ALBTargetControlConfigList + plural: albtargetcontrolconfigs + singular: albtargetcontrolconfig + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: The ALB target control agent sidecar image + jsonPath: .spec.image + name: IMAGE + type: string + - description: Application destination address + jsonPath: .spec.destinationAddress + name: DESTINATION + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: ALBTargetControlConfig is the Schema for the albtargetcontrolconfigs + 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 + 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 + type: string + metadata: + type: object + spec: + description: ALBTargetControlConfigSpec defines the desired state of ALBTargetControlConfig + properties: + controlAddress: + description: |- + ControlAddress specifies the socket (IP:port) where the load balancer exchanges management traffic with agents. + The port in the socket is the target control port you configure for the target group. + pattern: ^.+:[0-9]+$ + type: string + dataAddress: + description: |- + DataAddress specifies the socket (IP:port) where the agent receives application traffic from the load balancer. + The port in this socket is the application traffic port you configure for your target group. + pattern: ^.+:[0-9]+$ + type: string + destinationAddress: + description: |- + DestinationAddress specifies the socket (IP:port) where the agent proxies application traffic. + Your application should be listening on this port. + pattern: ^.+:[0-9]+$ + type: string + image: + description: |- + Image specifies the container image for the ALB target control agent sidecar. + The agent is available as a Docker image at: public.ecr.aws/aws-elb/target-optimizer/target-control-agent:latest + type: string + maxConcurrency: + default: 1 + description: MaxConcurrency specifies the maximum number of concurrent + requests that the target receives from the load balancer. + format: int32 + maximum: 1000 + minimum: 0 + type: integer + protocolVersion: + description: |- + ProtocolVersion specifies the protocol through which the load balancer communicates with the agent. + Possible values are HTTP1, HTTP2, GRPC. + enum: + - HTTP1 + - HTTP2 + - GRPC + type: string + resources: + description: Resources specifies the resource requirements for the + ALB target control agent sidecar + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object + rustLog: + description: |- + RustLog specifies the log level of the agent process. The agent software is written in Rust. + Possible values are debug, info, and error. + enum: + - debug + - info + - error + type: string + tlsCertPath: + description: |- + TLSCertPath specifies the location of the TLS certificate that the agent provides to the load balancer during TLS handshake. + By default, the agent generates a self-signed certificate in-memory. + type: string + tlsKeyPath: + description: |- + TLSKeyPath specifies the location of the private key corresponding to the TLS certificate that the agent provides to the load balancer during TLS handshake. + By default, the agent generates a private key in memory. + type: string + tlsSecurityPolicy: + description: TLSSecurityPolicy specifies the ELB security policy that + you configure for the target group. + type: string + required: + - controlAddress + - dataAddress + - destinationAddress + - image + type: object + type: object + served: true + storage: true + subresources: {} + +--- + +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.19.0 + labels: + addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io + app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: aws-load-balancer-controller + k8s-addon: aws-load-balancer-controller.addons.k8s.io + name: globalaccelerators.aga.k8s.aws +spec: + group: aga.k8s.aws + names: + kind: GlobalAccelerator + listKind: GlobalAcceleratorList + plural: globalaccelerators + singular: globalaccelerator + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: The Global Accelerator name + jsonPath: .spec.name + name: ACCELERATOR-NAME + type: string + - description: The Global Accelerator DNS name + jsonPath: .status.dnsName + name: DNS-NAME + type: string + - description: The Global Accelerator type + jsonPath: .spec.type + name: TYPE + type: string + - description: The Global Accelerator status + jsonPath: .status.status + name: STATUS + type: string + - description: The Global Accelerator ARN + jsonPath: .status.acceleratorARN + name: ARN + priority: 1 + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: GlobalAccelerator is the Schema for the GlobalAccelerator 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 + 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 + type: string + metadata: + type: object + spec: + description: GlobalAcceleratorSpec defines the desired state of GlobalAccelerator + properties: + ipAddressType: + default: IPV4 + description: IPAddressType is the value for the address type. + enum: + - IPV4 + - DUAL_STACK + type: string + ipAddresses: + description: |- + IpAddresses optionally specifies the IP addresses from your own IP address pool (BYOIP) to use for the accelerator's static IP addresses. + You can specify one or two addresses. Do not include the /32 suffix. + If you bring your own IP address pool to Global Accelerator (BYOIP), you can choose an IPv4 address from your own pool to use for the accelerator's static IPv4 address. + After you bring an address range to AWS, it appears in your account as an address pool. When you create an accelerator, you can assign one IPv4 address from your range to it. + Global Accelerator assigns you a second static IPv4 address from an Amazon IP address range. If you bring two IPv4 address ranges to AWS, you can assign one IPv4 address from each range to your accelerator. + Note that you can't update IP addresses for an existing accelerator. To change them, you must create a new accelerator with the new addresses. + For more information, see Bring your own IP addresses (BYOIP) in the AWS Global Accelerator Developer Guide. + https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html + items: + type: string + maxItems: 2 + minItems: 1 + type: array + listeners: + description: Listeners defines the listeners for the Global Accelerator. + items: + description: GlobalAcceleratorListener defines a listener for the + Global Accelerator. + properties: + clientAffinity: + default: NONE + description: |- + ClientAffinity lets you direct all requests from a user to the same endpoint, if you have stateful applications, regardless of the port and protocol of the client request. + Client affinity gives you control over whether to always route each client to the same specific endpoint. + AWS Global Accelerator uses a consistent-flow hashing algorithm to choose the optimal endpoint for a connection. + If client affinity is NONE, Global Accelerator uses the "five-tuple" (5-tuple) properties—source IP address, source port, destination IP address, destination port, and protocol—to select the hash value, and then chooses the best endpoint. + However, with this setting, if someone uses different ports to connect to Global Accelerator, their connections might not be always routed to the same endpoint because the hash value changes. + If you want a given client to always be routed to the same endpoint, set client affinity to SOURCE_IP instead. + When you use the SOURCE_IP setting, Global Accelerator uses the "two-tuple" (2-tuple) properties— source (client) IP address and destination IP address—to select the hash value. + The default value is NONE. + enum: + - SOURCE_IP + - NONE + type: string + endpointGroups: + description: EndpointGroups defines a list of endpoint groups + for a Global Accelerator listener. + items: + description: GlobalAcceleratorEndpointGroup defines an endpoint + group for a Global Accelerator listener. + properties: + endpoints: + description: Endpoints is the list of endpoint configurations + for this endpoint group. + items: + description: GlobalAcceleratorEndpoint defines an endpoint + for a Global Accelerator endpoint group. + properties: + clientIPPreservationEnabled: + default: true + description: |- + ClientIPPreservationEnabled indicates whether client IP address preservation is enabled for an Application Load Balancer endpoint. + The value is true or false. The default value is true for new accelerators. + If the value is set to true, the client's IP address is preserved in the X-Forwarded-For request header as traffic travels to applications on the Application Load Balancer endpoint fronted by the accelerator. + For more information, see Preserve Client IP Addresses in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/preserve-client-ip-address.html + type: boolean + endpointID: + description: |- + EndpointID is the ID of the endpoint when type is EndpointID. + If the endpoint is a Network Load Balancer or Application Load Balancer, this is the Amazon Resource Name (ARN) of the resource. + A resource must be valid and active when you add it as an endpoint. + Mandatory for remote regions. + maxLength: 255 + type: string + name: + description: Name is the name of the Kubernetes + resource when type is Service, Ingress, or Gateway. + type: string + namespace: + description: |- + Namespace is the namespace of the Kubernetes resource when type is Service, Ingress, or Gateway. + If not specified, defaults to the same namespace as the GlobalAccelerator resource. + type: string + type: + description: Type specifies the type of endpoint + reference. + enum: + - EndpointID + - Service + - Ingress + - Gateway + type: string + weight: + default: 128 + description: |- + Weight is the weight associated with the endpoint. When you add weights to endpoints, you configure Global Accelerator to route traffic based on proportions that you specify. + For example, you might specify endpoint weights of 4, 5, 5, and 6 (sum=20). The result is that 4/20 of your traffic, on average, is routed to the first endpoint, + 5/20 is routed both to the second and third endpoints, and 6/20 is routed to the last endpoint. + For more information, see Endpoint Weights in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/about-endpoints-endpoint-weights.html + format: int32 + maximum: 255 + minimum: 0 + type: integer + required: + - type + type: object + x-kubernetes-validations: + - message: endpointID is required and name must not + be set when type is EndpointID + rule: self.type != 'EndpointID' || (has(self.endpointID) + && !has(self.name)) + - message: name is required and endpointID must not + be set when type is Service/Ingress/Gateway + rule: self.type == 'EndpointID' || (has(self.name) + && !has(self.endpointID)) + type: array + portOverrides: + description: PortOverrides is a list of endpoint port + overrides. Allows you to override the destination ports + used to route traffic to an endpoint. Using a port override + lets you map a list of external destination ports (that + your users send traffic to) to a list of internal destination + ports that you want an application endpoint to receive + traffic on. + items: + description: |- + PortOverride defines a port override for an endpoint group. + Override specific listener ports used to route traffic to endpoints that are part of an endpoint group. + For example, you can create a port override in which the listener receives user traffic on ports 80 and 443, + but your accelerator routes that traffic to ports 1080 and 1443, respectively, on the endpoints. + + For more information, see Port overrides in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/about-endpoint-groups-port-override.html + properties: + endpointPort: + description: |- + EndpointPort is the endpoint port that you want traffic to be routed to. + This is the port on the endpoint, such as the Application Load Balancer or Amazon EC2 instance. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + listenerPort: + description: |- + ListenerPort is the listener port that you want to map to a specific endpoint port. + This is the port that user traffic arrives to the Global Accelerator on. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - endpointPort + - listenerPort + type: object + type: array + region: + description: |- + Region is the AWS Region where the endpoint group is located. + If unspecified, defaults to the current cluster region. + maxLength: 255 + type: string + trafficDialPercentage: + default: 100 + description: |- + TrafficDialPercentage is the percentage of traffic to send to an AWS Regions. Additional traffic is distributed to other endpoint groups for this listener + Use this action to increase (dial up) or decrease (dial down) traffic to a specific Region. The percentage is applied to the traffic that would otherwise have been routed to the Region based on optimal routing. + format: int32 + maximum: 100 + minimum: 0 + type: integer + type: object + type: array + portRanges: + description: |- + PortRanges is the list of port ranges for the connections from clients to the accelerator. + When not specified, the controller will automatically determine the port ranges by inspecting + the referenced Kubernetes resources (Service, Ingress, or Gateway) in the endpoint groups. + items: + description: PortRange defines the port range for Global Accelerator + listeners. + properties: + fromPort: + description: FromPort is the first port in the range of + ports, inclusive. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + toPort: + description: ToPort is the last port in the range of ports, + inclusive. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - fromPort + - toPort + type: object + x-kubernetes-validations: + - message: FromPort must be less than or equal to ToPort + rule: self.fromPort <= self.toPort + maxItems: 10 + minItems: 1 + type: array + protocol: + description: |- + Protocol is the protocol for the connections from clients to the accelerator. + When not specified, the controller will automatically determine the protocol by inspecting + the referenced Kubernetes resources (Service, Ingress, or Gateway) in the endpoint groups. + enum: + - TCP + - UDP + type: string + type: object + type: array + name: + description: |- + Name is the name of the Global Accelerator. + The name must contain only alphanumeric characters or hyphens (-), and must not begin or end with a hyphen. + maxLength: 64 + minLength: 1 + pattern: ^[a-zA-Z0-9_-]{1,64}$ + type: string + tags: + additionalProperties: + type: string + description: Tags defines list of Tags on the Global Accelerator. + type: object + type: object + status: + description: GlobalAcceleratorStatus defines the observed state of GlobalAccelerator + properties: + acceleratorARN: + description: AcceleratorARN is the Amazon Resource Name (ARN) of the + accelerator. + type: string + conditions: + description: Conditions represent the current conditions of the GlobalAccelerator. + items: + description: Condition contains details for one aspect of the current + state of this API Resource. + properties: + lastTransitionTime: + description: |- + lastTransitionTime is the last time the condition transitioned from one status to another. + This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: |- + message is a human readable message indicating details about the transition. + This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: |- + observedGeneration represents the .metadata.generation that the condition was set based upon. + For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date + with respect to the current state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: |- + reason contains a programmatic identifier indicating the reason for the condition's last transition. + Producers of specific condition types may define expected values and meanings for this field, + and whether the values are considered a guaranteed API. + The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + dnsName: + description: DNSName The Domain Name System (DNS) name that Global + Accelerator creates that points to an accelerator's static IPv4 + addresses. + type: string + dualStackDnsName: + description: 'DualStackDnsName is the Domain Name System (DNS) name + that Global Accelerator creates that points to a dual-stack accelerator''s + four static IP addresses: two IPv4 addresses and two IPv6 addresses.' + type: string + ipSets: + description: IPSets is the static IP addresses that Global Accelerator + associates with the accelerator. + items: + description: IPSet is the static IP addresses that Global Accelerator + associates with the accelerator. + properties: + ipAddressFamily: + description: IpAddressFamily is the types of IP addresses included + in this IP set. + type: string + ipAddresses: + description: IpAddresses is the array of IP addresses in the + IP address set. + items: + type: string + type: array + type: object + type: array + observedGeneration: + description: The generation observed by the GlobalAccelerator controller. + format: int64 + type: integer + status: + description: Status is the current status of the accelerator. + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} + +--- + +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.19.0 labels: addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io app.kubernetes.io/managed-by: kops @@ -15,7 +619,7 @@ spec: kind: IngressClassParams listKind: IngressClassParamsList plural: ingressclassparams - singular: ingressclassparams + singular: ingressclassparam scope: Cluster versions: - additionalPrinterColumns: @@ -60,8 +664,9 @@ spec: description: IngressClassParamsSpec defines the desired state of IngressClassParams properties: PrefixListsIDs: - description: PrefixListsIDs defines the security group prefix lists - for all Ingresses that belong to IngressClass with this IngressClassParams. + description: |- + PrefixListsIDsLegacy defines the security group prefix lists for all Ingresses that belong to IngressClass with this IngressClassParams. + Not Recommended, Use PrefixListsIDs (prefixListsIDs in JSON) instead items: type: string type: array @@ -152,6 +757,10 @@ spec: - value type: object type: array + loadBalancerName: + description: LoadBalancerName defines the name of the load balancer + that will be created with this IngressClassParams. + type: string minimumLoadBalancerCapacity: description: MinimumLoadBalancerCapacity define the capacity reservation for LoadBalancers for all Ingress that belong to IngressClass with @@ -212,6 +821,12 @@ spec: type: object type: object x-kubernetes-map-type: atomic + prefixListsIDs: + description: PrefixListsIDs defines the security group prefix lists + for all Ingresses that belong to IngressClass with this IngressClassParams. + items: + type: string + type: array scheme: description: Scheme defines the scheme for all Ingresses that belong to IngressClass with this IngressClassParams. @@ -223,6 +838,10 @@ spec: description: SSLPolicy specifies the SSL Policy for all Ingresses that belong to IngressClass with this IngressClassParams. type: string + sslRedirectPort: + description: SSLRedirectPort specifies the SSL Redirect Port for all + Ingresses that belong to IngressClass with this IngressClassParams. + type: string subnets: description: Subnets defines the subnets for all Ingresses that belong to IngressClass with this IngressClassParams. @@ -272,7 +891,16 @@ spec: - instance - ip type: string + wafv2AclArn: + description: WAFv2ACLArn specifies ARN for the Amazon WAFv2 web ACL. + type: string + wafv2AclName: + description: WAFv2ACLName specifies name of the Amazon WAFv2 web ACL. + type: string type: object + x-kubernetes-validations: + - message: cannot specify both 'prefixListsIDs' and 'PrefixListsIDs' fields + rule: '!(has(self.prefixListsIDs) && has(self.PrefixListsIDs))' type: object served: true storage: true @@ -284,7 +912,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 labels: addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io app.kubernetes.io/managed-by: kops @@ -707,6 +1335,19 @@ spec: targetGroupName: description: targetGroupName is the Name of the TargetGroup. type: string + targetGroupProtocol: + description: targetGroupProtocol is the Protocol of the TargetGroup. + If unspecified, it will be automatically inferred. + enum: + - HTTP + - HTTPS + - TCP + - TLS + - UDP + - TCP_UDP + - QUIC + - TCP_QUIC + type: string targetType: description: targetType is the TargetType of TargetGroup. If unspecified, it will be automatically inferred. @@ -820,6 +1461,9 @@ rules: - "" resources: - endpoints + - namespaces + - nodes + - pods verbs: - get - list @@ -834,59 +1478,52 @@ rules: - apiGroups: - "" resources: - - namespaces + - pods/status + - services/status verbs: - - get - - list - - watch + - patch + - update - apiGroups: - "" resources: - - nodes + - services verbs: - get - list + - patch + - update - watch - apiGroups: - - "" + - aga.k8s.aws resources: - - pods + - globalaccelerators verbs: - get - list + - patch - watch - apiGroups: - - "" + - aga.k8s.aws resources: - - pods/status + - globalaccelerators/finalizers + - globalaccelerators/status verbs: - patch - update - apiGroups: - - "" + - discovery.k8s.io resources: - - services + - endpointslices verbs: - get - list - - patch - - update - watch - apiGroups: - - "" - resources: - - services/status - verbs: - - patch - - update -- apiGroups: - - discovery.k8s.io + - elbv2.k8s.aws resources: - - endpointslices + - albtargetcontrolconfigs verbs: - get - - list - - watch - apiGroups: - elbv2.k8s.aws resources: @@ -916,6 +1553,7 @@ rules: - update - apiGroups: - extensions + - networking.k8s.io resources: - ingresses verbs: @@ -926,6 +1564,7 @@ rules: - watch - apiGroups: - extensions + - networking.k8s.io resources: - ingresses/status verbs: @@ -935,53 +1574,7 @@ rules: - gateway.k8s.aws resources: - listenerruleconfigurations - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.k8s.aws - resources: - - listenerruleconfigurations/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - - listenerruleconfigurations/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - loadbalancerconfigurations - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.k8s.aws - resources: - - loadbalancerconfigurations/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - - loadbalancerconfigurations/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - targetgroupconfigurations verbs: - get @@ -991,6 +1584,8 @@ rules: - apiGroups: - gateway.k8s.aws resources: + - listenerruleconfigurations/finalizers + - loadbalancerconfigurations/finalizers - targetgroupconfigurations/finalizers verbs: - patch @@ -998,6 +1593,8 @@ rules: - apiGroups: - gateway.k8s.aws resources: + - listenerruleconfigurations/status + - loadbalancerconfigurations/status - targetgroupconfigurations/status verbs: - get @@ -1007,30 +1604,8 @@ rules: - gateway.networking.k8s.io resources: - gatewayclasses - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - gatewayclasses/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - gatewayclasses/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - gateways + - referencegrants verbs: - get - list @@ -1039,6 +1614,7 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - gatewayclasses/finalizers - gateways/finalizers verbs: - patch @@ -1046,104 +1622,13 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - gatewayclasses/status - gateways/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - grpcroutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - grpcroutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - grpcroutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - httproutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - httproutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - httproutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - referencegrants - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tcproutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tcproutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - tcproutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - tlsroutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tlsroutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - tlsroutes/status + - udproutes/status verbs: - get - patch @@ -1151,6 +1636,10 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - grpcroutes + - httproutes + - tcproutes + - tlsroutes - udproutes verbs: - get @@ -1159,17 +1648,13 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - grpcroutes/finalizers + - httproutes/finalizers + - tcproutes/finalizers + - tlsroutes/finalizers - udproutes/finalizers verbs: - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - udproutes/status - verbs: - - get - - patch - - update - apiGroups: - networking.k8s.io resources: @@ -1178,23 +1663,6 @@ rules: - get - list - watch -- apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - get - - list - - patch - - update - - watch -- apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - patch - - update --- @@ -1303,7 +1771,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: public.ecr.aws/eks/aws-load-balancer-controller:v2.13.4 + image: public.ecr.aws/eks/aws-load-balancer-controller:v2.17.1 livenessProbe: failureThreshold: 2 httpGet: @@ -1434,6 +1902,7 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller + - coredns - key: app.kubernetes.io/instance operator: NotIn values: @@ -1455,7 +1924,7 @@ webhooks: name: aws-load-balancer-webhook-service namespace: kube-system path: /mutate-v1-pod - failurePolicy: Fail + failurePolicy: Ignore name: mpod.elbv2.k8s.aws namespaceSelector: matchExpressions: @@ -1469,6 +1938,43 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-v1-pod-server-id + failurePolicy: Fail + name: quicid.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/quic-server-id-inject + operator: In + values: + - enabled + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns - key: app.kubernetes.io/instance operator: NotIn values: @@ -1483,6 +1989,84 @@ webhooks: resources: - pods sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-alb-target-control-namespace-v1-pod + failurePolicy: Fail + name: alb-target-control.namespace.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/alb-target-control-agent-injection + operator: In + values: + - enabled + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + - key: elbv2.k8s.aws/alb-target-control-agent-inject + operator: NotIn + values: + - "false" + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-alb-target-control-object-v1-pod + failurePolicy: Fail + name: alb-target-control.object.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/alb-target-control-agent-injection + operator: DoesNotExist + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + - key: elbv2.k8s.aws/alb-target-control-agent-inject + operator: In + values: + - "true" + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None - admissionReviewVersions: - v1beta1 clientConfig: @@ -1518,6 +2102,28 @@ metadata: k8s-addon: aws-load-balancer-controller.addons.k8s.io name: aws-load-balancer-webhook webhooks: +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /validate-aga-k8s-aws-v1beta1-globalaccelerator + failurePolicy: Fail + matchPolicy: Equivalent + name: vglobalaccelerator.aga.k8s.aws + rules: + - apiGroups: + - aga.k8s.aws + apiVersions: + - v1beta1 + operations: + - CREATE + - UPDATE + resources: + - globalaccelerators + scope: Namespaced + sideEffects: None - admissionReviewVersions: - v1beta1 clientConfig: @@ -1533,10 +2139,6 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller - - key: app.kubernetes.io/instance - operator: NotIn - values: - - cert-manager rules: - apiGroups: - elbv2.k8s.aws 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 8c82e3ab2724d..43ce639228be9 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 @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io @@ -145,7 +145,7 @@ spec: version: 9.99.0 - id: k8s-1.19 manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml - manifestHash: b295d8da3d0e86937fd8a0a86c93db40bbeac296fb723849a65575b2adf9021f + manifestHash: 0cf51272e8829ed7cc6025d24a6d4c46d7df1fa4a11e6ccf59348e6348ec54c5 name: aws-load-balancer-controller.addons.k8s.io needsPKI: true selector: diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content index 2f2d683f9201e..bf24d14a81632 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content index 487420c2e4702..4e2d79fd2be96 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content index c410af0ee7ea6..f6b8fb213ca80 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content index 16e0822753fd7..152978d762695 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content index c90ac3ee9e327..5e665a3cbe52e 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content index 590bc43d8785a..a665bd91afb5a 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content index 590bc43d8785a..a665bd91afb5a 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content index 010f08a9dd3a9..597fe76f6f4fc 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content index c1cc7613d17e3..32d804d456f44 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content index 07a6dfbb4f41d..1588289e564e6 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 84adf53c8f77d..94b5ed0aac717 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 66ddfd6a1e06c..47c60ce6ac6e3 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content index 14ced030219e0..b941e02359d6c 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content index 0d913688123c7..f137191fbe04f 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content index 1f747bef15887..6c7c28ba6bef0 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content index 18de715fd408b..c133c578f8dcb 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 001e41acff0df..8128fd54526ac 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 6b14eaa3ba0c8..0da2a1b0ea2ab 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 0c2a6eae3197a598fa39c25791ea2be565023da68cf6b2baa920c5ff0fc42d15 + manifestHash: e0f172357f412fc64530b44709e0b02fd4662a6e39e9578d08fb8a66533b1e0d name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index c2554b7c73a3d..cef39ddfbfad2 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -218,6 +218,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -238,6 +239,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -338,18 +340,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: 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 ef048505008e0..f3402d9724f3c 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,611 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 + labels: + addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io + app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: aws-load-balancer-controller + k8s-addon: aws-load-balancer-controller.addons.k8s.io + name: albtargetcontrolconfigs.elbv2.k8s.aws +spec: + group: elbv2.k8s.aws + names: + kind: ALBTargetControlConfig + listKind: ALBTargetControlConfigList + plural: albtargetcontrolconfigs + singular: albtargetcontrolconfig + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: The ALB target control agent sidecar image + jsonPath: .spec.image + name: IMAGE + type: string + - description: Application destination address + jsonPath: .spec.destinationAddress + name: DESTINATION + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: ALBTargetControlConfig is the Schema for the albtargetcontrolconfigs + 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 + 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 + type: string + metadata: + type: object + spec: + description: ALBTargetControlConfigSpec defines the desired state of ALBTargetControlConfig + properties: + controlAddress: + description: |- + ControlAddress specifies the socket (IP:port) where the load balancer exchanges management traffic with agents. + The port in the socket is the target control port you configure for the target group. + pattern: ^.+:[0-9]+$ + type: string + dataAddress: + description: |- + DataAddress specifies the socket (IP:port) where the agent receives application traffic from the load balancer. + The port in this socket is the application traffic port you configure for your target group. + pattern: ^.+:[0-9]+$ + type: string + destinationAddress: + description: |- + DestinationAddress specifies the socket (IP:port) where the agent proxies application traffic. + Your application should be listening on this port. + pattern: ^.+:[0-9]+$ + type: string + image: + description: |- + Image specifies the container image for the ALB target control agent sidecar. + The agent is available as a Docker image at: public.ecr.aws/aws-elb/target-optimizer/target-control-agent:latest + type: string + maxConcurrency: + default: 1 + description: MaxConcurrency specifies the maximum number of concurrent + requests that the target receives from the load balancer. + format: int32 + maximum: 1000 + minimum: 0 + type: integer + protocolVersion: + description: |- + ProtocolVersion specifies the protocol through which the load balancer communicates with the agent. + Possible values are HTTP1, HTTP2, GRPC. + enum: + - HTTP1 + - HTTP2 + - GRPC + type: string + resources: + description: Resources specifies the resource requirements for the + ALB target control agent sidecar + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object + rustLog: + description: |- + RustLog specifies the log level of the agent process. The agent software is written in Rust. + Possible values are debug, info, and error. + enum: + - debug + - info + - error + type: string + tlsCertPath: + description: |- + TLSCertPath specifies the location of the TLS certificate that the agent provides to the load balancer during TLS handshake. + By default, the agent generates a self-signed certificate in-memory. + type: string + tlsKeyPath: + description: |- + TLSKeyPath specifies the location of the private key corresponding to the TLS certificate that the agent provides to the load balancer during TLS handshake. + By default, the agent generates a private key in memory. + type: string + tlsSecurityPolicy: + description: TLSSecurityPolicy specifies the ELB security policy that + you configure for the target group. + type: string + required: + - controlAddress + - dataAddress + - destinationAddress + - image + type: object + type: object + served: true + storage: true + subresources: {} + +--- + +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.19.0 + labels: + addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io + app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: aws-load-balancer-controller + k8s-addon: aws-load-balancer-controller.addons.k8s.io + name: globalaccelerators.aga.k8s.aws +spec: + group: aga.k8s.aws + names: + kind: GlobalAccelerator + listKind: GlobalAcceleratorList + plural: globalaccelerators + singular: globalaccelerator + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: The Global Accelerator name + jsonPath: .spec.name + name: ACCELERATOR-NAME + type: string + - description: The Global Accelerator DNS name + jsonPath: .status.dnsName + name: DNS-NAME + type: string + - description: The Global Accelerator type + jsonPath: .spec.type + name: TYPE + type: string + - description: The Global Accelerator status + jsonPath: .status.status + name: STATUS + type: string + - description: The Global Accelerator ARN + jsonPath: .status.acceleratorARN + name: ARN + priority: 1 + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: GlobalAccelerator is the Schema for the GlobalAccelerator 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 + 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 + type: string + metadata: + type: object + spec: + description: GlobalAcceleratorSpec defines the desired state of GlobalAccelerator + properties: + ipAddressType: + default: IPV4 + description: IPAddressType is the value for the address type. + enum: + - IPV4 + - DUAL_STACK + type: string + ipAddresses: + description: |- + IpAddresses optionally specifies the IP addresses from your own IP address pool (BYOIP) to use for the accelerator's static IP addresses. + You can specify one or two addresses. Do not include the /32 suffix. + If you bring your own IP address pool to Global Accelerator (BYOIP), you can choose an IPv4 address from your own pool to use for the accelerator's static IPv4 address. + After you bring an address range to AWS, it appears in your account as an address pool. When you create an accelerator, you can assign one IPv4 address from your range to it. + Global Accelerator assigns you a second static IPv4 address from an Amazon IP address range. If you bring two IPv4 address ranges to AWS, you can assign one IPv4 address from each range to your accelerator. + Note that you can't update IP addresses for an existing accelerator. To change them, you must create a new accelerator with the new addresses. + For more information, see Bring your own IP addresses (BYOIP) in the AWS Global Accelerator Developer Guide. + https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html + items: + type: string + maxItems: 2 + minItems: 1 + type: array + listeners: + description: Listeners defines the listeners for the Global Accelerator. + items: + description: GlobalAcceleratorListener defines a listener for the + Global Accelerator. + properties: + clientAffinity: + default: NONE + description: |- + ClientAffinity lets you direct all requests from a user to the same endpoint, if you have stateful applications, regardless of the port and protocol of the client request. + Client affinity gives you control over whether to always route each client to the same specific endpoint. + AWS Global Accelerator uses a consistent-flow hashing algorithm to choose the optimal endpoint for a connection. + If client affinity is NONE, Global Accelerator uses the "five-tuple" (5-tuple) properties—source IP address, source port, destination IP address, destination port, and protocol—to select the hash value, and then chooses the best endpoint. + However, with this setting, if someone uses different ports to connect to Global Accelerator, their connections might not be always routed to the same endpoint because the hash value changes. + If you want a given client to always be routed to the same endpoint, set client affinity to SOURCE_IP instead. + When you use the SOURCE_IP setting, Global Accelerator uses the "two-tuple" (2-tuple) properties— source (client) IP address and destination IP address—to select the hash value. + The default value is NONE. + enum: + - SOURCE_IP + - NONE + type: string + endpointGroups: + description: EndpointGroups defines a list of endpoint groups + for a Global Accelerator listener. + items: + description: GlobalAcceleratorEndpointGroup defines an endpoint + group for a Global Accelerator listener. + properties: + endpoints: + description: Endpoints is the list of endpoint configurations + for this endpoint group. + items: + description: GlobalAcceleratorEndpoint defines an endpoint + for a Global Accelerator endpoint group. + properties: + clientIPPreservationEnabled: + default: true + description: |- + ClientIPPreservationEnabled indicates whether client IP address preservation is enabled for an Application Load Balancer endpoint. + The value is true or false. The default value is true for new accelerators. + If the value is set to true, the client's IP address is preserved in the X-Forwarded-For request header as traffic travels to applications on the Application Load Balancer endpoint fronted by the accelerator. + For more information, see Preserve Client IP Addresses in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/preserve-client-ip-address.html + type: boolean + endpointID: + description: |- + EndpointID is the ID of the endpoint when type is EndpointID. + If the endpoint is a Network Load Balancer or Application Load Balancer, this is the Amazon Resource Name (ARN) of the resource. + A resource must be valid and active when you add it as an endpoint. + Mandatory for remote regions. + maxLength: 255 + type: string + name: + description: Name is the name of the Kubernetes + resource when type is Service, Ingress, or Gateway. + type: string + namespace: + description: |- + Namespace is the namespace of the Kubernetes resource when type is Service, Ingress, or Gateway. + If not specified, defaults to the same namespace as the GlobalAccelerator resource. + type: string + type: + description: Type specifies the type of endpoint + reference. + enum: + - EndpointID + - Service + - Ingress + - Gateway + type: string + weight: + default: 128 + description: |- + Weight is the weight associated with the endpoint. When you add weights to endpoints, you configure Global Accelerator to route traffic based on proportions that you specify. + For example, you might specify endpoint weights of 4, 5, 5, and 6 (sum=20). The result is that 4/20 of your traffic, on average, is routed to the first endpoint, + 5/20 is routed both to the second and third endpoints, and 6/20 is routed to the last endpoint. + For more information, see Endpoint Weights in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/about-endpoints-endpoint-weights.html + format: int32 + maximum: 255 + minimum: 0 + type: integer + required: + - type + type: object + x-kubernetes-validations: + - message: endpointID is required and name must not + be set when type is EndpointID + rule: self.type != 'EndpointID' || (has(self.endpointID) + && !has(self.name)) + - message: name is required and endpointID must not + be set when type is Service/Ingress/Gateway + rule: self.type == 'EndpointID' || (has(self.name) + && !has(self.endpointID)) + type: array + portOverrides: + description: PortOverrides is a list of endpoint port + overrides. Allows you to override the destination ports + used to route traffic to an endpoint. Using a port override + lets you map a list of external destination ports (that + your users send traffic to) to a list of internal destination + ports that you want an application endpoint to receive + traffic on. + items: + description: |- + PortOverride defines a port override for an endpoint group. + Override specific listener ports used to route traffic to endpoints that are part of an endpoint group. + For example, you can create a port override in which the listener receives user traffic on ports 80 and 443, + but your accelerator routes that traffic to ports 1080 and 1443, respectively, on the endpoints. + + For more information, see Port overrides in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/about-endpoint-groups-port-override.html + properties: + endpointPort: + description: |- + EndpointPort is the endpoint port that you want traffic to be routed to. + This is the port on the endpoint, such as the Application Load Balancer or Amazon EC2 instance. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + listenerPort: + description: |- + ListenerPort is the listener port that you want to map to a specific endpoint port. + This is the port that user traffic arrives to the Global Accelerator on. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - endpointPort + - listenerPort + type: object + type: array + region: + description: |- + Region is the AWS Region where the endpoint group is located. + If unspecified, defaults to the current cluster region. + maxLength: 255 + type: string + trafficDialPercentage: + default: 100 + description: |- + TrafficDialPercentage is the percentage of traffic to send to an AWS Regions. Additional traffic is distributed to other endpoint groups for this listener + Use this action to increase (dial up) or decrease (dial down) traffic to a specific Region. The percentage is applied to the traffic that would otherwise have been routed to the Region based on optimal routing. + format: int32 + maximum: 100 + minimum: 0 + type: integer + type: object + type: array + portRanges: + description: |- + PortRanges is the list of port ranges for the connections from clients to the accelerator. + When not specified, the controller will automatically determine the port ranges by inspecting + the referenced Kubernetes resources (Service, Ingress, or Gateway) in the endpoint groups. + items: + description: PortRange defines the port range for Global Accelerator + listeners. + properties: + fromPort: + description: FromPort is the first port in the range of + ports, inclusive. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + toPort: + description: ToPort is the last port in the range of ports, + inclusive. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - fromPort + - toPort + type: object + x-kubernetes-validations: + - message: FromPort must be less than or equal to ToPort + rule: self.fromPort <= self.toPort + maxItems: 10 + minItems: 1 + type: array + protocol: + description: |- + Protocol is the protocol for the connections from clients to the accelerator. + When not specified, the controller will automatically determine the protocol by inspecting + the referenced Kubernetes resources (Service, Ingress, or Gateway) in the endpoint groups. + enum: + - TCP + - UDP + type: string + type: object + type: array + name: + description: |- + Name is the name of the Global Accelerator. + The name must contain only alphanumeric characters or hyphens (-), and must not begin or end with a hyphen. + maxLength: 64 + minLength: 1 + pattern: ^[a-zA-Z0-9_-]{1,64}$ + type: string + tags: + additionalProperties: + type: string + description: Tags defines list of Tags on the Global Accelerator. + type: object + type: object + status: + description: GlobalAcceleratorStatus defines the observed state of GlobalAccelerator + properties: + acceleratorARN: + description: AcceleratorARN is the Amazon Resource Name (ARN) of the + accelerator. + type: string + conditions: + description: Conditions represent the current conditions of the GlobalAccelerator. + items: + description: Condition contains details for one aspect of the current + state of this API Resource. + properties: + lastTransitionTime: + description: |- + lastTransitionTime is the last time the condition transitioned from one status to another. + This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: |- + message is a human readable message indicating details about the transition. + This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: |- + observedGeneration represents the .metadata.generation that the condition was set based upon. + For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date + with respect to the current state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: |- + reason contains a programmatic identifier indicating the reason for the condition's last transition. + Producers of specific condition types may define expected values and meanings for this field, + and whether the values are considered a guaranteed API. + The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + dnsName: + description: DNSName The Domain Name System (DNS) name that Global + Accelerator creates that points to an accelerator's static IPv4 + addresses. + type: string + dualStackDnsName: + description: 'DualStackDnsName is the Domain Name System (DNS) name + that Global Accelerator creates that points to a dual-stack accelerator''s + four static IP addresses: two IPv4 addresses and two IPv6 addresses.' + type: string + ipSets: + description: IPSets is the static IP addresses that Global Accelerator + associates with the accelerator. + items: + description: IPSet is the static IP addresses that Global Accelerator + associates with the accelerator. + properties: + ipAddressFamily: + description: IpAddressFamily is the types of IP addresses included + in this IP set. + type: string + ipAddresses: + description: IpAddresses is the array of IP addresses in the + IP address set. + items: + type: string + type: array + type: object + type: array + observedGeneration: + description: The generation observed by the GlobalAccelerator controller. + format: int64 + type: integer + status: + description: Status is the current status of the accelerator. + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} + +--- + +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.19.0 labels: addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io app.kubernetes.io/managed-by: kops @@ -15,7 +619,7 @@ spec: kind: IngressClassParams listKind: IngressClassParamsList plural: ingressclassparams - singular: ingressclassparams + singular: ingressclassparam scope: Cluster versions: - additionalPrinterColumns: @@ -60,8 +664,9 @@ spec: description: IngressClassParamsSpec defines the desired state of IngressClassParams properties: PrefixListsIDs: - description: PrefixListsIDs defines the security group prefix lists - for all Ingresses that belong to IngressClass with this IngressClassParams. + description: |- + PrefixListsIDsLegacy defines the security group prefix lists for all Ingresses that belong to IngressClass with this IngressClassParams. + Not Recommended, Use PrefixListsIDs (prefixListsIDs in JSON) instead items: type: string type: array @@ -152,6 +757,10 @@ spec: - value type: object type: array + loadBalancerName: + description: LoadBalancerName defines the name of the load balancer + that will be created with this IngressClassParams. + type: string minimumLoadBalancerCapacity: description: MinimumLoadBalancerCapacity define the capacity reservation for LoadBalancers for all Ingress that belong to IngressClass with @@ -212,6 +821,12 @@ spec: type: object type: object x-kubernetes-map-type: atomic + prefixListsIDs: + description: PrefixListsIDs defines the security group prefix lists + for all Ingresses that belong to IngressClass with this IngressClassParams. + items: + type: string + type: array scheme: description: Scheme defines the scheme for all Ingresses that belong to IngressClass with this IngressClassParams. @@ -223,6 +838,10 @@ spec: description: SSLPolicy specifies the SSL Policy for all Ingresses that belong to IngressClass with this IngressClassParams. type: string + sslRedirectPort: + description: SSLRedirectPort specifies the SSL Redirect Port for all + Ingresses that belong to IngressClass with this IngressClassParams. + type: string subnets: description: Subnets defines the subnets for all Ingresses that belong to IngressClass with this IngressClassParams. @@ -272,7 +891,16 @@ spec: - instance - ip type: string + wafv2AclArn: + description: WAFv2ACLArn specifies ARN for the Amazon WAFv2 web ACL. + type: string + wafv2AclName: + description: WAFv2ACLName specifies name of the Amazon WAFv2 web ACL. + type: string type: object + x-kubernetes-validations: + - message: cannot specify both 'prefixListsIDs' and 'PrefixListsIDs' fields + rule: '!(has(self.prefixListsIDs) && has(self.PrefixListsIDs))' type: object served: true storage: true @@ -284,7 +912,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 labels: addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io app.kubernetes.io/managed-by: kops @@ -707,6 +1335,19 @@ spec: targetGroupName: description: targetGroupName is the Name of the TargetGroup. type: string + targetGroupProtocol: + description: targetGroupProtocol is the Protocol of the TargetGroup. + If unspecified, it will be automatically inferred. + enum: + - HTTP + - HTTPS + - TCP + - TLS + - UDP + - TCP_UDP + - QUIC + - TCP_QUIC + type: string targetType: description: targetType is the TargetType of TargetGroup. If unspecified, it will be automatically inferred. @@ -820,6 +1461,9 @@ rules: - "" resources: - endpoints + - namespaces + - nodes + - pods verbs: - get - list @@ -834,59 +1478,52 @@ rules: - apiGroups: - "" resources: - - namespaces + - pods/status + - services/status verbs: - - get - - list - - watch + - patch + - update - apiGroups: - "" resources: - - nodes + - services verbs: - get - list + - patch + - update - watch - apiGroups: - - "" + - aga.k8s.aws resources: - - pods + - globalaccelerators verbs: - get - list + - patch - watch - apiGroups: - - "" + - aga.k8s.aws resources: - - pods/status + - globalaccelerators/finalizers + - globalaccelerators/status verbs: - patch - update - apiGroups: - - "" + - discovery.k8s.io resources: - - services + - endpointslices verbs: - get - list - - patch - - update - watch - apiGroups: - - "" - resources: - - services/status - verbs: - - patch - - update -- apiGroups: - - discovery.k8s.io + - elbv2.k8s.aws resources: - - endpointslices + - albtargetcontrolconfigs verbs: - get - - list - - watch - apiGroups: - elbv2.k8s.aws resources: @@ -916,6 +1553,7 @@ rules: - update - apiGroups: - extensions + - networking.k8s.io resources: - ingresses verbs: @@ -926,6 +1564,7 @@ rules: - watch - apiGroups: - extensions + - networking.k8s.io resources: - ingresses/status verbs: @@ -935,53 +1574,7 @@ rules: - gateway.k8s.aws resources: - listenerruleconfigurations - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.k8s.aws - resources: - - listenerruleconfigurations/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - - listenerruleconfigurations/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - loadbalancerconfigurations - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.k8s.aws - resources: - - loadbalancerconfigurations/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - - loadbalancerconfigurations/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - targetgroupconfigurations verbs: - get @@ -991,6 +1584,8 @@ rules: - apiGroups: - gateway.k8s.aws resources: + - listenerruleconfigurations/finalizers + - loadbalancerconfigurations/finalizers - targetgroupconfigurations/finalizers verbs: - patch @@ -998,6 +1593,8 @@ rules: - apiGroups: - gateway.k8s.aws resources: + - listenerruleconfigurations/status + - loadbalancerconfigurations/status - targetgroupconfigurations/status verbs: - get @@ -1007,30 +1604,8 @@ rules: - gateway.networking.k8s.io resources: - gatewayclasses - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - gatewayclasses/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - gatewayclasses/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - gateways + - referencegrants verbs: - get - list @@ -1039,6 +1614,7 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - gatewayclasses/finalizers - gateways/finalizers verbs: - patch @@ -1046,104 +1622,13 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - gatewayclasses/status - gateways/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - grpcroutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - grpcroutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - grpcroutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - httproutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - httproutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - httproutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - referencegrants - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tcproutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tcproutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - tcproutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - tlsroutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tlsroutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - tlsroutes/status + - udproutes/status verbs: - get - patch @@ -1151,6 +1636,10 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - grpcroutes + - httproutes + - tcproutes + - tlsroutes - udproutes verbs: - get @@ -1159,17 +1648,13 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - grpcroutes/finalizers + - httproutes/finalizers + - tcproutes/finalizers + - tlsroutes/finalizers - udproutes/finalizers verbs: - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - udproutes/status - verbs: - - get - - patch - - update - apiGroups: - networking.k8s.io resources: @@ -1178,23 +1663,6 @@ rules: - get - list - watch -- apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - get - - list - - patch - - update - - watch -- apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - patch - - update --- @@ -1303,7 +1771,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: public.ecr.aws/eks/aws-load-balancer-controller:v2.13.4 + image: public.ecr.aws/eks/aws-load-balancer-controller:v2.17.1 livenessProbe: failureThreshold: 2 httpGet: @@ -1434,6 +1902,7 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller + - coredns - key: app.kubernetes.io/instance operator: NotIn values: @@ -1455,7 +1924,7 @@ webhooks: name: aws-load-balancer-webhook-service namespace: kube-system path: /mutate-v1-pod - failurePolicy: Fail + failurePolicy: Ignore name: mpod.elbv2.k8s.aws namespaceSelector: matchExpressions: @@ -1469,6 +1938,43 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-v1-pod-server-id + failurePolicy: Fail + name: quicid.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/quic-server-id-inject + operator: In + values: + - enabled + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns - key: app.kubernetes.io/instance operator: NotIn values: @@ -1483,6 +1989,84 @@ webhooks: resources: - pods sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-alb-target-control-namespace-v1-pod + failurePolicy: Fail + name: alb-target-control.namespace.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/alb-target-control-agent-injection + operator: In + values: + - enabled + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + - key: elbv2.k8s.aws/alb-target-control-agent-inject + operator: NotIn + values: + - "false" + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-alb-target-control-object-v1-pod + failurePolicy: Fail + name: alb-target-control.object.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/alb-target-control-agent-injection + operator: DoesNotExist + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + - key: elbv2.k8s.aws/alb-target-control-agent-inject + operator: In + values: + - "true" + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None - admissionReviewVersions: - v1beta1 clientConfig: @@ -1518,6 +2102,28 @@ metadata: k8s-addon: aws-load-balancer-controller.addons.k8s.io name: aws-load-balancer-webhook webhooks: +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /validate-aga-k8s-aws-v1beta1-globalaccelerator + failurePolicy: Fail + matchPolicy: Equivalent + name: vglobalaccelerator.aga.k8s.aws + rules: + - apiGroups: + - aga.k8s.aws + apiVersions: + - v1beta1 + operations: + - CREATE + - UPDATE + resources: + - globalaccelerators + scope: Namespaced + sideEffects: None - admissionReviewVersions: - v1beta1 clientConfig: @@ -1533,10 +2139,6 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller - - key: app.kubernetes.io/instance - operator: NotIn - values: - - cert-manager rules: - apiGroups: - elbv2.k8s.aws 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 558827b1ec343..86da46dd61d63 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 @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io @@ -160,7 +160,7 @@ spec: version: 9.99.0 - id: k8s-1.19 manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml - manifestHash: e054822df9ed81a9df63f9e5a3f6dede0e026175dca15fcd59a82673148ba5b7 + manifestHash: 24206dfab439420103f09c0afa4438959457d8630aa02d242b3bf530667aba24 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-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: 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 61dd3b3d8cfd9..c8bd81d2ef1e3 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,611 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 + labels: + addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io + app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: aws-load-balancer-controller + k8s-addon: aws-load-balancer-controller.addons.k8s.io + name: albtargetcontrolconfigs.elbv2.k8s.aws +spec: + group: elbv2.k8s.aws + names: + kind: ALBTargetControlConfig + listKind: ALBTargetControlConfigList + plural: albtargetcontrolconfigs + singular: albtargetcontrolconfig + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: The ALB target control agent sidecar image + jsonPath: .spec.image + name: IMAGE + type: string + - description: Application destination address + jsonPath: .spec.destinationAddress + name: DESTINATION + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: ALBTargetControlConfig is the Schema for the albtargetcontrolconfigs + 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 + 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 + type: string + metadata: + type: object + spec: + description: ALBTargetControlConfigSpec defines the desired state of ALBTargetControlConfig + properties: + controlAddress: + description: |- + ControlAddress specifies the socket (IP:port) where the load balancer exchanges management traffic with agents. + The port in the socket is the target control port you configure for the target group. + pattern: ^.+:[0-9]+$ + type: string + dataAddress: + description: |- + DataAddress specifies the socket (IP:port) where the agent receives application traffic from the load balancer. + The port in this socket is the application traffic port you configure for your target group. + pattern: ^.+:[0-9]+$ + type: string + destinationAddress: + description: |- + DestinationAddress specifies the socket (IP:port) where the agent proxies application traffic. + Your application should be listening on this port. + pattern: ^.+:[0-9]+$ + type: string + image: + description: |- + Image specifies the container image for the ALB target control agent sidecar. + The agent is available as a Docker image at: public.ecr.aws/aws-elb/target-optimizer/target-control-agent:latest + type: string + maxConcurrency: + default: 1 + description: MaxConcurrency specifies the maximum number of concurrent + requests that the target receives from the load balancer. + format: int32 + maximum: 1000 + minimum: 0 + type: integer + protocolVersion: + description: |- + ProtocolVersion specifies the protocol through which the load balancer communicates with the agent. + Possible values are HTTP1, HTTP2, GRPC. + enum: + - HTTP1 + - HTTP2 + - GRPC + type: string + resources: + description: Resources specifies the resource requirements for the + ALB target control agent sidecar + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object + rustLog: + description: |- + RustLog specifies the log level of the agent process. The agent software is written in Rust. + Possible values are debug, info, and error. + enum: + - debug + - info + - error + type: string + tlsCertPath: + description: |- + TLSCertPath specifies the location of the TLS certificate that the agent provides to the load balancer during TLS handshake. + By default, the agent generates a self-signed certificate in-memory. + type: string + tlsKeyPath: + description: |- + TLSKeyPath specifies the location of the private key corresponding to the TLS certificate that the agent provides to the load balancer during TLS handshake. + By default, the agent generates a private key in memory. + type: string + tlsSecurityPolicy: + description: TLSSecurityPolicy specifies the ELB security policy that + you configure for the target group. + type: string + required: + - controlAddress + - dataAddress + - destinationAddress + - image + type: object + type: object + served: true + storage: true + subresources: {} + +--- + +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.19.0 + labels: + addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io + app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: aws-load-balancer-controller + k8s-addon: aws-load-balancer-controller.addons.k8s.io + name: globalaccelerators.aga.k8s.aws +spec: + group: aga.k8s.aws + names: + kind: GlobalAccelerator + listKind: GlobalAcceleratorList + plural: globalaccelerators + singular: globalaccelerator + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: The Global Accelerator name + jsonPath: .spec.name + name: ACCELERATOR-NAME + type: string + - description: The Global Accelerator DNS name + jsonPath: .status.dnsName + name: DNS-NAME + type: string + - description: The Global Accelerator type + jsonPath: .spec.type + name: TYPE + type: string + - description: The Global Accelerator status + jsonPath: .status.status + name: STATUS + type: string + - description: The Global Accelerator ARN + jsonPath: .status.acceleratorARN + name: ARN + priority: 1 + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: GlobalAccelerator is the Schema for the GlobalAccelerator 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 + 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 + type: string + metadata: + type: object + spec: + description: GlobalAcceleratorSpec defines the desired state of GlobalAccelerator + properties: + ipAddressType: + default: IPV4 + description: IPAddressType is the value for the address type. + enum: + - IPV4 + - DUAL_STACK + type: string + ipAddresses: + description: |- + IpAddresses optionally specifies the IP addresses from your own IP address pool (BYOIP) to use for the accelerator's static IP addresses. + You can specify one or two addresses. Do not include the /32 suffix. + If you bring your own IP address pool to Global Accelerator (BYOIP), you can choose an IPv4 address from your own pool to use for the accelerator's static IPv4 address. + After you bring an address range to AWS, it appears in your account as an address pool. When you create an accelerator, you can assign one IPv4 address from your range to it. + Global Accelerator assigns you a second static IPv4 address from an Amazon IP address range. If you bring two IPv4 address ranges to AWS, you can assign one IPv4 address from each range to your accelerator. + Note that you can't update IP addresses for an existing accelerator. To change them, you must create a new accelerator with the new addresses. + For more information, see Bring your own IP addresses (BYOIP) in the AWS Global Accelerator Developer Guide. + https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html + items: + type: string + maxItems: 2 + minItems: 1 + type: array + listeners: + description: Listeners defines the listeners for the Global Accelerator. + items: + description: GlobalAcceleratorListener defines a listener for the + Global Accelerator. + properties: + clientAffinity: + default: NONE + description: |- + ClientAffinity lets you direct all requests from a user to the same endpoint, if you have stateful applications, regardless of the port and protocol of the client request. + Client affinity gives you control over whether to always route each client to the same specific endpoint. + AWS Global Accelerator uses a consistent-flow hashing algorithm to choose the optimal endpoint for a connection. + If client affinity is NONE, Global Accelerator uses the "five-tuple" (5-tuple) properties—source IP address, source port, destination IP address, destination port, and protocol—to select the hash value, and then chooses the best endpoint. + However, with this setting, if someone uses different ports to connect to Global Accelerator, their connections might not be always routed to the same endpoint because the hash value changes. + If you want a given client to always be routed to the same endpoint, set client affinity to SOURCE_IP instead. + When you use the SOURCE_IP setting, Global Accelerator uses the "two-tuple" (2-tuple) properties— source (client) IP address and destination IP address—to select the hash value. + The default value is NONE. + enum: + - SOURCE_IP + - NONE + type: string + endpointGroups: + description: EndpointGroups defines a list of endpoint groups + for a Global Accelerator listener. + items: + description: GlobalAcceleratorEndpointGroup defines an endpoint + group for a Global Accelerator listener. + properties: + endpoints: + description: Endpoints is the list of endpoint configurations + for this endpoint group. + items: + description: GlobalAcceleratorEndpoint defines an endpoint + for a Global Accelerator endpoint group. + properties: + clientIPPreservationEnabled: + default: true + description: |- + ClientIPPreservationEnabled indicates whether client IP address preservation is enabled for an Application Load Balancer endpoint. + The value is true or false. The default value is true for new accelerators. + If the value is set to true, the client's IP address is preserved in the X-Forwarded-For request header as traffic travels to applications on the Application Load Balancer endpoint fronted by the accelerator. + For more information, see Preserve Client IP Addresses in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/preserve-client-ip-address.html + type: boolean + endpointID: + description: |- + EndpointID is the ID of the endpoint when type is EndpointID. + If the endpoint is a Network Load Balancer or Application Load Balancer, this is the Amazon Resource Name (ARN) of the resource. + A resource must be valid and active when you add it as an endpoint. + Mandatory for remote regions. + maxLength: 255 + type: string + name: + description: Name is the name of the Kubernetes + resource when type is Service, Ingress, or Gateway. + type: string + namespace: + description: |- + Namespace is the namespace of the Kubernetes resource when type is Service, Ingress, or Gateway. + If not specified, defaults to the same namespace as the GlobalAccelerator resource. + type: string + type: + description: Type specifies the type of endpoint + reference. + enum: + - EndpointID + - Service + - Ingress + - Gateway + type: string + weight: + default: 128 + description: |- + Weight is the weight associated with the endpoint. When you add weights to endpoints, you configure Global Accelerator to route traffic based on proportions that you specify. + For example, you might specify endpoint weights of 4, 5, 5, and 6 (sum=20). The result is that 4/20 of your traffic, on average, is routed to the first endpoint, + 5/20 is routed both to the second and third endpoints, and 6/20 is routed to the last endpoint. + For more information, see Endpoint Weights in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/about-endpoints-endpoint-weights.html + format: int32 + maximum: 255 + minimum: 0 + type: integer + required: + - type + type: object + x-kubernetes-validations: + - message: endpointID is required and name must not + be set when type is EndpointID + rule: self.type != 'EndpointID' || (has(self.endpointID) + && !has(self.name)) + - message: name is required and endpointID must not + be set when type is Service/Ingress/Gateway + rule: self.type == 'EndpointID' || (has(self.name) + && !has(self.endpointID)) + type: array + portOverrides: + description: PortOverrides is a list of endpoint port + overrides. Allows you to override the destination ports + used to route traffic to an endpoint. Using a port override + lets you map a list of external destination ports (that + your users send traffic to) to a list of internal destination + ports that you want an application endpoint to receive + traffic on. + items: + description: |- + PortOverride defines a port override for an endpoint group. + Override specific listener ports used to route traffic to endpoints that are part of an endpoint group. + For example, you can create a port override in which the listener receives user traffic on ports 80 and 443, + but your accelerator routes that traffic to ports 1080 and 1443, respectively, on the endpoints. + + For more information, see Port overrides in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/about-endpoint-groups-port-override.html + properties: + endpointPort: + description: |- + EndpointPort is the endpoint port that you want traffic to be routed to. + This is the port on the endpoint, such as the Application Load Balancer or Amazon EC2 instance. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + listenerPort: + description: |- + ListenerPort is the listener port that you want to map to a specific endpoint port. + This is the port that user traffic arrives to the Global Accelerator on. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - endpointPort + - listenerPort + type: object + type: array + region: + description: |- + Region is the AWS Region where the endpoint group is located. + If unspecified, defaults to the current cluster region. + maxLength: 255 + type: string + trafficDialPercentage: + default: 100 + description: |- + TrafficDialPercentage is the percentage of traffic to send to an AWS Regions. Additional traffic is distributed to other endpoint groups for this listener + Use this action to increase (dial up) or decrease (dial down) traffic to a specific Region. The percentage is applied to the traffic that would otherwise have been routed to the Region based on optimal routing. + format: int32 + maximum: 100 + minimum: 0 + type: integer + type: object + type: array + portRanges: + description: |- + PortRanges is the list of port ranges for the connections from clients to the accelerator. + When not specified, the controller will automatically determine the port ranges by inspecting + the referenced Kubernetes resources (Service, Ingress, or Gateway) in the endpoint groups. + items: + description: PortRange defines the port range for Global Accelerator + listeners. + properties: + fromPort: + description: FromPort is the first port in the range of + ports, inclusive. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + toPort: + description: ToPort is the last port in the range of ports, + inclusive. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - fromPort + - toPort + type: object + x-kubernetes-validations: + - message: FromPort must be less than or equal to ToPort + rule: self.fromPort <= self.toPort + maxItems: 10 + minItems: 1 + type: array + protocol: + description: |- + Protocol is the protocol for the connections from clients to the accelerator. + When not specified, the controller will automatically determine the protocol by inspecting + the referenced Kubernetes resources (Service, Ingress, or Gateway) in the endpoint groups. + enum: + - TCP + - UDP + type: string + type: object + type: array + name: + description: |- + Name is the name of the Global Accelerator. + The name must contain only alphanumeric characters or hyphens (-), and must not begin or end with a hyphen. + maxLength: 64 + minLength: 1 + pattern: ^[a-zA-Z0-9_-]{1,64}$ + type: string + tags: + additionalProperties: + type: string + description: Tags defines list of Tags on the Global Accelerator. + type: object + type: object + status: + description: GlobalAcceleratorStatus defines the observed state of GlobalAccelerator + properties: + acceleratorARN: + description: AcceleratorARN is the Amazon Resource Name (ARN) of the + accelerator. + type: string + conditions: + description: Conditions represent the current conditions of the GlobalAccelerator. + items: + description: Condition contains details for one aspect of the current + state of this API Resource. + properties: + lastTransitionTime: + description: |- + lastTransitionTime is the last time the condition transitioned from one status to another. + This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: |- + message is a human readable message indicating details about the transition. + This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: |- + observedGeneration represents the .metadata.generation that the condition was set based upon. + For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date + with respect to the current state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: |- + reason contains a programmatic identifier indicating the reason for the condition's last transition. + Producers of specific condition types may define expected values and meanings for this field, + and whether the values are considered a guaranteed API. + The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + dnsName: + description: DNSName The Domain Name System (DNS) name that Global + Accelerator creates that points to an accelerator's static IPv4 + addresses. + type: string + dualStackDnsName: + description: 'DualStackDnsName is the Domain Name System (DNS) name + that Global Accelerator creates that points to a dual-stack accelerator''s + four static IP addresses: two IPv4 addresses and two IPv6 addresses.' + type: string + ipSets: + description: IPSets is the static IP addresses that Global Accelerator + associates with the accelerator. + items: + description: IPSet is the static IP addresses that Global Accelerator + associates with the accelerator. + properties: + ipAddressFamily: + description: IpAddressFamily is the types of IP addresses included + in this IP set. + type: string + ipAddresses: + description: IpAddresses is the array of IP addresses in the + IP address set. + items: + type: string + type: array + type: object + type: array + observedGeneration: + description: The generation observed by the GlobalAccelerator controller. + format: int64 + type: integer + status: + description: Status is the current status of the accelerator. + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} + +--- + +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.19.0 labels: addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io app.kubernetes.io/managed-by: kops @@ -15,7 +619,7 @@ spec: kind: IngressClassParams listKind: IngressClassParamsList plural: ingressclassparams - singular: ingressclassparams + singular: ingressclassparam scope: Cluster versions: - additionalPrinterColumns: @@ -60,8 +664,9 @@ spec: description: IngressClassParamsSpec defines the desired state of IngressClassParams properties: PrefixListsIDs: - description: PrefixListsIDs defines the security group prefix lists - for all Ingresses that belong to IngressClass with this IngressClassParams. + description: |- + PrefixListsIDsLegacy defines the security group prefix lists for all Ingresses that belong to IngressClass with this IngressClassParams. + Not Recommended, Use PrefixListsIDs (prefixListsIDs in JSON) instead items: type: string type: array @@ -152,6 +757,10 @@ spec: - value type: object type: array + loadBalancerName: + description: LoadBalancerName defines the name of the load balancer + that will be created with this IngressClassParams. + type: string minimumLoadBalancerCapacity: description: MinimumLoadBalancerCapacity define the capacity reservation for LoadBalancers for all Ingress that belong to IngressClass with @@ -212,6 +821,12 @@ spec: type: object type: object x-kubernetes-map-type: atomic + prefixListsIDs: + description: PrefixListsIDs defines the security group prefix lists + for all Ingresses that belong to IngressClass with this IngressClassParams. + items: + type: string + type: array scheme: description: Scheme defines the scheme for all Ingresses that belong to IngressClass with this IngressClassParams. @@ -223,6 +838,10 @@ spec: description: SSLPolicy specifies the SSL Policy for all Ingresses that belong to IngressClass with this IngressClassParams. type: string + sslRedirectPort: + description: SSLRedirectPort specifies the SSL Redirect Port for all + Ingresses that belong to IngressClass with this IngressClassParams. + type: string subnets: description: Subnets defines the subnets for all Ingresses that belong to IngressClass with this IngressClassParams. @@ -272,7 +891,16 @@ spec: - instance - ip type: string + wafv2AclArn: + description: WAFv2ACLArn specifies ARN for the Amazon WAFv2 web ACL. + type: string + wafv2AclName: + description: WAFv2ACLName specifies name of the Amazon WAFv2 web ACL. + type: string type: object + x-kubernetes-validations: + - message: cannot specify both 'prefixListsIDs' and 'PrefixListsIDs' fields + rule: '!(has(self.prefixListsIDs) && has(self.PrefixListsIDs))' type: object served: true storage: true @@ -284,7 +912,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 labels: addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io app.kubernetes.io/managed-by: kops @@ -707,6 +1335,19 @@ spec: targetGroupName: description: targetGroupName is the Name of the TargetGroup. type: string + targetGroupProtocol: + description: targetGroupProtocol is the Protocol of the TargetGroup. + If unspecified, it will be automatically inferred. + enum: + - HTTP + - HTTPS + - TCP + - TLS + - UDP + - TCP_UDP + - QUIC + - TCP_QUIC + type: string targetType: description: targetType is the TargetType of TargetGroup. If unspecified, it will be automatically inferred. @@ -820,6 +1461,9 @@ rules: - "" resources: - endpoints + - namespaces + - nodes + - pods verbs: - get - list @@ -834,59 +1478,52 @@ rules: - apiGroups: - "" resources: - - namespaces + - pods/status + - services/status verbs: - - get - - list - - watch + - patch + - update - apiGroups: - "" resources: - - nodes + - services verbs: - get - list + - patch + - update - watch - apiGroups: - - "" + - aga.k8s.aws resources: - - pods + - globalaccelerators verbs: - get - list + - patch - watch - apiGroups: - - "" + - aga.k8s.aws resources: - - pods/status + - globalaccelerators/finalizers + - globalaccelerators/status verbs: - patch - update - apiGroups: - - "" + - discovery.k8s.io resources: - - services + - endpointslices verbs: - get - list - - patch - - update - watch - apiGroups: - - "" - resources: - - services/status - verbs: - - patch - - update -- apiGroups: - - discovery.k8s.io + - elbv2.k8s.aws resources: - - endpointslices + - albtargetcontrolconfigs verbs: - get - - list - - watch - apiGroups: - elbv2.k8s.aws resources: @@ -916,6 +1553,7 @@ rules: - update - apiGroups: - extensions + - networking.k8s.io resources: - ingresses verbs: @@ -926,6 +1564,7 @@ rules: - watch - apiGroups: - extensions + - networking.k8s.io resources: - ingresses/status verbs: @@ -935,53 +1574,7 @@ rules: - gateway.k8s.aws resources: - listenerruleconfigurations - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.k8s.aws - resources: - - listenerruleconfigurations/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - - listenerruleconfigurations/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - loadbalancerconfigurations - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.k8s.aws - resources: - - loadbalancerconfigurations/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - - loadbalancerconfigurations/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - targetgroupconfigurations verbs: - get @@ -991,6 +1584,8 @@ rules: - apiGroups: - gateway.k8s.aws resources: + - listenerruleconfigurations/finalizers + - loadbalancerconfigurations/finalizers - targetgroupconfigurations/finalizers verbs: - patch @@ -998,6 +1593,8 @@ rules: - apiGroups: - gateway.k8s.aws resources: + - listenerruleconfigurations/status + - loadbalancerconfigurations/status - targetgroupconfigurations/status verbs: - get @@ -1007,30 +1604,8 @@ rules: - gateway.networking.k8s.io resources: - gatewayclasses - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - gatewayclasses/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - gatewayclasses/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - gateways + - referencegrants verbs: - get - list @@ -1039,6 +1614,7 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - gatewayclasses/finalizers - gateways/finalizers verbs: - patch @@ -1046,104 +1622,13 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - gatewayclasses/status - gateways/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - grpcroutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - grpcroutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - grpcroutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - httproutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - httproutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - httproutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - referencegrants - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tcproutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tcproutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - tcproutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - tlsroutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tlsroutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - tlsroutes/status + - udproutes/status verbs: - get - patch @@ -1151,6 +1636,10 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - grpcroutes + - httproutes + - tcproutes + - tlsroutes - udproutes verbs: - get @@ -1159,17 +1648,13 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - grpcroutes/finalizers + - httproutes/finalizers + - tcproutes/finalizers + - tlsroutes/finalizers - udproutes/finalizers verbs: - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - udproutes/status - verbs: - - get - - patch - - update - apiGroups: - networking.k8s.io resources: @@ -1178,23 +1663,6 @@ rules: - get - list - watch -- apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - get - - list - - patch - - update - - watch -- apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - patch - - update --- @@ -1313,7 +1781,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: public.ecr.aws/eks/aws-load-balancer-controller:v2.13.4 + image: public.ecr.aws/eks/aws-load-balancer-controller:v2.17.1 livenessProbe: failureThreshold: 2 httpGet: @@ -1440,6 +1908,7 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller + - coredns - key: app.kubernetes.io/instance operator: NotIn values: @@ -1461,7 +1930,7 @@ webhooks: name: aws-load-balancer-webhook-service namespace: kube-system path: /mutate-v1-pod - failurePolicy: Fail + failurePolicy: Ignore name: mpod.elbv2.k8s.aws namespaceSelector: matchExpressions: @@ -1475,6 +1944,43 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-v1-pod-server-id + failurePolicy: Fail + name: quicid.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/quic-server-id-inject + operator: In + values: + - enabled + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns - key: app.kubernetes.io/instance operator: NotIn values: @@ -1489,6 +1995,84 @@ webhooks: resources: - pods sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-alb-target-control-namespace-v1-pod + failurePolicy: Fail + name: alb-target-control.namespace.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/alb-target-control-agent-injection + operator: In + values: + - enabled + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + - key: elbv2.k8s.aws/alb-target-control-agent-inject + operator: NotIn + values: + - "false" + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-alb-target-control-object-v1-pod + failurePolicy: Fail + name: alb-target-control.object.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/alb-target-control-agent-injection + operator: DoesNotExist + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + - key: elbv2.k8s.aws/alb-target-control-agent-inject + operator: In + values: + - "true" + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None - admissionReviewVersions: - v1beta1 clientConfig: @@ -1524,6 +2108,28 @@ metadata: k8s-addon: aws-load-balancer-controller.addons.k8s.io name: aws-load-balancer-webhook webhooks: +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /validate-aga-k8s-aws-v1beta1-globalaccelerator + failurePolicy: Fail + matchPolicy: Equivalent + name: vglobalaccelerator.aga.k8s.aws + rules: + - apiGroups: + - aga.k8s.aws + apiVersions: + - v1beta1 + operations: + - CREATE + - UPDATE + resources: + - globalaccelerators + scope: Namespaced + sideEffects: None - admissionReviewVersions: - v1beta1 clientConfig: @@ -1539,10 +2145,6 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller - - key: app.kubernetes.io/instance - operator: NotIn - values: - - cert-manager rules: - apiGroups: - elbv2.k8s.aws 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 cab5ba6c7a8de..0f7fcf5ce1ac8 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 @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io @@ -160,7 +160,7 @@ spec: version: 9.99.0 - id: k8s-1.19 manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml - manifestHash: 1c4899c133afc4e24dbc8f4fa4242f72b6fe7aabdcdfa9a04c809baa4bd1bbb4 + manifestHash: 588f671d99d93fbfc8fa2d057614f231799bca9e856471a37474c23088d45427 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-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 98483436cd8dd..499f5ac200fdb 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.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_many-addons.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content index 89c04a61e6f21..e06da712df315 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.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_many-addons.example.com-addons-aws-load-balancer-controller.addons.k8s.io-k8s-1.19_content @@ -2,7 +2,611 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 + labels: + addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io + app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: aws-load-balancer-controller + k8s-addon: aws-load-balancer-controller.addons.k8s.io + name: albtargetcontrolconfigs.elbv2.k8s.aws +spec: + group: elbv2.k8s.aws + names: + kind: ALBTargetControlConfig + listKind: ALBTargetControlConfigList + plural: albtargetcontrolconfigs + singular: albtargetcontrolconfig + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: The ALB target control agent sidecar image + jsonPath: .spec.image + name: IMAGE + type: string + - description: Application destination address + jsonPath: .spec.destinationAddress + name: DESTINATION + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: ALBTargetControlConfig is the Schema for the albtargetcontrolconfigs + 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 + 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 + type: string + metadata: + type: object + spec: + description: ALBTargetControlConfigSpec defines the desired state of ALBTargetControlConfig + properties: + controlAddress: + description: |- + ControlAddress specifies the socket (IP:port) where the load balancer exchanges management traffic with agents. + The port in the socket is the target control port you configure for the target group. + pattern: ^.+:[0-9]+$ + type: string + dataAddress: + description: |- + DataAddress specifies the socket (IP:port) where the agent receives application traffic from the load balancer. + The port in this socket is the application traffic port you configure for your target group. + pattern: ^.+:[0-9]+$ + type: string + destinationAddress: + description: |- + DestinationAddress specifies the socket (IP:port) where the agent proxies application traffic. + Your application should be listening on this port. + pattern: ^.+:[0-9]+$ + type: string + image: + description: |- + Image specifies the container image for the ALB target control agent sidecar. + The agent is available as a Docker image at: public.ecr.aws/aws-elb/target-optimizer/target-control-agent:latest + type: string + maxConcurrency: + default: 1 + description: MaxConcurrency specifies the maximum number of concurrent + requests that the target receives from the load balancer. + format: int32 + maximum: 1000 + minimum: 0 + type: integer + protocolVersion: + description: |- + ProtocolVersion specifies the protocol through which the load balancer communicates with the agent. + Possible values are HTTP1, HTTP2, GRPC. + enum: + - HTTP1 + - HTTP2 + - GRPC + type: string + resources: + description: Resources specifies the resource requirements for the + ALB target control agent sidecar + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object + rustLog: + description: |- + RustLog specifies the log level of the agent process. The agent software is written in Rust. + Possible values are debug, info, and error. + enum: + - debug + - info + - error + type: string + tlsCertPath: + description: |- + TLSCertPath specifies the location of the TLS certificate that the agent provides to the load balancer during TLS handshake. + By default, the agent generates a self-signed certificate in-memory. + type: string + tlsKeyPath: + description: |- + TLSKeyPath specifies the location of the private key corresponding to the TLS certificate that the agent provides to the load balancer during TLS handshake. + By default, the agent generates a private key in memory. + type: string + tlsSecurityPolicy: + description: TLSSecurityPolicy specifies the ELB security policy that + you configure for the target group. + type: string + required: + - controlAddress + - dataAddress + - destinationAddress + - image + type: object + type: object + served: true + storage: true + subresources: {} + +--- + +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.19.0 + labels: + addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io + app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: aws-load-balancer-controller + k8s-addon: aws-load-balancer-controller.addons.k8s.io + name: globalaccelerators.aga.k8s.aws +spec: + group: aga.k8s.aws + names: + kind: GlobalAccelerator + listKind: GlobalAcceleratorList + plural: globalaccelerators + singular: globalaccelerator + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: The Global Accelerator name + jsonPath: .spec.name + name: ACCELERATOR-NAME + type: string + - description: The Global Accelerator DNS name + jsonPath: .status.dnsName + name: DNS-NAME + type: string + - description: The Global Accelerator type + jsonPath: .spec.type + name: TYPE + type: string + - description: The Global Accelerator status + jsonPath: .status.status + name: STATUS + type: string + - description: The Global Accelerator ARN + jsonPath: .status.acceleratorARN + name: ARN + priority: 1 + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: GlobalAccelerator is the Schema for the GlobalAccelerator 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 + 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 + type: string + metadata: + type: object + spec: + description: GlobalAcceleratorSpec defines the desired state of GlobalAccelerator + properties: + ipAddressType: + default: IPV4 + description: IPAddressType is the value for the address type. + enum: + - IPV4 + - DUAL_STACK + type: string + ipAddresses: + description: |- + IpAddresses optionally specifies the IP addresses from your own IP address pool (BYOIP) to use for the accelerator's static IP addresses. + You can specify one or two addresses. Do not include the /32 suffix. + If you bring your own IP address pool to Global Accelerator (BYOIP), you can choose an IPv4 address from your own pool to use for the accelerator's static IPv4 address. + After you bring an address range to AWS, it appears in your account as an address pool. When you create an accelerator, you can assign one IPv4 address from your range to it. + Global Accelerator assigns you a second static IPv4 address from an Amazon IP address range. If you bring two IPv4 address ranges to AWS, you can assign one IPv4 address from each range to your accelerator. + Note that you can't update IP addresses for an existing accelerator. To change them, you must create a new accelerator with the new addresses. + For more information, see Bring your own IP addresses (BYOIP) in the AWS Global Accelerator Developer Guide. + https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html + items: + type: string + maxItems: 2 + minItems: 1 + type: array + listeners: + description: Listeners defines the listeners for the Global Accelerator. + items: + description: GlobalAcceleratorListener defines a listener for the + Global Accelerator. + properties: + clientAffinity: + default: NONE + description: |- + ClientAffinity lets you direct all requests from a user to the same endpoint, if you have stateful applications, regardless of the port and protocol of the client request. + Client affinity gives you control over whether to always route each client to the same specific endpoint. + AWS Global Accelerator uses a consistent-flow hashing algorithm to choose the optimal endpoint for a connection. + If client affinity is NONE, Global Accelerator uses the "five-tuple" (5-tuple) properties—source IP address, source port, destination IP address, destination port, and protocol—to select the hash value, and then chooses the best endpoint. + However, with this setting, if someone uses different ports to connect to Global Accelerator, their connections might not be always routed to the same endpoint because the hash value changes. + If you want a given client to always be routed to the same endpoint, set client affinity to SOURCE_IP instead. + When you use the SOURCE_IP setting, Global Accelerator uses the "two-tuple" (2-tuple) properties— source (client) IP address and destination IP address—to select the hash value. + The default value is NONE. + enum: + - SOURCE_IP + - NONE + type: string + endpointGroups: + description: EndpointGroups defines a list of endpoint groups + for a Global Accelerator listener. + items: + description: GlobalAcceleratorEndpointGroup defines an endpoint + group for a Global Accelerator listener. + properties: + endpoints: + description: Endpoints is the list of endpoint configurations + for this endpoint group. + items: + description: GlobalAcceleratorEndpoint defines an endpoint + for a Global Accelerator endpoint group. + properties: + clientIPPreservationEnabled: + default: true + description: |- + ClientIPPreservationEnabled indicates whether client IP address preservation is enabled for an Application Load Balancer endpoint. + The value is true or false. The default value is true for new accelerators. + If the value is set to true, the client's IP address is preserved in the X-Forwarded-For request header as traffic travels to applications on the Application Load Balancer endpoint fronted by the accelerator. + For more information, see Preserve Client IP Addresses in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/preserve-client-ip-address.html + type: boolean + endpointID: + description: |- + EndpointID is the ID of the endpoint when type is EndpointID. + If the endpoint is a Network Load Balancer or Application Load Balancer, this is the Amazon Resource Name (ARN) of the resource. + A resource must be valid and active when you add it as an endpoint. + Mandatory for remote regions. + maxLength: 255 + type: string + name: + description: Name is the name of the Kubernetes + resource when type is Service, Ingress, or Gateway. + type: string + namespace: + description: |- + Namespace is the namespace of the Kubernetes resource when type is Service, Ingress, or Gateway. + If not specified, defaults to the same namespace as the GlobalAccelerator resource. + type: string + type: + description: Type specifies the type of endpoint + reference. + enum: + - EndpointID + - Service + - Ingress + - Gateway + type: string + weight: + default: 128 + description: |- + Weight is the weight associated with the endpoint. When you add weights to endpoints, you configure Global Accelerator to route traffic based on proportions that you specify. + For example, you might specify endpoint weights of 4, 5, 5, and 6 (sum=20). The result is that 4/20 of your traffic, on average, is routed to the first endpoint, + 5/20 is routed both to the second and third endpoints, and 6/20 is routed to the last endpoint. + For more information, see Endpoint Weights in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/about-endpoints-endpoint-weights.html + format: int32 + maximum: 255 + minimum: 0 + type: integer + required: + - type + type: object + x-kubernetes-validations: + - message: endpointID is required and name must not + be set when type is EndpointID + rule: self.type != 'EndpointID' || (has(self.endpointID) + && !has(self.name)) + - message: name is required and endpointID must not + be set when type is Service/Ingress/Gateway + rule: self.type == 'EndpointID' || (has(self.name) + && !has(self.endpointID)) + type: array + portOverrides: + description: PortOverrides is a list of endpoint port + overrides. Allows you to override the destination ports + used to route traffic to an endpoint. Using a port override + lets you map a list of external destination ports (that + your users send traffic to) to a list of internal destination + ports that you want an application endpoint to receive + traffic on. + items: + description: |- + PortOverride defines a port override for an endpoint group. + Override specific listener ports used to route traffic to endpoints that are part of an endpoint group. + For example, you can create a port override in which the listener receives user traffic on ports 80 and 443, + but your accelerator routes that traffic to ports 1080 and 1443, respectively, on the endpoints. + + For more information, see Port overrides in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/about-endpoint-groups-port-override.html + properties: + endpointPort: + description: |- + EndpointPort is the endpoint port that you want traffic to be routed to. + This is the port on the endpoint, such as the Application Load Balancer or Amazon EC2 instance. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + listenerPort: + description: |- + ListenerPort is the listener port that you want to map to a specific endpoint port. + This is the port that user traffic arrives to the Global Accelerator on. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - endpointPort + - listenerPort + type: object + type: array + region: + description: |- + Region is the AWS Region where the endpoint group is located. + If unspecified, defaults to the current cluster region. + maxLength: 255 + type: string + trafficDialPercentage: + default: 100 + description: |- + TrafficDialPercentage is the percentage of traffic to send to an AWS Regions. Additional traffic is distributed to other endpoint groups for this listener + Use this action to increase (dial up) or decrease (dial down) traffic to a specific Region. The percentage is applied to the traffic that would otherwise have been routed to the Region based on optimal routing. + format: int32 + maximum: 100 + minimum: 0 + type: integer + type: object + type: array + portRanges: + description: |- + PortRanges is the list of port ranges for the connections from clients to the accelerator. + When not specified, the controller will automatically determine the port ranges by inspecting + the referenced Kubernetes resources (Service, Ingress, or Gateway) in the endpoint groups. + items: + description: PortRange defines the port range for Global Accelerator + listeners. + properties: + fromPort: + description: FromPort is the first port in the range of + ports, inclusive. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + toPort: + description: ToPort is the last port in the range of ports, + inclusive. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - fromPort + - toPort + type: object + x-kubernetes-validations: + - message: FromPort must be less than or equal to ToPort + rule: self.fromPort <= self.toPort + maxItems: 10 + minItems: 1 + type: array + protocol: + description: |- + Protocol is the protocol for the connections from clients to the accelerator. + When not specified, the controller will automatically determine the protocol by inspecting + the referenced Kubernetes resources (Service, Ingress, or Gateway) in the endpoint groups. + enum: + - TCP + - UDP + type: string + type: object + type: array + name: + description: |- + Name is the name of the Global Accelerator. + The name must contain only alphanumeric characters or hyphens (-), and must not begin or end with a hyphen. + maxLength: 64 + minLength: 1 + pattern: ^[a-zA-Z0-9_-]{1,64}$ + type: string + tags: + additionalProperties: + type: string + description: Tags defines list of Tags on the Global Accelerator. + type: object + type: object + status: + description: GlobalAcceleratorStatus defines the observed state of GlobalAccelerator + properties: + acceleratorARN: + description: AcceleratorARN is the Amazon Resource Name (ARN) of the + accelerator. + type: string + conditions: + description: Conditions represent the current conditions of the GlobalAccelerator. + items: + description: Condition contains details for one aspect of the current + state of this API Resource. + properties: + lastTransitionTime: + description: |- + lastTransitionTime is the last time the condition transitioned from one status to another. + This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: |- + message is a human readable message indicating details about the transition. + This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: |- + observedGeneration represents the .metadata.generation that the condition was set based upon. + For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date + with respect to the current state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: |- + reason contains a programmatic identifier indicating the reason for the condition's last transition. + Producers of specific condition types may define expected values and meanings for this field, + and whether the values are considered a guaranteed API. + The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + dnsName: + description: DNSName The Domain Name System (DNS) name that Global + Accelerator creates that points to an accelerator's static IPv4 + addresses. + type: string + dualStackDnsName: + description: 'DualStackDnsName is the Domain Name System (DNS) name + that Global Accelerator creates that points to a dual-stack accelerator''s + four static IP addresses: two IPv4 addresses and two IPv6 addresses.' + type: string + ipSets: + description: IPSets is the static IP addresses that Global Accelerator + associates with the accelerator. + items: + description: IPSet is the static IP addresses that Global Accelerator + associates with the accelerator. + properties: + ipAddressFamily: + description: IpAddressFamily is the types of IP addresses included + in this IP set. + type: string + ipAddresses: + description: IpAddresses is the array of IP addresses in the + IP address set. + items: + type: string + type: array + type: object + type: array + observedGeneration: + description: The generation observed by the GlobalAccelerator controller. + format: int64 + type: integer + status: + description: Status is the current status of the accelerator. + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} + +--- + +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.19.0 labels: addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io app.kubernetes.io/managed-by: kops @@ -15,7 +619,7 @@ spec: kind: IngressClassParams listKind: IngressClassParamsList plural: ingressclassparams - singular: ingressclassparams + singular: ingressclassparam scope: Cluster versions: - additionalPrinterColumns: @@ -60,8 +664,9 @@ spec: description: IngressClassParamsSpec defines the desired state of IngressClassParams properties: PrefixListsIDs: - description: PrefixListsIDs defines the security group prefix lists - for all Ingresses that belong to IngressClass with this IngressClassParams. + description: |- + PrefixListsIDsLegacy defines the security group prefix lists for all Ingresses that belong to IngressClass with this IngressClassParams. + Not Recommended, Use PrefixListsIDs (prefixListsIDs in JSON) instead items: type: string type: array @@ -152,6 +757,10 @@ spec: - value type: object type: array + loadBalancerName: + description: LoadBalancerName defines the name of the load balancer + that will be created with this IngressClassParams. + type: string minimumLoadBalancerCapacity: description: MinimumLoadBalancerCapacity define the capacity reservation for LoadBalancers for all Ingress that belong to IngressClass with @@ -212,6 +821,12 @@ spec: type: object type: object x-kubernetes-map-type: atomic + prefixListsIDs: + description: PrefixListsIDs defines the security group prefix lists + for all Ingresses that belong to IngressClass with this IngressClassParams. + items: + type: string + type: array scheme: description: Scheme defines the scheme for all Ingresses that belong to IngressClass with this IngressClassParams. @@ -223,6 +838,10 @@ spec: description: SSLPolicy specifies the SSL Policy for all Ingresses that belong to IngressClass with this IngressClassParams. type: string + sslRedirectPort: + description: SSLRedirectPort specifies the SSL Redirect Port for all + Ingresses that belong to IngressClass with this IngressClassParams. + type: string subnets: description: Subnets defines the subnets for all Ingresses that belong to IngressClass with this IngressClassParams. @@ -272,7 +891,16 @@ spec: - instance - ip type: string + wafv2AclArn: + description: WAFv2ACLArn specifies ARN for the Amazon WAFv2 web ACL. + type: string + wafv2AclName: + description: WAFv2ACLName specifies name of the Amazon WAFv2 web ACL. + type: string type: object + x-kubernetes-validations: + - message: cannot specify both 'prefixListsIDs' and 'PrefixListsIDs' fields + rule: '!(has(self.prefixListsIDs) && has(self.PrefixListsIDs))' type: object served: true storage: true @@ -284,7 +912,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 labels: addon.kops.k8s.io/name: aws-load-balancer-controller.addons.k8s.io app.kubernetes.io/managed-by: kops @@ -707,6 +1335,19 @@ spec: targetGroupName: description: targetGroupName is the Name of the TargetGroup. type: string + targetGroupProtocol: + description: targetGroupProtocol is the Protocol of the TargetGroup. + If unspecified, it will be automatically inferred. + enum: + - HTTP + - HTTPS + - TCP + - TLS + - UDP + - TCP_UDP + - QUIC + - TCP_QUIC + type: string targetType: description: targetType is the TargetType of TargetGroup. If unspecified, it will be automatically inferred. @@ -820,6 +1461,9 @@ rules: - "" resources: - endpoints + - namespaces + - nodes + - pods verbs: - get - list @@ -834,59 +1478,52 @@ rules: - apiGroups: - "" resources: - - namespaces + - pods/status + - services/status verbs: - - get - - list - - watch + - patch + - update - apiGroups: - "" resources: - - nodes + - services verbs: - get - list + - patch + - update - watch - apiGroups: - - "" + - aga.k8s.aws resources: - - pods + - globalaccelerators verbs: - get - list + - patch - watch - apiGroups: - - "" + - aga.k8s.aws resources: - - pods/status + - globalaccelerators/finalizers + - globalaccelerators/status verbs: - patch - update - apiGroups: - - "" + - discovery.k8s.io resources: - - services + - endpointslices verbs: - get - list - - patch - - update - watch - apiGroups: - - "" - resources: - - services/status - verbs: - - patch - - update -- apiGroups: - - discovery.k8s.io + - elbv2.k8s.aws resources: - - endpointslices + - albtargetcontrolconfigs verbs: - get - - list - - watch - apiGroups: - elbv2.k8s.aws resources: @@ -916,6 +1553,7 @@ rules: - update - apiGroups: - extensions + - networking.k8s.io resources: - ingresses verbs: @@ -926,6 +1564,7 @@ rules: - watch - apiGroups: - extensions + - networking.k8s.io resources: - ingresses/status verbs: @@ -935,53 +1574,7 @@ rules: - gateway.k8s.aws resources: - listenerruleconfigurations - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.k8s.aws - resources: - - listenerruleconfigurations/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - - listenerruleconfigurations/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - loadbalancerconfigurations - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.k8s.aws - resources: - - loadbalancerconfigurations/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - - loadbalancerconfigurations/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - targetgroupconfigurations verbs: - get @@ -991,6 +1584,8 @@ rules: - apiGroups: - gateway.k8s.aws resources: + - listenerruleconfigurations/finalizers + - loadbalancerconfigurations/finalizers - targetgroupconfigurations/finalizers verbs: - patch @@ -998,6 +1593,8 @@ rules: - apiGroups: - gateway.k8s.aws resources: + - listenerruleconfigurations/status + - loadbalancerconfigurations/status - targetgroupconfigurations/status verbs: - get @@ -1007,30 +1604,8 @@ rules: - gateway.networking.k8s.io resources: - gatewayclasses - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - gatewayclasses/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - gatewayclasses/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - gateways + - referencegrants verbs: - get - list @@ -1039,6 +1614,7 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - gatewayclasses/finalizers - gateways/finalizers verbs: - patch @@ -1046,104 +1622,13 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - gatewayclasses/status - gateways/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - grpcroutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - grpcroutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - grpcroutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - httproutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - httproutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - httproutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - referencegrants - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tcproutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tcproutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - tcproutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - tlsroutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tlsroutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - tlsroutes/status + - udproutes/status verbs: - get - patch @@ -1151,6 +1636,10 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - grpcroutes + - httproutes + - tcproutes + - tlsroutes - udproutes verbs: - get @@ -1159,17 +1648,13 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - grpcroutes/finalizers + - httproutes/finalizers + - tcproutes/finalizers + - tlsroutes/finalizers - udproutes/finalizers verbs: - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - udproutes/status - verbs: - - get - - patch - - update - apiGroups: - networking.k8s.io resources: @@ -1178,23 +1663,6 @@ rules: - get - list - watch -- apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - get - - list - - patch - - update - - watch -- apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - patch - - update --- @@ -1313,7 +1781,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: public.ecr.aws/eks/aws-load-balancer-controller:v2.13.4 + image: public.ecr.aws/eks/aws-load-balancer-controller:v2.17.1 livenessProbe: failureThreshold: 2 httpGet: @@ -1440,6 +1908,7 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller + - coredns - key: app.kubernetes.io/instance operator: NotIn values: @@ -1461,7 +1930,7 @@ webhooks: name: aws-load-balancer-webhook-service namespace: kube-system path: /mutate-v1-pod - failurePolicy: Fail + failurePolicy: Ignore name: mpod.elbv2.k8s.aws namespaceSelector: matchExpressions: @@ -1475,6 +1944,43 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-v1-pod-server-id + failurePolicy: Fail + name: quicid.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/quic-server-id-inject + operator: In + values: + - enabled + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns - key: app.kubernetes.io/instance operator: NotIn values: @@ -1489,6 +1995,84 @@ webhooks: resources: - pods sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-alb-target-control-namespace-v1-pod + failurePolicy: Fail + name: alb-target-control.namespace.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/alb-target-control-agent-injection + operator: In + values: + - enabled + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + - key: elbv2.k8s.aws/alb-target-control-agent-inject + operator: NotIn + values: + - "false" + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-alb-target-control-object-v1-pod + failurePolicy: Fail + name: alb-target-control.object.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/alb-target-control-agent-injection + operator: DoesNotExist + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + - key: elbv2.k8s.aws/alb-target-control-agent-inject + operator: In + values: + - "true" + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None - admissionReviewVersions: - v1beta1 clientConfig: @@ -1524,6 +2108,28 @@ metadata: k8s-addon: aws-load-balancer-controller.addons.k8s.io name: aws-load-balancer-webhook webhooks: +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /validate-aga-k8s-aws-v1beta1-globalaccelerator + failurePolicy: Fail + matchPolicy: Equivalent + name: vglobalaccelerator.aga.k8s.aws + rules: + - apiGroups: + - aga.k8s.aws + apiVersions: + - v1beta1 + operations: + - CREATE + - UPDATE + resources: + - globalaccelerators + scope: Namespaced + sideEffects: None - admissionReviewVersions: - v1beta1 clientConfig: @@ -1539,10 +2145,6 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller - - key: app.kubernetes.io/instance - operator: NotIn - values: - - cert-manager rules: - apiGroups: - elbv2.k8s.aws diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content index d50335c9a635b..a9a5769b747fa 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io @@ -209,7 +209,7 @@ spec: version: 9.99.0 - id: k8s-1.19 manifest: aws-load-balancer-controller.addons.k8s.io/k8s-1.19.yaml - manifestHash: 31590854ee9be19cb9e7f42acfc438c0d552d7bef013169ad9036b9ec9988b31 + manifestHash: edb599575f56856897aaf472f91a9658fdbf54f94e3bbd9793c5d7f13d7e1627 name: aws-load-balancer-controller.addons.k8s.io needsPKI: true selector: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index e3726e800ce51..1f21a4da0f27d 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index bc192b7b55c87..e108cab7c3877 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 0e9e57aa6f086..2089eea412996 100644 --- a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-1.31/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 4956f417f2dcc..1db61a580d2f1 100644 --- a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-1.32/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 924575bdf08e3..55f2cc55b4129 100644 --- a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-1.33/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index ed6543a796a67..772e8dad20155 100644 --- a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-1.34/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content index 0c17a9d04d954..d9226517bf55f 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 75034f5f6ad52..70a8c398b6483 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8efc6205ff9f53823678fd32db357002bb25a14af3da879f3cd6626acf2e2ea4 + manifestHash: 0c15c2b81df272f2863af4f0dfa682aacf70bb1396909b54830860a040330f16 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 19d6e2f09306c..5c9f1128d99ba 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -94,7 +93,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -108,15 +106,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -126,6 +125,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -225,6 +225,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -245,6 +246,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -345,18 +347,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content index 29f38de6ac6fc..403fe4fa1c75a 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 3a25726f4f31c..835961265f2dd 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 6de53399b9e3e..1c82ab9821338 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8642b9d0bbcde0da9399db4bb1743aceb0b9b39260f42ba2c04b0c9ce77339ab + manifestHash: 259a202a0cc9029900ca313a6abf2aff2fa5ace01fdbe5c0127847b498412531 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 6c56564c9aa84..c57c994f6dcba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -91,7 +90,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -105,15 +103,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -123,6 +122,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -215,6 +215,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -235,6 +236,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -335,18 +337,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 7496895e0e7f5..134de6298e702 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8642b9d0bbcde0da9399db4bb1743aceb0b9b39260f42ba2c04b0c9ce77339ab + manifestHash: 259a202a0cc9029900ca313a6abf2aff2fa5ace01fdbe5c0127847b498412531 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 6c56564c9aa84..c57c994f6dcba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -91,7 +90,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -105,15 +103,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -123,6 +122,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -215,6 +215,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -235,6 +236,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -335,18 +337,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index adb663d5a35a7..1df4be7e5783e 100644 --- a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8642b9d0bbcde0da9399db4bb1743aceb0b9b39260f42ba2c04b0c9ce77339ab + manifestHash: 259a202a0cc9029900ca313a6abf2aff2fa5ace01fdbe5c0127847b498412531 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 6c56564c9aa84..c57c994f6dcba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -91,7 +90,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -105,15 +103,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -123,6 +122,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -215,6 +215,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -235,6 +236,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -335,18 +337,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index b69aa4b10c5e4..24d4474e741ba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8642b9d0bbcde0da9399db4bb1743aceb0b9b39260f42ba2c04b0c9ce77339ab + manifestHash: 259a202a0cc9029900ca313a6abf2aff2fa5ace01fdbe5c0127847b498412531 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 6c56564c9aa84..c57c994f6dcba 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -91,7 +90,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -105,15 +103,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -123,6 +122,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -215,6 +215,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -235,6 +236,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -335,18 +337,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index b69aa4b10c5e4..24d4474e741ba 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8642b9d0bbcde0da9399db4bb1743aceb0b9b39260f42ba2c04b0c9ce77339ab + manifestHash: 259a202a0cc9029900ca313a6abf2aff2fa5ace01fdbe5c0127847b498412531 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 6c56564c9aa84..c57c994f6dcba 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -91,7 +90,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -105,15 +103,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -123,6 +122,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -215,6 +215,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -235,6 +236,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -335,18 +337,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content index afe4572136f53..3f645523a2088 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content index b2cdd908d50da..e54e4125c1e70 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7e1bcff96851f27da385fa8be54159cfaf6a8e0b9a871eb09893390ec61d9494 + manifestHash: fb2c087bd8906a914ce44ee7cd1ca5e35163b1d9b0981a83eb4a1e01b0f06ddc name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 239feba381f9a..3a6281196a15b 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content index 91bef8da27ccf..0379aa9659be0 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content index 5a1775dc7e7d4..9307d5acaa50a 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: fa66e94cfc7d15e1e46fb5e9a9cbc5e06bdc5db4d13985fbbeec114085acc78b + manifestHash: 142062477a02a96eb3cd8fc09ce3c84c61d61040a8c4a4e98714e9d8b8cc2d6b name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 8345a43253a3d..a85bb78eb01ee 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -94,7 +93,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -108,15 +106,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -126,6 +125,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -225,6 +225,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -245,6 +246,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -345,18 +347,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content index 2f183a7212a48..71697b57fe976 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content index f9559a20632a8..3009db3d1d9e4 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content index f9559a20632a8..3009db3d1d9e4 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content index cc913fb77591f..691c7eb302cbd 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content index 4a552a910930d..f3ad0479843f8 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content index 45919628f36fa..e07f75a07c95a 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 9e9922bb0afbbe30ff4cdea62e54f87dbf04da6245bdb03792df4e422d7493c0 + manifestHash: 732e6e8857c25dbd46d2f9560161a6a5b436b019c3d88182cb3f260742d9e0ee name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content index 706a16d348a13..ebd34e70a4e7e 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -94,7 +93,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -108,15 +106,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -126,6 +125,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -225,6 +225,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -245,6 +246,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -345,18 +347,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content index 54fbcbcb99629..d80ede8736379 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 9e9922bb0afbbe30ff4cdea62e54f87dbf04da6245bdb03792df4e422d7493c0 + manifestHash: 732e6e8857c25dbd46d2f9560161a6a5b436b019c3d88182cb3f260742d9e0ee name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content index 706a16d348a13..ebd34e70a4e7e 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -94,7 +93,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -108,15 +106,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -126,6 +125,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -225,6 +225,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -245,6 +246,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -345,18 +347,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 446b498de852c..182b30efe8bd3 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8efc6205ff9f53823678fd32db357002bb25a14af3da879f3cd6626acf2e2ea4 + manifestHash: 0c15c2b81df272f2863af4f0dfa682aacf70bb1396909b54830860a040330f16 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 19d6e2f09306c..5c9f1128d99ba 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -94,7 +93,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -108,15 +106,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -126,6 +125,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -225,6 +225,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -245,6 +246,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -345,18 +347,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content index 1e434f4634d28..d63f6d455268f 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 9e9922bb0afbbe30ff4cdea62e54f87dbf04da6245bdb03792df4e422d7493c0 + manifestHash: 732e6e8857c25dbd46d2f9560161a6a5b436b019c3d88182cb3f260742d9e0ee name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content index 706a16d348a13..ebd34e70a4e7e 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_scw-minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -94,7 +93,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -108,15 +106,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -126,6 +125,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -225,6 +225,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -245,6 +246,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -345,18 +347,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content index 241f90fdef47a..cdc863766a1bc 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content index 241f90fdef47a..cdc863766a1bc 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content index 94fb280a7fd94..a440a2bc0c595 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content index 1eca0509c9291..3fc823c58f970 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 24b4a8859d1b3..d83a65ed4ac8e 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content index 272e2c22800db..66f2bff4e467b 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content index 406d83e9f5d72..05ed5d47616d5 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content index 3ed0add45a270..81e5fa14fcc92 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index c024180adc1bf..5b2d901072ed7 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index 346610984dcd1..08c3c6c733f91 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index b71b1bd2aed03..bea6439a24af3 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content index dbf3c0573e4a7..43d059974f09f 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content index f3606e7a183da..f5b3ab7684174 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content index bf9c826d902e9..d8eb71f2888c1 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content index 967d08e3e743d..23d5fbb005026 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-bootstrap_content index 1ca427a9dd4fd..9011e9e4eb931 100644 --- a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content index 4963de3a7536a..e586d8593b58b 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 4e25d9556ed28..f8b5edd662817 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content index c4a2f30a51750..3cd6b19b2e949 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content index db2ba93ddab34..3adb80e615a53 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index b69aa4b10c5e4..24d4474e741ba 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 8642b9d0bbcde0da9399db4bb1743aceb0b9b39260f42ba2c04b0c9ce77339ab + manifestHash: 259a202a0cc9029900ca313a6abf2aff2fa5ace01fdbe5c0127847b498412531 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 6c56564c9aa84..c57c994f6dcba 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -91,7 +90,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -105,15 +103,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -123,6 +122,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -215,6 +215,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -235,6 +236,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -335,18 +337,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content index 4a4bcb469e739..2bf966ae39e50 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 3a25726f4f31c..835961265f2dd 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 02f679952641c..4474d0ee2facb 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -214,6 +214,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -234,6 +235,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -334,18 +336,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: 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 28ee7797d7c2b..3b29ec86c95dc 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,605 @@ {{- with .CloudProvider.AWS.LoadBalancerController }} -# sourced from https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.13.4/v2_13_4_full.yaml +# sourced from https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.17.1/v2_17_1_full.yaml +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.19.0 + labels: + app.kubernetes.io/name: aws-load-balancer-controller + name: albtargetcontrolconfigs.elbv2.k8s.aws +spec: + group: elbv2.k8s.aws + names: + kind: ALBTargetControlConfig + listKind: ALBTargetControlConfigList + plural: albtargetcontrolconfigs + singular: albtargetcontrolconfig + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: The ALB target control agent sidecar image + jsonPath: .spec.image + name: IMAGE + type: string + - description: Application destination address + jsonPath: .spec.destinationAddress + name: DESTINATION + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: ALBTargetControlConfig is the Schema for the albtargetcontrolconfigs + 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 + 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 + type: string + metadata: + type: object + spec: + description: ALBTargetControlConfigSpec defines the desired state of ALBTargetControlConfig + properties: + controlAddress: + description: |- + ControlAddress specifies the socket (IP:port) where the load balancer exchanges management traffic with agents. + The port in the socket is the target control port you configure for the target group. + pattern: ^.+:[0-9]+$ + type: string + dataAddress: + description: |- + DataAddress specifies the socket (IP:port) where the agent receives application traffic from the load balancer. + The port in this socket is the application traffic port you configure for your target group. + pattern: ^.+:[0-9]+$ + type: string + destinationAddress: + description: |- + DestinationAddress specifies the socket (IP:port) where the agent proxies application traffic. + Your application should be listening on this port. + pattern: ^.+:[0-9]+$ + type: string + image: + description: |- + Image specifies the container image for the ALB target control agent sidecar. + The agent is available as a Docker image at: public.ecr.aws/aws-elb/target-optimizer/target-control-agent:latest + type: string + maxConcurrency: + default: 1 + description: MaxConcurrency specifies the maximum number of concurrent + requests that the target receives from the load balancer. + format: int32 + maximum: 1000 + minimum: 0 + type: integer + protocolVersion: + description: |- + ProtocolVersion specifies the protocol through which the load balancer communicates with the agent. + Possible values are HTTP1, HTTP2, GRPC. + enum: + - HTTP1 + - HTTP2 + - GRPC + type: string + resources: + description: Resources specifies the resource requirements for the + ALB target control agent sidecar + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object + rustLog: + description: |- + RustLog specifies the log level of the agent process. The agent software is written in Rust. + Possible values are debug, info, and error. + enum: + - debug + - info + - error + type: string + tlsCertPath: + description: |- + TLSCertPath specifies the location of the TLS certificate that the agent provides to the load balancer during TLS handshake. + By default, the agent generates a self-signed certificate in-memory. + type: string + tlsKeyPath: + description: |- + TLSKeyPath specifies the location of the private key corresponding to the TLS certificate that the agent provides to the load balancer during TLS handshake. + By default, the agent generates a private key in memory. + type: string + tlsSecurityPolicy: + description: TLSSecurityPolicy specifies the ELB security policy that + you configure for the target group. + type: string + required: + - controlAddress + - dataAddress + - destinationAddress + - image + type: object + type: object + served: true + storage: true + subresources: {} +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.19.0 + labels: + app.kubernetes.io/name: aws-load-balancer-controller + name: globalaccelerators.aga.k8s.aws +spec: + group: aga.k8s.aws + names: + kind: GlobalAccelerator + listKind: GlobalAcceleratorList + plural: globalaccelerators + singular: globalaccelerator + scope: Namespaced + versions: + - additionalPrinterColumns: + - description: The Global Accelerator name + jsonPath: .spec.name + name: ACCELERATOR-NAME + type: string + - description: The Global Accelerator DNS name + jsonPath: .status.dnsName + name: DNS-NAME + type: string + - description: The Global Accelerator type + jsonPath: .spec.type + name: TYPE + type: string + - description: The Global Accelerator status + jsonPath: .status.status + name: STATUS + type: string + - description: The Global Accelerator ARN + jsonPath: .status.acceleratorARN + name: ARN + priority: 1 + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 + schema: + openAPIV3Schema: + description: GlobalAccelerator is the Schema for the GlobalAccelerator 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 + 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 + type: string + metadata: + type: object + spec: + description: GlobalAcceleratorSpec defines the desired state of GlobalAccelerator + properties: + ipAddressType: + default: IPV4 + description: IPAddressType is the value for the address type. + enum: + - IPV4 + - DUAL_STACK + type: string + ipAddresses: + description: |- + IpAddresses optionally specifies the IP addresses from your own IP address pool (BYOIP) to use for the accelerator's static IP addresses. + You can specify one or two addresses. Do not include the /32 suffix. + If you bring your own IP address pool to Global Accelerator (BYOIP), you can choose an IPv4 address from your own pool to use for the accelerator's static IPv4 address. + After you bring an address range to AWS, it appears in your account as an address pool. When you create an accelerator, you can assign one IPv4 address from your range to it. + Global Accelerator assigns you a second static IPv4 address from an Amazon IP address range. If you bring two IPv4 address ranges to AWS, you can assign one IPv4 address from each range to your accelerator. + Note that you can't update IP addresses for an existing accelerator. To change them, you must create a new accelerator with the new addresses. + For more information, see Bring your own IP addresses (BYOIP) in the AWS Global Accelerator Developer Guide. + https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html + items: + type: string + maxItems: 2 + minItems: 1 + type: array + listeners: + description: Listeners defines the listeners for the Global Accelerator. + items: + description: GlobalAcceleratorListener defines a listener for the + Global Accelerator. + properties: + clientAffinity: + default: NONE + description: |- + ClientAffinity lets you direct all requests from a user to the same endpoint, if you have stateful applications, regardless of the port and protocol of the client request. + Client affinity gives you control over whether to always route each client to the same specific endpoint. + AWS Global Accelerator uses a consistent-flow hashing algorithm to choose the optimal endpoint for a connection. + If client affinity is NONE, Global Accelerator uses the "five-tuple" (5-tuple) properties—source IP address, source port, destination IP address, destination port, and protocol—to select the hash value, and then chooses the best endpoint. + However, with this setting, if someone uses different ports to connect to Global Accelerator, their connections might not be always routed to the same endpoint because the hash value changes. + If you want a given client to always be routed to the same endpoint, set client affinity to SOURCE_IP instead. + When you use the SOURCE_IP setting, Global Accelerator uses the "two-tuple" (2-tuple) properties— source (client) IP address and destination IP address—to select the hash value. + The default value is NONE. + enum: + - SOURCE_IP + - NONE + type: string + endpointGroups: + description: EndpointGroups defines a list of endpoint groups + for a Global Accelerator listener. + items: + description: GlobalAcceleratorEndpointGroup defines an endpoint + group for a Global Accelerator listener. + properties: + endpoints: + description: Endpoints is the list of endpoint configurations + for this endpoint group. + items: + description: GlobalAcceleratorEndpoint defines an endpoint + for a Global Accelerator endpoint group. + properties: + clientIPPreservationEnabled: + default: true + description: |- + ClientIPPreservationEnabled indicates whether client IP address preservation is enabled for an Application Load Balancer endpoint. + The value is true or false. The default value is true for new accelerators. + If the value is set to true, the client's IP address is preserved in the X-Forwarded-For request header as traffic travels to applications on the Application Load Balancer endpoint fronted by the accelerator. + For more information, see Preserve Client IP Addresses in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/preserve-client-ip-address.html + type: boolean + endpointID: + description: |- + EndpointID is the ID of the endpoint when type is EndpointID. + If the endpoint is a Network Load Balancer or Application Load Balancer, this is the Amazon Resource Name (ARN) of the resource. + A resource must be valid and active when you add it as an endpoint. + Mandatory for remote regions. + maxLength: 255 + type: string + name: + description: Name is the name of the Kubernetes + resource when type is Service, Ingress, or Gateway. + type: string + namespace: + description: |- + Namespace is the namespace of the Kubernetes resource when type is Service, Ingress, or Gateway. + If not specified, defaults to the same namespace as the GlobalAccelerator resource. + type: string + type: + description: Type specifies the type of endpoint + reference. + enum: + - EndpointID + - Service + - Ingress + - Gateway + type: string + weight: + default: 128 + description: |- + Weight is the weight associated with the endpoint. When you add weights to endpoints, you configure Global Accelerator to route traffic based on proportions that you specify. + For example, you might specify endpoint weights of 4, 5, 5, and 6 (sum=20). The result is that 4/20 of your traffic, on average, is routed to the first endpoint, + 5/20 is routed both to the second and third endpoints, and 6/20 is routed to the last endpoint. + For more information, see Endpoint Weights in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/about-endpoints-endpoint-weights.html + format: int32 + maximum: 255 + minimum: 0 + type: integer + required: + - type + type: object + x-kubernetes-validations: + - message: endpointID is required and name must not + be set when type is EndpointID + rule: self.type != 'EndpointID' || (has(self.endpointID) + && !has(self.name)) + - message: name is required and endpointID must not + be set when type is Service/Ingress/Gateway + rule: self.type == 'EndpointID' || (has(self.name) + && !has(self.endpointID)) + type: array + portOverrides: + description: PortOverrides is a list of endpoint port + overrides. Allows you to override the destination ports + used to route traffic to an endpoint. Using a port override + lets you map a list of external destination ports (that + your users send traffic to) to a list of internal destination + ports that you want an application endpoint to receive + traffic on. + items: + description: |- + PortOverride defines a port override for an endpoint group. + Override specific listener ports used to route traffic to endpoints that are part of an endpoint group. + For example, you can create a port override in which the listener receives user traffic on ports 80 and 443, + but your accelerator routes that traffic to ports 1080 and 1443, respectively, on the endpoints. + + For more information, see Port overrides in the AWS Global Accelerator Developer Guide: + https://docs.aws.amazon.com/global-accelerator/latest/dg/about-endpoint-groups-port-override.html + properties: + endpointPort: + description: |- + EndpointPort is the endpoint port that you want traffic to be routed to. + This is the port on the endpoint, such as the Application Load Balancer or Amazon EC2 instance. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + listenerPort: + description: |- + ListenerPort is the listener port that you want to map to a specific endpoint port. + This is the port that user traffic arrives to the Global Accelerator on. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - endpointPort + - listenerPort + type: object + type: array + region: + description: |- + Region is the AWS Region where the endpoint group is located. + If unspecified, defaults to the current cluster region. + maxLength: 255 + type: string + trafficDialPercentage: + default: 100 + description: |- + TrafficDialPercentage is the percentage of traffic to send to an AWS Regions. Additional traffic is distributed to other endpoint groups for this listener + Use this action to increase (dial up) or decrease (dial down) traffic to a specific Region. The percentage is applied to the traffic that would otherwise have been routed to the Region based on optimal routing. + format: int32 + maximum: 100 + minimum: 0 + type: integer + type: object + type: array + portRanges: + description: |- + PortRanges is the list of port ranges for the connections from clients to the accelerator. + When not specified, the controller will automatically determine the port ranges by inspecting + the referenced Kubernetes resources (Service, Ingress, or Gateway) in the endpoint groups. + items: + description: PortRange defines the port range for Global Accelerator + listeners. + properties: + fromPort: + description: FromPort is the first port in the range of + ports, inclusive. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + toPort: + description: ToPort is the last port in the range of ports, + inclusive. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - fromPort + - toPort + type: object + x-kubernetes-validations: + - message: FromPort must be less than or equal to ToPort + rule: self.fromPort <= self.toPort + maxItems: 10 + minItems: 1 + type: array + protocol: + description: |- + Protocol is the protocol for the connections from clients to the accelerator. + When not specified, the controller will automatically determine the protocol by inspecting + the referenced Kubernetes resources (Service, Ingress, or Gateway) in the endpoint groups. + enum: + - TCP + - UDP + type: string + type: object + type: array + name: + description: |- + Name is the name of the Global Accelerator. + The name must contain only alphanumeric characters or hyphens (-), and must not begin or end with a hyphen. + maxLength: 64 + minLength: 1 + pattern: ^[a-zA-Z0-9_-]{1,64}$ + type: string + tags: + additionalProperties: + type: string + description: Tags defines list of Tags on the Global Accelerator. + type: object + type: object + status: + description: GlobalAcceleratorStatus defines the observed state of GlobalAccelerator + properties: + acceleratorARN: + description: AcceleratorARN is the Amazon Resource Name (ARN) of the + accelerator. + type: string + conditions: + description: Conditions represent the current conditions of the GlobalAccelerator. + items: + description: Condition contains details for one aspect of the current + state of this API Resource. + properties: + lastTransitionTime: + description: |- + lastTransitionTime is the last time the condition transitioned from one status to another. + This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: |- + message is a human readable message indicating details about the transition. + This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: |- + observedGeneration represents the .metadata.generation that the condition was set based upon. + For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date + with respect to the current state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: |- + reason contains a programmatic identifier indicating the reason for the condition's last transition. + Producers of specific condition types may define expected values and meanings for this field, + and whether the values are considered a guaranteed API. + The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + dnsName: + description: DNSName The Domain Name System (DNS) name that Global + Accelerator creates that points to an accelerator's static IPv4 + addresses. + type: string + dualStackDnsName: + description: 'DualStackDnsName is the Domain Name System (DNS) name + that Global Accelerator creates that points to a dual-stack accelerator''s + four static IP addresses: two IPv4 addresses and two IPv6 addresses.' + type: string + ipSets: + description: IPSets is the static IP addresses that Global Accelerator + associates with the accelerator. + items: + description: IPSet is the static IP addresses that Global Accelerator + associates with the accelerator. + properties: + ipAddressFamily: + description: IpAddressFamily is the types of IP addresses included + in this IP set. + type: string + ipAddresses: + description: IpAddresses is the array of IP addresses in the + IP address set. + items: + type: string + type: array + type: object + type: array + observedGeneration: + description: The generation observed by the GlobalAccelerator controller. + format: int64 + type: integer + status: + description: Status is the current status of the accelerator. + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 labels: app.kubernetes.io/name: aws-load-balancer-controller name: ingressclassparams.elbv2.k8s.aws @@ -14,7 +609,7 @@ spec: kind: IngressClassParams listKind: IngressClassParamsList plural: ingressclassparams - singular: ingressclassparams + singular: ingressclassparam scope: Cluster versions: - additionalPrinterColumns: @@ -59,8 +654,9 @@ spec: description: IngressClassParamsSpec defines the desired state of IngressClassParams properties: PrefixListsIDs: - description: PrefixListsIDs defines the security group prefix lists - for all Ingresses that belong to IngressClass with this IngressClassParams. + description: |- + PrefixListsIDsLegacy defines the security group prefix lists for all Ingresses that belong to IngressClass with this IngressClassParams. + Not Recommended, Use PrefixListsIDs (prefixListsIDs in JSON) instead items: type: string type: array @@ -151,6 +747,10 @@ spec: - value type: object type: array + loadBalancerName: + description: LoadBalancerName defines the name of the load balancer + that will be created with this IngressClassParams. + type: string minimumLoadBalancerCapacity: description: MinimumLoadBalancerCapacity define the capacity reservation for LoadBalancers for all Ingress that belong to IngressClass with @@ -211,6 +811,12 @@ spec: type: object type: object x-kubernetes-map-type: atomic + prefixListsIDs: + description: PrefixListsIDs defines the security group prefix lists + for all Ingresses that belong to IngressClass with this IngressClassParams. + items: + type: string + type: array scheme: description: Scheme defines the scheme for all Ingresses that belong to IngressClass with this IngressClassParams. @@ -222,6 +828,10 @@ spec: description: SSLPolicy specifies the SSL Policy for all Ingresses that belong to IngressClass with this IngressClassParams. type: string + sslRedirectPort: + description: SSLRedirectPort specifies the SSL Redirect Port for all + Ingresses that belong to IngressClass with this IngressClassParams. + type: string subnets: description: Subnets defines the subnets for all Ingresses that belong to IngressClass with this IngressClassParams. @@ -271,7 +881,16 @@ spec: - instance - ip type: string + wafv2AclArn: + description: WAFv2ACLArn specifies ARN for the Amazon WAFv2 web ACL. + type: string + wafv2AclName: + description: WAFv2ACLName specifies name of the Amazon WAFv2 web ACL. + type: string type: object + x-kubernetes-validations: + - message: cannot specify both 'prefixListsIDs' and 'PrefixListsIDs' fields + rule: '!(has(self.prefixListsIDs) && has(self.PrefixListsIDs))' type: object served: true storage: true @@ -281,7 +900,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 labels: app.kubernetes.io/name: aws-load-balancer-controller name: targetgroupbindings.elbv2.k8s.aws @@ -701,6 +1320,19 @@ spec: targetGroupName: description: targetGroupName is the Name of the TargetGroup. type: string + targetGroupProtocol: + description: targetGroupProtocol is the Protocol of the TargetGroup. + If unspecified, it will be automatically inferred. + enum: + - HTTP + - HTTPS + - TCP + - TLS + - UDP + - TCP_UDP + - QUIC + - TCP_QUIC + type: string targetType: description: targetType is the TargetType of TargetGroup. If unspecified, it will be automatically inferred. @@ -799,6 +1431,9 @@ rules: - "" resources: - endpoints + - namespaces + - nodes + - pods verbs: - get - list @@ -813,48 +1448,35 @@ rules: - apiGroups: - "" resources: - - namespaces - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - nodes + - pods/status + - services/status verbs: - - get - - list - - watch + - patch + - update - apiGroups: - "" resources: - - pods + - services verbs: - get - list - - watch -- apiGroups: - - "" - resources: - - pods/status - verbs: - patch - update + - watch - apiGroups: - - "" + - aga.k8s.aws resources: - - services + - globalaccelerators verbs: - get - list - patch - - update - watch - apiGroups: - - "" + - aga.k8s.aws resources: - - services/status + - globalaccelerators/finalizers + - globalaccelerators/status verbs: - patch - update @@ -866,6 +1488,12 @@ rules: - get - list - watch +- apiGroups: + - elbv2.k8s.aws + resources: + - albtargetcontrolconfigs + verbs: + - get - apiGroups: - elbv2.k8s.aws resources: @@ -895,6 +1523,7 @@ rules: - update - apiGroups: - extensions + - networking.k8s.io resources: - ingresses verbs: @@ -905,6 +1534,7 @@ rules: - watch - apiGroups: - extensions + - networking.k8s.io resources: - ingresses/status verbs: @@ -914,53 +1544,7 @@ rules: - gateway.k8s.aws resources: - listenerruleconfigurations - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.k8s.aws - resources: - - listenerruleconfigurations/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - - listenerruleconfigurations/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - loadbalancerconfigurations - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.k8s.aws - resources: - - loadbalancerconfigurations/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - - loadbalancerconfigurations/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.k8s.aws - resources: - targetgroupconfigurations verbs: - get @@ -970,6 +1554,8 @@ rules: - apiGroups: - gateway.k8s.aws resources: + - listenerruleconfigurations/finalizers + - loadbalancerconfigurations/finalizers - targetgroupconfigurations/finalizers verbs: - patch @@ -977,6 +1563,8 @@ rules: - apiGroups: - gateway.k8s.aws resources: + - listenerruleconfigurations/status + - loadbalancerconfigurations/status - targetgroupconfigurations/status verbs: - get @@ -986,30 +1574,8 @@ rules: - gateway.networking.k8s.io resources: - gatewayclasses - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - gatewayclasses/finalizers - verbs: - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - gatewayclasses/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - gateways + - referencegrants verbs: - get - list @@ -1018,6 +1584,7 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - gatewayclasses/finalizers - gateways/finalizers verbs: - patch @@ -1025,104 +1592,13 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - gatewayclasses/status - gateways/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - grpcroutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - grpcroutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - grpcroutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - httproutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - httproutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - httproutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - referencegrants - verbs: - - get - - list - - patch - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tcproutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tcproutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - tcproutes/status - verbs: - - get - - patch - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - tlsroutes - verbs: - - get - - list - - watch -- apiGroups: - - gateway.networking.k8s.io - resources: - - tlsroutes/finalizers - verbs: - - update -- apiGroups: - - gateway.networking.k8s.io - resources: - tlsroutes/status + - udproutes/status verbs: - get - patch @@ -1130,6 +1606,10 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - grpcroutes + - httproutes + - tcproutes + - tlsroutes - udproutes verbs: - get @@ -1138,17 +1618,13 @@ rules: - apiGroups: - gateway.networking.k8s.io resources: + - grpcroutes/finalizers + - httproutes/finalizers + - tcproutes/finalizers + - tlsroutes/finalizers - udproutes/finalizers verbs: - update -- apiGroups: - - gateway.networking.k8s.io - resources: - - udproutes/status - verbs: - - get - - patch - - update - apiGroups: - networking.k8s.io resources: @@ -1157,23 +1633,6 @@ rules: - get - list - watch -- apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - get - - list - - patch - - update - - watch -- apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - patch - - update --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding @@ -1276,7 +1735,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: public.ecr.aws/eks/aws-load-balancer-controller:{{ or .Version "v2.13.4" }} + image: public.ecr.aws/eks/aws-load-balancer-controller:{{ or .Version "v2.17.1" }} livenessProbe: failureThreshold: 2 httpGet: @@ -1389,6 +1848,7 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller + - coredns - key: app.kubernetes.io/instance operator: NotIn values: @@ -1410,7 +1870,7 @@ webhooks: name: aws-load-balancer-webhook-service namespace: kube-system path: /mutate-v1-pod - failurePolicy: Fail + failurePolicy: Ignore name: mpod.elbv2.k8s.aws namespaceSelector: matchExpressions: @@ -1424,6 +1884,43 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-v1-pod-server-id + failurePolicy: Fail + name: quicid.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/quic-server-id-inject + operator: In + values: + - enabled + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns - key: app.kubernetes.io/instance operator: NotIn values: @@ -1438,6 +1935,84 @@ webhooks: resources: - pods sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-alb-target-control-namespace-v1-pod + failurePolicy: Fail + name: alb-target-control.namespace.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/alb-target-control-agent-injection + operator: In + values: + - enabled + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + - key: elbv2.k8s.aws/alb-target-control-agent-inject + operator: NotIn + values: + - "false" + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /mutate-alb-target-control-object-v1-pod + failurePolicy: Fail + name: alb-target-control.object.elbv2.k8s.aws + namespaceSelector: + matchExpressions: + - key: elbv2.k8s.aws/alb-target-control-agent-injection + operator: DoesNotExist + objectSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: NotIn + values: + - aws-load-balancer-controller + - coredns + - key: app.kubernetes.io/instance + operator: NotIn + values: + - cert-manager + - key: elbv2.k8s.aws/alb-target-control-agent-inject + operator: In + values: + - "true" + rules: + - apiGroups: + - "" + apiVersions: + - v1 + operations: + - CREATE + resources: + - pods + sideEffects: None - admissionReviewVersions: - v1beta1 clientConfig: @@ -1468,6 +2043,28 @@ metadata: app.kubernetes.io/name: aws-load-balancer-controller name: aws-load-balancer-webhook webhooks: +- admissionReviewVersions: + - v1beta1 + clientConfig: + service: + name: aws-load-balancer-webhook-service + namespace: kube-system + path: /validate-aga-k8s-aws-v1beta1-globalaccelerator + failurePolicy: Fail + matchPolicy: Equivalent + name: vglobalaccelerator.aga.k8s.aws + rules: + - apiGroups: + - aga.k8s.aws + apiVersions: + - v1beta1 + operations: + - CREATE + - UPDATE + resources: + - globalaccelerators + scope: Namespaced + sideEffects: None - admissionReviewVersions: - v1beta1 clientConfig: @@ -1483,10 +2080,6 @@ webhooks: operator: NotIn values: - aws-load-balancer-controller - - key: app.kubernetes.io/instance - operator: NotIn - values: - - cert-manager rules: - apiGroups: - elbv2.k8s.aws @@ -1540,7 +2133,7 @@ webhooks: - ingresses sideEffects: None --- -# sourced from https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.13.4/v2_13_4_ingclass.yaml +# sourced from https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.17.1/v2_17_1_ingclass.yaml apiVersion: elbv2.k8s.aws/v1beta1 kind: IngressClassParams metadata: diff --git a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template index b1a77f090db89..a8a75caf90d0f 100644 --- a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template +++ b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template @@ -5,16 +5,12 @@ kind: ServiceAccount metadata: name: coredns namespace: kube-system - labels: - kubernetes.io/cluster-service: "true" - k8s-addon: coredns.addons.k8s.io --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: kubernetes.io/bootstrapping: rbac-defaults - k8s-addon: coredns.addons.k8s.io name: system:coredns rules: - apiGroups: @@ -42,7 +38,6 @@ metadata: rbac.authorization.kubernetes.io/autoupdate: "true" labels: kubernetes.io/bootstrapping: rbac-defaults - k8s-addon: coredns.addons.k8s.io name: system:coredns roleRef: apiGroup: rbac.authorization.k8s.io @@ -58,8 +53,6 @@ kind: ConfigMap metadata: name: coredns namespace: kube-system - labels: - addonmanager.kubernetes.io/mode: EnsureExists data: Corefile: | {{- if KubeDNS.ExternalCoreFile }} @@ -104,8 +97,7 @@ metadata: labels: k8s-app: kube-dns kubernetes.io/name: "CoreDNS" - k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" + app.kubernetes.io/name: coredns spec: # replicas: not specified here: # 1. Default is 1. @@ -118,10 +110,12 @@ spec: selector: matchLabels: k8s-app: kube-dns + app.kubernetes.io/name: coredns template: metadata: labels: k8s-app: kube-dns + app.kubernetes.io/name: coredns {{- if KubeDNS.PodAnnotations }} annotations: {{- range $key, $value := KubeDNS.PodAnnotations }} @@ -247,16 +241,17 @@ metadata: prometheus.io/port: "9153" prometheus.io/scrape: "true" labels: - k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" + app.kubernetes.io/name: coredns # Without this resourceVersion value, an update of the Service between versions will yield: # Service "kube-dns" is invalid: metadata.resourceVersion: Invalid value: "": must be specified for an update resourceVersion: "0" spec: selector: k8s-app: kube-dns + app.kubernetes.io/name: coredns clusterIP: {{ KubeDNS.ServerIP }} ports: - name: dns @@ -289,14 +284,10 @@ kind: ServiceAccount metadata: name: coredns-autoscaler namespace: kube-system - labels: - k8s-addon: coredns.addons.k8s.io --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - labels: - k8s-addon: coredns.addons.k8s.io name: coredns-autoscaler rules: - apiGroups: [""] @@ -317,8 +308,6 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - labels: - k8s-addon: coredns.addons.k8s.io name: coredns-autoscaler roleRef: apiGroup: rbac.authorization.k8s.io @@ -335,17 +324,18 @@ metadata: name: coredns-autoscaler namespace: kube-system labels: - k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" + app.kubernetes.io/name: coredns-autoscaler spec: selector: matchLabels: k8s-app: coredns-autoscaler + app.kubernetes.io/name: coredns-autoscaler template: metadata: labels: k8s-app: coredns-autoscaler + app.kubernetes.io/name: coredns-autoscaler spec: containers: - name: autoscaler diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml index 015b1297bb692..80a8a6c58aa1b 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 015b1297bb692..80a8a6c58aa1b 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index 755f8bfa811c5..bbabb55b861c6 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml index 530bd6180869e..51d7b973dd051 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml index 4ec9aef148e99..e15588904a742 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 76a70f0160b12..684d2bf8c8408 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/coredns.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/coredns.addons.k8s.io-k8s-1.12.yaml index 13d0bd4984e23..9e343962c9d1c 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/coredns.addons.k8s.io-k8s-1.12.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/coredns.addons.k8s.io-k8s-1.12.yaml @@ -5,7 +5,6 @@ metadata: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io - kubernetes.io/cluster-service: "true" name: coredns namespace: kube-system @@ -90,7 +89,6 @@ kind: ConfigMap metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io - addonmanager.kubernetes.io/mode: EnsureExists app.kubernetes.io/managed-by: kops k8s-addon: coredns.addons.k8s.io name: coredns @@ -104,15 +102,16 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns - kubernetes.io/cluster-service: "true" kubernetes.io/name: CoreDNS name: coredns namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns k8s-app: kube-dns strategy: rollingUpdate: @@ -122,6 +121,7 @@ spec: template: metadata: labels: + app.kubernetes.io/name: coredns k8s-app: kube-dns kops.k8s.io/managed-by: kops spec: @@ -235,6 +235,7 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns k8s-addon: coredns.addons.k8s.io k8s-app: kube-dns kubernetes.io/cluster-service: "true" @@ -255,6 +256,7 @@ spec: port: 9153 protocol: TCP selector: + app.kubernetes.io/name: coredns k8s-app: kube-dns --- @@ -355,18 +357,20 @@ metadata: labels: addon.kops.k8s.io/name: coredns.addons.k8s.io app.kubernetes.io/managed-by: kops + app.kubernetes.io/name: coredns-autoscaler k8s-addon: coredns.addons.k8s.io k8s-app: coredns-autoscaler - kubernetes.io/cluster-service: "true" name: coredns-autoscaler namespace: kube-system spec: selector: matchLabels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler template: metadata: labels: + app.kubernetes.io/name: coredns-autoscaler k8s-app: coredns-autoscaler kops.k8s.io/managed-by: kops spec: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml index 0d6fde7c44c92..5a86972c8c451 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: af6d1cc67e400b0aeebba79948a4daaffc5356f3776c9d6a00d10804c2762193 + manifestHash: 38fceaae08ef155cc9e6a1ded517dcee0acde363de341e9381bb60e25d84cae8 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml index 9c73e325068b2..b04f810814f91 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml index e29bccce575e8..c6bd79a3d5ba7 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml index fe5258a69f978..2e2ae5106af56 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 6faaa9dcccb91..9aabe9b1066e3 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -13,7 +13,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: c6ebdb7a6f37311e443a0dc608f1e85d46e1aa7932c423b7a8782ed4e1da6df2 + manifestHash: fe4332a60e5d1da14450877a9d050a2884dabde8af3ee220ddef3637c36b6b34 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io