From 01eb2fea06ecc6b2b972d6178765e01b050b9dd3 Mon Sep 17 00:00:00 2001 From: Vasili Karaev Date: Wed, 2 Jun 2021 11:42:32 +0300 Subject: [PATCH 1/4] add doc-origin label --- starters/touchin-docs/templates/_helpers.tpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/starters/touchin-docs/templates/_helpers.tpl b/starters/touchin-docs/templates/_helpers.tpl index 6aa440a..1ba1bf4 100644 --- a/starters/touchin-docs/templates/_helpers.tpl +++ b/starters/touchin-docs/templates/_helpers.tpl @@ -36,6 +36,7 @@ Common labels {{- define ".labels" -}} helm.sh/chart: {{ include ".chart" . }} {{ include ".selectorLabels" . }} +{{ include ".touchinLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -69,3 +70,14 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{/* +Touchin labels +*/}} +{{- define ".touchinLabels" -}} +{{- if .Values.docs.meta.pullRequestNumber }} +touchin.ru/doc-origin: pr:{{ .Values.docs.meta.pullRequestNumber }} +{{- else if .Values.docs.meta.releaseBranch }} +touchin.ru/doc-origin: release:{{ .Values.docs.meta.releaseBranch }} +{{- end }} +{{- end }} From 4a9d5e02e7955b40be3d66097d6c18d4fd382938 Mon Sep 17 00:00:00 2001 From: Vasili Karaev Date: Wed, 2 Jun 2021 12:04:41 +0300 Subject: [PATCH 2/4] make origin label not documentation specific --- starters/touchin-docs/templates/_helpers.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/starters/touchin-docs/templates/_helpers.tpl b/starters/touchin-docs/templates/_helpers.tpl index 1ba1bf4..0be2b1d 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.docs.meta.pullRequestNumber }} -touchin.ru/doc-origin: pr:{{ .Values.docs.meta.pullRequestNumber }} +touchin.ru/origin: pr:{{ .Values.docs.meta.pullRequestNumber }} {{- else if .Values.docs.meta.releaseBranch }} -touchin.ru/doc-origin: release:{{ .Values.docs.meta.releaseBranch }} +touchin.ru/origin: release:{{ .Values.docs.meta.releaseBranch }} {{- end }} {{- end }} From 0827f9f9fb734dd7676bb1325418d4b18dd55eba Mon Sep 17 00:00:00 2001 From: Vasili Karaev Date: Wed, 2 Jun 2021 12:06:26 +0300 Subject: [PATCH 3/4] add touchin labels to server starter --- starters/touchin-server/templates/_helpers.tpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/starters/touchin-server/templates/_helpers.tpl b/starters/touchin-server/templates/_helpers.tpl index 654464e..5445a18 100644 --- a/starters/touchin-server/templates/_helpers.tpl +++ b/starters/touchin-server/templates/_helpers.tpl @@ -36,6 +36,7 @@ Common labels {{- define ".labels" -}} helm.sh/chart: {{ include ".chart" . }} {{ include ".selectorLabels" . }} +{{ include ".touchinLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -97,3 +98,14 @@ Get db name {{- define ".db.name" -}} {{ .Values.db.name }}{{- if .Values.releaseName}}--{{ .Values.releaseName }}{{- end }} {{- end }} + +{{/* +Touchin labels +*/}} +{{- define ".touchinLabels" -}} +{{- if .Values.docs.meta.pullRequestNumber }} +touchin.ru/origin: pr:{{ .Values.docs.meta.pullRequestNumber }} +{{- else if .Values.docs.meta.releaseBranch }} +touchin.ru/origin: release:{{ .Values.docs.meta.releaseBranch }} +{{- end }} +{{- end }} From 2c21aeb7204013b5b39c87d938e75e84dba7d985 Mon Sep 17 00:00:00 2001 From: Vasili Karaev Date: Wed, 2 Jun 2021 12:08:15 +0300 Subject: [PATCH 4/4] fix origin label --- starters/touchin-docs/templates/_helpers.tpl | 8 ++++---- starters/touchin-server/templates/_helpers.tpl | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/starters/touchin-docs/templates/_helpers.tpl b/starters/touchin-docs/templates/_helpers.tpl index 0be2b1d..f11b329 100644 --- a/starters/touchin-docs/templates/_helpers.tpl +++ b/starters/touchin-docs/templates/_helpers.tpl @@ -75,9 +75,9 @@ Create the name of the service account to use Touchin labels */}} {{- define ".touchinLabels" -}} -{{- if .Values.docs.meta.pullRequestNumber }} -touchin.ru/origin: pr:{{ .Values.docs.meta.pullRequestNumber }} -{{- else if .Values.docs.meta.releaseBranch }} -touchin.ru/origin: release:{{ .Values.docs.meta.releaseBranch }} +{{- if .Values.origin.pullRequestNumber }} +touchin.ru/origin: pr:{{ .Values.origin.pullRequestNumber }} +{{- else if .Values.origin.releaseBranch }} +touchin.ru/origin: release:{{ .Values.origin.releaseBranch }} {{- end }} {{- end }} diff --git a/starters/touchin-server/templates/_helpers.tpl b/starters/touchin-server/templates/_helpers.tpl index 5445a18..2a9e140 100644 --- a/starters/touchin-server/templates/_helpers.tpl +++ b/starters/touchin-server/templates/_helpers.tpl @@ -103,9 +103,9 @@ Get db name Touchin labels */}} {{- define ".touchinLabels" -}} -{{- if .Values.docs.meta.pullRequestNumber }} -touchin.ru/origin: pr:{{ .Values.docs.meta.pullRequestNumber }} -{{- else if .Values.docs.meta.releaseBranch }} -touchin.ru/origin: release:{{ .Values.docs.meta.releaseBranch }} +{{- if .Values.origin.pullRequestNumber }} +touchin.ru/origin: pr:{{ .Values.origin.pullRequestNumber }} +{{- else if .Values.origin.releaseBranch }} +touchin.ru/origin: release:{{ .Values.origin.releaseBranch }} {{- end }} {{- end }}