meshery · yash37158 · Nov 14, 2024
diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package v1alpha1 contains API Schema definitions for the meshery v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=meshery.layer5.io
+// +groupName=cloud.layer5.io
 package v1alpha1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "meshery.layer5.io", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "cloud.layer5.io", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/api/v1alpha1/meshsync_types_test.go b/api/v1alpha1/meshsync_types_test.go
@@ -29,7 +29,7 @@ var _ = Describe("The test case for the meshsync CRDs", func() {
 		FileManager  string = "testcase-meshsync"
 
 		Kind       string = "MeshSync"
-		APIVersion string = "meshery.layer5.io/v1alpha1"
+		APIVersion string = "cloud.layer5.io/v1alpha1"
 	)
 
 	meshSync := &MeshSync{

diff --git a/bundle/0.0.1/manifests/meshery-operator.clusterserviceversion.yaml b/bundle/0.0.1/manifests/meshery-operator.clusterserviceversion.yaml
@@ -5,7 +5,7 @@ metadata:
     alm-examples: |-
       [
         {
-          "apiVersion": "meshery.layer5.io/v1alpha1",
+          "apiVersion": "cloud.layer5.io/v1alpha1",
           "kind": "Broker",
           "metadata": {
             "annotations": {
@@ -24,7 +24,7 @@ metadata:
           }
         },
         {
-          "apiVersion": "meshery.layer5.io/v1alpha1",
+          "apiVersion": "cloud.layer5.io/v1alpha1",
           "kind": "MeshSync",
           "metadata": {
             "annotations": {
@@ -65,12 +65,12 @@ spec:
   customresourcedefinitions:
     owned:
     - kind: Broker
-      name: brokers.meshery.layer5.io
+      name: brokers.cloud.layer5.io
       version: v1alpha1
     - description: MeshSync is the Schema for the meshsyncs API
       displayName: Mesh Sync
       kind: MeshSync
-      name: meshsyncs.meshery.layer5.io
+      name: meshsyncs.cloud.layer5.io
       version: v1alpha1
   description: Meshery Operator is the multi-service mesh operator and implementation
     of MeshSync.
@@ -451,7 +451,7 @@ FnZVJlYWR5ccllPAAAAABJRU5ErkJggg=="
           - update
           - watch
         - apiGroups:
-          - meshery.layer5.io
+          - cloud.layer5.io
           resources:
           - brokers
           verbs:
@@ -463,7 +463,7 @@ FnZVJlYWR5ccllPAAAAABJRU5ErkJggg=="
           - update
           - watch
         - apiGroups:
-          - meshery.layer5.io
+          - cloud.layer5.io
           resources:
           - brokers/status
           verbs:

diff --git a/bundle/0.0.1/manifests/meshery.layer5.io_brokers.yaml b/bundle/0.0.1/manifests/meshery.layer5.io_brokers.yaml
@@ -4,9 +4,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.1
   creationTimestamp: null
-  name: brokers.meshery.layer5.io
+  name: brokers.cloud.layer5.io
 spec:
-  group: meshery.layer5.io
+  group: cloud.layer5.io
   names:
     kind: Broker
     listKind: BrokerList

diff --git a/bundle/0.0.1/manifests/meshery.layer5.io_meshsyncs.yaml b/bundle/0.0.1/manifests/meshery.layer5.io_meshsyncs.yaml
@@ -4,9 +4,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.1
   creationTimestamp: null
-  name: meshsyncs.meshery.layer5.io
+  name: meshsyncs.cloud.layer5.io
 spec:
-  group: meshery.layer5.io
+  group: cloud.layer5.io
   names:
     kind: MeshSync
     listKind: MeshSyncList

diff --git a/config/crd/bases/meshery.layer5.io_brokers.yaml b/config/crd/bases/meshery.layer5.io_brokers.yaml
@@ -5,9 +5,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
-  name: brokers.meshery.layer5.io
+  name: brokers.cloud.layer5.io
 spec:
-  group: meshery.layer5.io
+  group: cloud.layer5.io
   names:
     kind: Broker
     listKind: BrokerList

diff --git a/config/crd/bases/meshery.layer5.io_meshsyncs.yaml b/config/crd/bases/meshery.layer5.io_meshsyncs.yaml
@@ -5,9 +5,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
-  name: meshsyncs.meshery.layer5.io
+  name: meshsyncs.cloud.layer5.io
 spec:
-  group: meshery.layer5.io
+  group: cloud.layer5.io
   names:
     kind: MeshSync
     listKind: MeshSyncList

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/meshery.layer5.io_meshsyncs.yaml
-- bases/meshery.layer5.io_brokers.yaml
+- bases/cloud.layer5.io_meshsyncs.yaml
+- bases/cloud.layer5.io_brokers.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

diff --git a/config/crd/patches/cainjection_in_brokers.yaml b/config/crd/patches/cainjection_in_brokers.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: brokers.meshery.layer5.io
+  name: brokers.cloud.layer5.io
diff --git a/config/crd/patches/cainjection_in_meshsyncs.yaml b/config/crd/patches/cainjection_in_meshsyncs.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: meshsyncs.meshery.layer5.io
+  name: meshsyncs.cloud.layer5.io
diff --git a/config/crd/patches/webhook_in_brokers.yaml b/config/crd/patches/webhook_in_brokers.yaml
@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: brokers.meshery.layer5.io
+  name: brokers.cloud.layer5.io
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/crd/patches/webhook_in_meshsyncs.yaml b/config/crd/patches/webhook_in_meshsyncs.yaml
@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: meshsyncs.meshery.layer5.io
+  name: meshsyncs.cloud.layer5.io
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/manifests/bases/meshery-operator.clusterserviceversion.yaml b/config/manifests/bases/meshery-operator.clusterserviceversion.yaml
@@ -13,7 +13,7 @@ spec:
     - description: MeshSync is the Schema for the meshsyncs API
       displayName: Mesh Sync
       kind: MeshSync
-      name: meshsyncs.meshery.layer5.io
+      name: meshsyncs.cloud.layer5.io
       version: v1alpha1
   description: Meshery Operator is the multi-service mesh operator and implementation
     of MeshSync.

diff --git a/config/manifests/crd.yaml b/config/manifests/crd.yaml
@@ -4,9 +4,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
-  name: brokers.meshery.layer5.io
+  name: brokers.cloud.layer5.io
 spec:
-  group: meshery.layer5.io
+  group: cloud.layer5.io
   names:
     kind: Broker
     listKind: BrokerList
@@ -96,9 +96,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
-  name: meshsyncs.meshery.layer5.io
+  name: meshsyncs.cloud.layer5.io
 spec:
-  group: meshery.layer5.io
+  group: cloud.layer5.io
   names:
     kind: MeshSync
     listKind: MeshSyncList

diff --git a/config/manifests/default.yaml b/config/manifests/default.yaml
@@ -4,9 +4,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.1
   creationTimestamp: null
-  name: brokers.meshery.layer5.io
+  name: brokers.cloud.layer5.io
 spec:
-  group: meshery.layer5.io
+  group: cloud.layer5.io
   names:
     kind: Broker
     listKind: BrokerList
@@ -95,9 +95,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.6.1
   creationTimestamp: null
-  name: meshsyncs.meshery.layer5.io
+  name: meshsyncs.cloud.layer5.io
 spec:
-  group: meshery.layer5.io
+  group: cloud.layer5.io
   names:
     kind: MeshSync
     listKind: MeshSyncList
@@ -268,7 +268,7 @@ metadata:
   name: meshery-operator-role
 rules:
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - brokers
   verbs:
@@ -280,7 +280,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - brokers/status
   verbs:

diff --git a/config/manifests/rbac.yaml b/config/manifests/rbac.yaml
@@ -48,7 +48,7 @@ metadata:
   name: meshery-operator-role
 rules:
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - brokers
   verbs:
@@ -60,7 +60,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - brokers/status
   verbs:

diff --git a/config/rbac/broker_editor_role.yaml b/config/rbac/broker_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: broker-editor-role
 rules:
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - brokers
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - brokers/status
   verbs:

diff --git a/config/rbac/broker_viewer_role.yaml b/config/rbac/broker_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: broker-viewer-role
 rules:
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - brokers
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - brokers/status
   verbs:

diff --git a/config/rbac/meshsync_editor_role.yaml b/config/rbac/meshsync_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: meshsync-editor-role
 rules:
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - meshsyncs
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - meshsyncs/status
   verbs:

diff --git a/config/rbac/meshsync_viewer_role.yaml b/config/rbac/meshsync_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: meshsync-viewer-role
 rules:
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - meshsyncs
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - meshsyncs/status
   verbs:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -6,7 +6,7 @@ metadata:
   name: operator-role
 rules:
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - brokers
   verbs:
@@ -18,7 +18,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - meshery.layer5.io
+  - cloud.layer5.io
   resources:
   - brokers/status
   verbs:

diff --git a/config/samples/meshery_v1alpha1_broker.yaml b/config/samples/meshery_v1alpha1_broker.yaml
@@ -1,4 +1,4 @@
-apiVersion: meshery.layer5.io/v1alpha1
+apiVersion: cloud.layer5.io/v1alpha1
 kind: Broker
 metadata:
   name: meshery-broker

diff --git a/config/samples/meshery_v1alpha1_meshsync.yaml b/config/samples/meshery_v1alpha1_meshsync.yaml
@@ -1,4 +1,4 @@
-apiVersion: meshery.layer5.io/v1alpha1
+apiVersion: cloud.layer5.io/v1alpha1
 kind: MeshSync
 metadata:
   name: meshery-meshsync

diff --git a/controllers/broker_controller.go b/controllers/broker_controller.go
@@ -44,8 +44,8 @@ type BrokerReconciler struct {
 	Scheme     *runtime.Scheme
 }
 
-// +kubebuilder:rbac:groups=meshery.layer5.io,resources=brokers,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=meshery.layer5.io,resources=brokers/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=cloud.layer5.io,resources=brokers,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=cloud.layer5.io,resources=brokers/status,verbs=get;update;patch
 
 func (r *BrokerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := r.Log

diff --git a/controllers/broker_controller_test.go b/controllers/broker_controller_test.go
@@ -53,7 +53,7 @@ var _ = Describe("The test cases for customize resource: Broker's controller ",
 		namespace = "default"
 		broker := &v1alpha1.Broker{
 			TypeMeta: metav1.TypeMeta{
-				APIVersion: "meshery.layer5.io/v1alpha1",
+				APIVersion: "cloud.layer5.io/v1alpha1",
 				Kind:       "Broker",
 			},
 			ObjectMeta: metav1.ObjectMeta{

diff --git a/controllers/meshsync_controller.go b/controllers/meshsync_controller.go
@@ -47,8 +47,8 @@ type MeshSyncReconciler struct {
 	Scheme     *runtime.Scheme
 }
 
-// +kubebuilder:rbac:groups=meshery.layer5.io,resources=meshsyncs,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=meshery.layer5.io,resources=meshsyncs/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=cloud.layer5.io,resources=meshsyncs,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=cloud.layer5.io,resources=meshsyncs/status,verbs=get;update;patch
 func (r *MeshSyncReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := r.Log
 	log = log.WithValues("controller", "MeshSync")