From c5ab43a3d676f66547a3c703ffd0f743b1cea751 Mon Sep 17 00:00:00 2001 From: NikolaiKuziaevQubership Date: Tue, 4 Feb 2025 16:15:33 +0400 Subject: [PATCH] helm template creating --- charts/env-checker/templates/CronJob.yaml | 2 +- charts/env-checker/templates/Deployment.yaml | 2 +- charts/env-checker/templates/Job.yaml | 2 +- charts/env-checker/templates/_helpers.tpl | 13 +++++++++++++ charts/env-checker/values.yaml | 4 ++-- 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 charts/env-checker/templates/_helpers.tpl diff --git a/charts/env-checker/templates/CronJob.yaml b/charts/env-checker/templates/CronJob.yaml index f93ce09..3e7ba92 100644 --- a/charts/env-checker/templates/CronJob.yaml +++ b/charts/env-checker/templates/CronJob.yaml @@ -23,7 +23,7 @@ spec: serviceAccountName: {{ .Values.serviceAccount.name }} containers: - name: '{{ printf "%s-cronjob" .Values.SERVICE_NAME }}' - image: '{{ .Values.IMAGE_REPOSITORY }}:{{ .Values.TAG }}' + image: {{ template "env-checker.image" . }} command: [ "/bin/sh", "-c", "$(ENVIRONMENT_CHECKER_CRON_JOB_COMMAND)" ] env: - name: "ENVIRONMENT_CHECKER_CRON_JOB_COMMAND" diff --git a/charts/env-checker/templates/Deployment.yaml b/charts/env-checker/templates/Deployment.yaml index 8e6de26..201c87c 100644 --- a/charts/env-checker/templates/Deployment.yaml +++ b/charts/env-checker/templates/Deployment.yaml @@ -60,7 +60,7 @@ spec: {{- end }} containers: - name: '{{ .Values.SERVICE_NAME }}' - image: '{{ .Values.IMAGE_REPOSITORY }}:{{ .Values.TAG }}' + image: {{ template "env-checker.image" . }} ports: - name: web containerPort: 8888 diff --git a/charts/env-checker/templates/Job.yaml b/charts/env-checker/templates/Job.yaml index 08be417..672cee7 100644 --- a/charts/env-checker/templates/Job.yaml +++ b/charts/env-checker/templates/Job.yaml @@ -18,7 +18,7 @@ spec: restartPolicy: Never containers: - name: '{{ printf "%s-job" .Values.SERVICE }}' - image: '{{ .Values.IMAGE_REPOSITORY }}:{{ .Values.TAG }}' + image: {{ template "env-checker.image" . }} command: [ "/bin/sh", "-c", "$(ENVIRONMENT_CHECKER_JOB_COMMAND)" ] env: - name: "ENVIRONMENT_CHECKER_JOB_COMMAND" diff --git a/charts/env-checker/templates/_helpers.tpl b/charts/env-checker/templates/_helpers.tpl new file mode 100644 index 0000000..85fe43e --- /dev/null +++ b/charts/env-checker/templates/_helpers.tpl @@ -0,0 +1,13 @@ +{{/* +Find a env-checker image in various places. +Image can be found from: +* specified by user from .Values.IMAGE_REPOSITORY and .Values.TAG +* default value +*/}} +{{- define "env-checker.image" -}} + {{- if and (not (empty .Values.IMAGE_REPOSITORY)) (not (empty .Values.TAG)) -}} + {{- printf "%s:%s" .Values.IMAGE_REPOSITORY .Values.TAG -}} + {{- else -}} + {{- printf "ghcr.io/netcracker/qubership-env-checker:main" -}} + {{- end -}} +{{- end -}} \ No newline at end of file diff --git a/charts/env-checker/values.yaml b/charts/env-checker/values.yaml index b5444c7..c58a81b 100644 --- a/charts/env-checker/values.yaml +++ b/charts/env-checker/values.yaml @@ -13,8 +13,8 @@ MANAGED_BY: "saasDeployer" NAMESPACE: 'default' #Artifact descriptor version which is installed. ARTIFACT_DESCRIPTOR_VERSION : '' -IMAGE_REPOSITORY: 'ghcr.io/netcracker/qubership-env-checker' -TAG: 'main' +#IMAGE_REPOSITORY: 'ghcr.io/netcracker/qubership-env-checker' +#TAG: 'main' DELIMITER: "-" DEPLOYMENT_SESSION_ID: '' CLOUD_NAME: 'qubership'