Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: trim new line #89

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/snyk-broker/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,6 @@ Create the name of the broker service to use
{{- if not .Values.disableSuffixes -}}
{{ .Values.scmType }}-broker-service-{{ .Release.Name }}
{{- else }}
{{ .Values.scmType}}-broker-service
{{ .Values.scmType }}-broker-service
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/snyk-broker/templates/broker_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ spec:
- name: PORT
value: {{ .Values.deployment.container.containerPort | squote }}
- name: BROKER_CLIENT_URL
value: "http://{{ include "snyk-broker.brokerServiceName" . }}:{{ .Values.service.port }}"
value: "http://{{ include "snyk-broker.brokerServiceName" . | trim }}:{{ .Values.service.port }}"
- name: BROKER_CLIENT_VALIDATION_URL
value: http://cra-service{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}:{{ .Values.deployment.container.crSnykPort | toString }}/healthcheck
{{- end }}
Expand Down
6 changes: 3 additions & 3 deletions charts/snyk-broker/templates/broker_ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
backend:
{{- if $ingressApiIsStable }}
service:
name: {{ include "snyk-broker.brokerServiceName" $ }}
name: {{ include "snyk-broker.brokerServiceName" $ | trim }}
port:
number: {{ $servicePort }}
{{- else }}
Expand All @@ -64,11 +64,11 @@ spec:
- backend:
{{- if $ingressApiIsStable }}
service:
name: {{ include "snyk-broker.brokerServiceName" . }}
name: {{ include "snyk-broker.brokerServiceName" . | trim }}
port:
number: {{ $servicePort }}
{{- else }}
serviceName: {{ include "snyk-broker.brokerServiceName" . }}
serviceName: {{ include "snyk-broker.brokerServiceName" . | trim }}
servicePort: {{ $servicePort }}
{{- end }}
{{- if $ingressPath }}
Expand Down
2 changes: 1 addition & 1 deletion charts/snyk-broker/templates/broker_service.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "snyk-broker.brokerServiceName" . | nindent 4 }}
name: {{ include "snyk-broker.brokerServiceName" . | trim | nindent 4 }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "snyk-broker.labels" . | nindent 4 }}
Expand Down
Loading