CAPI 1.6

helm/cluster-api/files/bootstrap/bases/kubeadmconfigs.bootstrap.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-kubeadm-bootstrap-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -12,7 +12,6 @@ metadata:
     application.giantswarm.io/branch: '{{ .Values.project.branch }}'
     application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     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
     clusterctl.cluster.x-k8s.io: ""
@@ -58,7 +57,7 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         status: {}

helm/cluster-api/files/bootstrap/bases/kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-kubeadm-bootstrap-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -12,7 +12,6 @@ metadata:
     application.giantswarm.io/branch: '{{ .Values.project.branch }}'
     application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     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
     clusterctl.cluster.x-k8s.io: ""
@@ -56,7 +55,7 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources: {}
     - additionalPrinterColumns:

helm/cluster-api/files/controlplane/bases/kubeadmcontrolplanes.controlplane.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-kubeadm-control-plane-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -12,7 +12,6 @@ metadata:
     application.giantswarm.io/branch: '{{ .Values.project.branch }}'
     application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     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
     clusterctl.cluster.x-k8s.io: ""
@@ -121,7 +120,7 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         scale:

helm/cluster-api/files/controlplane/bases/kubeadmcontrolplanetemplates.controlplane.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-kubeadm-control-plane-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -12,7 +12,6 @@ metadata:
     application.giantswarm.io/branch: '{{ .Values.project.branch }}'
     application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     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
     clusterctl.cluster.x-k8s.io: ""
@@ -51,7 +50,7 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources: {}
     - additionalPrinterColumns:

helm/cluster-api/files/core/bases/clusterclasses.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -50,7 +50,7 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources: {}
     - additionalPrinterColumns:

helm/cluster-api/files/core/bases/clusterresourcesetbindings.addons.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    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:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         status: {}

helm/cluster-api/files/core/bases/clusterresourcesets.addons.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    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:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         status: {}

helm/cluster-api/files/core/bases/clusters.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -66,11 +66,15 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         status: {}
     - additionalPrinterColumns:
+        - description: ClusterClass of this Cluster, empty if the Cluster is not using a ClusterClass
+          jsonPath: .spec.topology.class
+          name: ClusterClass
+          type: string
         - description: Cluster status such as Pending/Provisioning/Provisioned/Deleting/Failed
           jsonPath: .status.phase
           name: Phase

helm/cluster-api/files/core/bases/extensionconfigs.runtime.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'

helm/cluster-api/files/core/bases/ipaddressclaims.ipam.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -49,9 +49,32 @@ spec:
           jsonPath: .spec.poolRef.kind
           name: Pool Kind
           type: string
+        - description: Time duration since creation of IPAdressClaim
+          jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
       name: v1alpha1
       schema: {}
       served: true
+      storage: false
+      subresources:
+        status: {}
+    - additionalPrinterColumns:
+        - description: Name of the pool to allocate an address from
+          jsonPath: .spec.poolRef.name
+          name: Pool Name
+          type: string
+        - description: Kind of the pool to allocate an address from
+          jsonPath: .spec.poolRef.kind
+          name: Pool Kind
+          type: string
+        - description: Time duration since creation of IPAdressClaim
+          jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
+      name: v1beta1
+      schema: {}
+      served: true
       storage: true
       subresources:
         status: {}

helm/cluster-api/files/core/bases/ipaddresses.ipam.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -53,8 +53,34 @@ spec:
           jsonPath: .spec.poolRef.kind
           name: Pool Kind
           type: string
+        - description: Time duration since creation of IPAdress
+          jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
       name: v1alpha1
       schema: {}
       served: true
+      storage: false
+      subresources: {}
+    - additionalPrinterColumns:
+        - description: Address
+          jsonPath: .spec.address
+          name: Address
+          type: string
+        - description: Name of the pool the address is from
+          jsonPath: .spec.poolRef.name
+          name: Pool Name
+          type: string
+        - description: Kind of the pool the address is from
+          jsonPath: .spec.poolRef.kind
+          name: Pool Kind
+          type: string
+        - description: Time duration since creation of IPAdress
+          jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
+      name: v1beta1
+      schema: {}
+      served: true
       storage: true
       subresources: {}

helm/cluster-api/files/core/bases/machinedeployments.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -106,7 +106,7 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         scale:

helm/cluster-api/files/core/bases/machinehealthchecks.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -87,7 +87,7 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         status: {}

helm/cluster-api/files/core/bases/machinepools.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -85,7 +85,7 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         scale:

helm/cluster-api/files/core/bases/machines.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -96,7 +96,7 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         status: {}

helm/cluster-api/files/core/bases/machinesets.cluster.x-k8s.io.yaml

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capi-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.13.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -90,7 +90,7 @@ spec:
       deprecated: true
       name: v1alpha4
       schema: {}
-      served: true
+      served: false
       storage: false
       subresources:
         scale:

helm/cluster-api/files/core/kustomization.yaml

@@ -90,12 +90,24 @@ patches:
       version: v1
       kind: CustomResourceDefinition
       name: ipaddressclaims.ipam.cluster.x-k8s.io
+  - path: patches/versions/v1beta1/ipaddressclaims.ipam.cluster.x-k8s.io.yaml
+    target:
+      group: apiextensions.k8s.io
+      version: v1
+      kind: CustomResourceDefinition
+      name: ipaddressclaims.ipam.cluster.x-k8s.io
   - path: patches/versions/v1alpha1/ipaddresses.ipam.cluster.x-k8s.io.yaml
     target:
       group: apiextensions.k8s.io
       version: v1
       kind: CustomResourceDefinition
       name: ipaddresses.ipam.cluster.x-k8s.io
+  - path: patches/versions/v1beta1/ipaddresses.ipam.cluster.x-k8s.io.yaml
+    target:
+      group: apiextensions.k8s.io
+      version: v1
+      kind: CustomResourceDefinition
+      name: ipaddresses.ipam.cluster.x-k8s.io
   - path: patches/versions/v1alpha3/machinedeployments.cluster.x-k8s.io.yaml
     target:
       group: apiextensions.k8s.io