Rename API group to multicluster.x-k8s.io

vanekjar · vanekjar · commit 39db3fbc4390 · 2021-10-02T16:50:24.000-07:00
diff --git a/PROJECT b/PROJECT
@@ -1,4 +1,4 @@
-domain: k8s.aws
+domain: x-k8s.io
 layout:
 - go.kubebuilder.io/v3
 projectName: aws-cloud-map-mcs-controller-for-k8s
@@ -8,7 +8,7 @@ resources:
     crdVersion: v1
     namespaced: true
   controller: true
-  domain: k8s.aws
+  domain: x-k8s.io
   group: multicluster
   kind: ServiceExport
   path: github.com/aws/aws-cloud-map-mcs-controller-for-k8s/api/v1alpha1
@@ -17,7 +17,7 @@ resources:
     crdVersion: v1
     namespaced: true
   controller: true
-  domain: k8s.aws
+  domain: x-k8s.io
   group: multicluster
   kind: ServiceImport
   path: github.com/aws/aws-cloud-map-mcs-controller-for-k8s/api/v1alpha1
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ Create a testing ServiceExport resource
 # my-export.yaml
 
 kind: ServiceExport
-apiVersion: multicluster.k8s.aws/v1alpha1
+apiVersion: multicluster.x-k8s.io/v1alpha1
 metadata:
  namespace: demo
  name: my-service-name
diff --git a/config/crd/bases/multicluster.x-k8s.io_serviceexports.yaml b/config/crd/bases/multicluster.x-k8s.io_serviceexports.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
-  name: serviceexports.multicluster.k8s.aws
+  name: serviceexports.multicluster.x-k8s.io
 spec:
-  group: multicluster.k8s.aws
+  group: multicluster.x-k8s.io
   names:
     kind: ServiceExport
     listKind: ServiceExportList
diff --git a/config/crd/bases/multicluster.x-k8s.io_serviceimports.yaml b/config/crd/bases/multicluster.x-k8s.io_serviceimports.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
-  name: serviceimports.multicluster.k8s.aws
+  name: serviceimports.multicluster.x-k8s.io
 spec:
-  group: multicluster.k8s.aws
+  group: multicluster.x-k8s.io
   names:
     kind: ServiceImport
     listKind: ServiceImportList
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,8 +2,8 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/multicluster.k8s.aws_serviceexports.yaml
-- bases/multicluster.k8s.aws_serviceimports.yaml
+- bases/multicluster.x-k8s.io_serviceexports.yaml
+- bases/multicluster.x-k8s.io_serviceimports.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:
diff --git a/config/crd/patches/cainjection_in_serviceexports.yaml b/config/crd/patches/cainjection_in_serviceexports.yaml
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: serviceexports.multicluster.k8s.aws
+  name: serviceexports.multicluster.x-k8s.io
diff --git a/config/crd/patches/cainjection_in_serviceimports.yaml b/config/crd/patches/cainjection_in_serviceimports.yaml
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: serviceimports.multicluster.k8s.aws
+  name: serviceimports.multicluster.x-k8s.io
diff --git a/config/crd/patches/webhook_in_serviceexports.yaml b/config/crd/patches/webhook_in_serviceexports.yaml
@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: serviceexports.multicluster.k8s.aws
+  name: serviceexports.multicluster.x-k8s.io
 spec:
   conversion:
     strategy: Webhook
diff --git a/config/crd/patches/webhook_in_serviceimports.yaml b/config/crd/patches/webhook_in_serviceimports.yaml
@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: serviceimports.multicluster.k8s.aws
+  name: serviceimports.multicluster.x-k8s.io
 spec:
   conversion:
     strategy: Webhook
diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml
@@ -8,4 +8,4 @@ webhook:
   port: 9443
 leaderElection:
   leaderElect: true
-  resourceName: db692913.k8s.aws
+  resourceName: db692913.x-k8s.io
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -7,7 +7,7 @@ metadata:
   name: manager-role
 rules:
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceexports
   verbs:
