feat[ASM-10596]- Readiness/Liveliness: revert base image and make reg…

…ex match space smaller
akeylesslabs · Jun 16, 2024 · 8337291 · 8337291
1 parent 5618da8
commit 8337291
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/charts/akeyless-api-gateway/templates/_helpers.tpl b/charts/akeyless-api-gateway/templates/_helpers.tpl
@@ -386,15 +386,15 @@ Check metrics configuration Secret
     {{- end -}}
 {{- end -}}
 
-{{- define "version" -}}
-{{ .Values.image.tag  | default .Chart.AppVersion | printf }}
+{{- define "gw_version" -}}
+{{ .Values.version  | default .Chart.AppVersion | printf }}
 {{- end }}
 
 {{- define "gw_health_path" -}}
-{{- if not (regexMatch "[0-9]+(\\.[0-9]+){2}" (include "version" .)) -}}
+{{- if not (regexMatch "^[0-9]+(\\.[0-9]+){2}$" (include "gw_version" .)) -}}
 /health
 {{- else -}}
-{{- $parts :=  split "." (include "version" .) -}}
+{{- $parts :=  split "." (include "gw_version" .) -}}
 {{- $major := index $parts "_0" | int }}
 {{- $minor := index $parts "_1" | int }}
 {{- $patch := index $parts "_2" | int }}

diff --git a/charts/akeyless-api-gateway/templates/deployment.yaml b/charts/akeyless-api-gateway/templates/deployment.yaml
@@ -121,9 +121,9 @@ spec:
       containers:
         - name: {{ .Values.containerName }}
           {{- if .Values.akeylessStrictMode  }}
-          image: "{{ .Values.image.repository }}:{{ include "version" . }}-akeyless"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}-akeyless"
           {{else}}
-          image: "{{ .Values.image.repository }}:{{ include "version" . }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           {{- end}}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- if .Values.deployment.containerSecurityContext }}
@@ -389,7 +389,7 @@ spec:
           {{- end }}
           # end provision
             - name: VERSION
-              value: {{ include "version" . }}
+              value: {{ include "gw_version" . }}
           {{- if .Values.httpProxySettings.http_proxy }}
             - name: HTTP_PROXY
               value: {{ .Values.httpProxySettings.http_proxy }}

diff --git a/charts/akeyless-api-gateway/values.yaml b/charts/akeyless-api-gateway/values.yaml
@@ -30,7 +30,7 @@ image:
 #  repository: docker.registry-2.akeyless.io/base
 
   pullPolicy: Always
-  # tag: latest
+  tag: latest
 
 # Uncomment for downloading Akeyless artifacts from fixed repository
 # ref: https://docs.akeyless.io/docs/advanced-k8s-gateway-configuration#fixed-artifact-repository