Fix/cloud port (#4271)

* patch cloud_port to ingress nginx controller * fix cloud port
labring · Nov 8, 2023 · c4e8187 · c4e8187
1 parent 2113d17
commit c4e8187
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/controllers/terminal/deploy/Kubefile b/controllers/terminal/deploy/Kubefile
@@ -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"
 

diff --git a/controllers/terminal/deploy/manifests/deploy.yaml.tmpl b/controllers/terminal/deploy/manifests/deploy.yaml.tmpl
@@ -444,7 +444,7 @@ spec:
         - name: DOMAIN
           value: {{ .cloudDomain }}
         - name: PORT
-          value: {{ .port }}
+          value: {{ .cloudPort }}
         - name: SECRET_NAME
           value: {{ .wildcardCertSecretName }}
         - name: SECRET_NAMESPACE

diff --git a/frontend/providers/cronjob/deploy/manifests/appcr.yaml.tmpl b/frontend/providers/cronjob/deploy/manifests/appcr.yaml.tmpl
@@ -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

diff --git a/frontend/providers/license/deploy/manifests/appcr.yaml.tmpl b/frontend/providers/license/deploy/manifests/appcr.yaml.tmpl
@@ -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

diff --git a/scripts/cloud/install.sh b/scripts/cloud/install.sh
@@ -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"