Skip to content

Commit

Permalink
Chore: upgrade and fix cloud build logic (#4408)
Browse files Browse the repository at this point in the history
* cloud: delete free license.

Signed-off-by: yy <lingdie.yy@outlook.com>

* cloud: fix cert config.

Signed-off-by: yy <lingdie.yy@outlook.com>

* cloud: patch ingress controller to use default cert.

Signed-off-by: yy <lingdie.yy@outlook.com>

---------

Signed-off-by: yy <lingdie.yy@outlook.com>
  • Loading branch information
lingdie committed Dec 13, 2023
1 parent a04ca53 commit a3efc3a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
10 changes: 0 additions & 10 deletions deploy/cloud/manifests/free-license.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions deploy/cloud/scripts/init.sh
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion scripts/cloud/install.sh
Expand Up @@ -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:
Expand Down Expand Up @@ -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"

Expand Down

0 comments on commit a3efc3a

Please sign in to comment.