@@ -17,14 +17,14 @@ rules:
   - update
   - watch
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceexports/finalizers
   verbs:
   - get
   - update
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceimports
   verbs:
diff --git a/config/rbac/serviceexport_editor_role.yaml b/config/rbac/serviceexport_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: serviceexport-editor-role
 rules:
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceexports
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceexports/status
   verbs:
diff --git a/config/rbac/serviceexport_viewer_role.yaml b/config/rbac/serviceexport_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: serviceexport-viewer-role
 rules:
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceexports
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceexports/status
   verbs:
diff --git a/config/rbac/serviceimport_editor_role.yaml b/config/rbac/serviceimport_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: serviceimport-editor-role
 rules:
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceimports
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceimports/status
   verbs:
diff --git a/config/rbac/serviceimport_viewer_role.yaml b/config/rbac/serviceimport_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: serviceimport-viewer-role
 rules:
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceimports
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - multicluster.k8s.aws
+  - multicluster.x-k8s.io
   resources:
   - serviceimports/status
   verbs:
diff --git a/config/samples/multicluster_v1alpha1_serviceexport.yaml b/config/samples/multicluster_v1alpha1_serviceexport.yaml
@@ -1,4 +1,4 @@
-apiVersion: multicluster.k8s.aws/v1alpha1
+apiVersion: multicluster.x-k8s.io/v1alpha1
 kind: ServiceExport
 metadata:
   name: serviceexport-sample
diff --git a/config/samples/multicluster_v1alpha1_serviceimport.yaml b/config/samples/multicluster_v1alpha1_serviceimport.yaml
@@ -1,4 +1,4 @@
-apiVersion: multicluster.k8s.aws/v1alpha1
+apiVersion: multicluster.x-k8s.io/v1alpha1
 kind: ServiceImport
 metadata:
   name: serviceimport-sample
diff --git a/main.go b/main.go
@@ -75,7 +75,7 @@ func main() {
 		Port:                   9443,
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
-		LeaderElectionID:       "db692913.k8s.aws",
+		LeaderElectionID:       "db692913.x-k8s.io",
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to start manager")
diff --git a/pkg/api/v1alpha1/groupversion_info.go b/pkg/api/v1alpha1/groupversion_info.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package v1alpha1 contains API Schema definitions for the multicluster v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=multicluster.k8s.aws
+// +groupName=multicluster.x-k8s.io
 package v1alpha1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "multicluster.k8s.aws", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "multicluster.x-k8s.io", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
diff --git a/pkg/controllers/cloudmap_controller.go b/pkg/controllers/cloudmap_controller.go
@@ -33,7 +33,7 @@ type CloudMapReconciler struct {
 	logr.Logger
 }
 
-// +kubebuilder:rbac:groups=multicluster.k8s.aws,resources=serviceimports,verbs=get;list;update;patch
+// +kubebuilder:rbac:groups=multicluster.x-k8s.io,resources=serviceimports,verbs=get;list;update;patch
 
 // Start implements manager.Runnable
 func (r *CloudMapReconciler) Start(ctx context.Context) error {
diff --git a/pkg/controllers/serviceexport_controller.go b/pkg/controllers/serviceexport_controller.go
@@ -46,8 +46,8 @@ type ServiceExportReconciler struct {
 	Cloudmap cloudmap.ServiceDiscoveryClient
 }
 
-// +kubebuilder:rbac:groups=multicluster.k8s.aws,resources=serviceexports,verbs=get;list;watch;update;patch
-// +kubebuilder:rbac:groups=multicluster.k8s.aws,resources=serviceexports/finalizers,verbs=get;update
+// +kubebuilder:rbac:groups=multicluster.x-k8s.io,resources=serviceexports,verbs=get;list;watch;update;patch
+// +kubebuilder:rbac:groups=multicluster.x-k8s.io,resources=serviceexports/finalizers,verbs=get;update
 
 func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	ctx, cancel := context.WithCancel(ctx)
