rename README
diff --git a/README.md b/README.md
index fcfc9dd..175e3d8 100644
--- a/README.md
+++ b/README.md
@@ -47,17 +47,17 @@
RocketMQ Operator provides several CRDs to allow users define their RocketMQ service component cluster, which includes the Namesrv cluster and the Broker cluster.
-1. Check the file ```rocketmq_v1alpha1_metaservice_cr.yaml``` in the ```deploy/crds``` directory, for example:
+1. Check the file ```rocketmq_v1alpha1_nameservice_cr.yaml``` in the ```deploy/crds``` directory, for example:
```
-apiVersion: rocketmq.operator.com/v1alpha1
-kind: MetaService
+apiVersion: rocketmq.apache.org/v1alpha1
+kind: NameService
metadata:
- name: meta-service
+ name: name-service
spec:
# size is the the name service instance number of the name service cluster
size: 1
- # metaServiceImage is the customized docker image repo of the RocketMQ name service
- metaServiceImage: 2019liurui/rocketmq-namesrv:4.5.0-alpine
+ # nameServiceImage is the customized docker image repo of the RocketMQ name service
+ nameServiceImage: 2019liurui/rocketmq-namesrv:4.5.0-alpine
# imagePullPolicy is the image pull policy
imagePullPolicy: Always
# volumeClaimTemplates defines the storageClass
@@ -77,7 +77,7 @@
2. Check the file ```cache_v1alpha1_broker_cr.yaml``` in the ```deploy/crds``` directory, for example:
```
-apiVersion: cache.example.com/v1alpha1
+apiVersion: rocketmq.apache.org/v1alpha1
kind: Broker
metadata:
name: broker
@@ -94,6 +94,8 @@
brokerImage: 2019liurui/rocketmq-broker:4.5.0-alpine
# imagePullPolicy is the image pull policy
imagePullPolicy: Always
+ # allowRestart defines whether allow pod restart
+ allowRestart: false
# volumeClaimTemplates defines the storageClass
volumeClaimTemplates:
- metadata:
@@ -129,8 +131,8 @@
2. Deploy the RocketMQ name service cluster by running:
```
-$ kubectl apply -f deploy/crds/rocketmq_v1alpha1_metaservice_cr.yaml
-metaservice.rocketmq.operator.com/meta-service created
+$ kubectl apply -f deploy/crds/rocketmq_v1alpha1_nameservice_cr.yaml
+nameservice.rocketmq.apache.org/name-service created
```
Check the status:
@@ -138,7 +140,7 @@
```
$ kubectl get pods -owide
NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
-meta-service-0 1/1 Running 0 3m18s 192.168.130.33 k2data-13 <none> <none>
+name-service-0 1/1 Running 0 3m18s 192.168.130.33 k2data-13 <none> <none>
nfs-client-provisioner-7cf858f754-7vxmm 1/1 Running 0 150m 10.244.2.114 k2data-14 <none> <none>
rocketmq-operator-564b5d75d-jllzk 1/1 Running 0 5m53s 10.244.2.116 k2data-14 <none> <none>
```
@@ -160,7 +162,7 @@
broker-0-replica-1-0 1/1 Running 0 38s 10.244.1.128 k2data-13 <none> <none>
broker-1-master-0 1/1 Running 0 38s 10.244.2.117 k2data-14 <none> <none>
broker-1-replica-1-0 1/1 Running 0 38s 10.244.3.17 k2data-15 <none> <none>
-meta-service-0 1/1 Running 0 6m7s 192.168.130.33 k2data-13 <none> <none>
+name-service-0 1/1 Running 0 6m7s 192.168.130.33 k2data-13 <none> <none>
nfs-client-provisioner-7cf858f754-7vxmm 1/1 Running 0 153m 10.244.2.114 k2data-14 <none> <none>
rocketmq-operator-564b5d75d-jllzk 1/1 Running 0 8m42s 10.244.2.116 k2data-14 <none> <none>
```
@@ -173,13 +175,13 @@
broker-storage-broker-0-replica-1-0 Bound pvc-521e7e9a-3795-487a-9f76-22da74db74dd 8Gi RWO rocketmq-storage 78s
broker-storage-broker-1-master-0 Bound pvc-d7b76efe-384c-4f8d-9e8a-ebe209ba826c 8Gi RWO rocketmq-storage 78s
broker-storage-broker-1-replica-1-0 Bound pvc-af266db9-83a9-4929-a2fe-e40fb5fdbfa4 8Gi RWO rocketmq-storage 78s
-namesrv-storage-meta-service-0 Bound pvc-c708cb49-aa52-4992-8cac-f46a48e2cc2e 1Gi RWO rocketmq-storage 79s
+namesrv-storage-name-service-0 Bound pvc-c708cb49-aa52-4992-8cac-f46a48e2cc2e 1Gi RWO rocketmq-storage 79s
$ kubectl get pv
NAME CAPACITY ACCESS MODES RECLAIM POLICY STATUS CLAIM STORAGECLASS REASON AGE
pvc-521e7e9a-3795-487a-9f76-22da74db74dd 8Gi RWO Delete Bound default/broker-storage-broker-0-replica-1-0 rocketmq-storage 79s
pvc-7a74871b-c005-441a-bb15-8106566c9d19 8Gi RWO Delete Bound default/broker-storage-broker-0-master-0 rocketmq-storage 79s
pvc-af266db9-83a9-4929-a2fe-e40fb5fdbfa4 8Gi RWO Delete Bound default/broker-storage-broker-1-replica-1-0 rocketmq-storage 78s
-pvc-c708cb49-aa52-4992-8cac-f46a48e2cc2e 1Gi RWO Delete Bound default/namesrv-storage-meta-service-0 rocketmq-storage 79s
+pvc-c708cb49-aa52-4992-8cac-f46a48e2cc2e 1Gi RWO Delete Bound default/namesrv-storage-name-service-0 rocketmq-storage 79s
pvc-d7b76efe-384c-4f8d-9e8a-ebe209ba826c 8Gi RWO Delete Bound default/broker-storage-broker-1-master-0 rocketmq-storage 78s
```
@@ -193,7 +195,7 @@
$ cd /data/k8s/
$ ls
default-broker-storage-broker-0-master-0-pvc-7a74871b-c005-441a-bb15-8106566c9d19 default-broker-storage-broker-1-replica-1-0-pvc-af266db9-83a9-4929-a2fe-e40fb5fdbfa4
-default-broker-storage-broker-0-replica-1-0-pvc-521e7e9a-3795-487a-9f76-22da74db74dd default-namesrv-storage-meta-service-0-pvc-c708cb49-aa52-4992-8cac-f46a48e2cc2e
+default-broker-storage-broker-0-replica-1-0-pvc-521e7e9a-3795-487a-9f76-22da74db74dd default-namesrv-storage-name-service-0-pvc-c708cb49-aa52-4992-8cac-f46a48e2cc2e
default-broker-storage-broker-1-master-0-pvc-d7b76efe-384c-4f8d-9e8a-ebe209ba826c
$ ls default-broker-storage-broker-1-master-0-pvc-d7b76efe-384c-4f8d-9e8a-ebe209ba826c/logs/rocketmqlogs/
broker_default.log broker.log commercial.log filter.log lock.log protection.log remoting.log stats.log storeerror.log store.log transaction.log watermark.log
@@ -216,7 +218,7 @@
to remove the name service clusters:
```
-$ kubectl delete -f deploy/crds/rocketmq_v1alpha1_metaservice_cr.yaml
+$ kubectl delete -f deploy/crds/rocketmq_v1alpha1_nameservice_cr.yaml
```
to remove the RocketMQ Operator:
diff --git a/deploy/role.yaml b/deploy/role.yaml
index a6d4419..e8801d6 100644
--- a/deploy/role.yaml
+++ b/deploy/role.yaml
@@ -47,18 +47,6 @@
verbs:
- update
- apiGroups:
- - cache.example.com
- resources:
- - '*'
- verbs:
- - '*'
-- apiGroups:
- - rocketmq.operator.com
- resources:
- - '*'
- verbs:
- - '*'
-- apiGroups:
- rocketmq.apache.org
resources:
- '*'
diff --git a/pkg/apis/rocketmq/v1alpha1/doc.go b/pkg/apis/rocketmq/v1alpha1/doc.go
index 45ae331..04cafd4 100644
--- a/pkg/apis/rocketmq/v1alpha1/doc.go
+++ b/pkg/apis/rocketmq/v1alpha1/doc.go
@@ -17,5 +17,5 @@
// Package v1alpha1 contains API Schema definitions for the rocketmq v1alpha1 API group
// +k8s:deepcopy-gen=package,register
-// +groupName=rocketmq.operator.com
+// +groupName=rocketmq.apache.org
package v1alpha1
diff --git a/pkg/apis/rocketmq/v1alpha1/register.go b/pkg/apis/rocketmq/v1alpha1/register.go
index d663d51..c1bd895 100644
--- a/pkg/apis/rocketmq/v1alpha1/register.go
+++ b/pkg/apis/rocketmq/v1alpha1/register.go
@@ -19,7 +19,7 @@
// Package v1alpha1 contains API Schema definitions for the rocketmq v1alpha1 API group
// +k8s:deepcopy-gen=package,register
-// +groupName=rocketmq.operator.com
+// +groupName=rocketmq.apache.org
package v1alpha1
import (
@@ -29,7 +29,7 @@
var (
// SchemeGroupVersion is group version used to register these objects
- SchemeGroupVersion = schema.GroupVersion{Group: "rocketmq.operator.com", Version: "v1alpha1"}
+ SchemeGroupVersion = schema.GroupVersion{Group: "rocketmq.apache.org", Version: "v1alpha1"}
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
diff --git a/pkg/controller/broker/broker_controller_test.go b/pkg/controller/broker/broker_controller_test.go
index 6aba3cf..aafb8bb 100644
--- a/pkg/controller/broker/broker_controller_test.go
+++ b/pkg/controller/broker/broker_controller_test.go
@@ -24,7 +24,7 @@
"strconv"
"testing"
- cachev1alpha1 "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis/cache/v1alpha1"
+ rocketmqv1alpha1 "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
@@ -50,12 +50,12 @@
)
// A Broker resource with metadata and spec.
- broker := &cachev1alpha1.Broker{
+ broker := &rocketmqv1alpha1.Broker{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
},
- Spec: cachev1alpha1.BrokerSpec{
+ Spec: rocketmqv1alpha1.BrokerSpec{
Size: replicas, // Set desired number of Broker replicas.
},
}
@@ -66,7 +66,7 @@
// Register operator types with the runtime scheme.
s := scheme.Scheme
- s.AddKnownTypes(cachev1alpha1.SchemeGroupVersion, broker)
+ s.AddKnownTypes(rocketmqv1alpha1.SchemeGroupVersion, broker)
// Create a fake client to mock API calls.
cl := fake.NewFakeClient(objs...)
// Create a ReconcileBroker object with the scheme and fake client.
@@ -129,7 +129,7 @@
}
// Get the updated Broker object.
- broker = &cachev1alpha1.Broker{}
+ broker = &rocketmqv1alpha1.Broker{}
err = r.client.Get(context.TODO(), req.NamespacedName, broker)
if err != nil {
t.Errorf("get broker: (%v)", err)
diff --git a/test/e2e/memcached_test.go b/test/e2e/memcached_test.go
index 5693e97..52d01f2 100644
--- a/test/e2e/memcached_test.go
+++ b/test/e2e/memcached_test.go
@@ -21,7 +21,7 @@
"time"
apis "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis"
- operator "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis/cache/v1alpha1"
+ operator "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
framework "github.com/operator-framework/operator-sdk/pkg/test"
"github.com/operator-framework/operator-sdk/pkg/test/e2eutil"
