From 6569cc7121120d0384d9758ad69febb12cfff14a Mon Sep 17 00:00:00 2001 From: yy <56745951+lingdie@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:46:06 +0800 Subject: [PATCH] chore: add launchpad monitor service. (#4653) Signed-off-by: yy --- deploy/cloud/init.sh | 2 ++ deploy/cloud/scripts/init.sh | 6 ++++-- scripts/cloud/install.sh | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/deploy/cloud/init.sh b/deploy/cloud/init.sh index bc103979ff4..529c7f35d8d 100644 --- a/deploy/cloud/init.sh +++ b/deploy/cloud/init.sh @@ -42,6 +42,7 @@ 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-launchpad-service:latest retryPullImage ghcr.io/labring/sealos-cloud-job-init-controller:latest retryPullImage ghcr.io/labring/sealos-cloud-job-heartbeat-controller:latest @@ -63,5 +64,6 @@ sealos save -o tars/frontend-cronjob.tar ghcr.io/labring/sealos-cloud-cronjob-fr 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/launchpad-service.tar ghcr.io/labring/sealos-cloud-launchpad-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 index 7b46828a159..934339e495d 100644 --- a/deploy/cloud/scripts/init.sh +++ b/deploy/cloud/scripts/init.sh @@ -276,9 +276,11 @@ function sealos_run_frontend { --env cloudPort="$cloudPort" \ --env certSecretName="wildcard-cert" - - echo "run db monitoring" + echo "run database monitoring" sealos run tars/database-service.tar + + echo "run launchpad monitoring" + sealos run tars/launchpad-service.tar } function resource_exists { diff --git a/scripts/cloud/install.sh b/scripts/cloud/install.sh index c69822068af..1f9346424ae 100644 --- a/scripts/cloud/install.sh +++ b/scripts/cloud/install.sh @@ -640,8 +640,8 @@ EOF get_prompt "ingress_installation" sealos run ${image_registry}/${image_repository}/ingress-nginx:v${ingress_nginx_version#v:-1.9.4} --config-file $CLOUD_DIR/ingress-nginx-config.yaml - sealos run ${image_registry}/${image_repository}/kubeblocks:v${kubeblocks_version#v:-0.8.2} \ - ${image_registry}/${image_repository}/kubeblocks-apecloud-mysql:v${kubeblocks_version#v:-0.8.2} \ + sealos run ${image_registry}/${image_repository}/kubeblocks:v${kubeblocks_version#v:-0.8.2} + 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} @@ -652,14 +652,14 @@ EOF get_prompt "installing_monitoring" sealos run "${image_registry}/${image_repository}/victoria-metrics-k8s-stack:v${victoria_metrics_k8s_stack_version#v:-1.96.0}" - kubectl patch cm kb-addon-prometheus-server -n kb-system --patch-file $CLOUD_DIR/kb-addon-prometheus-server-patch.yaml - get_prompt "patching_ingress" kubectl patch cm -n ingress-nginx ingress-nginx-controller --patch '{"data":{"allow-snippet-annotations":"true","annotation-value-word-blocklist":"load_module,lua_package,_by_lua,location,root,proxy_pass,serviceaccount"}}' kubectl -n ingress-nginx patch ds ingress-nginx-controller -p '{"spec":{"template":{"spec":{"tolerations":[{"key":"node-role.kubernetes.io/control-plane","operator":"Exists","effect":"NoSchedule"}]}}}}' kubectl get daemonset ingress-nginx-controller -n ingress-nginx -o json | grep https-port= >/dev/null || kubectl patch daemonset ingress-nginx-controller -n ingress-nginx --type='json' -p="[{'op': 'add', 'path': '/spec/template/spec/containers/0/args/-', 'value': '--https-port=${cloud_port:-443}'}]" kubectl get daemonset ingress-nginx-controller -n ingress-nginx -o json | grep default-ssl-certificate= >/dev/null || kubectl patch daemonset ingress-nginx-controller -n ingress-nginx --type='json' -p="[{'op': 'add', 'path': '/spec/template/spec/containers/0/args/-', 'value': '--default-ssl-certificate=sealos-system/wildcard-cert'}]" + kubectl patch cm kb-addon-prometheus-server -n kb-system --patch-file $CLOUD_DIR/kb-addon-prometheus-server-patch.yaml + get_prompt "installing_cloud" setMongoVersion