Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: upgrade and fix cloud build logic #4408

Merged
merged 3 commits into from Dec 13, 2023
Merged

Chore: upgrade and fix cloud build logic #4408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d93d8b4
cloud: delete free license.
lingdie Dec 13, 2023
4e35769
cloud: fix cert config.
lingdie Dec 13, 2023
9d74d0e
cloud: patch ingress controller to use default cert.
lingdie Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 0 additions & 10 deletions deploy/cloud/manifests/free-license.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions deploy/cloud/scripts/init.sh
View file
Open in desktop
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
View file
Open in desktop
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