Skip to content

The Unified and Autonomous Development Platform

chore: use 80 as default http service port

Robin Shen780498c26afa
diff --git a/server-product/helm/templates/NOTES.txt b/server-product/helm/templates/NOTES.txt
index 98b340273b..8ef1934c75 100644
--- a/server-product/helm/templates/NOTES.txt
+++ b/server-product/helm/templates/NOTES.txt
@@ -27,9 +27,9 @@ APP VERSION: {{ .Chart.AppVersion }}
{{- if contains "ClusterIP" .Values.service.type }}
- kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ include "ods.fullname" . }} {{ default "6610" .Values.service.ports.httpPort }}:6610 &
+ kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ include "ods.fullname" . }} 6610:{{ default 80 .Values.service.ports.http }} &
- URL: http://127.0.0.1:{{ default "6610" .Values.service.ports.httpPort }}/
+ URL: http://127.0.0.1:6610
{{- else if contains "LoadBalancer" .Values.service.type }}
@@ -38,7 +38,11 @@ APP VERSION: {{ .Chart.AppVersion }}
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "ods.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}")
- echo "URL: http://$SERVICE_IP:{{ default "6610" .Values.service.ports.httpPort }}/"
+{{- if .Values.service.ports.http }}
+ echo "URL: http://$SERVICE_IP:{{ .Values.service.ports.http }}"
+{{- else }}
+ echo "URL: http://$SERVICE_IP"
+{{- end }}
{{- end }}
{{- end }}
diff --git a/server-product/helm/templates/ingress.yaml b/server-product/helm/templates/ingress.yaml
index e2d2b31aca..405512d144 100644
--- a/server-product/helm/templates/ingress.yaml
+++ b/server-product/helm/templates/ingress.yaml
@@ -47,10 +47,10 @@ spec:
{{- if .Values.ingress.port.name }}
name: {{ .Values.ingress.port.name }}
{{- else }}
- number: {{ default "6610" .Values.service.ports.httpPort }}
+ number: {{ default "6610" .Values.service.ports.http }}
{{- end }}
{{- else }}
serviceName: {{ include "ods.fullname" $ }}
- servicePort: {{ default "6610" .Values.service.ports.httpPort }}
+ servicePort: {{ default "6610" .Values.service.ports.http }}
{{- end }}
{{- end }}
diff --git a/server-product/helm/templates/service.yaml b/server-product/helm/templates/service.yaml
index 61e9fd99f1..15307cc018 100644
--- a/server-product/helm/templates/service.yaml
+++ b/server-product/helm/templates/service.yaml
@@ -24,12 +24,12 @@ spec:
{{- end }}
ports:
- name: http
- port: {{ default "6610" .Values.service.ports.httpPort }}
+ port: {{ default "80" .Values.service.ports.http }}
targetPort: http
protocol: TCP
{{- if not .Values.service.separateSSHService.enabled }}
- name: ssh
- port: {{ default "22" .Values.service.ports.sshPort }}
+ port: {{ default "22" .Values.service.ports.ssh }}
targetPort: ssh
protocol: TCP
{{- end }}
diff --git a/server-product/helm/values.yaml b/server-product/helm/values.yaml
index 7617cabfbc..9777acd3cf 100644
--- a/server-product/helm/values.yaml
+++ b/server-product/helm/values.yaml
@@ -182,8 +182,8 @@ service:
# - "*"
# service.ports -- Manually change the ServicePorts
ports:
- httpPort: ""
- sshPort: ""
+ http: ""
+ ssh: ""
# service.nodePort -- Specify a nodePort for servcie
nodePort: ""
# service.externalTrafficPolicy -- Specify the