diff --git a/deploy/cloud/manifests/free-license.yaml b/deploy/cloud/manifests/free-license.yaml deleted file mode 100644 index af40d1a2012..00000000000 --- a/deploy/cloud/manifests/free-license.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# TODO delete this after job-init finished -apiVersion: license.sealos.io/v1 -kind: License -metadata: - name: free-license - namespace: ns-admin -spec: - type: Account - # nosemgrep: generic.secrets.security.detected-jwt-token.detected-jwt-token - token: "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJTZWFsb3MiLCJpYXQiOjE2OTgxMTQzMjUsImV4cCI6MTc5MjcyMjMyNSwidHlwZSI6IkFjY291bnQiLCJkYXRhIjp7ImFtb3VudCI6Mjk5fX0.LmLPGAdG26m8mkUaSsoIZdVQLujVVv6_bqc_EvntZhNCcNE2C2v6Xk5MZGoCP0CLwwVUP_3931XzYtulYBcIoCykzPUvATasbPf8UDVrcvEp-GMgzCAGXZMQnJJioBQquKug-RA_8_-jx-h-7XHs32Glwleg5T8LGNbbicyUZZAYg-Gur49PZjcMHFS2E_KHUaKAQHtzQVmVdhDjKXpSOfvLBFuY5wnMqwxHSsql6k3h_VoEJQbluPMtnWl1aSf1xdNqb3reLzXYVnJhsuZCe6PH55jYnkdmMcMfeoaZdd4zlrj-GrgSTBVqH1mbmlr8RS06jE2vG-UtqELJrU8NEw" diff --git a/deploy/cloud/scripts/init.sh b/deploy/cloud/scripts/init.sh index b212d92b647..563595aac68 100644 --- a/deploy/cloud/scripts/init.sh +++ b/deploy/cloud/scripts/init.sh @@ -126,8 +126,6 @@ function sealos_authorize { while [ -z "$(kubectl get ns ns-admin 2>/dev/null)" ]; do sleep 1 done - - kubectl apply -f manifests/free-license.yaml } function sealos_run_frontend { diff --git a/scripts/cloud/install.sh b/scripts/cloud/install.sh index bdfcfe41c73..3699ed76842 100644 --- a/scripts/cloud/install.sh +++ b/scripts/cloud/install.sh @@ -343,7 +343,7 @@ metadata: name: secret spec: path: manifests/tls-secret.yaml - match: ${image_registry}/${image_repository}/sealos-cloud:latest + match: ${image_registry}/${image_repository}/sealos-cloud:${cloud_version} strategy: merge data: | data: @@ -444,6 +444,7 @@ EOF get_prompt "patching_ingress" 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'}]" get_prompt "installing_cloud"