Skip to content

Commit

Permalink
Domain Switch
Browse files Browse the repository at this point in the history
Signed-off-by: yash37158 <[email protected]>
  • Loading branch information
yash37158 committed Nov 14, 2024
1 parent 0eacb42 commit ce42b7f
Show file tree
Hide file tree
Showing 30 changed files with 59 additions and 59 deletions.
4 changes: 2 additions & 2 deletions api/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/meshsync_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
alm-examples: |-
[
{
"apiVersion": "meshery.layer5.io/v1alpha1",
"apiVersion": "cloud.layer5.io/v1alpha1",
"kind": "Broker",
"metadata": {
"annotations": {
Expand All @@ -24,7 +24,7 @@ metadata:
}
},
{
"apiVersion": "meshery.layer5.io/v1alpha1",
"apiVersion": "cloud.layer5.io/v1alpha1",
"kind": "MeshSync",
"metadata": {
"annotations": {
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -451,7 +451,7 @@ FnZVJlYWR5ccllPAAAAABJRU5ErkJggg=="
- update
- watch
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- brokers
verbs:
Expand All @@ -463,7 +463,7 @@ FnZVJlYWR5ccllPAAAAABJRU5ErkJggg=="
- update
- watch
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- brokers/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions bundle/0.0.1/manifests/meshery.layer5.io_brokers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions bundle/0.0.1/manifests/meshery.layer5.io_meshsyncs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/meshery.layer5.io_brokers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/meshery.layer5.io_meshsyncs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/patches/cainjection_in_brokers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/crd/patches/cainjection_in_meshsyncs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/crd/patches/webhook_in_brokers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/patches/webhook_in_meshsyncs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions config/manifests/crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions config/manifests/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -268,7 +268,7 @@ metadata:
name: meshery-operator-role
rules:
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- brokers
verbs:
Expand All @@ -280,7 +280,7 @@ rules:
- update
- watch
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- brokers/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/manifests/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ metadata:
name: meshery-operator-role
rules:
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- brokers
verbs:
Expand All @@ -60,7 +60,7 @@ rules:
- update
- watch
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- brokers/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/broker_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: broker-editor-role
rules:
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- brokers
verbs:
Expand All @@ -17,7 +17,7 @@ rules:
- update
- watch
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- brokers/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/broker_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/meshsync_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: meshsync-editor-role
rules:
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- meshsyncs
verbs:
Expand All @@ -17,7 +17,7 @@ rules:
- update
- watch
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- meshsyncs/status
verbs:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/meshsync_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: operator-role
rules:
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- brokers
verbs:
Expand All @@ -18,7 +18,7 @@ rules:
- update
- watch
- apiGroups:
- meshery.layer5.io
- cloud.layer5.io
resources:
- brokers/status
verbs:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/meshery_v1alpha1_broker.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: meshery.layer5.io/v1alpha1
apiVersion: cloud.layer5.io/v1alpha1
kind: Broker
metadata:
name: meshery-broker
Expand Down
2 changes: 1 addition & 1 deletion config/samples/meshery_v1alpha1_meshsync.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: meshery.layer5.io/v1alpha1
apiVersion: cloud.layer5.io/v1alpha1
kind: MeshSync
metadata:
name: meshery-meshsync
Expand Down
4 changes: 2 additions & 2 deletions controllers/broker_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion controllers/broker_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions controllers/meshsync_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading

0 comments on commit ce42b7f

Please sign in to comment.