Upgrade machinecontroller addon apiextensions to v1 API

Signed-off-by: Artiom Diomin <kron82@gmail.com>
kubermatic · Jul 19, 2021 · bca76d6 · bca76d6
1 parent 99bd338
commit bca76d6
Showing 1 changed file with 114 additions and 90 deletions.
diff --git a/addons/machinecontroller/machine-controller.yaml b/addons/machinecontroller/machine-controller.yaml
@@ -1,153 +1,177 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: machines.cluster.k8s.io
   annotations:
     "api-approved.kubernetes.io": "unapproved, legacy API"
 spec:
   group: cluster.k8s.io
-  version: v1alpha1
   scope: Namespaced
   names:
     kind: Machine
     plural: machines
     singular: machine
     listKind: MachineList
     shortNames: ["ma"]
-  additionalPrinterColumns:
-    - name: Provider
-      type: string
-      JSONPath: .spec.providerSpec.value.cloudProvider
-    - name: OS
-      type: string
-      JSONPath: .spec.providerSpec.value.operatingSystem
-    - name: Node
-      type: string
-      JSONPath: .status.nodeRef.name
-    - name: Kubelet
-      type: string
-      JSONPath: .spec.versions.kubelet
-    - name: Address
-      type: string
-      JSONPath: .status.addresses[0].address
-    - name: Age
-      type: date
-      JSONPath: .metadata.creationTimestamp
-    - name: Deleted
-      type: date
-      JSONPath: .metadata.deletionTimestamp
-      priority: 1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+      additionalPrinterColumns:
+        - name: Provider
+          type: string
+          jsonPath: .spec.providerSpec.value.cloudProvider
+        - name: OS
+          type: string
+          jsonPath: .spec.providerSpec.value.operatingSystem
+        - name: Node
+          type: string
+          jsonPath: .status.nodeRef.name
+        - name: Kubelet
+          type: string
+          jsonPath: .spec.versions.kubelet
+        - name: Address
+          type: string
+          jsonPath: .status.addresses[0].address
+        - name: Age
+          type: date
+          jsonPath: .metadata.creationTimestamp
+        - name: Deleted
+          type: date
+          jsonPath: .metadata.deletionTimestamp
+          priority: 1
 
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: machinesets.cluster.k8s.io
   annotations:
     "api-approved.kubernetes.io": "unapproved, legacy API"
 spec:
   group: cluster.k8s.io
-  version: v1alpha1
   scope: Namespaced
   names:
     kind: MachineSet
     plural: machinesets
     singular: machineset
     listKind: MachineSetList
     shortNames: ["ms"]
-  subresources:
-    status: {}
-  additionalPrinterColumns:
-    - name: Replicas
-      type: integer
-      JSONPath: .spec.replicas
-    - name: Available-Replicas
-      type: integer
-      JSONPath: .status.availableReplicas
-    - name: Provider
-      type: string
-      JSONPath: .spec.template.spec.providerSpec.value.cloudProvider
-    - name: OS
-      type: string
-      JSONPath: .spec.template.spec.providerSpec.value.operatingSystem
-    - name: MachineDeployment
-      type: string
-      JSONPath: .metadata.ownerReferences[0].name
-    - name: Kubelet
-      type: string
-      JSONPath: .spec.template.spec.versions.kubelet
-    - name: Age
-      type: date
-      JSONPath: .metadata.creationTimestamp
-    - name: Deleted
-      type: date
-      JSONPath: .metadata.deletionTimestamp
-      priority: 1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+      subresources:
+        status: {}
+      additionalPrinterColumns:
+        - name: Replicas
+          type: integer
+          jsonPath: .spec.replicas
+        - name: Available-Replicas
+          type: integer
+          jsonPath: .status.availableReplicas
+        - name: Provider
+          type: string
+          jsonPath: .spec.template.spec.providerSpec.value.cloudProvider
+        - name: OS
+          type: string
+          jsonPath: .spec.template.spec.providerSpec.value.operatingSystem
+        - name: MachineDeployment
+          type: string
+          jsonPath: .metadata.ownerReferences[0].name
+        - name: Kubelet
+          type: string
+          jsonPath: .spec.template.spec.versions.kubelet
+        - name: Age
+          type: date
+          jsonPath: .metadata.creationTimestamp
+        - name: Deleted
+          type: date
+          jsonPath: .metadata.deletionTimestamp
+          priority: 1
 
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: machinedeployments.cluster.k8s.io
   annotations:
     "api-approved.kubernetes.io": "unapproved, legacy API"
 spec:
   group: cluster.k8s.io
-  version: v1alpha1
   scope: Namespaced
   names:
     kind: MachineDeployment
     plural: machinedeployments
     singular: machinedeployment
     listKind: MachineDeploymentList
     shortNames: ["md"]
-  subresources:
-    scale:
-      specReplicasPath: .spec.replicas
-      statusReplicasPath: .status.replicas
-    status: {}
-  additionalPrinterColumns:
-    - name: Replicas
-      type: integer
-      JSONPath: .spec.replicas
-    - name: Available-Replicas
-      type: integer
-      JSONPath: .status.availableReplicas
-    - name: Provider
-      type: string
-      JSONPath: .spec.template.spec.providerSpec.value.cloudProvider
-    - name: OS
-      type: string
-      JSONPath: .spec.template.spec.providerSpec.value.operatingSystem
-    - name: Kubelet
-      type: string
-      JSONPath: .spec.template.spec.versions.kubelet
-    - name: Age
-      type: date
-      JSONPath: .metadata.creationTimestamp
-    - name: Deleted
-      type: date
-      JSONPath: .metadata.deletionTimestamp
-      priority: 1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+      subresources:
+        scale:
+          specReplicasPath: .spec.replicas
+          statusReplicasPath: .status.replicas
+        status: {}
+      additionalPrinterColumns:
+        - name: Replicas
+          type: integer
+          jsonPath: .spec.replicas
+        - name: Available-Replicas
+          type: integer
+          jsonPath: .status.availableReplicas
+        - name: Provider
+          type: string
+          jsonPath: .spec.template.spec.providerSpec.value.cloudProvider
+        - name: OS
+          type: string
+          jsonPath: .spec.template.spec.providerSpec.value.operatingSystem
+        - name: Kubelet
+          type: string
+          jsonPath: .spec.template.spec.versions.kubelet
+        - name: Age
+          type: date
+          jsonPath: .metadata.creationTimestamp
+        - name: Deleted
+          type: date
+          jsonPath: .metadata.deletionTimestamp
+          priority: 1
 
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clusters.cluster.k8s.io
   annotations:
     "api-approved.kubernetes.io": "unapproved, legacy API"
 spec:
   group: cluster.k8s.io
-  version: v1alpha1
   scope: Namespaced
   names:
     kind: Cluster
     plural: clusters
-  subresources:
-    # status enables the status subresource.
-    status: {}
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+      subresources:
+        # status enables the status subresource.
+        status: {}
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1