Merge pull request #248 from RADAR-base/feature/some-fixes

Upgrade appversions of various services

.helmdocsignore

@@ -1,4 +1,3 @@
-charts/kafka-manager/
 charts/radar-backend/
 charts/smtp/
 external/

charts/app-config/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.5.0"
 description: A Helm chart for RADAR-base application config (app-config) backend service which is used as mobile app configuration engine with per-project and per-user configuration.
 name: app-config
-version: 1.2.0
+version: 1.3.0
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/app-config

charts/app-config/README.md

@@ -3,7 +3,7 @@
 # app-config
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/app-config)](https://artifacthub.io/packages/helm/radar-base/app-config)
 
-![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
+![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
 
 A Helm chart for RADAR-base application config (app-config) backend service which is used as mobile app configuration engine with per-project and per-user configuration.
 
@@ -32,8 +32,8 @@ A Helm chart for RADAR-base application config (app-config) backend service whic
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | replicaCount | int | `2` | Number of Appconfig replicas to deploy |
-| image.repository | string | `"radarbase/radar-app-config"` | Appconfig image repository |
-| image.tag | string | `"0.5.0"` | Appconfig image tag (immutable tags are recommended) |
+| image.repository | string | `"radarbase/radar-app-config"` | Appconfig image repositorys |
+| image.tag | string | `nil` | Appconfig image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | Appconfig image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override appconfig.fullname template with a string (will prepend the release name) |

charts/app-config/templates/deployment.yaml

@@ -48,7 +48,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: JAVA_OPTS

charts/app-config/values.yaml

@@ -6,10 +6,11 @@
 replicaCount: 2
 
 image:
-  # -- Appconfig image repository
+  # -- Appconfig image repositorys
   repository: radarbase/radar-app-config
   # -- Appconfig image tag (immutable tags are recommended)
-  tag: 0.5.0
+  # Overrides the image tag whose default is the chart appVersion.
+  tag:
   # -- Appconfig image pull policy
   pullPolicy: IfNotPresent
 

charts/kafka-manager/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: kafka-manager
-version: 2.2.0
+version: 2.3.0
 appVersion: 1.3.3.18
 kubeVersion: "^1.8.0-0"
 description: A tool for managing Apache Kafka.

charts/kafka-manager/README.md

@@ -1,27 +1,44 @@
 
 
-# kafka-manager
+# Kafka Manager Helm Chart
 
-![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![AppVersion: 1.3.3.18](https://img.shields.io/badge/AppVersion-1.3.3.18-informational?style=flat-square)
+[Kafka Manager](https://github.com/yahoo/kafka-manager) is a tool for managing [Apache Kafka](http://kafka.apache.org/).
 
-A tool for managing Apache Kafka.
+## TL;DR;
 
-**Homepage:** <https://github.com/yahoo/kafka-manager>
+```bash
+$ helm install stable/kafka-manager
+```
 
-## Maintainers
+## Prerequisites
 
-| Name | Email | Url |
-| ---- | ------ | --- |
-| giacomoguiulfo | <[email protected]> |  |
-| ssalaues | <[email protected]> |  |
+- Kubernetes 1.9+ with Beta APIs enabled
 
-## Source Code
+## Installing the Chart
 
-* <https://github.com/yahoo/kafka-manager>
+To install the chart with the release name `my-release`:
 
-## Requirements
+```bash
+$ helm install --name my-release stable/kafka-manager
+```
 
-Kubernetes: `^1.8.0-0`
+The command deploys Kafka Manager on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```bash
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+
+The following table lists the configurable parameters of the Kafka Manager chart and their default values.
 
 ## Values
 
@@ -46,7 +63,7 @@ Kubernetes: `^1.8.0-0`
 | zookeeper | object | `{"enabled":false,"env":{"ZK_HEAP_SIZE":"1G"},"persistence":{"enabled":false}}` | ---------------------------------------------------------------------------- |
 | zkHosts | string | `"cp-zookeeper:2181"` |  |
 | image.repository | string | `"radarbase/kafka-manager"` |  |
-| image.tag | string | `"1.3.3.18"` |  |
+| image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | disable_tls | bool | `false` | Disable TLS (reconfigures Ingress and sets URLs to use HTTP) |
@@ -57,5 +74,17 @@ Kubernetes: `^1.8.0-0`
 | ingress.hosts | list | `["localhost"]` | Hosts to accept requests from |
 | ingress.tls.secretName | string | `"radar-base-tls"` | TLS Secret Name |
 
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install stable/kafka-manager --name my-release \
+    --set ingress.enabled=true
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install stable/kafka-manager --name my-release -f values.yaml
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)

charts/kafka-manager/README.md.gotmpl

@@ -0,0 +1,56 @@
+# Kafka Manager Helm Chart
+
+[Kafka Manager](https://github.com/yahoo/kafka-manager) is a tool for managing [Apache Kafka](http://kafka.apache.org/).
+
+## TL;DR;
+
+```bash
+$ helm install stable/kafka-manager
+```
+
+## Prerequisites
+
+- Kubernetes 1.9+ with Beta APIs enabled
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```bash
+$ helm install --name my-release stable/kafka-manager
+```
+
+The command deploys Kafka Manager on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```bash
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+
+The following table lists the configurable parameters of the Kafka Manager chart and their default values.
+
+{{ template "chart.valuesSection" . }}
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install stable/kafka-manager --name my-release \
+    --set ingress.enabled=true
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install stable/kafka-manager --name my-release -f values.yaml
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)

charts/kafka-manager/templates/deployment.yaml

@@ -23,7 +23,7 @@ spec:
       serviceAccountName: {{ template "kafka-manager.serviceAccountName" . }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: kafka-manager

charts/kafka-manager/templates/job.yaml

@@ -22,7 +22,7 @@ spec:
             defaultMode: 0744
       containers:
         - name: {{ .Chart.Name }}-bootstrap
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: ["/usr/local/script/addClusters.sh"]
           env:

charts/kafka-manager/values.yaml

@@ -140,7 +140,8 @@ zkHosts: cp-zookeeper:2181
 ##
 image:
   repository: radarbase/kafka-manager
-  tag: 1.3.3.18
+  # -- Overrides the image tag whose default is the chart appVersion.
+  tag:
   pullPolicy: IfNotPresent
 
 # -- Docker registry secret names as an array

charts/radar-backend/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.4.0"
 description: A Helm chart for RADAR-Base backend services which provides a layer to monitor and analyze streams of wearable data and write data to  storage.
 name: radar-backend
-version: 0.2.1
+version: 0.3.0
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-backend

charts/radar-backend/README.md

@@ -1,24 +1,39 @@
+
+
 # radar-backend
+[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-backend)](https://artifacthub.io/packages/helm/radar-base/radar-backend)
 
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: 0.4.0](https://img.shields.io/badge/AppVersion-0.4.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.0](https://img.shields.io/badge/AppVersion-0.4.0-informational?style=flat-square)
 
 A Helm chart for RADAR-Base backend services which provides a layer to monitor and analyze streams of wearable data and write data to  storage.
 
+**Homepage:** <https://radar-base.org>
+
 ## Maintainers
 
 | Name | Email | Url |
 | ---- | ------ | --- |
-| Keyvan Hedayati | [email protected] | https://www.thehyve.nl |
-| Joris Borgdorff | [email protected] | https://www.thehyve.nl/experts/joris-borgdorff |
-| Nivethika Mahasivam | [email protected] | https://www.thehyve.nl/experts/nivethika-mahasivam |
+| Keyvan Hedayati | <[email protected]> | <https://www.thehyve.nl> |
+| Joris Borgdorff | <[email protected]> | <https://www.thehyve.nl/experts/joris-borgdorff> |
+| Nivethika Mahasivam | <[email protected]> | <https://www.thehyve.nl/experts/nivethika-mahasivam> |
+
+## Source Code
+
+* <https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-backend>
+* <https://github.com/RADAR-base/RADAR-Appserver>
+
+## Prerequisites
+* Kubernetes 1.22+
+* Kubectl 1.22+
+* Helm 3.1.0+
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | replicaCount | int | `2` |  |
 | image.repository | string | `"radarbase/radar-backend"` |  |
-| image.tag | string | `"0.4.0"` |  |
+| image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-backend.fullname template with a string (will prepend the release name) |
@@ -32,17 +47,14 @@ A Helm chart for RADAR-Base backend services which provides a layer to monitor a
 | nodeSelector | object | `{}` |  |
 | tolerations | list | `[]` |  |
 | affinity | object | `{}` |  |
+| extraEnv[0].name | string | `"TOPIC_LIST"` |  |
+| extraEnv[0].value | string | `"application_record_counts"` |  |
 | zookeeper | string | `"cp-zookeeper-headless:2181"` |  |
 | kafka | string | `"cp-kafka-headless:9092"` |  |
 | rest_proxy | string | `"http://cp-kafka-rest:8082"` |  |
 | schema_registry | string | `"http://cp-schema-registry:8081"` |  |
 | kafka_num_brokers | string | `"3"` |  |
-| extraEnv[0].name | string | `"TOPIC_LIST"` |  |
-| extraEnv[0].value | string | `"application_record_counts"` |  |
 | smtp.host | string | `"smtp"` |  |
 | smtp.port | int | `25` |  |
 | smtp.user | string | `"[email protected]"` |  |
 | persistence.enabled | bool | `false` |  |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

charts/radar-backend/templates/deployment.yaml

@@ -47,7 +47,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - radar-backend

charts/radar-backend/values.yaml

@@ -6,7 +6,8 @@ replicaCount: 2
 
 image:
   repository: radarbase/radar-backend
-  tag: 0.4.0
+  # -- Overrides the image tag whose default is the chart appVersion.
+  tag:
   pullPolicy: IfNotPresent
 
 # -- Docker registry secret names as an array

charts/radar-integration/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "1.0.4"
 description: A Helm chart for RADAR-Base REDCap survey integration application.
 name: radar-integration
-version: 0.6.0
+version: 0.7.0
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-integration

charts/radar-integration/README.md

@@ -3,7 +3,7 @@
 # radar-integration
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-integration)](https://artifacthub.io/packages/helm/radar-base/radar-integration)
 
-![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.4](https://img.shields.io/badge/AppVersion-1.0.4-informational?style=flat-square)
+![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.4](https://img.shields.io/badge/AppVersion-1.0.4-informational?style=flat-square)
 
 A Helm chart for RADAR-Base REDCap survey integration application.
 
@@ -32,7 +32,7 @@ A Helm chart for RADAR-Base REDCap survey integration application.
 |-----|------|---------|-------------|
 | replicaCount | int | `2` | Number replicas to deploy |
 | image.repository | string | `"radarbase/radar-redcapintegration"` | radar-integration image repository |
-| image.tag | string | `"1.0.4"` | radar-integration image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `nil` | radar-integration image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | radar-integration image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-integration.fullname template with a string (will prepend the release name) |

charts/radar-integration/templates/deployment.yaml

@@ -44,7 +44,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http

charts/radar-integration/values.yaml

@@ -10,7 +10,7 @@ image:
   repository: radarbase/radar-redcapintegration
   # -- radar-integration image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 1.0.4
+  tag:
   # -- radar-integration image pull policy
   pullPolicy: IfNotPresent
 

charts/radar-oura-connector/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.5.0"
+appVersion: "0.5.3"
 description: A Helm chart for RADAR-base oura connector. This application collects data from participants via the Oura Web API.
 name: radar-oura-connector
-version: 0.0.3
+version: 0.0.4
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-oura-connector