diff --git a/starters/touchin-docs/templates/_helpers.tpl b/starters/touchin-docs/templates/_helpers.tpl index f11b329..8ced485 100644 --- a/starters/touchin-docs/templates/_helpers.tpl +++ b/starters/touchin-docs/templates/_helpers.tpl @@ -76,8 +76,8 @@ Touchin labels */}} {{- define ".touchinLabels" -}} {{- if .Values.origin.pullRequestNumber }} -touchin.ru/origin: pr:{{ .Values.origin.pullRequestNumber }} +touchin.ru/origin: pr__{{ .Values.origin.pullRequestNumber }} {{- else if .Values.origin.releaseBranch }} -touchin.ru/origin: release:{{ .Values.origin.releaseBranch }} +touchin.ru/origin: release__{{ .Values.origin.releaseBranch }} {{- end }} {{- end }} diff --git a/starters/touchin-docs/values.yaml b/starters/touchin-docs/values.yaml index e91f9e1..bfd76c6 100644 --- a/starters/touchin-docs/values.yaml +++ b/starters/touchin-docs/values.yaml @@ -40,6 +40,10 @@ securityContext: {} app: port: 80 +origin: + releaseBranch: "" + pullRequestNumber: "" + service: type: ClusterIP port: 80 diff --git a/starters/touchin-server/templates/_helpers.tpl b/starters/touchin-server/templates/_helpers.tpl index 2a9e140..c6e7044 100644 --- a/starters/touchin-server/templates/_helpers.tpl +++ b/starters/touchin-server/templates/_helpers.tpl @@ -104,8 +104,8 @@ Touchin labels */}} {{- define ".touchinLabels" -}} {{- if .Values.origin.pullRequestNumber }} -touchin.ru/origin: pr:{{ .Values.origin.pullRequestNumber }} +touchin.ru/origin: pr__{{ .Values.origin.pullRequestNumber }} {{- else if .Values.origin.releaseBranch }} -touchin.ru/origin: release:{{ .Values.origin.releaseBranch }} +touchin.ru/origin: release__{{ .Values.origin.releaseBranch }} {{- end }} {{- end }} diff --git a/starters/touchin-server/values.yaml b/starters/touchin-server/values.yaml index fe7d4c7..44a6170 100644 --- a/starters/touchin-server/values.yaml +++ b/starters/touchin-server/values.yaml @@ -50,6 +50,10 @@ db: app: port: 8080 +origin: + releaseBranch: "" + pullRequestNumber: "" + service: type: ClusterIP port: 80