Upgrade to CAPA v2.4.2 (#254)

* Upgrade to CAPA v2.4.2 * Metrics port is now 8443
giantswarm · Aug 27, 2024 · f94cb91 · f94cb91
1 parent 1d0e59d
commit f94cb91
Show file tree

Hide file tree

Showing 43 changed files with 2,020 additions and 45 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
+
+- Bump CAPA version v2.4.2-gs-70b4664c1. This bumps CAPA to `v2.4.2` and apply the customizations we already had in our fork.
+
 ## [2.21.0] - 2024-07-24
 
 ### Changed

diff --git a/config/helm/deployment-args.yaml b/config/helm/deployment-args.yaml
@@ -11,7 +11,7 @@ spec:
         - name: manager
           args:
             - --leader-elect
-            - --metrics-bind-addr=0.0.0.0:8080
+            - --metrics-bind-addr=0.0.0.0:8443
             - --feature-gates=EKS=true,EKSEnableIAM=true,EKSAllowAddRoles=false,EKSFargate=false,MachinePool=true,EventBridgeInstanceState=false,AutoControllerIdentityCreator=true,ExternalResourceGC=true,BootstrapFormatIgnition=true
             - --watch-filter=capi
             # We need to set the sync-period to 2m to improve scale-up time, currently there is no watch in the capa controller that update the provideridlist. Upstream issues https://github.com/kubernetes-sigs/cluster-api/issues/9858 and https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/4618

diff --git a/config/helm/deployment-metrics-port.yaml b/config/helm/deployment-metrics-port.yaml
@@ -10,6 +10,6 @@ spec:
       containers:
         - name: manager
           ports:
-            - containerPort: 8080
+            - containerPort: 8443
               name: metrics
               protocol: TCP
diff --git a/config/helm/webhook-mutating-watchfilter.yaml b/config/helm/webhook-mutating-watchfilter.yaml
@@ -40,6 +40,10 @@ webhooks:
     objectSelector:
       matchLabels:
         cluster.x-k8s.io/watch-filter: capi
+  - name: default.rosamachinepool.infrastructure.cluster.x-k8s.io
+    objectSelector:
+      matchLabels:
+        cluster.x-k8s.io/watch-filter: capi
   - name: default.eksconfigs.bootstrap.cluster.x-k8s.io
     objectSelector:
       matchLabels:
@@ -52,3 +56,7 @@ webhooks:
     objectSelector:
       matchLabels:
         cluster.x-k8s.io/watch-filter: capi
+  - name: default.rosacontrolplanes.controlplane.cluster.x-k8s.io
+    objectSelector:
+      matchLabels:
+        cluster.x-k8s.io/watch-filter: capi
diff --git a/config/helm/webhook-validating-watchfilter.yaml b/config/helm/webhook-validating-watchfilter.yaml
@@ -44,6 +44,10 @@ webhooks:
     objectSelector:
       matchLabels:
         cluster.x-k8s.io/watch-filter: capi
+  - name: validation.rosamachinepool.infrastructure.cluster.x-k8s.io
+    objectSelector:
+      matchLabels:
+        cluster.x-k8s.io/watch-filter: capi
   - name: validation.eksconfigs.bootstrap.cluster.x-k8s.io
     objectSelector:
       matchLabels:
@@ -56,3 +60,7 @@ webhooks:
     objectSelector:
       matchLabels:
         cluster.x-k8s.io/watch-filter: capi
+  - name: validation.rosacontrolplanes.controlplane.cluster.x-k8s.io
+    objectSelector:
+      matchLabels:
+        cluster.x-k8s.io/watch-filter: capi
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.12.1
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -55,7 +55,7 @@ spec:
           type: string
       name: v1beta1
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         status: {}

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.12.1
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -46,7 +46,7 @@ spec:
   versions:
     - name: v1beta1
       schema: {}
-      served: true
+      served: false
       storage: false
     - name: v1beta2
       schema: {}

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.12.1
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -68,7 +68,7 @@ spec:
           type: string
       name: v1beta1
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         status: {}

diff --git a/...rovider-aws/files/controlplane/bases/rosacontrolplanes.controlplane.cluster.x-k8s.io.yaml b/...rovider-aws/files/controlplane/bases/rosacontrolplanes.controlplane.cluster.x-k8s.io.yaml
@@ -0,0 +1,61 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
+    controller-gen.kubebuilder.io/version: v0.13.0
+  labels:
+    app.kubernetes.io/instance: '{{ .Release.Name }}'
+    app.kubernetes.io/managed-by: '{{ .Release.Service }}'
+    app.kubernetes.io/name: '{{ .Chart.Name }}'
+    app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/team: '{{ index .Chart.Annotations "application.giantswarm.io/team" }}'
+    cluster.x-k8s.io/provider: infrastructure-aws
+    cluster.x-k8s.io/v1alpha3: v1alpha3
+    cluster.x-k8s.io/v1alpha4: v1alpha4
+    cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
+    clusterctl.cluster.x-k8s.io: ""
+    clusterctl.cluster.x-k8s.io/move: ""
+    helm.sh/chart: '{{ .Chart.Name }}'
+  name: rosacontrolplanes.controlplane.cluster.x-k8s.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        caBundle: Cg==
+        service:
+          name: capa-webhook-service
+          namespace: '{{ .Release.Namespace }}'
+          path: /convert
+          port: 443
+      conversionReviewVersions:
+        - v1
+        - v1beta1
+  group: controlplane.cluster.x-k8s.io
+  names:
+    categories:
+      - cluster-api
+    kind: ROSAControlPlane
+    listKind: ROSAControlPlaneList
+    plural: rosacontrolplanes
+    shortNames:
+      - rosacp
+    singular: rosacontrolplane
+  scope: Namespaced
+  versions:
+    - additionalPrinterColumns:
+        - description: Cluster to which this RosaControl belongs
+          jsonPath: .metadata.labels.cluster\.x-k8s\.io/cluster-name
+          name: Cluster
+          type: string
+        - description: Control plane infrastructure is ready for worker nodes
+          jsonPath: .status.ready
+          name: Ready
+          type: string
+      name: v1beta2
+      schema: {}
+      served: true
+      storage: true
+      subresources:
+        status: {}
diff --git a/helm/cluster-api-provider-aws/files/controlplane/kustomization.yaml b/helm/cluster-api-provider-aws/files/controlplane/kustomization.yaml
@@ -1,5 +1,6 @@
 resources:
   - bases/awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io.yaml
+  - bases/rosacontrolplanes.controlplane.cluster.x-k8s.io.yaml
 patches:
   - path: patches/versions/v1beta1/awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io.yaml
     target:
@@ -13,3 +14,9 @@ patches:
       version: v1
       kind: CustomResourceDefinition
       name: awsmanagedcontrolplanes.controlplane.cluster.x-k8s.io
+  - path: patches/versions/v1beta2/rosacontrolplanes.controlplane.cluster.x-k8s.io.yaml
+    target:
+      group: apiextensions.k8s.io
+      version: v1
+      kind: CustomResourceDefinition
+      name: rosacontrolplanes.controlplane.cluster.x-k8s.io