Update values.yaml in compass-runtime-agent (#12225)

* compass * console * oops * fix * retrigger jobs * rerun netlify it's stuck somehow * revert console
kyma-project · Oct 6, 2021 · 69943e0 · 69943e0
1 parent cad4e8c
commit 69943e0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/resources/compass-runtime-agent/templates/_helpers.tpl b/resources/compass-runtime-agent/templates/_helpers.tpl
@@ -5,3 +5,14 @@ Expand the name of the chart.
 {{- define "name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Create a URL for container images
+*/}}
+{{- define "imageurl" -}}
+{{- $registry := default $.reg.path $.img.containerRegistryPath -}}
+{{- $path := ternary (print $registry) (print $registry "/" $.img.directory) (empty $.img.directory) -}}
+{{- $version := ternary (print ":" $.img.version) (print "@sha256:" $.img.sha) (empty $.img.sha) -}}
+{{- print $path "/" $.img.name $version -}}
+{{- end -}}
+
diff --git a/resources/compass-runtime-agent/templates/deployment.yaml b/resources/compass-runtime-agent/templates/deployment.yaml
@@ -29,7 +29,7 @@ spec:
           ports:
             - containerPort: {{ .Values.compassRuntimeAgent.healthCheck.port }}
               name: http-health
-          image: {{ .Values.global.images.containerRegistry.path }}/compass-runtime-agent:{{ .Values.global.images.runtimeAgent.version }}
+          image: {{ include "imageurl" (dict "reg" .Values.global.containerRegistry "img" .Values.global.images.compass_runtime_agent) }}
           imagePullPolicy: {{ .Values.compassRuntimeAgent.image.pullPolicy }}
           args:
             - "/compass-runtime-agent"

diff --git a/resources/compass-runtime-agent/templates/tests/test-runtime-agent-integration.yaml b/resources/compass-runtime-agent/templates/tests/test-runtime-agent-integration.yaml
@@ -26,7 +26,7 @@ spec:
       serviceAccountName: {{ .Chart.Name }}-tests
       containers:
         - name: {{ .Chart.Name }}-tests
-          image: {{ .Values.global.images.containerRegistry.path }}/compass-runtime-agent-tests:{{ .Values.global.images.runtimeAgentTests.version }}
+          image: {{ include "imageurl" (dict "reg" .Values.global.containerRegistry "img" .Values.global.testImages.compass_runtime_agent_tests) }}
           imagePullPolicy: {{ .Values.compassRuntimeAgent.image.pullPolicy }}
           envFrom:
           - secretRef:

diff --git a/resources/compass-runtime-agent/values.yaml b/resources/compass-runtime-agent/values.yaml
@@ -1,10 +1,13 @@
 global:
+  containerRegistry:
+    path: eu.gcr.io/kyma-project
   images:
-    containerRegistry:
-      path: eu.gcr.io/kyma-project
-    runtimeAgent:
+    compass_runtime_agent:
+      name: "compass-runtime-agent"
       version: "PR-12141"
-    runtimeAgentTests:
+  testImages:
+    compass_runtime_agent_tests:
+      name: "compass-runtime-agent-tests"
       version: "5b55dce8"
   istio:
     gateway: