Upgrade CAPI/CAPO to v1.6.2/v0.9.0 (#1)

unikorn-cloud · Mar 12, 2024 · 23c3610 · 23c3610
1 parent c1903fa
commit 23c3610
Show file tree

Hide file tree

Showing 42 changed files with 1,146 additions and 157 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 # Update this for every tagged release.
-CHART_VERSION = v0.1.10
+CHART_VERSION = v0.1.11
 
 # Defines the versions to use for cluster API components.
-CAPI_VERSION = v1.4.3
-CAPO_VERSION = v0.8.0
+CAPI_VERSION = v1.6.2
+CAPO_VERSION = v0.9.0
 
 # All the charts we can generate.
 CHARTS = cluster-api-core \

diff --git a/charts/cluster-api-bootstrap-kubeadm/Chart.yaml b/charts/cluster-api-bootstrap-kubeadm/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
-appVersion: v1.4.3
+appVersion: v1.6.2
 description: A Helm chart for deploying cluster API.
 icon: https://assets.unikorn-cloud.org/assets/images/logos/dark-on-light/icon.png
 name: cluster-api-bootstrap-kubeadm
 type: application
-version: v0.1.10
+version: v0.1.11
diff --git a/charts/cluster-api-bootstrap-kubeadm/crds/kubeadmconfigs.bootstrap.cluster.x-k8s.io.yaml b/charts/cluster-api-bootstrap-kubeadm/crds/kubeadmconfigs.bootstrap.cluster.x-k8s.io.yaml
@@ -3,10 +3,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: capi-kubeadm-bootstrap-system/capi-kubeadm-bootstrap-serving-cert
-    controller-gen.kubebuilder.io/version: v0.11.4
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     cluster.x-k8s.io/provider: bootstrap-kubeadm
-    cluster.x-k8s.io/v1alpha3: v1alpha3
     cluster.x-k8s.io/v1alpha4: v1alpha4
     cluster.x-k8s.io/v1beta1: v1beta1
   name: kubeadmconfigs.bootstrap.cluster.x-k8s.io
@@ -1019,7 +1018,7 @@ spec:
                 type: boolean
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources:
       status: {}
@@ -2005,7 +2004,7 @@ spec:
                 type: boolean
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources:
       status: {}

diff --git a/...cluster-api-bootstrap-kubeadm/crds/kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io.yaml b/...cluster-api-bootstrap-kubeadm/crds/kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io.yaml
@@ -3,10 +3,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: capi-kubeadm-bootstrap-system/capi-kubeadm-bootstrap-serving-cert
-    controller-gen.kubebuilder.io/version: v0.11.4
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     cluster.x-k8s.io/provider: bootstrap-kubeadm
-    cluster.x-k8s.io/v1alpha3: v1alpha3
     cluster.x-k8s.io/v1alpha4: v1alpha4
     cluster.x-k8s.io/v1beta1: v1beta1
   name: kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io
@@ -1010,7 +1009,7 @@ spec:
             - template
             type: object
         type: object
-    served: true
+    served: false
     storage: false
   - additionalPrinterColumns:
     - description: Time duration since creation of KubeadmConfigTemplate
@@ -1993,7 +1992,7 @@ spec:
             - template
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources: {}
   - additionalPrinterColumns:

diff --git a/charts/cluster-api-bootstrap-kubeadm/templates/clusterrole-0.yaml b/charts/cluster-api-bootstrap-kubeadm/templates/clusterrole-0.yaml
@@ -19,6 +19,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create
 - apiGroups:
   - bootstrap.cluster.x-k8s.io
   resources:

diff --git a/charts/cluster-api-bootstrap-kubeadm/templates/deployment-0.yaml b/charts/cluster-api-bootstrap-kubeadm/templates/deployment-0.yaml
@@ -21,8 +21,9 @@ spec:
       containers:
       - args:
         - --leader-elect
-        - --metrics-bind-addr=localhost:8080
-        - --feature-gates=MachinePool={{ .Values.exp_machine_pool }},KubeadmBootstrapFormatIgnition={{ .Values.exp_kubeadm_bootstrap_format_ignition }},LazyRestmapper={{ .Values.exp_lazy_restmapper }}
+        - --diagnostics-address={{ .Values.capi_diagnostics_address }}
+        - --insecure-diagnostics={{ .Values.capi_insecure_diagnostics }}
+        - --feature-gates=MachinePool={{ .Values.exp_machine_pool }},KubeadmBootstrapFormatIgnition={{ .Values.exp_kubeadm_bootstrap_format_ignition }}
         - --bootstrap-token-ttl={{ .Values.kubeadm_bootstrap_token_ttl }}
         - --logging-format=json
         command:
@@ -41,6 +42,9 @@ spec:
         - containerPort: 9440
           name: healthz
           protocol: TCP
+        - containerPort: 8443
+          name: metrics
+          protocol: TCP
         readinessProbe:
           httpGet:
             path: /readyz

diff --git a/charts/cluster-api-bootstrap-kubeadm/values.yaml b/charts/cluster-api-bootstrap-kubeadm/values.yaml
@@ -1,5 +1,6 @@
+capi_diagnostics_address: :8443
+capi_insecure_diagnostics: false
 exp_kubeadm_bootstrap_format_ignition: false
-exp_lazy_restmapper: false
 exp_machine_pool: false
-image: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.3
+image: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.2
 kubeadm_bootstrap_token_ttl: 15m
diff --git a/charts/cluster-api-cluster-openstack/Chart.yaml b/charts/cluster-api-cluster-openstack/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: cluster-api-cluster-openstack
 description: A Helm chart to deploy a Kubernetes Cluster
 type: application
-version: v0.3.26
+version: v0.3.27
 icon: https://raw.githubusercontent.com/unikorn-cloud/helm-cluster-api/main/icons/default.png
diff --git a/charts/cluster-api-control-plane-kubeadm/Chart.yaml b/charts/cluster-api-control-plane-kubeadm/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
-appVersion: v1.4.3
+appVersion: v1.6.2
 description: A Helm chart for deploying cluster API.
 icon: https://assets.unikorn-cloud.org/assets/images/logos/dark-on-light/icon.png
 name: cluster-api-control-plane-kubeadm
 type: application
-version: v0.1.10
+version: v0.1.11
diff --git a/...er-api-control-plane-kubeadm/crds/kubeadmcontrolplanes.controlplane.cluster.x-k8s.io.yaml b/...er-api-control-plane-kubeadm/crds/kubeadmcontrolplanes.controlplane.cluster.x-k8s.io.yaml
@@ -3,10 +3,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: capi-kubeadm-control-plane-system/capi-kubeadm-control-plane-serving-cert
-    controller-gen.kubebuilder.io/version: v0.11.4
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     cluster.x-k8s.io/provider: control-plane-kubeadm
-    cluster.x-k8s.io/v1alpha3: v1alpha3
     cluster.x-k8s.io/v1alpha4: v1alpha4
     cluster.x-k8s.io/v1beta1: v1beta1
   name: kubeadmcontrolplanes.controlplane.cluster.x-k8s.io
@@ -1201,7 +1200,7 @@ spec:
                 type: integer
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources:
       scale:
@@ -2413,7 +2412,7 @@ spec:
                 type: string
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources:
       scale:

diff --git a/...ontrol-plane-kubeadm/crds/kubeadmcontrolplanetemplates.controlplane.cluster.x-k8s.io.yaml b/...ontrol-plane-kubeadm/crds/kubeadmcontrolplanetemplates.controlplane.cluster.x-k8s.io.yaml
@@ -3,10 +3,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: capi-kubeadm-control-plane-system/capi-kubeadm-control-plane-serving-cert
-    controller-gen.kubebuilder.io/version: v0.11.4
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     cluster.x-k8s.io/provider: control-plane-kubeadm
-    cluster.x-k8s.io/v1alpha3: v1alpha3
     cluster.x-k8s.io/v1alpha4: v1alpha4
     cluster.x-k8s.io/v1beta1: v1beta1
   name: kubeadmcontrolplanetemplates.controlplane.cluster.x-k8s.io
@@ -1190,7 +1189,7 @@ spec:
             - template
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources: {}
   - additionalPrinterColumns:

diff --git a/charts/cluster-api-control-plane-kubeadm/templates/clusterrole-1.yaml b/charts/cluster-api-control-plane-kubeadm/templates/clusterrole-1.yaml
@@ -14,6 +14,18 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create
 - apiGroups:
   - bootstrap.cluster.x-k8s.io
   - controlplane.cluster.x-k8s.io

diff --git a/charts/cluster-api-control-plane-kubeadm/templates/deployment-0.yaml b/charts/cluster-api-control-plane-kubeadm/templates/deployment-0.yaml
@@ -21,8 +21,9 @@ spec:
       containers:
       - args:
         - --leader-elect
-        - --metrics-bind-addr=localhost:8080
-        - --feature-gates=ClusterTopology={{ .Values.cluster_topology }},KubeadmBootstrapFormatIgnition={{ .Values.exp_kubeadm_bootstrap_format_ignition }},LazyRestmapper={{ .Values.exp_lazy_restmapper }}
+        - --diagnostics-address={{ .Values.capi_diagnostics_address }}
+        - --insecure-diagnostics={{ .Values.capi_insecure_diagnostics }}
+        - --feature-gates=ClusterTopology={{ .Values.cluster_topology }},KubeadmBootstrapFormatIgnition={{ .Values.exp_kubeadm_bootstrap_format_ignition }}
         - --logging-format=json
         command:
         - /manager
@@ -53,6 +54,9 @@ spec:
         - containerPort: 9440
           name: healthz
           protocol: TCP
+        - containerPort: 8443
+          name: metrics
+          protocol: TCP
         readinessProbe:
           httpGet:
             path: /readyz

diff --git a/charts/cluster-api-control-plane-kubeadm/templates/validatingwebhookconfiguration-0.yaml b/charts/cluster-api-control-plane-kubeadm/templates/validatingwebhookconfiguration-0.yaml
@@ -14,20 +14,19 @@ webhooks:
     service:
       name: capi-kubeadm-control-plane-webhook-service
       namespace: capi-kubeadm-control-plane-system
-      path: /validate-controlplane-cluster-x-k8s-io-v1beta1-kubeadmcontrolplane
+      path: /validate-scale-controlplane-cluster-x-k8s-io-v1beta1-kubeadmcontrolplane
   failurePolicy: Fail
   matchPolicy: Equivalent
-  name: validation.kubeadmcontrolplane.controlplane.cluster.x-k8s.io
+  name: validation-scale.kubeadmcontrolplane.controlplane.cluster.x-k8s.io
   rules:
   - apiGroups:
     - controlplane.cluster.x-k8s.io
     apiVersions:
     - v1beta1
     operations:
-    - CREATE
     - UPDATE
     resources:
-    - kubeadmcontrolplanes
+    - kubeadmcontrolplanes/scale
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -36,9 +35,10 @@ webhooks:
     service:
       name: capi-kubeadm-control-plane-webhook-service
       namespace: capi-kubeadm-control-plane-system
-      path: /validate-controlplane-cluster-x-k8s-io-v1beta1-kubeadmcontrolplanetemplate
+      path: /validate-controlplane-cluster-x-k8s-io-v1beta1-kubeadmcontrolplane
   failurePolicy: Fail
-  name: validation.kubeadmcontrolplanetemplate.controlplane.cluster.x-k8s.io
+  matchPolicy: Equivalent
+  name: validation.kubeadmcontrolplane.controlplane.cluster.x-k8s.io
   rules:
   - apiGroups:
     - controlplane.cluster.x-k8s.io
@@ -48,7 +48,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - kubeadmcontrolplanetemplates
+    - kubeadmcontrolplanes
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -57,17 +57,17 @@ webhooks:
     service:
       name: capi-kubeadm-control-plane-webhook-service
       namespace: capi-kubeadm-control-plane-system
-      path: /validate-scale-controlplane-cluster-x-k8s-io-v1beta1-kubeadmcontrolplane
+      path: /validate-controlplane-cluster-x-k8s-io-v1beta1-kubeadmcontrolplanetemplate
   failurePolicy: Fail
-  matchPolicy: Equivalent
-  name: validation-scale.kubeadmcontrolplane.controlplane.cluster.x-k8s.io
+  name: validation.kubeadmcontrolplanetemplate.controlplane.cluster.x-k8s.io
   rules:
   - apiGroups:
     - controlplane.cluster.x-k8s.io
     apiVersions:
     - v1beta1
     operations:
+    - CREATE
     - UPDATE
     resources:
-    - kubeadmcontrolplanes/scale
+    - kubeadmcontrolplanetemplates
   sideEffects: None
diff --git a/charts/cluster-api-control-plane-kubeadm/values.yaml b/charts/cluster-api-control-plane-kubeadm/values.yaml
@@ -1,4 +1,5 @@
+capi_diagnostics_address: :8443
+capi_insecure_diagnostics: false
 cluster_topology: false
 exp_kubeadm_bootstrap_format_ignition: false
-exp_lazy_restmapper: false
-image: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.3
+image: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.2
diff --git a/charts/cluster-api-core/Chart.yaml b/charts/cluster-api-core/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
-appVersion: v1.4.3
+appVersion: v1.6.2
 description: A Helm chart for deploying cluster API.
 icon: https://assets.unikorn-cloud.org/assets/images/logos/dark-on-light/icon.png
 name: cluster-api-core
 type: application
-version: v0.1.10
+version: v0.1.11