diff --git a/reportportal/templates/service-api/api-service.yaml b/reportportal/templates/service-api/api-service.yaml index 60a3d71..f1aa576 100644 --- a/reportportal/templates/service-api/api-service.yaml +++ b/reportportal/templates/service-api/api-service.yaml @@ -5,8 +5,8 @@ metadata: labels: {{ include "labels" . | indent 4 }} annotations: service: {{ $.Values.serviceapi.name | default "api" }} - infoEndpoint: "{{- $path := .Values.ingress.path -}}/api/info" - healthEndpoint: "{{- $path := .Values.ingress.path -}}/api/health" + infoEndpoint: "{{ .Values.ingress.path }}/api/info" + healthEndpoint: "{{ .Values.ingress.path }}/api/health" {{- with .Values.serviceapi.service.annotations }} {{- toYaml . | nindent 4 }} {{- end }} diff --git a/reportportal/templates/service-authorization/uat-service.yaml b/reportportal/templates/service-authorization/uat-service.yaml index df5407d..83c852a 100644 --- a/reportportal/templates/service-authorization/uat-service.yaml +++ b/reportportal/templates/service-authorization/uat-service.yaml @@ -5,8 +5,8 @@ metadata: labels: {{ include "labels" . | indent 4 }} annotations: service: {{ $.Values.uat.name | default "uat" }} - infoEndpoint: "{{- $path := .Values.ingress.path -}}/uat/info" - healthEndpoint: "{{- $path := .Values.ingress.path -}}/uat/health" + infoEndpoint: "{{ .Values.ingress.path }}/uat/info" + healthEndpoint: "{{ .Values.ingress.path }}/uat/health" {{- with .Values.uat.service.annotations }} {{- toYaml . | nindent 4 }} {{- end }} diff --git a/reportportal/templates/service-index/index-service.yaml b/reportportal/templates/service-index/index-service.yaml index bf93f14..d6e5e50 100644 --- a/reportportal/templates/service-index/index-service.yaml +++ b/reportportal/templates/service-index/index-service.yaml @@ -5,8 +5,8 @@ metadata: labels: {{ include "labels" . | indent 4 }} annotations: service: {{ $.Values.serviceindex.name | default "index" }} - infoEndpoint: "{{- $path := .Values.ingress.path -}}/info" - healthEndpoint: "{{- $path := .Values.ingress.path -}}/health" + infoEndpoint: "{{ .Values.ingress.path }}/info" + healthEndpoint: "{{ .Values.ingress.path }}/health" {{- with .Values.serviceindex.service.annotations }} {{- toYaml . | nindent 4 }} {{- end }} diff --git a/reportportal/templates/service-jobs/jobs-services.yaml b/reportportal/templates/service-jobs/jobs-services.yaml index ab838b8..d3f06e5 100644 --- a/reportportal/templates/service-jobs/jobs-services.yaml +++ b/reportportal/templates/service-jobs/jobs-services.yaml @@ -5,8 +5,8 @@ metadata: labels: {{ include "labels" . | indent 4 }} annotations: service: {{ $.Values.servicejobs.name | default "jobs" }} - infoEndpoint: "{{- $path := .Values.ingress.path -}}/jobs/info" - healthEndpoint: "{{- $path := .Values.ingress.path -}}/jobs/health" + infoEndpoint: "{{ .Values.ingress.path }}/jobs/info" + healthEndpoint: "{{ .Values.ingress.path }}/jobs/health" {{- with .Values.servicejobs.service.annotations }} {{- toYaml . | nindent 4 }} {{- end }} diff --git a/reportportal/templates/service-ui/ui-service.yaml b/reportportal/templates/service-ui/ui-service.yaml index e5b70ac..df8f70c 100644 --- a/reportportal/templates/service-ui/ui-service.yaml +++ b/reportportal/templates/service-ui/ui-service.yaml @@ -5,8 +5,8 @@ metadata: labels: {{ include "labels" . | indent 4 }} annotations: service: {{ $.Values.serviceui.name | default "ui" }} - infoEndpoint: "{{- $path := .Values.ingress.path -}}/ui/info" - healthEndpoint: "{{- $path := .Values.ingress.path -}}/ui/health" + infoEndpoint: "{{ .Values.ingress.path }}/ui/info" + healthEndpoint: "{{ .Values.ingress.path }}/ui/health" {{- with .Values.serviceui.service.annotations }} {{- toYaml . | nindent 4 }} {{- end }}