fix: admin deploy and sed command error

lingdie · Feb 27, 2025 · 6039fee · 6039fee
1 parent abc4271
commit 6039fee
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 24 deletions.
diff --git a/deploy/admin/scripts/init.sh b/deploy/admin/scripts/init.sh
@@ -1,18 +1,18 @@
 # get sealos config
 function get_sealos_config {
   # get cloudDomain from sealos-config configmap
-  cloudDomain=$(kubectl get configmap sealos-config -o jsonpath='{.data.cloudDomain}')
-  cloudPort=$(kubectl get configmap sealos-config -o jsonpath='{.data.cloudPort}')
-  certSecretName=$(kubectl get configmap sealos-config -o jsonpath='{.data.certSecretName}')
-  regionUID=$(kubectl get configmap sealos-config -o jsonpath='{.data.regionUID}')
-  databaseMongodbURI=$(kubectl get configmap sealos-config -o jsonpath='{.data.databaseMongodbURI}')
-  databaseGlobalCockroachdbURI=$(kubectl get configmap sealos-config -o jsonpath='{.data.databaseGlobalCockroachdbURI}')
-  databaseRegionalCockroachdbURI=$(kubectl get configmap sealos-config -o jsonpath='{.data.databaseRegionalCockroachdbURI}')
-  passwordEnabled=$(kubectl get configmap sealos-config -o jsonpath='{.data.passwordEnabled}')
-  passwordSalt=$(kubectl get configmap sealos-config -o jsonpath='{.data.passwordSalt}')
-  jwtInternal=$(kubectl get configmap sealos-config -o jsonpath='{.data.jwtInternal}')
-  jwtGlobal=$(kubectl get configmap sealos-config -o jsonpath='{.data.jwtGlobal}')
-  jwtRegional=$(kubectl get configmap sealos-config -o jsonpath='{.data.jwtRegional}')
+  cloudDomain=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.cloudDomain}')
+  cloudPort=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.cloudPort}')
+  certSecretName=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.certSecretName}')
+  regionUID=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.regionUID}')
+  databaseMongodbURI=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.databaseMongodbURI}')
+  databaseGlobalCockroachdbURI=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.databaseGlobalCockroachdbURI}')
+  databaseRegionalCockroachdbURI=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.databaseLocalCockroachdbURI}')
+  passwordEnabled=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.passwordEnabled}')
+  passwordSalt=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.passwordSalt}')
+  jwtInternal=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.jwtInternal}')
+  jwtGlobal=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.jwtGlobal}')
+  jwtRegional=$(kubectl get configmap sealos-config -n sealos-system -o jsonpath='{.data.jwtRegional}')
 }
 
 function install_admin {
@@ -32,3 +32,5 @@ function install_admin {
   --env jwtInternal=$jwtInternal \
   --env jwtGlobal=$jwtGlobal
 }
+
+install_admin
diff --git a/deploy/cloud/scripts/init.sh b/deploy/cloud/scripts/init.sh
@@ -211,18 +211,32 @@ function create_tls_secret {
 
 function update_sealos_config {
   # use generated values to update sealos-config configmap
-  sed -i "s/$cloudDomainPlaceholder/$cloudDomain/g" manifests/sealos-config.yaml
-  sed -i "s/$cloudPortPlaceholder/$cloudPort/g" manifests/sealos-config.yaml
-  sed -i "s/$certSecretNamePlaceholder/$certSecretName/g" manifests/sealos-config.yaml
-  sed -i "s/$regionUIDPlaceholder/$localRegionUID/g" manifests/sealos-config.yaml
-  sed -i "s/$databaseMongodbURIPlaceholder/$mongodbUri/g" manifests/sealos-config.yaml
-  sed -i "s/$databaseLocalCockroachdbURIPlaceholder/$cockroachdbLocalUri/g" manifests/sealos-config.yaml
-  sed -i "s/$databaseGlobalCockroachdbURIPlaceholder/$cockroachdbGlobalUri/g" manifests/sealos-config.yaml
-  sed -i "s/$passwordEnabledPlaceholder/$passwordEnabled/g" manifests/sealos-config.yaml
-  sed -i "s/$passwordSaltPlaceholder/$saltKey/g" manifests/sealos-config.yaml
-  sed -i "s/$jwtInternalPlaceholder/$jwtInternal/g" manifests/sealos-config.yaml
-  sed -i "s/$jwtRegionalPlaceholder/$jwtRegional/g" manifests/sealos-config.yaml
-  sed -i "s/$jwtGlobalPlaceholder/$jwtGlobal/g" manifests/sealos-config.yaml
+  echo "update sealos-config configmap"
+  echo "cloudDomain: $cloudDomain"
+  sed -i "s|$cloudDomainPlaceholder|$cloudDomain|g" manifests/sealos-config.yaml
+  echo "cloudPort: $cloudPort"
+  sed -i "s|$cloudPortPlaceholder|$cloudPort|g" manifests/sealos-config.yaml
+  echo "certSecretName: $certSecretName"
+  sed -i "s|$certSecretNamePlaceholder|$certSecretName|g" manifests/sealos-config.yaml
+  echo "regionUID: $localRegionUID"
+  sed -i "s|$regionUIDPlaceholder|$localRegionUID|g" manifests/sealos-config.yaml
+  echo "mongodbUri: $mongodbUri"
+  sed -i "s|$databaseMongodbURIPlaceholder|$mongodbUri|g" manifests/sealos-config.yaml
+  echo "cockroachdbLocalUri: $cockroachdbLocalUri"
+  sed -i "s|$databaseLocalCockroachdbURIPlaceholder|$cockroachdbLocalUri|g" manifests/sealos-config.yaml
+  echo "cockroachdbGlobalUri: $cockroachdbGlobalUri"
+  sed -i "s|$databaseGlobalCockroachdbURIPlaceholder|$cockroachdbGlobalUri|g" manifests/sealos-config.yaml
+  echo "passwordEnabled: $passwordEnabled"
+  sed -i "s|$passwordEnabledPlaceholder|$passwordEnabled|g" manifests/sealos-config.yaml
+  echo "passwordSalt: $saltKey"
+  sed -i "s|$passwordSaltPlaceholder|$saltKey|g" manifests/sealos-config.yaml
+  echo "jwtInternal: $jwtInternal"
+  sed -i "s|$jwtInternalPlaceholder|$jwtInternal|g" manifests/sealos-config.yaml
+  echo "jwtRegional: $jwtRegional"
+  sed -i "s|$jwtRegionalPlaceholder|$jwtRegional|g" manifests/sealos-config.yaml
+  echo "jwtGlobal: $jwtGlobal"
+  sed -i "s|$jwtGlobalPlaceholder|$jwtGlobal|g" manifests/sealos-config.yaml
+  echo "apply sealos-config configmap"
   kubectl apply -f manifests/sealos-config.yaml
 }