Added wasp-ws-reading-service (#22)

* Added wasp-ws-reading-service * Changed template name of kafka.listenerType template and bumped several charts to new versions.
digicatapult · Feb 21, 2023 · b3d2780 · b3d2780
1 parent 94d7a1a
commit b3d2780
Show file tree

Hide file tree

Showing 27 changed files with 1,702 additions and 215 deletions.
diff --git a/README.md b/README.md
@@ -12,8 +12,8 @@ A collection of [helm](https://helm.sh) charts created by [Digital Catapult](htt
 * [wasp-routing-service](charts/wasp-routing-service/README.md) - Deploy wasp-routing-service
 * [wasp-authentication-service](charts/wasp-authentication-service/README.md) - Deploy wasp-authentication-service
 * [wasp-thing-service](charts/wasp-thing-service/README.md) - Deploy wasp-thing-service
-* [wasp-user-service](charts/wasp-user-service/Chart.yaml) - Deploy wasp-user-service
+* [wasp-user-service](charts/wasp-user-service/README.md) - Deploy wasp-user-service
 * [wasp-reading-service](charts/wasp-reading-service/README.md) - Deploy wasp-reading-service
 * [wasp-event-service](charts/wasp-event-service/README.md) - Deploy wasp-event-service
-* [wasp-ws-event-service](charts/wasp-ws-event-service/Chart.yaml) - Deploy wasp-ws-event-service
-* [wasp-ws-reading-service](charts/wasp-ws-reading-service/Chart.yaml) - Deploy wasp-ws-reading-service
+* [wasp-ws-event-service](charts/wasp-ws-event-service/README.md) - Deploy wasp-ws-event-service
+* [wasp-ws-reading-service](charts/wasp-ws-reading-service/README.md) - Deploy wasp-ws-reading-service
diff --git a/charts/wasp-event-service/Chart.yaml b/charts/wasp-event-service/Chart.yaml
@@ -29,4 +29,4 @@ maintainers:
 name: wasp-event-service
 sources:
   - https://github.com/digicatapult/wasp-event-service
-version: 1.0.0
+version: 1.0.1
diff --git a/charts/wasp-event-service/templates/_helpers.tpl b/charts/wasp-event-service/templates/_helpers.tpl
@@ -55,9 +55,9 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{/*
 Return the type of listener
 Usage:
-{{ include "wasp-event-service.listenerType" ( dict "protocol" .Values.path.to.the.Value ) }}
+{{ include "wasp-event-service.kafka.listenerType" ( dict "protocol" .Values.path.to.the.Value ) }}
 */}}
-{{- define "wasp-event-service.listenerType" -}}
+{{- define "wasp-event-service.kafka.listenerType" -}}
 {{- if eq .protocol "plaintext" -}}
 PLAINTEXT
 {{- else if or (eq .protocol "tls") (eq .protocol "mtls") -}}
@@ -267,7 +267,7 @@ wasp-event-service:
 
 {{/* Validate values of Schema Registry - SASL authentication */}}
 {{- define "wasp-event-service.validateValues.authentication.sasl" -}}
-{{- $kafkaProtocol := include "wasp-event-service.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
+{{- $kafkaProtocol := include "wasp-event-service.kafka.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
 {{- if .Values.kafka.enabled }}
 {{- if and (contains "SASL" $kafkaProtocol) (or (not .Values.kafka.auth.sasl.jaas.clientUsers) (not .Values.kafka.auth.sasl.jaas.clientPasswords)) }}
 wasp-event-service: kafka.auth.jaas.clientUsers kafka.auth.jaas.clientPasswords
@@ -287,7 +287,7 @@ wasp-event-service: externalKafka.auth.jaas.user externalKafka.auth.jaas.passwor
 
 {{/* Validate values of Schema Registry - TLS authentication */}}
 {{- define "wasp-event-service.validateValues.authentication.tls" -}}
-{{- $kafkaProtocol := include "wasp-event-service.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
+{{- $kafkaProtocol := include "wasp-event-service.kafka.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
 {{- if and (contains "SSL" $kafkaProtocol) (not .Values.kafka.auth.jksSecret) }}
 kafka: auth.kafka.jksSecret
     A secret containing the Schema Registry JKS files is required when TLS encryption in enabled

diff --git a/charts/wasp-reading-service/Chart.yaml b/charts/wasp-reading-service/Chart.yaml
@@ -29,4 +29,4 @@ maintainers:
 name: wasp-reading-service
 sources:
   - https://github.com/digicatapult/wasp-reading-service
-version: 1.0.0
+version: 1.0.1
diff --git a/charts/wasp-reading-service/templates/_helpers.tpl b/charts/wasp-reading-service/templates/_helpers.tpl
@@ -55,9 +55,9 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{/*
 Return the type of listener
 Usage:
-{{ include "wasp-reading-service.listenerType" ( dict "protocol" .Values.path.to.the.Value ) }}
+{{ include "wasp-reading-service.kafka.listenerType" ( dict "protocol" .Values.path.to.the.Value ) }}
 */}}
-{{- define "wasp-reading-service.listenerType" -}}
+{{- define "wasp-reading-service.kafka.listenerType" -}}
 {{- if eq .protocol "plaintext" -}}
 PLAINTEXT
 {{- else if or (eq .protocol "tls") (eq .protocol "mtls") -}}
@@ -267,7 +267,7 @@ wasp-reading-service:
 
 {{/* Validate values of Schema Registry - SASL authentication */}}
 {{- define "wasp-reading-service.validateValues.authentication.sasl" -}}
-{{- $kafkaProtocol := include "wasp-reading-service.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
+{{- $kafkaProtocol := include "wasp-reading-service.kafka.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
 {{- if .Values.kafka.enabled }}
 {{- if and (contains "SASL" $kafkaProtocol) (or (not .Values.kafka.auth.sasl.jaas.clientUsers) (not .Values.kafka.auth.sasl.jaas.clientPasswords)) }}
 wasp-reading-service: kafka.auth.jaas.clientUsers kafka.auth.jaas.clientPasswords
@@ -287,7 +287,7 @@ wasp-reading-service: externalKafka.auth.jaas.user externalKafka.auth.jaas.passw
 
 {{/* Validate values of Schema Registry - TLS authentication */}}
 {{- define "wasp-reading-service.validateValues.authentication.tls" -}}
-{{- $kafkaProtocol := include "wasp-reading-service.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
+{{- $kafkaProtocol := include "wasp-reading-service.kafka.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
 {{- if and (contains "SSL" $kafkaProtocol) (not .Values.kafka.auth.jksSecret) }}
 kafka: auth.kafka.jksSecret
     A secret containing the Schema Registry JKS files is required when TLS encryption in enabled

diff --git a/charts/wasp-routing-service/Chart.yaml b/charts/wasp-routing-service/Chart.yaml
@@ -24,4 +24,4 @@ maintainers:
 name: wasp-routing-service
 sources:
   - https://github.com/digicatapult/wasp-routing-service
-version: 3.0.0
+version: 3.0.1
diff --git a/charts/wasp-routing-service/templates/_helpers.tpl b/charts/wasp-routing-service/templates/_helpers.tpl
@@ -14,9 +14,9 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{/*
 Return the type of listener
 Usage:
-{{ include "wasp-routing-service.listenerType" ( dict "protocol" .Values.path.to.the.Value ) }}
+{{ include "wasp-routing-service.kafka.listenerType" ( dict "protocol" .Values.path.to.the.Value ) }}
 */}}
-{{- define "wasp-routing-service.listenerType" -}}
+{{- define "wasp-routing-service.kafka.listenerType" -}}
 {{- if eq .protocol "plaintext" -}}
 PLAINTEXT
 {{- else if or (eq .protocol "tls") (eq .protocol "mtls") -}}
@@ -126,7 +126,7 @@ Compile all warnings into a single message, and call fail.
 
 {{/* Validate values of Schema Registry - SASL authentication */}}
 {{- define "wasp-routing-service.validateValues.authentication.sasl" -}}
-{{- $kafkaProtocol := include "wasp-routing-service.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
+{{- $kafkaProtocol := include "wasp-routing-service.kafka.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
 {{- if .Values.kafka.enabled }}
 {{- if and (contains "SASL" $kafkaProtocol) (or (not .Values.kafka.auth.sasl.jaas.clientUsers) (not .Values.kafka.auth.sasl.jaas.clientPasswords)) }}
 wasp-routing-service: kafka.auth.jaas.clientUsers kafka.auth.jaas.clientPasswords
@@ -146,7 +146,7 @@ wasp-routing-service: externalKafka.auth.jaas.user externalKafka.auth.jaas.passw
 
 {{/* Validate values of Schema Registry - TLS authentication */}}
 {{- define "wasp-routing-service.validateValues.authentication.tls" -}}
-{{- $kafkaProtocol := include "wasp-routing-service.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
+{{- $kafkaProtocol := include "wasp-routing-service.kafka.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
 {{- if and (contains "SSL" $kafkaProtocol) (not .Values.auth.kafka.jksSecret) }}
 kafka: auth.kafka.jksSecret
     A secret containing the Schema Registry JKS files is required when TLS encryption in enabled

diff --git a/charts/wasp-ws-event-service/Chart.yaml b/charts/wasp-ws-event-service/Chart.yaml
@@ -25,4 +25,4 @@ maintainers:
 name: wasp-ws-event-service
 sources:
   - https://github.com/digicatapult/wasp-ws-event-service
-version: 1.0.0
+version: 1.0.1
diff --git a/charts/wasp-ws-event-service/templates/_helpers.tpl b/charts/wasp-ws-event-service/templates/_helpers.tpl
@@ -40,9 +40,9 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{/*
 Return the type of listener
 Usage:
-{{ include "wasp-ws-event-service.listenerType" ( dict "protocol" .Values.path.to.the.Value ) }}
+{{ include "wasp-ws-event-service.kafka.listenerType" ( dict "protocol" .Values.path.to.the.Value ) }}
 */}}
-{{- define "wasp-ws-event-service.listenerType" -}}
+{{- define "wasp-ws-event-service.kafka.listenerType" -}}
 {{- if eq .protocol "plaintext" -}}
 PLAINTEXT
 {{- else if or (eq .protocol "tls") (eq .protocol "mtls") -}}
@@ -113,7 +113,7 @@ Compile all warnings into a single message, and call fail.
 
 {{/* Validate values of Schema Registry - SASL authentication */}}
 {{- define "wasp-ws-event-service.validateValues.authentication.sasl" -}}
-{{- $kafkaProtocol := include "wasp-ws-event-service.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
+{{- $kafkaProtocol := include "wasp-ws-event-service.kafka.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
 {{- if .Values.kafka.enabled }}
 {{- if and (contains "SASL" $kafkaProtocol) (or (not .Values.kafka.auth.sasl.jaas.clientUsers) (not .Values.kafka.auth.sasl.jaas.clientPasswords)) }}
 wasp-ws-event-service: kafka.auth.jaas.clientUsers kafka.auth.jaas.clientPasswords
@@ -133,7 +133,7 @@ wasp-ws-event-service: externalKafka.auth.jaas.user externalKafka.auth.jaas.pass
 
 {{/* Validate values of Schema Registry - TLS authentication */}}
 {{- define "wasp-ws-event-service.validateValues.authentication.tls" -}}
-{{- $kafkaProtocol := include "wasp-ws-event-service.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
+{{- $kafkaProtocol := include "wasp-ws-event-service.kafka.listenerType" ( dict "protocol" (ternary .Values.kafka.auth.clientProtocol .Values.externalKafka.auth.protocol .Values.kafka.enabled) ) -}}
 {{- if and (contains "SSL" $kafkaProtocol) (not .Values.kafka.auth.jksSecret) }}
 kafka: auth.kafka.jksSecret
     A secret containing the Schema Registry JKS files is required when TLS encryption in enabled

diff --git a/charts/wasp-ws-reading-service/.helmignore b/charts/wasp-ws-reading-service/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/charts/wasp-ws-reading-service/Chart.lock b/charts/wasp-ws-reading-service/Chart.lock
@@ -1,6 +1,9 @@
 dependencies:
 - name: kafka
   repository: https://charts.bitnami.com/bitnami
-  version: 20.0.5
-digest: sha256:7b64b5633bdd799f9b73157c2eba9edd918998952031ff5bd13d2fb27cd3830b
-generated: "2023-01-24T10:13:21.759898Z"
+  version: 20.0.6
+- name: common
+  repository: https://charts.bitnami.com/bitnami
+  version: 2.2.3
+digest: sha256:e09ef4c860d8c62fa8b131797793c98af5bf85342f629fa624bf3a8b999e51c5
+generated: "2023-02-20T11:38:59.023932Z"
diff --git a/charts/wasp-ws-reading-service/Chart.yaml b/charts/wasp-ws-reading-service/Chart.yaml
@@ -1,16 +1,28 @@
+annotations:
+  category: wasp
+  licenses: Apache-2.0
 apiVersion: v2
-name: wasp-ws-reading-service
-appVersion: '0.1.0'
-description: A Helm chart for wasp-ws-reading-service
-version: '0.0.9'
-type: application
-maintainers:
-  - name: digicatapult
-    email: opensource@digicatapult.org.uk
-    url: www.digicatapult.org.uk
-
+appVersion: 0.1.1
 dependencies:
-  - name: kafka
-    version: '20.x.x'
+  - condition: kafka.enabled
+    name: kafka
+    repository: https://charts.bitnami.com/bitnami
+    version: 20.x.x
+  - name: common
     repository: https://charts.bitnami.com/bitnami
-    condition: kafka.enabled
+    tags:
+      - bitnami-common
+    version: 2.x.x
+description: The wasp-ws-reading-service is a component of the WASP (Wide-Area-Sensor-Platform), an IoT platform designed to normalise and consolidate data from multiple IoT data services into one place.
+home: https://github.com/digicatapult/wasp-documentation
+icon: https://raw.githubusercontent.com/digicatapult/wasp-documentation/main/assets/icon.png
+keywords:
+  - IoT
+maintainers:
+  - name: digicatapult  # Digital Catapult
+    url: https://github.com/digicatapult/helm-charts
+    email: opensource@digicatapult.org.uk
+name: wasp-ws-reading-service
+sources:
+  - https://github.com/digicatapult/wasp-ws-reading-service
+version: 1.0.0