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.

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

release: sealos v5.0.1 beta2 #5110

Merged
merged 2 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/cloud-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
sudo mv /tmp/sealos /usr/bin/sealos
sudo sealos version
- name: Build
run: export CLOUD_VERSION=${{ github.event.release.tag_name }} && export ARCH=arm64 && bash ./scripts/cloud/build-offline-tar.sh
run: export CLOUD_VERSION=${{ github.event.release.tag_name }} && VERSION=${{ github.event.release.tag_name }} && export ARCH=arm64 && bash ./scripts/cloud/build-offline-tar.sh
- name: Setup ossutil
uses: manyuanrong/[email protected]
with:
Expand All @@ -111,4 +111,4 @@ jobs:
- name: Upload
run: |
ossutil cp ./sealos-cloud.tar.gz oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-arm64.tar.gz
ossutil cp ./sealos-cloud.tar.gz.md5 oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-arm64.tar.gz.md5
ossutil cp ./sealos-cloud.tar.gz.md5 oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-arm64.tar.gz.md5
36 changes: 34 additions & 2 deletions deploy/cloud/scripts/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ cockroachdbGlobalUri=""
localRegionUID=""

tlsCrtPlaceholder="<tls-crt-placeholder>"
tlsKeyPlaceholder="<tls-key-placeholder>"
acmednsSecretPlaceholder="<acmedns-secret-placeholder>"

saltKey=""
jwtInternal=""
jwtRegional=""
jwtGlobal=""

