Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: admin deploy and sed command error #5423

Merged
merged 5 commits into from
Feb 27, 2025
+42 −26
Merged

fix: admin deploy and sed command error #5423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e31aaf4
feat: sealos cloud deploy add a config in sealos-system
lingdie Feb 27, 2025
69ae3a7
feat: sealos cloud deploy add a config in sealos-system
lingdie Feb 27, 2025
eb5d055
fix higress
lingdie Feb 27, 2025
abc4271
Merge branch 'labring:main' into deploy-config
lingdie Feb 27, 2025
6039fee
fix: admin deploy and sed command error
lingdie Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions deploy/admin/scripts/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -32,3 +32,5 @@ function install_admin {
--env jwtInternal=$jwtInternal \
--env jwtGlobal=$jwtGlobal
}

install_admin
38 changes: 26 additions & 12 deletions deploy/cloud/scripts/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions scripts/cloud/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,8 @@ spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerm:
matchExpressions:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
tolerations:
Expand Down
Loading