From bae00054b2805d4f0a3faab0c3868f83c9661502 Mon Sep 17 00:00:00 2001 From: xudaotutou <13435638964@163.com> Date: Thu, 26 Sep 2024 15:47:04 +0800 Subject: [PATCH] fix rc5.0.1 --- deploy/cloud/scripts/init.sh | 5 +++-- frontend/desktop/deploy/manifests/configmap.yaml.tmpl | 1 + frontend/desktop/deploy/manifests/rbac.yaml | 3 +++ frontend/providers/costcenter/deploy/Kubefile | 1 + .../costcenter/deploy/manifests/configmap.yaml.tmpl | 4 ++++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/deploy/cloud/scripts/init.sh b/deploy/cloud/scripts/init.sh index e52a10f1f23..1787b1a498c 100644 --- a/deploy/cloud/scripts/init.sh +++ b/deploy/cloud/scripts/init.sh @@ -289,8 +289,9 @@ function sealos_run_frontend { --env cloudPort="$cloudPort" \ --env certSecretName="wildcard-cert" \ --env transferEnabled="true" \ - --env rechargeEnabled="false" - + --env rechargeEnabled="false" \ + --env jwtInternal="$jwtInternal" + echo "run template frontend" sealos run tars/frontend-template.tar \ --env cloudDomain=$cloudDomain \ diff --git a/frontend/desktop/deploy/manifests/configmap.yaml.tmpl b/frontend/desktop/deploy/manifests/configmap.yaml.tmpl index ac9e9c33a5f..dd6d744efd6 100644 --- a/frontend/desktop/deploy/manifests/configmap.yaml.tmpl +++ b/frontend/desktop/deploy/manifests/configmap.yaml.tmpl @@ -39,6 +39,7 @@ data: proxyAddress: "" callbackURL: "https://{{ .cloudDomain }}{{ if .cloudPort }}:{{ .cloudPort }}{{ end }}/callback" signUpEnabled: true + billingUrl: "http://account-service.account-system.svc:2333" baiduToken: "" invite: enabled: false diff --git a/frontend/desktop/deploy/manifests/rbac.yaml b/frontend/desktop/deploy/manifests/rbac.yaml index a42c1180a4f..5a3e98d49e7 100644 --- a/frontend/desktop/deploy/manifests/rbac.yaml +++ b/frontend/desktop/deploy/manifests/rbac.yaml @@ -89,6 +89,9 @@ rules: - apiGroups: ["notification.sealos.io"] resources: ["notifications"] verbs: ["list", "get", "create", "update", "patch", "watch"] + - apiGroups: [""] + resources: ["namespaces"] + verbs: ["patch"] --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding diff --git a/frontend/providers/costcenter/deploy/Kubefile b/frontend/providers/costcenter/deploy/Kubefile index 9c6af5ae51c..139414db66a 100644 --- a/frontend/providers/costcenter/deploy/Kubefile +++ b/frontend/providers/costcenter/deploy/Kubefile @@ -10,5 +10,6 @@ ENV cloudDomain="127.0.0.1.nip.io" ENV cloudPort="" ENV transferEnabled="true" ENV rechargeEnabled="true" +ENV jwtInternal="" CMD ["kubectl apply -f manifests"] diff --git a/frontend/providers/costcenter/deploy/manifests/configmap.yaml.tmpl b/frontend/providers/costcenter/deploy/manifests/configmap.yaml.tmpl index 8e7dba149b3..490f2207df2 100644 --- a/frontend/providers/costcenter/deploy/manifests/configmap.yaml.tmpl +++ b/frontend/providers/costcenter/deploy/manifests/configmap.yaml.tmpl @@ -15,6 +15,10 @@ data: costCenter: transferEnabled: true currencyType: "shellCoin" + auth: + jwt: + internal: "{{ .jwtInternal }}" + billing: "{{ .jwtInternal }}" invoice: enabled: false feiShuBotURL: ""