function prepare {
# source .env
Expand All @@ -36,6 +39,9 @@ function prepare {
# gen regionUID if not set or not found in secret
gen_regionUID

# gen jwt tokens
gen_jwt_tokens

# create tls secret
create_tls_secret
}
Expand Down Expand Up @@ -132,6 +138,7 @@ function gen_cockroachdbUri() {
cockroachdbGlobalUri="$cockroachdbUri/global"
}

# TODO: use a better way to check saltKey
function gen_saltKey() {
password_salt=$(kubectl get configmap desktop-frontend-config -n sealos -o jsonpath='{.data.config\.yaml}' | grep "salt:" | awk '{print $2}' 2>/dev/null | tr -d '"' || true)
if [[ -z "$password_salt" ]]; then
Expand All @@ -141,6 +148,28 @@ function gen_saltKey() {
fi
}

# TODO: use a better way to check jwt tokens
function gen_jwt_tokens() {
jwt_internal=$(kubectl get configmap desktop-frontend-config -n sealos -o jsonpath='{.data.config\.yaml}' | grep "internal:" | awk '{print $2}' 2>/dev/null | tr -d '"' || true)
if [[ -z "$jwt_internal" ]]; then
jwtInternal=$(tr -dc 'a-z0-9' </dev/urandom | head -c64)
else
jwtInternal=$jwt_internal
fi
jwt_regional=$(kubectl get configmap desktop-frontend-config -n sealos -o jsonpath='{.data.config\.yaml}' | grep "regional:" | awk '{print $2}' 2>/dev/null | tr -d '"' || true)
if [[ -z "$jwt_regional" ]]; then
jwtRegional=$(tr -dc 'a-z0-9' </dev/urandom | head -c64)
else
jwtRegional=$jwt_regional
fi
jwt_global=$(kubectl get configmap desktop-frontend-config -n sealos -o jsonpath='{.data.config\.yaml}' | grep "global:" | awk '{print $2}' 2>/dev/null | tr -d '"' || true)
if [[ -z "$jwt_global" ]]; then
jwtGlobal=$(tr -dc 'a-z0-9' </dev/urandom | head -c64)
else
jwtGlobal=$jwt_global
fi
}

function gen_regionUID(){
uid=$(kubectl get configmap desktop-frontend-config -n sealos -o jsonpath='{.data.config\.yaml}' | grep "regionUID:" | awk '{print $2}' 2>/dev/null | tr -d '"' || true)
if [[ -z "$uid" ]]; then
Expand Down Expand Up @@ -176,7 +205,10 @@ function sealos_run_desktop {
--env regionUID="$localRegionUID" \
--env databaseMongodbURI="${mongodbUri}/sealos-auth?authSource=admin" \
--env databaseLocalCockroachdbURI="$cockroachdbLocalUri" \
--env databaseGlobalCockroachdbURI="$cockroachdbGlobalUri"
--env databaseGlobalCockroachdbURI="$cockroachdbGlobalUri" \
--env jwtInternal="$jwtInternal" \
--env jwtRegional="$jwtRegional" \
--env jwtGlobal="$jwtGlobal"
}

function sealos_run_controller {
Expand Down
3 changes: 3 additions & 0 deletions frontend/desktop/deploy/Kubefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@ ENV databaseMongodbURI=""
ENV databaseGlobalCockroachdbURI=""
ENV databaseLocalCockroachdbURI=""
ENV passwordSalt="randomSalt"
ENV jwtInternal=""
ENV jwtRegional=""
ENV jwtGlobal=""

CMD ["bash scripts/init.sh"]
6 changes: 3 additions & 3 deletions frontend/desktop/deploy/manifests/configmap.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ data:
invite:
enabled: false
jwt:
internal: "<your-internal-jwt-secret>"
regional: "<your-regional-jwt-secret>"
global: "<your-global-jwt-secret>"
internal: "{{ .jwtInternal }}"
regional: "{{ .jwtRegional }}"
global: "{{ .jwtGlobal }}"
idp:
password:
enabled: true
Expand Down
3 changes: 0 additions & 3 deletions frontend/desktop/deploy/scripts/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,5 @@ if [[ -n "$cm_exists" ]]; then
echo "desktop-frontend-config already exists, skip create desktop config"
else
echo "create desktop config"
sed -i -e "s;<your-internal-jwt-secret>;$(tr -cd 'a-z0-9' </dev/urandom | head -c64);" manifests/configmap.yaml
sed -i -e "s;<your-regional-jwt-secret>;$(tr -cd 'a-z0-9' </dev/urandom | head -c64);" manifests/configmap.yaml
sed -i -e "s;<your-global-jwt-secret>;$(tr -cd 'a-z0-9' </dev/urandom | head -c64);" manifests/configmap.yaml
kubectl apply -f manifests/configmap.yaml --validate=false
fi
1 change: 1 addition & 0 deletions scripts/cloud/build-offline-tar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ images=(
docker.io/labring/kubeblocks-mongodb:v0.8.2
docker.io/labring/kubeblocks-postgresql:v0.8.2
docker.io/labring/kubeblocks-apecloud-mysql:v0.8.2
docker.io/labring/kubeblocks-csi-s3:v0.31.4
docker.io/labring/cockroach:v2.12.0
docker.io/labring/metrics-server:v0.6.4
)
Expand Down
6 changes: 4 additions & 2 deletions scripts/cloud/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ init() {
pull_image "kubeblocks-apecloud-mysql" "v${kubeblocks_version#v:-0.8.2}"
pull_image "kubeblocks-postgresql" "v${kubeblocks_version#v:-0.8.2}"
pull_image "kubeblocks-mongodb" "v${kubeblocks_version#v:-0.8.2}"
pull_image "kubeblocks-csi-s3" "v0.31.4"
pull_image "cockroach" "v2.12.0"
pull_image "metrics-server" "v${metrics_server_version#v:-0.6.4}"
pull_image "victoria-metrics-k8s-stack" "v${victoria_metrics_k8s_stack_version#v:-1.96.0}"
Expand Down Expand Up @@ -770,9 +771,10 @@ EOF
sealos run ${image_registry}/${image_repository}/kubeblocks-apecloud-mysql:v${kubeblocks_version#v:-0.8.2} \
${image_registry}/${image_repository}/kubeblocks-postgresql:v${kubeblocks_version#v:-0.8.2} \
${image_registry}/${image_repository}/kubeblocks-mongodb:v${kubeblocks_version#v:-0.8.2} \
${image_registry}/${image_repository}/kubeblocks-redis:v${kubeblocks_version#v:-0.8.2}
${image_registry}/${image_repository}/kubeblocks-redis:v${kubeblocks_version#v:-0.8.2} \
${image_registry}/${image_repository}/kubeblocks-csi-s3:v0.31.4

addons=("snapshot-controller" "csi-s3" "migration" "milvus" "weaviate")
addons=("snapshot-controller" "migration" "milvus" "weaviate")

for addon in "${addons[@]}"; do
kubectl patch addon $addon --type='merge' -p '{"spec":{"install":{"enabled":true,"resources":{},"tolerations":"[{\"effect\":\"NoSchedule\",\"key\":\"kb-controller\",\"operator\":\"Equal\",\"value\":\"true\"}]"}}}'
Expand Down
Loading