From 9e56438cef2a03a8c0706720d2179a3d9487f66a Mon Sep 17 00:00:00 2001 From: yy Date: Mon, 3 Jul 2023 11:16:28 +0800 Subject: [PATCH 1/2] fix deploy of desktop and dbprovider --- frontend/desktop/deploy/manifests/deploy.yaml.tmpl | 7 +++++++ .../providers/dbprovider/deploy/manifests/deploy.yaml.tmpl | 3 +++ 2 files changed, 10 insertions(+) diff --git a/frontend/desktop/deploy/manifests/deploy.yaml.tmpl b/frontend/desktop/deploy/manifests/deploy.yaml.tmpl index 09fff2a2779..cfb4bba3467 100644 --- a/frontend/desktop/deploy/manifests/deploy.yaml.tmpl +++ b/frontend/desktop/deploy/manifests/deploy.yaml.tmpl @@ -90,6 +90,13 @@ spec: - name: SMS_ENABLED value: '{{ .smsEnabled }}' + # password login env + - name: PASSWORD_SALT + valueFrom: + secretKeyRef: + name: desktop-frontend-secret + key: password_salt + # github login env - name: GITHUB_CLIENT_ID valueFrom: diff --git a/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl index d05a9610cb0..d252cb25a7f 100644 --- a/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl +++ b/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl @@ -37,6 +37,9 @@ spec: serviceAccountName: cluster-version-reader containers: - name: dbprovider-frontend + env: + - name: SEALOS_DOMAIN + value: {{ .cloudDomain }} securityContext: runAsNonRoot: true runAsUser: 1001 From 923c62eec7ca8ba68505560e9b091e34bf556172 Mon Sep 17 00:00:00 2001 From: yy Date: Tue, 4 Jul 2023 11:23:22 +0800 Subject: [PATCH 2/2] add image shim for ttyd image and nginx --- frontend/providers/applaunchpad/deploy/images/shim/images | 1 + frontend/providers/terminal/.env | 2 +- frontend/providers/terminal/deploy/Kubefile | 2 +- frontend/providers/terminal/deploy/images/shim/imagelist | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 frontend/providers/applaunchpad/deploy/images/shim/images create mode 100644 frontend/providers/terminal/deploy/images/shim/imagelist diff --git a/frontend/providers/applaunchpad/deploy/images/shim/images b/frontend/providers/applaunchpad/deploy/images/shim/images new file mode 100644 index 00000000000..76d6e816388 --- /dev/null +++ b/frontend/providers/applaunchpad/deploy/images/shim/images @@ -0,0 +1 @@ +docker.io/library/nginx:latest \ No newline at end of file diff --git a/frontend/providers/terminal/.env b/frontend/providers/terminal/.env index e6a4876e5b2..bd1d14eb6cb 100644 --- a/frontend/providers/terminal/.env +++ b/frontend/providers/terminal/.env @@ -1,2 +1,2 @@ SITE="https://cloud.sealos.io" -TTYD_IMAGE="hub.sealos.cn/labring/terminal-app:1.19.4" \ No newline at end of file +TTYD_IMAGE="docker.io/labring/docker-terminal:1.20.4-6" \ No newline at end of file diff --git a/frontend/providers/terminal/deploy/Kubefile b/frontend/providers/terminal/deploy/Kubefile index 1797a076445..ae68f6fb3f4 100644 --- a/frontend/providers/terminal/deploy/Kubefile +++ b/frontend/providers/terminal/deploy/Kubefile @@ -7,7 +7,7 @@ COPY manifests manifests ENV certSecretName="wildcard-cert" ENV cloudDomain="cloud.example.com" -ENV ttydImage="docker.io/labring/docker-terminal:1.20.4-3" +ENV ttydImage="docker.io/labring/docker-terminal:1.20.4-6" CMD ["kubectl apply -f manifests"] diff --git a/frontend/providers/terminal/deploy/images/shim/imagelist b/frontend/providers/terminal/deploy/images/shim/imagelist new file mode 100644 index 00000000000..faaf53793fd --- /dev/null +++ b/frontend/providers/terminal/deploy/images/shim/imagelist @@ -0,0 +1 @@ +docker.io/labring/docker-terminal:1.20.4-6 \ No newline at end of file