Replace deprecated kustomize config patchesStrategicMerge

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Replace deprecated kustomize config `patchesStrategicMerge`
+
 ## [1.12.0] - 2023-05-17
 
 ### Added

README.md

@@ -6,11 +6,8 @@ This is a meta App that provides deployment packaging for Cluster API core, boot
 
 ## Upgrading CAPI
 
-If you want to upgrade the CAPI version used in this app, there is a value in the `values.yaml` file of the helm chart that controls which CAPI version to use.
+See README of [cluster-api fork](https://github.com/giantswarm/cluster-api/blob/main/README.md) for testing and releasing changes.
 
-Once you have changed that value, you may run `make generate` so that the app helm manifests and CRDs are regenerated using that version of CAPI.
-Manifests will be generated automatically from the source manifests attached to the Github release of the selected version.
+It is important to run `make generate` so that the patches, app manifests and CRDs are regenerated using the new version of CAPI.
 
-There is one thing that needs manual intervention though. **When new webhooks are added upstream** we need to add them to the following `kustomize` patches:
-- webhook-certificate.yaml
-- webhook-watchfilter.yaml
+There is one thing that needs manual intervention though: **when new webhooks are added upstream**, we need to manually add them to the relevant patches (`config/helm/certificate*.yaml`).

config/helm/certificate-kubeadm-bootstrap.yaml

@@ -0,0 +1,14 @@
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: capi-kubeadm-bootstrap-serving-cert
+  namespace: capi-kubeadm-bootstrap-system
+spec:
+  dnsNames:
+  - capi-kubeadm-bootstrap-webhook-service.{{ .Release.Namespace }}.svc
+  - capi-kubeadm-bootstrap-webhook-service.{{ .Release.Namespace }}.svc.cluster.local
+  issuerRef:
+    group: cert-manager.io
+    kind: ClusterIssuer
+    name: selfsigned-giantswarm
+  secretName: capi-kubeadm-bootstrap-webhook-service-cert

config/helm/certificate-kubeadm-control-plane.yaml

@@ -0,0 +1,14 @@
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: capi-kubeadm-control-plane-serving-cert
+  namespace: capi-kubeadm-control-plane-system
+spec:
+  dnsNames:
+  - capi-kubeadm-control-plane-webhook-service.{{ .Release.Namespace }}.svc
+  - capi-kubeadm-control-plane-webhook-service.{{ .Release.Namespace }}.svc.cluster.local
+  issuerRef:
+    group: cert-manager.io
+    kind: ClusterIssuer
+    name: selfsigned-giantswarm
+  secretName: capi-kubeadm-control-plane-webhook-service-cert

config/helm/certificate.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -13,33 +12,3 @@ spec:
     kind: ClusterIssuer
     name: selfsigned-giantswarm
   secretName: capi-webhook-service-cert
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: capi-kubeadm-control-plane-serving-cert
-  namespace: capi-kubeadm-control-plane-system
-spec:
-  dnsNames:
-  - capi-kubeadm-control-plane-webhook-service.{{ .Release.Namespace }}.svc
-  - capi-kubeadm-control-plane-webhook-service.{{ .Release.Namespace }}.svc.cluster.local
-  issuerRef:
-    group: cert-manager.io
-    kind: ClusterIssuer
-    name: selfsigned-giantswarm
-  secretName: capi-kubeadm-control-plane-webhook-service-cert
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: capi-kubeadm-bootstrap-serving-cert
-  namespace: capi-kubeadm-bootstrap-system
-spec:
-  dnsNames:
-  - capi-kubeadm-bootstrap-webhook-service.{{ .Release.Namespace }}.svc
-  - capi-kubeadm-bootstrap-webhook-service.{{ .Release.Namespace }}.svc.cluster.local
-  issuerRef:
-    group: cert-manager.io
-    kind: ClusterIssuer
-    name: selfsigned-giantswarm
-  secretName: capi-kubeadm-bootstrap-webhook-service-cert

config/helm/deployment-args-controller-manager.yaml

@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capi-controller-manager
+  namespace: capi-system
+spec:
+  template:
+    spec:
+      containers:
+        - name: manager
+          args:
+            - --metrics-bind-addr=0.0.0.0:8080
+            - --feature-gates=MachinePool=true,ClusterResourceSet=true,ClusterTopology=true
+            - --watch-filter={{ .Values.watchFilter }}
+            - --v=0
+          image: '{{.Values.images.domain}}/{{.Values.images.core.name}}:{{.Values.images.core.tag | default .Values.images.tag}}'

config/helm/deployment-args-kubeadm-bootstrap-controller-manager.yaml

@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capi-kubeadm-bootstrap-controller-manager
+  namespace: capi-kubeadm-bootstrap-system
+spec:
+  template:
+    spec:
+      containers:
+        - name: manager
+          args:
+            - --metrics-bind-addr=0.0.0.0:8080
+            - --feature-gates=MachinePool=true,KubeadmBootstrapFormatIgnition=true
+            - --watch-filter={{ .Values.watchFilter }}
+            - --v=0
+          image: '{{.Values.images.domain}}/{{.Values.images.bootstrap.name}}:{{.Values.images.bootstrap.tag | default .Values.images.tag}}'

config/helm/deployment-args-kubeadm-control-plane-controller-manager.yaml

@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capi-kubeadm-control-plane-controller-manager
+  namespace: capi-kubeadm-control-plane-system
+spec:
+  template:
+    spec:
+      containers:
+        - name: manager
+          args:
+            - --metrics-bind-addr=0.0.0.0:8080
+            - --feature-gates=ClusterTopology=true,KubeadmBootstrapFormatIgnition=true
+            - --watch-filter={{ .Values.watchFilter }}
+            - --v=0
+          image: '{{.Values.images.domain}}/{{.Values.images.controlplane.name}}:{{.Values.images.controlplane.tag | default .Values.images.tag}}'

config/helm/deployment-labels-controller-manager.yaml

@@ -0,0 +1,7 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capi-controller-manager
+  namespace: capi-system
+  labels:
+    app.kubernetes.io/component: cluster-api

config/helm/deployment-labels-kubeadm-bootstrap-controller-manager.yaml

@@ -0,0 +1,7 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capi-kubeadm-bootstrap-controller-manager
+  namespace: capi-kubeadm-bootstrap-system
+  labels:
+    app.kubernetes.io/component: bootstrap-kubeadm

config/helm/deployment-labels-kubeadm-control-plane-controller-manager.yaml

@@ -0,0 +1,7 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capi-kubeadm-control-plane-controller-manager
+  namespace: capi-kubeadm-control-plane-system
+  labels:
+    app.kubernetes.io/component: control-plane-kubeadm

config/helm/deployment-metrics-port-controller-manager.yaml

@@ -0,0 +1,14 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capi-controller-manager
+  namespace: capi-system
+spec:
+  template:
+    spec:
+      containers:
+        - name: manager
+          ports:
+            - containerPort: 8080
+              name: metrics
+              protocol: TCP

config/helm/deployment-metrics-port-kubeadm-bootstrap-controller-manager.yaml

@@ -0,0 +1,14 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capi-kubeadm-bootstrap-controller-manager
+  namespace: capi-kubeadm-bootstrap-system
+spec:
+  template:
+    spec:
+      containers:
+        - name: manager
+          ports:
+            - containerPort: 8080
+              name: metrics
+              protocol: TCP

config/helm/deployment-metrics-port-kubeadm-control-plane-controller-manager.yaml

@@ -0,0 +1,14 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capi-kubeadm-control-plane-controller-manager
+  namespace: capi-kubeadm-control-plane-system
+spec:
+  template:
+    spec:
+      containers:
+        - name: manager
+          ports:
+            - containerPort: 8080
+              name: metrics
+              protocol: TCP