Update config files for machine API

kubernetes-sigs · Jan 15, 2019 · c827431 · c827431
1 parent 56638b7
commit c827431
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/config/crds/cluster_v1alpha1_machine.yaml → config/crds/machine_v1alpha1_machine.yaml b/config/crds/cluster_v1alpha1_machine.yaml → config/crds/machine_v1alpha1_machine.yaml
@@ -4,9 +4,9 @@ metadata:
   creationTimestamp: null
   labels:
     controller-tools.k8s.io: "1.0"
-  name: machines.cluster.k8s.io
+  name: machines.machine.k8s.io
 spec:
-  group: cluster.k8s.io
+  group: machine.k8s.io
   names:
     kind: Machine
     plural: machines

diff --git a/...g/crds/cluster_v1alpha1_machineclass.yaml → ...g/crds/machine_v1alpha1_machineclass.yaml b/...g/crds/cluster_v1alpha1_machineclass.yaml → ...g/crds/machine_v1alpha1_machineclass.yaml
@@ -4,9 +4,9 @@ metadata:
   creationTimestamp: null
   labels:
     controller-tools.k8s.io: "1.0"
-  name: machineclasses.cluster.k8s.io
+  name: machineclasses.machine.k8s.io
 spec:
-  group: cluster.k8s.io
+  group: machine.k8s.io
   names:
     kind: MachineClass
     plural: machineclasses

diff --git a/...s/cluster_v1alpha1_machinedeployment.yaml → ...s/machine_v1alpha1_machinedeployment.yaml b/...s/cluster_v1alpha1_machinedeployment.yaml → ...s/machine_v1alpha1_machinedeployment.yaml
@@ -4,9 +4,9 @@ metadata:
   creationTimestamp: null
   labels:
     controller-tools.k8s.io: "1.0"
-  name: machinedeployments.cluster.k8s.io
+  name: machinedeployments.machine.k8s.io
 spec:
-  group: cluster.k8s.io
+  group: machine.k8s.io
   names:
     kind: MachineDeployment
     plural: machinedeployments

diff --git a/config/crds/cluster_v1alpha1_machineset.yaml → config/crds/machine_v1alpha1_machineset.yaml b/config/crds/cluster_v1alpha1_machineset.yaml → config/crds/machine_v1alpha1_machineset.yaml
@@ -4,9 +4,9 @@ metadata:
   creationTimestamp: null
   labels:
     controller-tools.k8s.io: "1.0"
-  name: machinesets.cluster.k8s.io
+  name: machinesets.machine.k8s.io
 spec:
-  group: cluster.k8s.io
+  group: machine.k8s.io
   names:
     kind: MachineSet
     plural: machinesets

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -19,10 +19,10 @@ namePrefix: cluster-api-
 # markers ("---").
 resources:
 - ../crds/cluster_v1alpha1_cluster.yaml
-- ../crds/cluster_v1alpha1_machine.yaml
-- ../crds/cluster_v1alpha1_machineclass.yaml
-- ../crds/cluster_v1alpha1_machinedeployment.yaml
-- ../crds/cluster_v1alpha1_machineset.yaml
+- ../crds/machine_v1alpha1_machine.yaml
+- ../crds/machine_v1alpha1_machineclass.yaml
+- ../crds/machine_v1alpha1_machinedeployment.yaml
+- ../crds/machine_v1alpha1_machineset.yaml
 - ../rbac/rbac_role.yaml
 - ../rbac/rbac_role_binding.yaml
 - ../manager/manager.yaml

diff --git a/config/rbac/rbac_role.yaml b/config/rbac/rbac_role.yaml
@@ -17,7 +17,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cluster.k8s.io
+  - machine.k8s.io
   resources:
   - machines
   verbs:
@@ -29,7 +29,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cluster.k8s.io
+  - machine.k8s.io
   resources:
   - machinedeployments
   verbs:
@@ -41,7 +41,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cluster.k8s.io
+  - machine.k8s.io
   resources:
   - machinesets
   verbs:
@@ -53,7 +53,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cluster.k8s.io
+  - machine.k8s.io
   resources:
   - machines
   verbs:
@@ -77,7 +77,7 @@ rules:
   - patch
   - delete
 - apiGroups:
-  - cluster.k8s.io
+  - machine.k8s.io
   resources:
   - machines
   verbs:

diff --git a/config/samples/cluster_v1alpha1_machine.yaml → config/samples/machine_v1alpha1_machine.yaml b/config/samples/cluster_v1alpha1_machine.yaml → config/samples/machine_v1alpha1_machine.yaml
@@ -1,4 +1,4 @@
-apiVersion: cluster.k8s.io/v1alpha1
+apiVersion: machine.k8s.io/v1alpha1
 kind: Machine
 metadata:
   labels:

diff --git a/...s/cluster_v1alpha1_machinedeployment.yaml → ...s/machine_v1alpha1_machinedeployment.yaml b/...s/cluster_v1alpha1_machinedeployment.yaml → ...s/machine_v1alpha1_machinedeployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: cluster.k8s.io/v1alpha1
+apiVersion: machine.k8s.io/v1alpha1
 kind: MachineDeployment
 metadata:
   labels:

diff --git a/.../samples/cluster_v1alpha1_machineset.yaml → .../samples/machine_v1alpha1_machineset.yaml b/.../samples/cluster_v1alpha1_machineset.yaml → .../samples/machine_v1alpha1_machineset.yaml
@@ -1,4 +1,4 @@
-apiVersion: cluster.k8s.io/v1alpha1
+apiVersion: machine.k8s.io/v1alpha1
 kind: MachineSet
 metadata:
   labels: