Merge pull request #4 from Netcracker/helm-template-refactoring

Helm template refactoring

Author: asatt

charts/diag-proxy/templates/_helpers.tpl

@@ -0,0 +1,13 @@
+{{/*
+Find a diag-proxy image in various places.
+Image can be found from:
+* specified by user from .Values.IMAGE_REPOSITORY and .Values.TAG
+* default value
+*/}}
+{{- define "diag-proxy.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/diag-proxy:main" -}}
+  {{- end -}}
+{{- end -}}

charts/diag-proxy/templates/deployment.yaml

@@ -54,7 +54,7 @@ spec:
       {{- end }}
       containers:
       - name: {{ .Values.SERVICE_NAME }}
-        image: '{{ .Values.IMAGE_REPOSITORY }}:{{ .Values.TAG }}'
+        image: {{ template "diag-proxy.image" . }}
         ports:
         - name: cdt-tcp
           containerPort: 1715

charts/diag-proxy/values.yaml

@@ -6,8 +6,8 @@ ARTIFACT_DESCRIPTOR_VERSION: ''
 
 # -- Image coordinates, next two values will be joined as:
 # IMAGE_REPOSITORY:TAG
-IMAGE_REPOSITORY: ghcr.io/netcracker/diag-proxy
-TAG: main
+#IMAGE_REPOSITORY: ghcr.io/netcracker/diag-proxy
+#TAG: main
 # --- The name of the secret in Kubernetes that provides access to the private Docker registry
 imagePullSecrets: []
 ### Deployment parameters