feat(server): implement instance manage in server (#494)

* fix(core): fix app db user role missing Signed-off-by: maslow <wangfugen@126.com> * feat(server): implement instance manage in server Signed-off-by: maslow <wangfugen@126.com>
labring · Dec 7, 2022 · 7cf8694 · 7cf8694
1 parent 71e3a93
commit 7cf8694
Show file tree

Hide file tree

Showing 24 changed files with 1,014 additions and 490 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -46,6 +46,7 @@
     "fullname",
     "ghaction",
     "gonanoid",
+    "healthz",
     "hostpath",
     "Kube",
     "kubebuilder",

diff --git a/core/controllers/database/dbm/mongo.go b/core/controllers/database/dbm/mongo.go
@@ -34,7 +34,7 @@ func (m *MongoManager) CreateDatabase(databaseName string, username string, pass
 	command := bson.D{
 		{Key: "createUser", Value: username},
 		{Key: "pwd", Value: password},
-		{Key: "roles", Value: []bson.M{{"role": "readWrite", "db": databaseName}}}}
+		{Key: "roles", Value: []bson.M{{"role": "readWrite", "db": databaseName}, {"role": "dbAdmin", "db": databaseName}}}}
 
 	err := m.client.Database(databaseName).RunCommand(m.context, command).Decode(&result)
 	if err != nil {

diff --git a/deploy/scripts/README.md b/deploy/scripts/README.md
@@ -15,9 +15,6 @@ sh install-k8s.sh
 
 # setup laf core
 sh install-laf-core.sh
-
-# apply laf cluster resources
-kubectl apply -f init-laf/
 ```
 
 ## Create development environment on MacOS
@@ -40,9 +37,6 @@ sh init-vm.sh
 
 # setup laf core
 multipass exec laf-dev -- sudo -u root sh /laf/deploy/scripts/install-laf-core.sh 
-
-# apply laf cluster resource
-multipass exec laf-dev -- sudo -u root kubectl apply -f /laf/deploy/scripts/init-laf/
 ``` 
 
 3. Start laf server

diff --git a/deploy/scripts/install-laf-core.sh b/deploy/scripts/install-laf-core.sh
@@ -69,3 +69,6 @@ helm install apisix \
   --namespace laf \
   $CHARTS_DIR/apisix
 
+
+# init laf resources
+kubectl apply -f $SCRIPT_DIR/init-laf/
diff --git a/runtimes/nodejs/Dockerfile.init b/runtimes/nodejs/Dockerfile.init
@@ -17,4 +17,4 @@ RUN chown node:node /app/package.json
 RUN chown node:node /app/package-lock.json
 
 USER node
-CMD [ "node", "./dist/init.js" ]
+CMD [ "sh", "/app/init.sh" ]
diff --git a/runtimes/nodejs/init.sh b/runtimes/nodejs/init.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# echo "****** init start ******"
+exec node ./dist/init.js
+# echo "****** init end *******"