Upgrade CAPA to 2.2.4 (#182)

giantswarm · Oct 9, 2023 · 7dda36d · 7dda36d
1 parent 9f77d8f
commit 7dda36d
Show file tree

Hide file tree

Showing 21 changed files with 286 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Upgraded to CAPA v2.2.4.
+
 ## [2.4.0] - 2023-09-19
 
 ### Added

diff --git a/...cluster-api-provider-aws/files/bootstrap/bases/eksconfigs.bootstrap.cluster.x-k8s.io.yaml b/...cluster-api-provider-aws/files/bootstrap/bases/eksconfigs.bootstrap.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...api-provider-aws/files/bootstrap/bases/eksconfigtemplates.bootstrap.cluster.x-k8s.io.yaml b/...api-provider-aws/files/bootstrap/bases/eksconfigtemplates.bootstrap.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...r-aws/files/controlplane/bases/awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io.yaml b/...r-aws/files/controlplane/bases/awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...plane/patches/versions/v1beta1/awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io.yaml b/...plane/patches/versions/v1beta1/awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io.yaml
@@ -241,6 +241,67 @@
             network:
               description: NetworkSpec encapsulates all things related to AWS network.
               properties:
+                additionalControlPlaneIngressRules:
+                  description: AdditionalControlPlaneIngressRules is an optional set of ingress rules to add to the control plane
+                  items:
+                    description: IngressRule defines an AWS ingress rule for security groups.
+                    properties:
+                      cidrBlocks:
+                        description: List of CIDR blocks to allow access from. Cannot be specified with SourceSecurityGroupID.
+                        items:
+                          type: string
+                        type: array
+                      description:
+                        description: Description provides extended information about the ingress rule.
+                        type: string
+                      fromPort:
+                        description: FromPort is the start of port range.
+                        format: int64
+                        type: integer
+                      ipv6CidrBlocks:
+                        description: List of IPv6 CIDR blocks to allow access from. Cannot be specified with SourceSecurityGroupID.
+                        items:
+                          type: string
+                        type: array
+                      protocol:
+                        description: Protocol is the protocol for the ingress rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp", "icmp", and "58" (ICMPv6).
+                        enum:
+                          - "-1"
+                          - "4"
+                          - tcp
+                          - udp
+                          - icmp
+                          - "58"
+                        type: string
+                      sourceSecurityGroupIds:
+                        description: The security group id to allow access from. Cannot be specified with CidrBlocks.
+                        items:
+                          type: string
+                        type: array
+                      sourceSecurityGroupRoles:
+                        description: The security group role to allow access from. Cannot be specified with CidrBlocks. The field will be combined with source security group IDs if specified.
+                        items:
+                          description: SecurityGroupRole defines the unique role of a security group.
+                          enum:
+                            - bastion
+                            - node
+                            - controlplane
+                            - apiserver-lb
+                            - lb
+                            - node-eks-additional
+                          type: string
+                        type: array
+                      toPort:
+                        description: ToPort is the end of port range.
+                        format: int64
+                        type: integer
+                    required:
+                      - description
+                      - fromPort
+                      - protocol
+                      - toPort
+                    type: object
+                  type: array
                 cni:
                   description: CNI configuration
                   properties:
@@ -450,6 +511,7 @@
                             required:
                               - key
                             type: object
+                            x-kubernetes-map-type: atomic
                           fieldRef:
                             description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.'
                             properties:
@@ -462,6 +524,7 @@
                             required:
                               - fieldPath
                             type: object
+                            x-kubernetes-map-type: atomic
                           resourceFieldRef:
                             description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.'
                             properties:
@@ -481,6 +544,7 @@
                             required:
                               - resource
                             type: object
+                            x-kubernetes-map-type: atomic
                           secretKeyRef:
                             description: Selects a key of a secret in the pod's namespace
                             properties:
@@ -496,6 +560,7 @@
                             required:
                               - key
                             type: object
+                            x-kubernetes-map-type: atomic
                         type: object
                     required:
                       - name
@@ -990,6 +1055,11 @@
                       description: Tags is a map of tags associated with the load balancer.
                       type: object
                   type: object
+                natGatewaysIPs:
+                  description: NatGatewaysIPs contains the public IPs of the NAT Gateways
+                  items:
+                    type: string
+                  type: array
                 securityGroups:
                   additionalProperties:
                     description: SecurityGroup defines an AWS security group.

diff --git a/...plane/patches/versions/v1beta2/awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io.yaml b/...plane/patches/versions/v1beta2/awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io.yaml
@@ -237,6 +237,67 @@
             network:
               description: NetworkSpec encapsulates all things related to AWS network.
               properties:
+                additionalControlPlaneIngressRules:
+                  description: AdditionalControlPlaneIngressRules is an optional set of ingress rules to add to the control plane
+                  items:
+                    description: IngressRule defines an AWS ingress rule for security groups.
+                    properties:
+                      cidrBlocks:
+                        description: List of CIDR blocks to allow access from. Cannot be specified with SourceSecurityGroupID.
+                        items:
+                          type: string
+                        type: array
+                      description:
+                        description: Description provides extended information about the ingress rule.
+                        type: string
+                      fromPort:
+                        description: FromPort is the start of port range.
+                        format: int64
+                        type: integer
+                      ipv6CidrBlocks:
+                        description: List of IPv6 CIDR blocks to allow access from. Cannot be specified with SourceSecurityGroupID.
+                        items:
+                          type: string
+                        type: array
+                      protocol:
+                        description: Protocol is the protocol for the ingress rule. Accepted values are "-1" (all), "4" (IP in IP),"tcp", "udp", "icmp", and "58" (ICMPv6).
+                        enum:
+                          - "-1"
+                          - "4"
+                          - tcp
+                          - udp
+                          - icmp
+                          - "58"
+                        type: string
+                      sourceSecurityGroupIds:
+                        description: The security group id to allow access from. Cannot be specified with CidrBlocks.
+                        items:
+                          type: string
+                        type: array
+                      sourceSecurityGroupRoles:
+                        description: The security group role to allow access from. Cannot be specified with CidrBlocks. The field will be combined with source security group IDs if specified.
+                        items:
+                          description: SecurityGroupRole defines the unique role of a security group.
+                          enum:
+                            - bastion
+                            - node
+                            - controlplane
+                            - apiserver-lb
+                            - lb
+                            - node-eks-additional
+                          type: string
+                        type: array
+                      toPort:
+                        description: ToPort is the end of port range.
+                        format: int64
+                        type: integer
+                    required:
+                      - description
+                      - fromPort
+                      - protocol
+                      - toPort
+                    type: object
+                  type: array
                 cni:
                   description: CNI configuration
                   properties:
@@ -453,6 +514,7 @@
                             required:
                               - key
                             type: object
+                            x-kubernetes-map-type: atomic
                           fieldRef:
                             description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.'
                             properties:
@@ -465,6 +527,7 @@
                             required:
                               - fieldPath
                             type: object
+                            x-kubernetes-map-type: atomic
                           resourceFieldRef:
                             description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.'
                             properties:
@@ -484,6 +547,7 @@
                             required:
                               - resource
                             type: object
+                            x-kubernetes-map-type: atomic
                           secretKeyRef:
                             description: Selects a key of a secret in the pod's namespace
                             properties:
@@ -499,6 +563,7 @@
                             required:
                               - key
                             type: object
+                            x-kubernetes-map-type: atomic
                         type: object
                     required:
                       - name
@@ -993,6 +1058,11 @@
                       description: Tags is a map of tags associated with the load balancer.
                       type: object
                   type: object
+                natGatewaysIPs:
+                  description: NatGatewaysIPs contains the public IPs of the NAT Gateways
+                  items:
+                    type: string
+                  type: array
                 securityGroups:
                   additionalProperties:
                     description: SecurityGroup defines an AWS security group.

diff --git a/.../infrastructure/bases/awsclustercontrolleridentities.infrastructure.cluster.x-k8s.io.yaml b/.../infrastructure/bases/awsclustercontrolleridentities.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/.../files/infrastructure/bases/awsclusterroleidentities.infrastructure.cluster.x-k8s.io.yaml b/.../files/infrastructure/bases/awsclusterroleidentities.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...-provider-aws/files/infrastructure/bases/awsclusters.infrastructure.cluster.x-k8s.io.yaml b/...-provider-aws/files/infrastructure/bases/awsclusters.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...iles/infrastructure/bases/awsclusterstaticidentities.infrastructure.cluster.x-k8s.io.yaml b/...iles/infrastructure/bases/awsclusterstaticidentities.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...r-aws/files/infrastructure/bases/awsclustertemplates.infrastructure.cluster.x-k8s.io.yaml b/...r-aws/files/infrastructure/bases/awsclustertemplates.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...er-aws/files/infrastructure/bases/awsfargateprofiles.infrastructure.cluster.x-k8s.io.yaml b/...er-aws/files/infrastructure/bases/awsfargateprofiles.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...vider-aws/files/infrastructure/bases/awsmachinepools.infrastructure.cluster.x-k8s.io.yaml b/...vider-aws/files/infrastructure/bases/awsmachinepools.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...-provider-aws/files/infrastructure/bases/awsmachines.infrastructure.cluster.x-k8s.io.yaml b/...-provider-aws/files/infrastructure/bases/awsmachines.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...r-aws/files/infrastructure/bases/awsmachinetemplates.infrastructure.cluster.x-k8s.io.yaml b/...r-aws/files/infrastructure/bases/awsmachinetemplates.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...er-aws/files/infrastructure/bases/awsmanagedclusters.infrastructure.cluster.x-k8s.io.yaml b/...er-aws/files/infrastructure/bases/awsmanagedclusters.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'

diff --git a/...ws/files/infrastructure/bases/awsmanagedmachinepools.infrastructure.cluster.x-k8s.io.yaml b/...ws/files/infrastructure/bases/awsmanagedmachinepools.infrastructure.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.1
   labels:
     app.giantswarm.io/branch: '{{ .Values.project.branch }}'
     app.giantswarm.io/commit: '{{ .Values.project.commit }}'