adapt cockroachdb for license & init job

labring · Mar 15, 2024 · 4c9a0ff · 4c9a0ff
1 parent ae252be
commit 4c9a0ff
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/deploy/cloud/etc/sealos/desktop-config.yaml b/deploy/cloud/etc/sealos/desktop-config.yaml
@@ -15,3 +15,4 @@ spec:
       jwt_secret_region: <your-jwt-secret-region-base64>
       region_database_url: <your-region-database-url-base64>
       global_database_url: <your-global-database-url-base64>
+      region_uid: <your-local-region-uid-base64>
diff --git a/deploy/cloud/init.sh b/deploy/cloud/init.sh
@@ -41,6 +41,7 @@ retryPullImage ghcr.io/labring/sealos-cloud-license-frontend:latest
 retryPullImage ghcr.io/labring/sealos-cloud-cronjob-frontend:latest
 
 retryPullImage ghcr.io/labring/sealos-cloud-database-service:latest
+retryPullImage ghcr.io/labring/sealos-cloud-account-service:latest
 retryPullImage ghcr.io/labring/sealos-cloud-job-init-controller:latest
 retryPullImage ghcr.io/labring/sealos-cloud-job-heartbeat-controller:latest
 
@@ -61,5 +62,6 @@ sealos save -o tars/frontend-license.tar ghcr.io/labring/sealos-cloud-license-fr
 sealos save -o tars/frontend-cronjob.tar ghcr.io/labring/sealos-cloud-cronjob-frontend:latest
 
 sealos save -o tars/database-service.tar ghcr.io/labring/sealos-cloud-database-service:latest
+sealos save -o tars/account-service.tar ghcr.io/labring/sealos-cloud-account-service:latest
 sealos save -o tars/job-init.tar ghcr.io/labring/sealos-cloud-job-init-controller:latest
 sealos save -o tars/job-heartbeat.tar ghcr.io/labring/sealos-cloud-job-heartbeat-controller:latest
diff --git a/deploy/cloud/scripts/init.sh b/deploy/cloud/scripts/init.sh
@@ -7,6 +7,7 @@ mongodbUri=""
 cockroachdbUri=""
 cockroachdbLocalUri=""
 cockroachdbGlobalUri=""
+defaultLocalRegionUID="ed257b4d-6832-437a-9e06-d683e7edb320"
 
 tlsCrtPlaceholder="<tls-crt-placeholder>"
 tlsKeyPlaceholder="<tls-key-placeholder>"
@@ -142,6 +143,7 @@ function mutate_desktop_config() {
     sed -i -e "s;<your-password-salt-base64>;$saltKey;" etc/sealos/desktop-config.yaml
     sed -i -e "s;<your-region-database-url-base64>;$(echo -n "${cockroachdbLocalUri}" | base64 -w 0);" etc/sealos/desktop-config.yaml
     sed -i -e "s;<your-global-database-url-base64>;$(echo -n "${cockroachdbGlobalUri}" | base64 -w 0);" etc/sealos/desktop-config.yaml
+    sed -i -e "s;<your-global-database-url-base64>;$(echo -n "${defaultLocalRegionUID}" | base64 -w 0);" etc/sealos/desktop-config.yaml
 }
 
 function create_tls_secret {
@@ -181,16 +183,20 @@ function sealos_run_controller {
   --env MONGO_URI="$mongodbUri" \
   --env cloudDomain="$cloudDomain" \
   --env cloudPort="$cloudPort" \
-  --env DEFAULT_NAMESPACE="account-system"
+  --env DEFAULT_NAMESPACE="account-system" \
+  --env GLOBAL_COCKROACH_URI="$cockroachdbGlobalUri" \
+  --env LOCAL_COCKROACH_URI="$cockroachdbLocalUri" \
+  --env LOCAL_REGION="$defaultLocalRegionUID"
+
+  sealos run tars/account-service.tar
 
   # run license controller
-#  sealos run tars/license.tar \
-#  --env MONGO_URI="$mongodbUri"
+  sealos run tars/license.tar
 }
 
 
 function sealos_authorize {
-  sealos run tars/job-init.tar
+  sealos run tars/job-init.tar --env PASSWORD_SALT="$(echo -n "$saltKey" | base64 -d)"
   sealos run tars/job-heartbeat.tar
 
   # wait for admin user create
@@ -212,7 +218,7 @@ function sealos_run_frontend {
 
   # sealos authorize !!must run after sealos_run_controller frontend-desktop.tar and before sealos_run_frontend
   # TODO fix sealos_authorize in controller/job/init
-  # sealos_authorize
+  sealos_authorize
 
   echo "run applaunchpad frontend"
   sealos run tars/frontend-applaunchpad.tar \

diff --git a/frontend/desktop/deploy/manifests/secret.yaml b/frontend/desktop/deploy/manifests/secret.yaml
@@ -23,9 +23,6 @@ data:
   # base64 encoded provider jwt secret, required
   jwt_secret_app: ""
 
-  # base64 encoded current region , required
-  # default value is "ed257b4d-6832-437a-9e06-d683e7edb320"
-  region_uid: "ZWQyNTdiNGQtNjgzMi00MzdhLTllMDYtZDY4M2U3ZWRiMzIw"
   # base64 encoded password salt, required if env PASSWORD_ENABLED is true
   # please use a random string and do not change it after deployment
   password_salt: ""