feat: add persistenceSuffix

templates/_helpers.tpl

@@ -16,12 +16,14 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 
 {{- define "apicurio-registry.image" -}}
 {{- $sfx := "" -}}
-{{- if hasKey . "sql" -}}
-{{- $sfx = "sql" -}}
+{{- if not .image.persistenceSuffix -}}
+{{- $sfx = "" -}}
+{{- else if hasKey . "sql" -}}
+{{- $sfx = "-sql" -}}
 {{- else if hasKey . "kafka" -}}
-{{- $sfx = "kafkasql" -}}
+{{- $sfx = "-kafkasql" -}}
 {{- else -}}
-{{- $sfx = "mem" -}}
+{{- $sfx = "-mem" -}}
 {{- end -}}
-{{ printf "%s/%s-%s:%s" .image.registry .image.repository $sfx .image.tag }}
+{{ printf "%s/%s%s:%s" .image.registry .image.repository $sfx .image.tag }}
 {{- end -}}

test/lint/registry.yaml

@@ -2,6 +2,17 @@ suite: lint registry values
 templates:
   - fake.yaml
 tests:
+  - it: persistenceSuffix is not boolean
+    set:
+      registry:
+        image:
+          persistenceSuffix: "qwe"
+    asserts:
+      - failedTemplate:
+          errorMessage: |
+            values don't meet the specifications of the schema(s) in the following chart(s):
+            apicurio-registry:
+            - registry.image.persistenceSuffix: Invalid type. Expected: boolean, given: string
   - it: imagePullSecrets is not array
     set:
       registry:

test/unit/deployment_registry.yaml

@@ -2,6 +2,60 @@ suite: test deployment-registry.yaml template
 templates:
   - deployment-registry.yaml
 tests:
+  - it: use mem image
+    set:
+      registry:
+        image:
+          registry: "quay.io"
+          repository: "apicurio/apicurio-registry"
+          tag: "fakeTag"
+          persistenceSuffix: true
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: quay.io/apicurio/apicurio-registry-mem:fakeTag
+  - it: use sql default image
+    set:
+      registry:
+        sql:
+          username: user
+          password: password
+          url: url
+        image:
+          registry: "quay.io"
+          repository: "apicurio/apicurio-registry"
+          tag: "fakeTag"
+          persistenceSuffix: true
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: quay.io/apicurio/apicurio-registry-sql:fakeTag
+  - it: use kafka default image
+    set:
+      registry:
+        kafka:
+          bootstrapServers: kafka
+        image:
+          registry: "quay.io"
+          repository: "apicurio/apicurio-registry"
+          tag: "fakeTag"
+          persistenceSuffix: true
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: quay.io/apicurio/apicurio-registry-kafkasql:fakeTag
+  - it: use customImage
+    set:
+      registry:
+        image:
+          registry: "myregistry"
+          repository: "myrepo/myimage"
+          tag: "fakeTag"
+          persistenceSuffix: false
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: myregistry/myrepo/myimage:fakeTag
   - it: set imagePullSecrets
     set:
       registry:

values.schema.json

@@ -13,7 +13,10 @@
       "properties": {
         "registry": {"type": "string", "default": "quay.io"},
         "repository": {"type": "string"},
-        "tag": {"type": "string"}
+        "tag": {"type": "string"},
+        "persistenceSuffix": {
+          "type": "boolean", "title": "Autodetect image suffix based on persistence type" , "default": true
+        }
       }
     },
     "podResources": {

values.yaml

@@ -18,6 +18,9 @@ registry:
     registry: "quay.io"
     repository: "apicurio/apicurio-registry"
     tag: "2.4.14.Final"
+    # Autodetect image suffix based on persistence type
+    # the default is true, it is used by helpers.tpl to define the image to use
+    persistenceSuffix: true
   # optional node selector
   nodeSelector: {}
   # optional init containers