From 3122eed9e2c60c295472187c1f03cb06b3c576ae Mon Sep 17 00:00:00 2001 From: hecy7 Date: Mon, 4 Sep 2023 17:45:22 +0800 Subject: [PATCH 1/2] Adapt to the rest interface of serving server Signed-off-by: hecy7 --- .../FATE-Serving/templates/serving-server-module.yaml | 7 +++++++ helm-charts/FATE-Serving/values.yaml | 1 + 2 files changed, 8 insertions(+) diff --git a/helm-charts/FATE-Serving/templates/serving-server-module.yaml b/helm-charts/FATE-Serving/templates/serving-server-module.yaml index c427a42fe..a762baaaa 100644 --- a/helm-charts/FATE-Serving/templates/serving-server-module.yaml +++ b/helm-charts/FATE-Serving/templates/serving-server-module.yaml @@ -163,6 +163,13 @@ spec: nodePort: {{ .Values.servingServer.nodePort }} {{- end }} protocol: TCP + - name: "8080" + port: 8080 + targetPort: 8080 + { { - if eq .Values.servingServer.type "NodePort" "LoadBalancer" } } + nodePort: { { .Values.servingServer.httpNodePort } } + { { - end } } + protocol: TCP type: {{ .Values.servingServer.type }} {{- if .Values.servingServer.loadBalancerIP }} loadBalancerIP: "{{ .Values.servingServer.loadBalancerIP }}" diff --git a/helm-charts/FATE-Serving/values.yaml b/helm-charts/FATE-Serving/values.yaml index f5e120598..7a41b1ffe 100644 --- a/helm-charts/FATE-Serving/values.yaml +++ b/helm-charts/FATE-Serving/values.yaml @@ -62,6 +62,7 @@ servingServer: include: true type: NodePort nodePort: 30209 + httpNodePort: 30210 loadBalancerIP: fateflow: ip: fateflow From 99c23fbbace15b3fc461037e6e313352bfdf111d Mon Sep 17 00:00:00 2001 From: hecy7 Date: Tue, 5 Sep 2023 10:31:37 +0800 Subject: [PATCH 2/2] fix helm lint check Signed-off-by: hecy7 --- .../FATE-Serving/templates/serving-server-module.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm-charts/FATE-Serving/templates/serving-server-module.yaml b/helm-charts/FATE-Serving/templates/serving-server-module.yaml index a762baaaa..52274735a 100644 --- a/helm-charts/FATE-Serving/templates/serving-server-module.yaml +++ b/helm-charts/FATE-Serving/templates/serving-server-module.yaml @@ -166,9 +166,9 @@ spec: - name: "8080" port: 8080 targetPort: 8080 - { { - if eq .Values.servingServer.type "NodePort" "LoadBalancer" } } - nodePort: { { .Values.servingServer.httpNodePort } } - { { - end } } + {{- if eq .Values.servingServer.type "NodePort" "LoadBalancer" }} + nodePort: {{ .Values.servingServer.httpNodePort }} + {{- end }} protocol: TCP type: {{ .Values.servingServer.type }} {{- if .Values.servingServer.loadBalancerIP }}