opensource/sealos
3
0
Fork 0
mirror of https://github.com/labring/sealos.git synced 2026-09-24 15:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix/cloud port (#4271)

Browse Source 
* patch cloud_port to ingress nginx controller

* fix cloud port
This commit is contained in:
Jiahui
2023-11-08 10:55:21 +08:00
committed by GitHub
parent 2113d17e5a
commit c4e8187ec0
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/terminal/deploy/Kubefile
+1 -1
View File
@@ -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"
controllers/terminal/deploy/manifests/deploy.yaml.tmpl
+1 -1
View File
@@ -444,7 +444,7 @@ spec:
- name: DOMAIN
value: {{ .cloudDomain }}
- name: PORT
value: {{ .port }}
value: {{ .cloudPort }}
- name: SECRET_NAME
value: {{ .wildcardCertSecretName }}
- name: SECRET_NAMESPACE
frontend/providers/cronjob/deploy/manifests/appcr.yaml.tmpl
+2 -2
View File
@@ -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
frontend/providers/license/deploy/manifests/appcr.yaml.tmpl
+2 -2
View File
@@ -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
scripts/cloud/install.sh
+2 -1
View File
@@ -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
@@ -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"