Switch apiGroup to x-k8s.io (#1182)

Signed-off-by: Vince Prignano <[email protected]>

Author: vincepri

PROJECT

@@ -1,3 +1,3 @@
 version: "1"
-domain: sigs.k8s.io
+domain: x-k8s.io
 repo: sigs.k8s.io/cluster-api

cmd/clusterctl/validation/validate_cluster_api_objects_test.go

@@ -59,7 +59,7 @@ func getMachineWithError(machineName, namespace string, nodeRef *v1.ObjectRefere
 		},
 		Spec: v1alpha2.MachineSpec{
 			InfrastructureRef: corev1.ObjectReference{
-				APIVersion: "infrastructure.cluster.sigs.k8s.io/v1alpha1",
+				APIVersion: "infrastructure.cluster.x-k8s.io/v1alpha1",
 				Kind:       "InfrastructureRef",
 				Name:       "machine-infrastructure",
 			},

config/crds/cluster.sigs.k8s.io_clusters.yaml renamed to config/crds/cluster.x-k8s.io_clusters.yaml

@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: clusters.cluster.sigs.k8s.io
+  name: clusters.cluster.x-k8s.io
 spec:
-  group: cluster.sigs.k8s.io
+  group: cluster.x-k8s.io
   names:
     kind: Cluster
     plural: clusters

config/crds/cluster.sigs.k8s.io_machinedeployments.yaml renamed to config/crds/cluster.x-k8s.io_machinedeployments.yaml

@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: machinedeployments.cluster.sigs.k8s.io
+  name: machinedeployments.cluster.x-k8s.io
 spec:
-  group: cluster.sigs.k8s.io
+  group: cluster.x-k8s.io
   names:
     kind: MachineDeployment
     plural: machinedeployments

config/crds/cluster.sigs.k8s.io_machines.yaml renamed to config/crds/cluster.x-k8s.io_machines.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: machines.cluster.sigs.k8s.io
+  name: machines.cluster.x-k8s.io
 spec:
   additionalPrinterColumns:
   - JSONPath: .spec.providerID
@@ -20,7 +20,7 @@ spec:
     name: NodeName
     priority: 1
     type: string
-  group: cluster.sigs.k8s.io
+  group: cluster.x-k8s.io
   names:
     kind: Machine
     plural: machines

config/crds/cluster.sigs.k8s.io_machinesets.yaml renamed to config/crds/cluster.x-k8s.io_machinesets.yaml

@@ -4,9 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  name: machinesets.cluster.sigs.k8s.io
+  name: machinesets.cluster.x-k8s.io
 spec:
-  group: cluster.sigs.k8s.io
+  group: cluster.x-k8s.io
   names:
     kind: MachineSet
     plural: machinesets

config/crds/kustomization.yaml

@@ -4,10 +4,10 @@
 # YAML string, with resources separated by document
 # markers ("---").
 resources:
-- cluster.sigs.k8s.io_clusters.yaml
-- cluster.sigs.k8s.io_machines.yaml
-- cluster.sigs.k8s.io_machinesets.yaml
-- cluster.sigs.k8s.io_machinedeployments.yaml
+- cluster.x-k8s.io_clusters.yaml
+- cluster.x-k8s.io_machines.yaml
+- cluster.x-k8s.io_machinesets.yaml
+- cluster.x-k8s.io_machinedeployments.yaml
 - cluster.k8s.io_clusters.yaml
 - cluster.k8s.io_machines.yaml
 - cluster.k8s.io_machinesets.yaml

config/rbac/role.yaml

@@ -7,8 +7,8 @@ metadata:
   name: manager-role
 rules:
 - apiGroups:
-  - bootstrap.cluster.sigs.k8s.io
-  - infrastructure.cluster.sigs.k8s.io
+  - bootstrap.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
   resources:
   - '*'
   verbs:
@@ -20,7 +20,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - cluster.sigs.k8s.io
+  - cluster.x-k8s.io
   resources:
   - clusters
   - clusters/status

pkg/apis/cluster/v1alpha2/cluster_types.go

@@ -24,8 +24,8 @@ import (
 )
 
 const (
-	ClusterFinalizer                   = "cluster.cluster.sigs.k8s.io"
-	ClusterAnnotationControlPlaneReady = "cluster.sigs.k8s.io/control-plane-ready"
+	ClusterFinalizer                   = "cluster.cluster.x-k8s.io"
+	ClusterAnnotationControlPlaneReady = "cluster.x-k8s.io/control-plane-ready"
 )
 
 // +genclient

pkg/apis/cluster/v1alpha2/doc.go

@@ -19,5 +19,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=sigs.k8s.io/cluster-api/pkg/apis/cluster
 // +k8s:defaulter-gen=TypeMeta
-// +groupName=cluster.sigs.k8s.io
+// +groupName=cluster.x-k8s.io
 package v1alpha2

pkg/apis/cluster/v1alpha2/machine_types.go

@@ -24,13 +24,13 @@ import (
 
 const (
 	// MachineFinalizer is set on PrepareForCreate callback.
-	MachineFinalizer = "machine.cluster.sigs.k8s.io"
+	MachineFinalizer = "machine.cluster.x-k8s.io"
 
 	// MachineClusterLabelName is the label set on machines linked to a cluster.
-	MachineClusterLabelName = "cluster.sigs.k8s.io/cluster-name"
+	MachineClusterLabelName = "cluster.x-k8s.io/cluster-name"
 
 	// MachineControlPlaneLabelName is the label set on machines part of a control plane.
-	MachineControlPlaneLabelName = "cluster.sigs.k8s.io/control-plane"
+	MachineControlPlaneLabelName = "cluster.x-k8s.io/control-plane"
 )
 
 // +genclient

pkg/apis/cluster/v1alpha2/machine_types_test.go

@@ -38,7 +38,7 @@ func TestStorageMachine(t *testing.T) {
 		},
 		Spec: MachineSpec{
 			InfrastructureRef: corev1.ObjectReference{
-				APIVersion: "infrastructure.cluster.sigs.k8s.io/v1alpha1",
+				APIVersion: "infrastructure.cluster.x-k8s.io/v1alpha1",
 				Kind:       "InfrastructureRef",
 				Name:       "machine-infrastructure",
 			},

pkg/apis/cluster/v1alpha2/machinedeployment_types_test.go

@@ -40,7 +40,7 @@ func TestStorageMachineDeployment(t *testing.T) {
 			Template: MachineTemplateSpec{
 				Spec: MachineSpec{
 					InfrastructureRef: corev1.ObjectReference{
-						APIVersion: "infrastructure.cluster.sigs.k8s.io/v1alpha1",
+						APIVersion: "infrastructure.cluster.x-k8s.io/v1alpha1",
 						Kind:       "InfrastructureRef",
 						Name:       "machine-infrastructure",
 					},

pkg/apis/cluster/v1alpha2/machineset_types.go

@@ -84,19 +84,19 @@ type MachineSetDeletePolicy string
 
 const (
 	// RandomMachineSetDeletePolicy prioritizes both Machines that have the annotation
-	// "cluster.sigs.k8s.io/delete-machine=yes" and Machines that are unhealthy
+	// "cluster.x-k8s.io/delete-machine=yes" and Machines that are unhealthy
 	// (Status.ErrorReason or Status.ErrorMessage are set to a non-empty value).
 	// Finally, it picks Machines at random to delete.
 	RandomMachineSetDeletePolicy MachineSetDeletePolicy = "Random"
 
 	// NewestMachineSetDeletePolicy prioritizes both Machines that have the annotation
-	// "cluster.sigs.k8s.io/delete-machine=yes" and Machines that are unhealthy
+	// "cluster.x-k8s.io/delete-machine=yes" and Machines that are unhealthy
 	// (Status.ErrorReason or Status.ErrorMessage are set to a non-empty value).
 	// It then prioritizes the newest Machines for deletion based on the Machine's CreationTimestamp.
 	NewestMachineSetDeletePolicy MachineSetDeletePolicy = "Newest"
 
 	// OldestMachineSetDeletePolicy prioritizes both Machines that have the annotation
-	// "cluster.sigs.k8s.io/delete-machine=yes" and Machines that are unhealthy
+	// "cluster.x-k8s.io/delete-machine=yes" and Machines that are unhealthy
 	// (Status.ErrorReason or Status.ErrorMessage are set to a non-empty value).
 	// It then prioritizes the oldest Machines for deletion based on the Machine's CreationTimestamp.
 	OldestMachineSetDeletePolicy MachineSetDeletePolicy = "Oldest"

pkg/apis/cluster/v1alpha2/machineset_types_test.go

@@ -40,7 +40,7 @@ func TestStorageMachineSet(t *testing.T) {
 			Template: MachineTemplateSpec{
 				Spec: MachineSpec{
 					InfrastructureRef: corev1.ObjectReference{
-						APIVersion: "infrastructure.cluster.sigs.k8s.io/v1alpha1",
+						APIVersion: "infrastructure.cluster.x-k8s.io/v1alpha1",
 						Kind:       "InfrastructureRef",
 						Name:       "machine-infrastructure",
 					},

pkg/apis/cluster/v1alpha2/register.go

@@ -21,7 +21,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=sigs.k8s.io/cluster-api/pkg/apis/cluster
 // +k8s:defaulter-gen=TypeMeta
-// +groupName=cluster.sigs.k8s.io
+// +groupName=cluster.x-k8s.io
 package v1alpha2
 
 import (
@@ -31,7 +31,7 @@ import (
 
 var (
 	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "cluster.sigs.k8s.io", Version: "v1alpha2"}
+	SchemeGroupVersion = schema.GroupVersion{Group: "cluster.x-k8s.io", Version: "v1alpha2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}

pkg/client/clientset_generated/clientset/typed/cluster/v1alpha2/cluster_client.go

@@ -23,8 +23,8 @@ import (
 // +kubebuilder:rbac:groups=core,resources=events,verbs=get;list;watch;create;patch
 // +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch
 // +kubebuilder:rbac:groups=core,resources=nodes,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=cluster.sigs.k8s.io,resources=clusters;clusters/status;machines;machines/status;machinedeployments;machinedeployments/status;machinesets;machinesets/status,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=infrastructure.cluster.sigs.k8s.io;bootstrap.cluster.sigs.k8s.io,resources=*,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=clusters;clusters/status;machines;machines/status;machinedeployments;machinedeployments/status;machinesets;machinesets/status,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io;bootstrap.cluster.x-k8s.io,resources=*,verbs=get;list;watch;create;update;patch;delete
 
 // AddToManagerFuncs is a list of functions to add all Controllers to the Manager
 var AddToManagerFuncs []func(manager.Manager) error

pkg/client/clientset_generated/clientset/typed/cluster/v1alpha2/fake/fake_cluster.go

@@ -24,10 +24,10 @@ import (
 var (
 	TestGenericInfrastructureCRD = &apiextensionsv1beta1.CustomResourceDefinition{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "genericmachines.infrastructure.cluster.sigs.k8s.io",
+			Name: "genericmachines.infrastructure.cluster.x-k8s.io",
 		},
 		Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{
-			Group: "infrastructure.cluster.sigs.k8s.io",
+			Group: "infrastructure.cluster.x-k8s.io",
 			Scope: apiextensionsv1beta1.NamespaceScoped,
 			Names: apiextensionsv1beta1.CustomResourceDefinitionNames{
 				Kind:   "InfrastructureMachine",
@@ -49,10 +49,10 @@ var (
 
 	TestGenericInfrastructureTemplateCRD = &apiextensionsv1beta1.CustomResourceDefinition{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "genericmachinetemplates.infrastructure.cluster.sigs.k8s.io",
+			Name: "genericmachinetemplates.infrastructure.cluster.x-k8s.io",
 		},
 		Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{
-			Group: "infrastructure.cluster.sigs.k8s.io",
+			Group: "infrastructure.cluster.x-k8s.io",
 			Scope: apiextensionsv1beta1.NamespaceScoped,
 			Names: apiextensionsv1beta1.CustomResourceDefinitionNames{
 				Kind:   "InfrastructureMachineTemplate",