feat: configurable persistence

eshepelyuk · Jun 29, 2021 · cd2553f · cd2553f
1 parent fbf6043
commit cd2553f
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 7 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -14,3 +14,14 @@ app.kubernetes.io/name: {{ .Chart.Name }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{- define "apicurio-registry.image" -}}
+{{- $sfx := "" -}}
+{{- if hasKey . "sql" -}}
+{{- $sfx = "sql" -}}
+{{- else if hasKey . "kafka" -}}
+{{- $sfx = "kafkasql" -}}
+{{- else -}}
+{{- $sfx = "mem" -}}
+{{- end -}}
+{{ printf "%s/%s-%s:%s" .image.registry .image.repository $sfx .image.tag }}
+{{- end -}}
diff --git a/templates/deployment-registry.yaml b/templates/deployment-registry.yaml
@@ -19,20 +19,30 @@ spec:
       serviceAccountName: {{ include "apicurio-registry.name" . }}
       containers:
         - name: apicurio-registry
-          image: {{ .Values.registry.image.registry }}/{{ .Values.registry.image.repository }}:{{ .Values.registry.image.tag }}
+          image: {{ include "apicurio-registry.image" .Values.registry }}
           ports:
             - containerPort: 8080
               name: http
               protocol: TCP
           env:
-            # - name: K_SINK
-            #   value: http://localhost:8787/events
             - name: REGISTRY_LOG_LEVEL
               value: INFO
             - name: LOG_LEVEL
               value: INFO
             - name: QUARKUS_PROFILE
               value: prod
+            {{- if hasKey .Values.registry "sql" }}
+            - name: REGISTRY_DATASOURCE_URL
+              value: {{ .Values.registry.sql.url }}
+            - name: REGISTRY_DATASOURCE_USERNAME
+              value: {{ .Values.registry.sql.username }}
+            - name: REGISTRY_DATASOURCE_PASSWORD
+              value: {{ .Values.registry.sql.password }}
+            {{- end }}
+            {{- if hasKey .Values.registry "kafka" }}
+            - name: KAFKA_BOOTSTRAP_SERVERS
+              value: {{ .Values.registry.kafka.bootstrapServers }}
+            {{- end }}
           livenessProbe:
             httpGet:
               path: /health/live

diff --git a/templates/deployment-sync.yaml b/templates/deployment-sync.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       serviceAccountName: {{ include "apicurio-registry.name" . }}
       containers:
-        - name: kube-sync
+        - name: artf-sync
           image: {{ .Values.sync.image.registry }}/{{ .Values.sync.image.repository }}:{{ .Values.sync.image.tag }}
           imagePullPolicy: "Always"
           env:

diff --git a/test/linter/test.sh b/test/linter/test.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -x
 
 helm lint . --strict
 if [ $? -ne 0 ]; then
@@ -25,3 +24,27 @@ helm lint . --strict --set 'sync.watchNamespaces=null'
 if [ $? -ne 0 ]; then
   exit 1
 fi
+
+helm lint . --strict --set 'registry.kafka.bootstrapServers=kafka1'
+if [ $? -ne 0 ]; then
+  exit 1
+fi
+
+helm lint . --strict --set 'registry.kafka.bootstrap=kafka1'
+if [ $? -eq 0 ]; then
+  exit 1
+fi
+
+helm lint . --strict --set 'registry.sql.url=c,registry.sql.username=a,registry.sql.password=b'
+if [ $? -ne 0 ]; then
+  exit 1
+fi
+
+helm lint . --strict --set 'registry.sql.url=c,registry.sql.username=a,registry.sql.pwd=b'
+if [ $? -eq 0 ]; then
+  exit 1
+fi
+
+echo "=================================================================================="
+echo "                                LINT PASSED"
+echo "=================================================================================="
diff --git a/values.schema.json b/values.schema.json
@@ -27,6 +27,24 @@
           "type": "object"
         }
       }
+    },
+    "persistence": {
+      "kafka": {
+        "type": "object", "additionalProperties": false,
+        "required": ["bootstrapServers"],
+        "properties": {
+          "bootstrapServers": {"type": "string"}
+        }
+      },
+      "sql": {
+        "type": "object", "additionalProperties": false,
+        "required": ["url", "username", "password"],
+        "properties": {
+          "url": {"type": "string"},
+          "username": {"type": "string"},
+          "password": {"type": "string"}
+        }
+      }
     }
   },
 
@@ -36,10 +54,13 @@
     "registry": {
       "type": "object", "title": "registry settings",
       "required": ["enabled", "image", "resources"],
+      "additionalProperties": false,
       "properties": {
         "enabled": {"$ref": "#/definitions/isEnabled"},
         "image": {"$ref": "#/definitions/dockerImage"},
-        "resources": {"$ref": "#/definitions/podResources"}
+        "resources": {"$ref": "#/definitions/podResources"},
+        "kafka": {"$ref": "#/definitions/persistence/kafka"},
+        "sql": {"$ref": "#/definitions/persistence/sql"}
       }
     },
     "sync": {

diff --git a/values.yaml b/values.yaml
@@ -1,8 +1,19 @@
 registry:
   enabled: true
+
+  ## uncomment and adjust for kafka persistence
+  # kafka:
+  #   bootstrapServers: kafka1:9092,kafka2:9092
+
+  ## uncomment and adjust for sql persistence
+  # sql:
+  #   url: jdbc:postgresql://postgres/apicurio-registry
+  #   username: apicurio
+  #   password: apicurio-password
+
   image:
     registry: "quay.io"
-    repository: "apicurio/apicurio-registry-mem"
+    repository: "apicurio/apicurio-registry"
     tag: "2.0.0.Final"
   resources: {}
     # limits: