diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go index d1dc2166..1e97d7cd 100644 --- 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 index 57a613f2..9ad62dfc 100644 --- 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 index 5c2b753c..cd0f6f80 100644 --- 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 index 6917ef3d..e0d0d07a 100644 --- 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 index 9715ffa5..5ac093fe 100644 --- 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 index 30bbe501..f09e442c 100644 --- 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 index 4358c0da..f27aec2e 100644 --- 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 index b0b7de4c..fbaafc60 100644 --- 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 index 57cc0090..63d815b6 100644 --- 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 index 560ac46c..2ed807b8 100644 --- 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 index 20aae4c1..a1fc4c10 100644 --- 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 index 1b15541a..bd434e70 100644 --- 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 index df5cc647..a772f26d 100644 --- 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 index 3c7f4877..ae511bfa 100644 --- 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 index 8bdc97a0..fc83ee1f 100644 --- 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 index b9a70fe4..9141e933 100644 --- 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 index 3285996f..b4124b4b 100644 --- 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 index 1b0e3d7d..033afc58 100644 --- a/config/rbac/broker_viewer_role.yaml +++ b/config/rbac/broker_viewer_role.yaml @@ -5,7 +5,7 @@ metadata: name: broker-viewer-role rules: - apiGroups: - - meshery.layer5.io + - cloud.layer5.io resources: - brokers verbs: @@ -13,7 +13,7 @@ rules: - 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 index 6e590cfc..e46adc97 100644 --- 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 index da7aefa3..b5a35213 100644 --- a/config/rbac/meshsync_viewer_role.yaml +++ b/config/rbac/meshsync_viewer_role.yaml @@ -5,7 +5,7 @@ metadata: name: meshsync-viewer-role rules: - apiGroups: - - meshery.layer5.io + - cloud.layer5.io resources: - meshsyncs verbs: @@ -13,7 +13,7 @@ rules: - 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 index 3dd53f0a..5d367d70 100644 --- 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 index 4cbb2527..b5b16824 100644 --- 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 index 13cf3406..11ff71c0 100644 --- 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 index a160aa63..59de65a4 100644 --- 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 index 27df70bf..9e304fff 100644 --- 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 index 03c7a1ee..b0faedc5 100644 --- 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") diff --git a/controllers/meshsync_controller_test.go b/controllers/meshsync_controller_test.go index 5557307a..a5f34e24 100644 --- a/controllers/meshsync_controller_test.go +++ b/controllers/meshsync_controller_test.go @@ -50,7 +50,7 @@ var _ = Describe("The test cases for customize resource: MeshSync's controller " namespace = "default" meshSync := &v1alpha1.MeshSync{ TypeMeta: metav1.TypeMeta{ - APIVersion: "meshery.layer5.io/v1alpha1", + APIVersion: "cloud.layer5.io/v1alpha1", Kind: "MeshSync", }, ObjectMeta: metav1.ObjectMeta{ diff --git a/controllers/suit_test.go b/controllers/suit_test.go index 60dcb874..e01c0a79 100644 --- a/controllers/suit_test.go +++ b/controllers/suit_test.go @@ -140,9 +140,9 @@ var _ = BeforeSuite(func(ctx SpecContext) { crd := &apiv1.CustomResourceDefinition{} - err = k8sClient.Get(ctx, types.NamespacedName{Name: "meshsyncs.meshery.layer5.io"}, crd) + err = k8sClient.Get(ctx, types.NamespacedName{Name: "meshsyncs.cloud.layer5.io"}, crd) Expect(err).NotTo(HaveOccurred()) - err = k8sClient.Get(ctx, types.NamespacedName{Name: "brokers.meshery.layer5.io"}, crd) + err = k8sClient.Get(ctx, types.NamespacedName{Name: "brokers.cloud.layer5.io"}, crd) Expect(err).NotTo(HaveOccurred()) Expect(crd.Spec.Names.Kind).To(Equal("Broker")) }) diff --git a/main.go b/main.go index 51896276..3078e6cc 100644 --- a/main.go +++ b/main.go @@ -64,7 +64,7 @@ func main() { MetricsBindAddress: metricsAddr, Port: 9443, LeaderElection: enableLeaderElection, - LeaderElectionID: fmt.Sprintf("operator-%s.meshery.layer5.io", opID), + LeaderElectionID: fmt.Sprintf("operator-%s.cloud.layer5.io", opID), LeaderElectionNamespace: namespace, }) if err != nil { diff --git a/pkg/broker/suit_test.go b/pkg/broker/suit_test.go index d679e52f..e926ee42 100644 --- a/pkg/broker/suit_test.go +++ b/pkg/broker/suit_test.go @@ -96,9 +96,9 @@ var _ = BeforeSuite(func(ctx SpecContext) { crd := &apiv1.CustomResourceDefinition{} - err = k8sClient.Get(ctx, types.NamespacedName{Name: "meshsyncs.meshery.layer5.io"}, crd) + err = k8sClient.Get(ctx, types.NamespacedName{Name: "meshsyncs.cloud.layer5.io"}, crd) Expect(err).NotTo(HaveOccurred()) - err = k8sClient.Get(ctx, types.NamespacedName{Name: "brokers.meshery.layer5.io"}, crd) + err = k8sClient.Get(ctx, types.NamespacedName{Name: "brokers.cloud.layer5.io"}, crd) Expect(err).NotTo(HaveOccurred()) Expect(crd.Spec.Names.Kind).To(Equal("Broker")) })