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

Fix/cloud port #4271

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Fix/cloud port #4271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04ccbe6
patch cloud_port to ingress nginx controller
bxy4543 Nov 3, 2023
2b70794
fix cloud port
bxy4543 Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controllers/terminal/deploy/Kubefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPY manifests manifests

ENV userNamespace="user-system"
ENV cloudDomain="127.0.0.1.nip.io"
ENV port=""
ENV cloudPort=""
ENV wildcardCertSecretName="wildcard-cert"
ENV wildcardCertSecretNamespace="sealos-system"

Expand Down
2 changes: 1 addition & 1 deletion controllers/terminal/deploy/manifests/deploy.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ spec:
- name: DOMAIN
value: {{ .cloudDomain }}
- name: PORT
value: {{ .port }}
value: {{ .cloudPort }}
- name: SECRET_NAME
value: {{ .wildcardCertSecretName }}
- name: SECRET_NAMESPACE
Expand Down
4 changes: 2 additions & 2 deletions frontend/providers/cronjob/deploy/manifests/appcr.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
spec:
data:
desc: CronJob
url: "https://cronjob.{{ .cloudDomain }}"
icon: "https://cronjob.{{ .cloudDomain }}/logo.svg"
url: "https://cronjob.{{ .cloudDomain }}{{ if .cloudPort }}:{{ .cloudPort }}{{ end }}"
icon: "https://cronjob.{{ .cloudDomain }}{{ if .cloudPort }}:{{ .cloudPort }}{{ end }}/logo.svg"
menuData:
helpDropDown: false
nameColor: text-black
Expand Down
4 changes: 2 additions & 2 deletions frontend/providers/license/deploy/manifests/appcr.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
spec:
data:
desc: license
url: "https://license.{{ .cloudDomain }}"
icon: "https://license.{{ .cloudDomain }}/logo.svg"
url: "https://license.{{ .cloudDomain }}{{ if .cloudPort }}:{{ .cloudPort }}{{ end }}"
icon: "https://license.{{ .cloudDomain }}{{ if .cloudPort }}:{{ .cloudPort }}{{ end }}/logo.svg"
menuData:
helpDropDown: false
nameColor: text-black
Expand Down
3 changes: 2 additions & 1 deletion scripts/cloud/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ collect_input() {
fi
done
fi
if [[ -z "$node_ips" ]]; then
if [[ -z "$node_ips" && $single != "y" ]]; then
while :; do
read -p "$(get_prompt "input_node_ips")" node_ips
if validate_ips "$node_ips"; then
Expand Down Expand Up @@ -443,6 +443,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}'}]"

get_prompt "installing_cloud"

Expand Down
Loading