refactor(*): change code path name operator-sdk-samples to apache
diff --git a/README.md b/README.md
index d1898c5..be48093 100644
--- a/README.md
+++ b/README.md
@@ -373,4 +373,9 @@
$ ./remove-storage-class.sh
```
-> Note: the NFS persistence data will not be deleted by default.
\ No newline at end of file
+> Note: the NFS persistence data will not be deleted by default.
+
+
+```kubectl apply -f rocketmq-operator.yaml```
+
+```kubectl apply -f rocketmq-cluster.yaml```
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 0dfbde9..26e2573 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -24,8 +24,8 @@
"os"
"runtime"
- "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis"
- "github.com/operator-sdk-samples/rocketmq-operator/pkg/controller"
+ "github.com/apache/rocketmq-operator/pkg/apis"
+ "github.com/apache/rocketmq-operator/pkg/controller"
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/leader"
diff --git a/go.mod b/go.mod
index 743d676..51349d8 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/operator-sdk-samples/rocketmq-operator
+module github.com/apache/rocketmq-operator
go 1.12
diff --git a/pkg/apis/addtoscheme_rocketmq_v1alpha1.go b/pkg/apis/addtoscheme_rocketmq_v1alpha1.go
index fed371c..33a478d 100644
--- a/pkg/apis/addtoscheme_rocketmq_v1alpha1.go
+++ b/pkg/apis/addtoscheme_rocketmq_v1alpha1.go
@@ -18,7 +18,7 @@
package apis
import (
- "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
+ "github.com/apache/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
)
func init() {
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
index 5c2b8ba..f6ed7a4 100644
--- a/pkg/constants/constants.go
+++ b/pkg/constants/constants.go
@@ -20,6 +20,7 @@
const BrokerClusterPrefix = "broker-cluster-"
const BrokerContainerName = "broker"
const AdminToolDir = "/home/rocketmq/rocketmq-4.5.0/bin/mqadmin"
+const StoreConfigDir = "/home/rocketmq/store/config"
const TopicJsonDir = "/home/rocketmq/store/config/topics.json"
const SubscriptionGroupJsonDir = "/home/rocketmq/store/config/subscriptionGroup.json"
const UpdateBrokerConfig = "updateBrokerConfig"
diff --git a/pkg/controller/add_broker.go b/pkg/controller/add_broker.go
index f4f6b56..e04c181 100644
--- a/pkg/controller/add_broker.go
+++ b/pkg/controller/add_broker.go
@@ -18,7 +18,7 @@
package controller
import (
- "github.com/operator-sdk-samples/rocketmq-operator/pkg/controller/broker"
+ "github.com/apache/rocketmq-operator/pkg/controller/broker"
)
func init() {
diff --git a/pkg/controller/add_nameservice.go b/pkg/controller/add_nameservice.go
index 6fbe28f..51b8560 100644
--- a/pkg/controller/add_nameservice.go
+++ b/pkg/controller/add_nameservice.go
@@ -18,7 +18,7 @@
package controller
import (
- "github.com/operator-sdk-samples/rocketmq-operator/pkg/controller/nameservice"
+ "github.com/apache/rocketmq-operator/pkg/controller/nameservice"
)
func init() {
diff --git a/pkg/controller/broker/broker_controller.go b/pkg/controller/broker/broker_controller.go
index 1058449..d40a37c 100644
--- a/pkg/controller/broker/broker_controller.go
+++ b/pkg/controller/broker/broker_controller.go
@@ -24,10 +24,10 @@
"strings"
"time"
- rocketmqv1alpha1 "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
- cons "github.com/operator-sdk-samples/rocketmq-operator/pkg/constants"
- "github.com/operator-sdk-samples/rocketmq-operator/pkg/share"
- "github.com/operator-sdk-samples/rocketmq-operator/pkg/tool"
+ rocketmqv1alpha1 "github.com/apache/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
+ cons "github.com/apache/rocketmq-operator/pkg/constants"
+ "github.com/apache/rocketmq-operator/pkg/share"
+ "github.com/apache/rocketmq-operator/pkg/tool"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
@@ -258,7 +258,9 @@
log.Info("topicsCommand: " + topicsCommand)
subscriptionGroupCommand := getCopyMetadataJsonCommand(cons.SubscriptionGroupJsonDir, sourcePodName, broker.Namespace, k8s)
log.Info("subscriptionGroupCommand: " + subscriptionGroupCommand)
- cmd = []string{"/bin/bash", "-c", topicsCommand + " && " + subscriptionGroupCommand}
+ MakeConfigDirCommand := "mkdir -p " + cons.StoreConfigDir
+ ChmodDirCommand := "chmod a+rw -R " + cons.StoreConfigDir
+ cmd = []string{"/bin/bash", "-c", MakeConfigDirCommand + " && " + ChmodDirCommand + " && " + topicsCommand + " && " + subscriptionGroupCommand}
}
}
diff --git a/pkg/controller/broker/broker_controller_test.go b/pkg/controller/broker/broker_controller_test.go
index aafb8bb..fc28059 100644
--- a/pkg/controller/broker/broker_controller_test.go
+++ b/pkg/controller/broker/broker_controller_test.go
@@ -24,7 +24,7 @@
"strconv"
"testing"
- rocketmqv1alpha1 "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
+ rocketmqv1alpha1 "github.com/apache/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/controller/nameservice/nameservice_controller.go b/pkg/controller/nameservice/nameservice_controller.go
index 434dd6d..6c0db47 100644
--- a/pkg/controller/nameservice/nameservice_controller.go
+++ b/pkg/controller/nameservice/nameservice_controller.go
@@ -24,9 +24,9 @@
"strconv"
"time"
- rocketmqv1alpha1 "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
- cons "github.com/operator-sdk-samples/rocketmq-operator/pkg/constants"
- "github.com/operator-sdk-samples/rocketmq-operator/pkg/share"
+ rocketmqv1alpha1 "github.com/apache/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
+ cons "github.com/apache/rocketmq-operator/pkg/constants"
+ "github.com/apache/rocketmq-operator/pkg/share"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
diff --git a/test/e2e/memcached_test.go b/test/e2e/memcached_test.go
index 52d01f2..8730194 100644
--- a/test/e2e/memcached_test.go
+++ b/test/e2e/memcached_test.go
@@ -20,8 +20,8 @@
"testing"
"time"
- apis "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis"
- operator "github.com/operator-sdk-samples/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
+ apis "github.com/apache/rocketmq-operator/pkg/apis"
+ operator "github.com/apache/rocketmq-operator/pkg/apis/rocketmq/v1alpha1"
framework "github.com/operator-framework/operator-sdk/pkg/test"
"github.com/operator-framework/operator-sdk/pkg/test/e2eutil"
