From 18d9a9d386bc0188cc5e2442454ab07c0b9f7d77 Mon Sep 17 00:00:00 2001 From: Keyvan Date: Mon, 18 Sep 2023 13:22:11 +0200 Subject: [PATCH] Allow charts to have customized liveness and readiness probes --- charts/app-config-frontend/Chart.yaml | 2 +- charts/app-config-frontend/README.md | 16 ++++++++- .../templates/deployment.yaml | 18 ++++++++++ charts/app-config-frontend/values.yaml | 35 ++++++++++++++++++ charts/app-config/Chart.yaml | 2 +- charts/app-config/README.md | 16 ++++++++- charts/app-config/templates/deployment.yaml | 28 +++++++++------ charts/app-config/values.yaml | 34 ++++++++++++++++++ charts/catalog-server/Chart.yaml | 2 +- charts/catalog-server/README.md | 16 ++++++++- .../catalog-server/templates/deployment.yaml | 28 +++++++++------ charts/catalog-server/values.yaml | 34 ++++++++++++++++++ charts/management-portal/Chart.yaml | 2 +- charts/management-portal/README.md | 16 ++++++++- .../templates/deployment.yaml | 28 +++++++++------ charts/management-portal/values.yaml | 34 ++++++++++++++++++ charts/radar-appserver/Chart.yaml | 2 +- charts/radar-appserver/README.md | 16 ++++++++- .../radar-appserver/templates/deployment.yaml | 28 +++++++++------ charts/radar-appserver/values.yaml | 34 ++++++++++++++++++ charts/radar-fitbit-connector/Chart.yaml | 2 +- charts/radar-fitbit-connector/README.md | 16 ++++++++- .../templates/deployment.yaml | 28 +++++++++------ charts/radar-fitbit-connector/values.yaml | 34 ++++++++++++++++++ charts/radar-gateway/Chart.yaml | 2 +- charts/radar-gateway/README.md | 16 ++++++++- .../radar-gateway/templates/deployment.yaml | 36 +++++++++++-------- charts/radar-gateway/values.yaml | 34 ++++++++++++++++++ charts/radar-home/Chart.yaml | 2 +- charts/radar-home/README.md | 16 ++++++++- charts/radar-home/templates/deployment.yaml | 18 ++++++++++ charts/radar-home/values.yaml | 34 ++++++++++++++++++ charts/radar-integration/Chart.yaml | 2 +- charts/radar-integration/README.md | 16 ++++++++- .../templates/deployment.yaml | 28 +++++++++------ charts/radar-integration/values.yaml | 34 ++++++++++++++++++ charts/radar-jdbc-connector/Chart.yaml | 2 +- charts/radar-jdbc-connector/README.md | 16 ++++++++- .../templates/deployment.yaml | 28 +++++++++------ charts/radar-jdbc-connector/values.yaml | 34 ++++++++++++++++++ charts/radar-push-endpoint/Chart.yaml | 2 +- charts/radar-push-endpoint/README.md | 16 ++++++++- .../templates/deployment.yaml | 36 +++++++++++-------- charts/radar-push-endpoint/values.yaml | 34 ++++++++++++++++++ .../radar-rest-sources-authorizer/Chart.yaml | 2 +- .../radar-rest-sources-authorizer/README.md | 16 ++++++++- .../templates/deployment.yaml | 28 +++++++++------ .../radar-rest-sources-authorizer/values.yaml | 34 ++++++++++++++++++ charts/radar-rest-sources-backend/Chart.yaml | 2 +- charts/radar-rest-sources-backend/README.md | 16 ++++++++- .../templates/deployment.yaml | 28 +++++++++------ charts/radar-rest-sources-backend/values.yaml | 34 ++++++++++++++++++ charts/radar-s3-connector/Chart.yaml | 2 +- charts/radar-s3-connector/README.md | 16 ++++++++- .../templates/deployment.yaml | 28 +++++++++------ charts/radar-s3-connector/values.yaml | 34 ++++++++++++++++++ .../radar-upload-connect-backend/Chart.yaml | 2 +- charts/radar-upload-connect-backend/README.md | 16 ++++++++- .../templates/deployment.yaml | 23 +++++++++--- .../radar-upload-connect-backend/values.yaml | 34 ++++++++++++++++++ .../radar-upload-connect-frontend/Chart.yaml | 2 +- .../radar-upload-connect-frontend/README.md | 16 ++++++++- .../templates/deployment.yaml | 22 +++++++++--- .../radar-upload-connect-frontend/values.yaml | 34 ++++++++++++++++++ .../radar-upload-source-connector/Chart.yaml | 2 +- .../radar-upload-source-connector/README.md | 16 ++++++++- .../templates/deployment.yaml | 28 +++++++++------ .../radar-upload-source-connector/values.yaml | 34 ++++++++++++++++++ charts/s3-proxy/Chart.yaml | 2 +- charts/s3-proxy/README.md | 16 ++++++++- charts/s3-proxy/templates/deployment.yaml | 28 +++++++++------ charts/s3-proxy/values.yaml | 34 ++++++++++++++++++ 72 files changed, 1233 insertions(+), 193 deletions(-) diff --git a/charts/app-config-frontend/Chart.yaml b/charts/app-config-frontend/Chart.yaml index 76439a64..dac7bc62 100644 --- a/charts/app-config-frontend/Chart.yaml +++ b/charts/app-config-frontend/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.1 +version: 1.0.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/app-config-frontend/README.md b/charts/app-config-frontend/README.md index e3d5c9a1..f52d0bf7 100644 --- a/charts/app-config-frontend/README.md +++ b/charts/app-config-frontend/README.md @@ -3,7 +3,7 @@ # app-config-frontend [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/app-config-frontend)](https://artifacthub.io/packages/helm/radar-base/app-config-frontend) -![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-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.0.2](https://img.shields.io/badge/Version-1.0.2-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 the frontend application of RADAR-base application config (app-config). @@ -56,6 +56,20 @@ A Helm chart for the frontend application of RADAR-base application config (app- | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `60` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `20` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `60` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `20` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | authUrl | string | `"http://localhost/managementportal/oauth"` | Authorization URL of the IDP | | authCallbackUrl | string | `"http://localhost/appconfig/login"` | Callback URL to where authorization-code should be returned | | backendUrl | string | `"/appconfig/api"` | Base-URL of the App Config backend service | diff --git a/charts/app-config-frontend/templates/deployment.yaml b/charts/app-config-frontend/templates/deployment.yaml index 815e1318..940bc6c5 100644 --- a/charts/app-config-frontend/templates/deployment.yaml +++ b/charts/app-config-frontend/templates/deployment.yaml @@ -62,14 +62,32 @@ spec: - name: http containerPort: 8080 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: httpGet: path: /appconfig/ port: http + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: httpGet: path: /appconfig/ port: http + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} diff --git a/charts/app-config-frontend/values.yaml b/charts/app-config-frontend/values.yaml index d3dac913..02827250 100644 --- a/charts/app-config-frontend/values.yaml +++ b/charts/app-config-frontend/values.yaml @@ -93,6 +93,41 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 60 + # -- Period seconds for livenessProbe + periodSeconds: 20 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 60 + # -- Period seconds for readinessProbe + periodSeconds: 20 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + + # -- Authorization URL of the IDP authUrl: http://localhost/managementportal/oauth # -- Callback URL to where authorization-code should be returned diff --git a/charts/app-config/Chart.yaml b/charts/app-config/Chart.yaml index d425d31d..7999141c 100644 --- a/charts/app-config/Chart.yaml +++ b/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.0.1 +version: 1.0.2 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 diff --git a/charts/app-config/README.md b/charts/app-config/README.md index dbbd7046..aa2be899 100644 --- a/charts/app-config/README.md +++ b/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.0.1](https://img.shields.io/badge/Version-1.0.1-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.0.2](https://img.shields.io/badge/Version-1.0.2-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. @@ -58,6 +58,20 @@ A Helm chart for RADAR-base application config (app-config) backend service whic | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `20` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `60` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `20` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `60` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | javaOpts | string | `"-Xmx550m"` | Standard JAVA_OPTS that should be passed to this service | | clientId | string | `"radar_appconfig"` | OAuth2 client id | | clientSecret | string | `"secret"` | OAuth2 client secret | diff --git a/charts/app-config/templates/deployment.yaml b/charts/app-config/templates/deployment.yaml index 273c9957..1a4f0729 100644 --- a/charts/app-config/templates/deployment.yaml +++ b/charts/app-config/templates/deployment.yaml @@ -91,26 +91,34 @@ spec: - name: hazelcast containerPort: 5801 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: exec: command: - /bin/sh - /etc/radar-app-config/healthcheck.sh - failureThreshold: 3 - initialDelaySeconds: 20 - periodSeconds: 60 - successThreshold: 1 - timeoutSeconds: 5 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: exec: command: - /bin/sh - /etc/radar-app-config/healthcheck.sh - failureThreshold: 3 - initialDelaySeconds: 20 - periodSeconds: 60 - successThreshold: 1 - timeoutSeconds: 5 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumes: diff --git a/charts/app-config/values.yaml b/charts/app-config/values.yaml index d7fd3e76..1b1312fc 100644 --- a/charts/app-config/values.yaml +++ b/charts/app-config/values.yaml @@ -98,6 +98,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 20 + # -- Period seconds for livenessProbe + periodSeconds: 60 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 20 + # -- Period seconds for readinessProbe + periodSeconds: 60 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # -- Standard JAVA_OPTS that should be passed to this service javaOpts: "-Xmx550m" # -- OAuth2 client id diff --git a/charts/catalog-server/Chart.yaml b/charts/catalog-server/Chart.yaml index e4398168..9a7b1534 100644 --- a/charts/catalog-server/Chart.yaml +++ b/charts/catalog-server/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.8.2" description: A Helm chart for RADAR-base catalogue server. This application creates RADAR-base topics in Kafka, registers schemas in Schema Registry and keeps a catalog of available source types. name: catalog-server -version: 0.4.7 +version: 0.4.8 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/catalog-server diff --git a/charts/catalog-server/README.md b/charts/catalog-server/README.md index f0230d92..3bd8552d 100644 --- a/charts/catalog-server/README.md +++ b/charts/catalog-server/README.md @@ -3,7 +3,7 @@ # catalog-server [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/catalog-server)](https://artifacthub.io/packages/helm/radar-base/catalog-server) -![Version: 0.4.7](https://img.shields.io/badge/Version-0.4.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.2](https://img.shields.io/badge/AppVersion-0.8.2-informational?style=flat-square) +![Version: 0.4.8](https://img.shields.io/badge/Version-0.4.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.2](https://img.shields.io/badge/AppVersion-0.8.2-informational?style=flat-square) A Helm chart for RADAR-base catalogue server. This application creates RADAR-base topics in Kafka, registers schemas in Schema Registry and keeps a catalog of available source types. @@ -51,6 +51,20 @@ A Helm chart for RADAR-base catalogue server. This application creates RADAR-bas | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVarsInit | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `60` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `60` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | kafka_num_brokers | int | `3` | number of Kafka brokers to look for | | kafka | string | `"cp-kafka-headless:9092"` | URI of Kafka brokers | | schema_registry | string | `"http://cp-schema-registry:8081"` | URL of the confluent schema registry | diff --git a/charts/catalog-server/templates/deployment.yaml b/charts/catalog-server/templates/deployment.yaml index fc1118f6..e42c61c2 100644 --- a/charts/catalog-server/templates/deployment.yaml +++ b/charts/catalog-server/templates/deployment.yaml @@ -107,24 +107,32 @@ spec: - name: http containerPort: 9010 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: httpGet: path: /source-types port: http - initialDelaySeconds: 5 - periodSeconds: 60 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: httpGet: path: /source-types port: http - initialDelaySeconds: 5 - periodSeconds: 60 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/catalog-server/values.yaml b/charts/catalog-server/values.yaml index b28ba4ff..a30798ee 100644 --- a/charts/catalog-server/values.yaml +++ b/charts/catalog-server/values.yaml @@ -88,6 +88,40 @@ extraEnvVarsInit: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 5 + # -- Period seconds for livenessProbe + periodSeconds: 60 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 5 + # -- Period seconds for readinessProbe + periodSeconds: 60 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # -- number of Kafka brokers to look for kafka_num_brokers: 3 # -- URI of Kafka brokers diff --git a/charts/management-portal/Chart.yaml b/charts/management-portal/Chart.yaml index 0febc0f2..22eea30f 100644 --- a/charts/management-portal/Chart.yaml +++ b/charts/management-portal/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.0.0" description: A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base. name: management-portal -version: 1.0.2 +version: 1.0.3 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/management-portal diff --git a/charts/management-portal/README.md b/charts/management-portal/README.md index 0725f4e7..d365d729 100644 --- a/charts/management-portal/README.md +++ b/charts/management-portal/README.md @@ -3,7 +3,7 @@ # management-portal [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/management-portal)](https://artifacthub.io/packages/helm/radar-base/management-portal) -![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) +![Version: 1.0.3](https://img.shields.io/badge/Version-1.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base. @@ -55,6 +55,20 @@ A Helm chart for RADAR-Base Management Portal to manage projects and participant | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `60` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `90` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `60` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `90` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | keystore | string | `""` | base 64 encoded binary p12 keystore containing a ECDSA certificate with alias `radarbase-managementportal-ec` and a RSA certificate with alias `selfsigned`. | | postgres.host | string | `"postgresql"` | host name of the postgres db | | postgres.port | int | `5432` | post of the postgres db | diff --git a/charts/management-portal/templates/deployment.yaml b/charts/management-portal/templates/deployment.yaml index d5398e57..1bd766fd 100644 --- a/charts/management-portal/templates/deployment.yaml +++ b/charts/management-portal/templates/deployment.yaml @@ -131,26 +131,34 @@ spec: - name: http containerPort: 8080 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: exec: command: - /bin/sh - /config/healthcheck.sh - initialDelaySeconds: 60 - periodSeconds: 90 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: exec: command: - /bin/sh - /config/healthcheck.sh - initialDelaySeconds: 60 - periodSeconds: 90 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/management-portal/values.yaml b/charts/management-portal/values.yaml index 2afdd0a8..6587165f 100644 --- a/charts/management-portal/values.yaml +++ b/charts/management-portal/values.yaml @@ -98,6 +98,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 60 + # -- Period seconds for livenessProbe + periodSeconds: 90 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 60 + # -- Period seconds for readinessProbe + periodSeconds: 90 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # -- base 64 encoded binary p12 keystore containing a ECDSA certificate with alias `radarbase-managementportal-ec` and a RSA certificate with alias `selfsigned`. keystore: "" # With helmfile, this can be set in a production.yaml.gotmpl diff --git a/charts/radar-appserver/Chart.yaml b/charts/radar-appserver/Chart.yaml index 0d7db5ff..3068568f 100644 --- a/charts/radar-appserver/Chart.yaml +++ b/charts/radar-appserver/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.3.0" description: A Helm chart for the backend application of RADAR-base Appserver name: radar-appserver -version: 0.1.8 +version: 0.1.9 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-appserver diff --git a/charts/radar-appserver/README.md b/charts/radar-appserver/README.md index 17f456b1..375eb0db 100644 --- a/charts/radar-appserver/README.md +++ b/charts/radar-appserver/README.md @@ -3,7 +3,7 @@ # radar-appserver [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-appserver)](https://artifacthub.io/packages/helm/radar-base/radar-appserver) -![Version: 0.1.8](https://img.shields.io/badge/Version-0.1.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) +![Version: 0.1.9](https://img.shields.io/badge/Version-0.1.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) A Helm chart for the backend application of RADAR-base Appserver @@ -53,6 +53,20 @@ A Helm chart for the backend application of RADAR-base Appserver | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `20` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `60` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `20` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `60` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | postgres.host | string | `"radar-appserver-postgresql"` | host name of the postgres db | | postgres.port | int | `5432` | post of the postgres db | | postgres.database | string | `"appserver"` | database name | diff --git a/charts/radar-appserver/templates/deployment.yaml b/charts/radar-appserver/templates/deployment.yaml index 11ea351d..281a2c00 100644 --- a/charts/radar-appserver/templates/deployment.yaml +++ b/charts/radar-appserver/templates/deployment.yaml @@ -92,26 +92,34 @@ spec: - name: http containerPort: 8080 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: exec: command: - /bin/sh - /etc/radar-appserver/healthcheck.sh - failureThreshold: 3 - initialDelaySeconds: 20 - periodSeconds: 60 - successThreshold: 1 - timeoutSeconds: 5 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: exec: command: - /bin/sh - /etc/radar-appserver/healthcheck.sh - failureThreshold: 3 - initialDelaySeconds: 20 - periodSeconds: 60 - successThreshold: 1 - timeoutSeconds: 5 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/radar-appserver/values.yaml b/charts/radar-appserver/values.yaml index e1d0ab15..138f1d40 100644 --- a/charts/radar-appserver/values.yaml +++ b/charts/radar-appserver/values.yaml @@ -90,6 +90,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 20 + # -- Period seconds for livenessProbe + periodSeconds: 60 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 20 + # -- Period seconds for readinessProbe + periodSeconds: 60 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # Configuration of the Postgres data base to store data from Appserver postgres: # -- host name of the postgres db diff --git a/charts/radar-fitbit-connector/Chart.yaml b/charts/radar-fitbit-connector/Chart.yaml index af087c27..6f66b03c 100644 --- a/charts/radar-fitbit-connector/Chart.yaml +++ b/charts/radar-fitbit-connector/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.4.1" description: A Helm chart for RADAR-base fitbit connector. This application collects data from participants via the Fitbit Web API. name: radar-fitbit-connector -version: 0.2.6 +version: 0.2.7 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-fitbit-connector diff --git a/charts/radar-fitbit-connector/README.md b/charts/radar-fitbit-connector/README.md index 7a750248..1e10b2c0 100644 --- a/charts/radar-fitbit-connector/README.md +++ b/charts/radar-fitbit-connector/README.md @@ -3,7 +3,7 @@ # radar-fitbit-connector [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-fitbit-connector)](https://artifacthub.io/packages/helm/radar-base/radar-fitbit-connector) -![Version: 0.2.6](https://img.shields.io/badge/Version-0.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.1](https://img.shields.io/badge/AppVersion-0.4.1-informational?style=flat-square) +![Version: 0.2.7](https://img.shields.io/badge/Version-0.2.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.1](https://img.shields.io/badge/AppVersion-0.4.1-informational?style=flat-square) A Helm chart for RADAR-base fitbit connector. This application collects data from participants via the Fitbit Web API. @@ -53,6 +53,20 @@ A Helm chart for RADAR-base fitbit connector. This application collects data fro | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[{"name":"CONNECT_SECURITY_PROTOCOL","value":"PLAINTEXT"}]` | Extra environment variables | | extraEnvVars[0] | object | `{"name":"CONNECT_SECURITY_PROTOCOL","value":"PLAINTEXT"}` | Protocol used to communicate with brokers. Valid values are: PLAINTEXT, SSL, SASL_PLAINTEXT, SASL_SSL. | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `60` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `60` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | zookeeper | string | `"cp-zookeeper-headless:2181"` | URI of Zookeeper instances of the cluster | | kafka | string | `"PLAINTEXT://cp-kafka-headless:9092"` | URI of Kafka brokers of the cluster | | kafka_num_brokers | string | `"3"` | Number of Kafka brokers. This is used to validate the cluster availability at connector init. | diff --git a/charts/radar-fitbit-connector/templates/deployment.yaml b/charts/radar-fitbit-connector/templates/deployment.yaml index b7c841cd..3c185d69 100644 --- a/charts/radar-fitbit-connector/templates/deployment.yaml +++ b/charts/radar-fitbit-connector/templates/deployment.yaml @@ -106,28 +106,36 @@ spec: - name: http containerPort: 80 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: exec: command: - /bin/sh - -c - curl -sf localhost:8083/connectors/radar-fitbit-source/status | grep -o '\"state\":\"[^\"]*\"' | tr '\\n' ',' | grep -vq FAILED || exit 1 - initialDelaySeconds: 5 - periodSeconds: 60 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: exec: command: - /bin/sh - -c - curl -sf localhost:8083/connectors/radar-fitbit-source/status | grep -o '\"state\":\"[^\"]*\"' | tr '\\n' ',' | grep -vq FAILED || exit 1 - initialDelaySeconds: 5 - periodSeconds: 60 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/radar-fitbit-connector/values.yaml b/charts/radar-fitbit-connector/values.yaml index ccdd2f74..847a4955 100644 --- a/charts/radar-fitbit-connector/values.yaml +++ b/charts/radar-fitbit-connector/values.yaml @@ -92,6 +92,40 @@ extraEnvVars: - name: CONNECT_SECURITY_PROTOCOL value: PLAINTEXT +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 5 + # -- Period seconds for livenessProbe + periodSeconds: 60 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 5 + # -- Period seconds for readinessProbe + periodSeconds: 60 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # -- URI of Zookeeper instances of the cluster zookeeper: cp-zookeeper-headless:2181 # -- URI of Kafka brokers of the cluster diff --git a/charts/radar-gateway/Chart.yaml b/charts/radar-gateway/Chart.yaml index 9a291828..95e7d74e 100644 --- a/charts/radar-gateway/Chart.yaml +++ b/charts/radar-gateway/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.6.0" description: A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming participant data. It performs authentication, authorization, content validation and decompression. For more details of the configurations, see https://github.com/RADAR-base/RADAR-Gateway/blob/master/gateway.yml. name: radar-gateway -version: 1.0.2 +version: 1.0.3 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-gateway diff --git a/charts/radar-gateway/README.md b/charts/radar-gateway/README.md index 464b7455..e376bf2e 100644 --- a/charts/radar-gateway/README.md +++ b/charts/radar-gateway/README.md @@ -3,7 +3,7 @@ # radar-gateway [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-gateway)](https://artifacthub.io/packages/helm/radar-base/radar-gateway) -![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.0](https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square) +![Version: 1.0.3](https://img.shields.io/badge/Version-1.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.0](https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square) A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming participant data. It performs authentication, authorization, content validation and decompression. For more details of the configurations, see https://github.com/RADAR-base/RADAR-Gateway/blob/master/gateway.yml. @@ -54,6 +54,20 @@ A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming partici | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `10` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `30` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `10` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `30` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | serviceMonitor.enabled | bool | `true` | Enable metrics to be collected via Prometheus-operator | | managementportalHost | string | `"management-portal"` | Host name of the management portal application | | schemaRegistry | string | `"http://cp-schema-registry:8081"` | Schema Registry URL | diff --git a/charts/radar-gateway/templates/deployment.yaml b/charts/radar-gateway/templates/deployment.yaml index da5860e8..9187510b 100644 --- a/charts/radar-gateway/templates/deployment.yaml +++ b/charts/radar-gateway/templates/deployment.yaml @@ -76,26 +76,34 @@ spec: - name: http containerPort: {{ .Values.service.port }} protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: exec: command: - - /bin/sh - - /etc/radar-gateway/healthcheck.sh - initialDelaySeconds: 10 - periodSeconds: 30 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + - /bin/sh + - /etc/radar-gateway/healthcheck.sh + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: exec: command: - - /bin/sh - - /etc/radar-gateway/healthcheck.sh - initialDelaySeconds: 10 - periodSeconds: 30 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + - /bin/sh + - /etc/radar-gateway/healthcheck.sh + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/radar-gateway/values.yaml b/charts/radar-gateway/values.yaml index bbc8aab1..f9701e7b 100644 --- a/charts/radar-gateway/values.yaml +++ b/charts/radar-gateway/values.yaml @@ -96,6 +96,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 10 + # -- Period seconds for livenessProbe + periodSeconds: 30 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 10 + # -- Period seconds for readinessProbe + periodSeconds: 30 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + serviceMonitor: # -- Enable metrics to be collected via Prometheus-operator enabled: true diff --git a/charts/radar-home/Chart.yaml b/charts/radar-home/Chart.yaml index 5be516a9..3c47b3c9 100644 --- a/charts/radar-home/Chart.yaml +++ b/charts/radar-home/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.1.3" description: RADAR-base home page. name: radar-home -version: 0.1.4 +version: 0.1.5 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-home diff --git a/charts/radar-home/README.md b/charts/radar-home/README.md index 515dcc2c..2eced2b5 100644 --- a/charts/radar-home/README.md +++ b/charts/radar-home/README.md @@ -3,7 +3,7 @@ # radar-home [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-home)](https://artifacthub.io/packages/helm/radar-base/radar-home) -![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.3](https://img.shields.io/badge/AppVersion-0.1.3-informational?style=flat-square) +![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.3](https://img.shields.io/badge/AppVersion-0.1.3-informational?style=flat-square) RADAR-base home page. @@ -53,6 +53,20 @@ RADAR-base home page. | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `10` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `30` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `10` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `30` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | s3.enabled | bool | `false` | Enable link to S3 | | s3.url | string | `nil` | URL to S3 | | dashboard.enabled | bool | `false` | Enable link to dashboard | diff --git a/charts/radar-home/templates/deployment.yaml b/charts/radar-home/templates/deployment.yaml index 57c037ee..6969967f 100644 --- a/charts/radar-home/templates/deployment.yaml +++ b/charts/radar-home/templates/deployment.yaml @@ -94,14 +94,32 @@ spec: - name: http containerPort: 8080 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: httpGet: path: / port: http + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: httpGet: path: / port: http + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/charts/radar-home/values.yaml b/charts/radar-home/values.yaml index 59ae629f..8de1e565 100644 --- a/charts/radar-home/values.yaml +++ b/charts/radar-home/values.yaml @@ -78,6 +78,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 10 + # -- Period seconds for livenessProbe + periodSeconds: 30 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 10 + # -- Period seconds for readinessProbe + periodSeconds: 30 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + s3: # -- Enable link to S3 enabled: false diff --git a/charts/radar-integration/Chart.yaml b/charts/radar-integration/Chart.yaml index 774f2d9e..2ad7db57 100644 --- a/charts/radar-integration/Chart.yaml +++ b/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.4.2 +version: 0.4.3 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 diff --git a/charts/radar-integration/README.md b/charts/radar-integration/README.md index 67415cfe..67777dec 100644 --- a/charts/radar-integration/README.md +++ b/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.4.2](https://img.shields.io/badge/Version-0.4.2-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.4.3](https://img.shields.io/badge/Version-0.4.3-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. @@ -52,6 +52,20 @@ A Helm chart for RADAR-Base REDCap survey integration application. | nodeSelector | object | `{}` | Node labels for pod assignment | | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `60` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `60` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | oauth_client_id | string | `"radar_redcap_integrator"` | OAuth2 clientId used by the webApp for making requests | | oauth_client_secret | string | `"secret"` | OAuth2 client secret | | management_portal_url | string | `"management-portal"` | Base URL of the Management Portal | diff --git a/charts/radar-integration/templates/deployment.yaml b/charts/radar-integration/templates/deployment.yaml index 3bf8935c..395aa963 100644 --- a/charts/radar-integration/templates/deployment.yaml +++ b/charts/radar-integration/templates/deployment.yaml @@ -53,22 +53,30 @@ spec: - name: http containerPort: 8080 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: - failureThreshold: 3 - initialDelaySeconds: 5 - periodSeconds: 60 - successThreshold: 1 tcpSocket: port: 8080 - timeoutSeconds: 5 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: - failureThreshold: 3 - initialDelaySeconds: 5 - periodSeconds: 60 - successThreshold: 1 tcpSocket: port: 8080 - timeoutSeconds: 5 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/radar-integration/values.yaml b/charts/radar-integration/values.yaml index 58d672fa..3c35fc93 100644 --- a/charts/radar-integration/values.yaml +++ b/charts/radar-integration/values.yaml @@ -86,6 +86,40 @@ tolerations: [] # -- Affinity labels for pod assignment affinity: {} +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 5 + # -- Period seconds for livenessProbe + periodSeconds: 60 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 5 + # -- Period seconds for readinessProbe + periodSeconds: 60 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # -- OAuth2 clientId used by the webApp for making requests oauth_client_id: radar_redcap_integrator # -- OAuth2 client secret diff --git a/charts/radar-jdbc-connector/Chart.yaml b/charts/radar-jdbc-connector/Chart.yaml index 696beb00..0d98a680 100644 --- a/charts/radar-jdbc-connector/Chart.yaml +++ b/charts/radar-jdbc-connector/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "10.5.2" name: radar-jdbc-connector description: A Helm chart for RADAR-base JDBC Kafka connector. This is a fork of the Kafka JDBC connector which allows data from topics to be imported into JDBC databases (including TimescaleDB databases which is used in the dashboard pipeline). -version: 0.4.4 +version: 0.4.5 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-jdbc-connector diff --git a/charts/radar-jdbc-connector/README.md b/charts/radar-jdbc-connector/README.md index ef1ba89d..cca62fd5 100644 --- a/charts/radar-jdbc-connector/README.md +++ b/charts/radar-jdbc-connector/README.md @@ -3,7 +3,7 @@ # radar-jdbc-connector [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-jdbc-connector)](https://artifacthub.io/packages/helm/radar-base/radar-jdbc-connector) -![Version: 0.4.4](https://img.shields.io/badge/Version-0.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.5.2](https://img.shields.io/badge/AppVersion-10.5.2-informational?style=flat-square) +![Version: 0.4.5](https://img.shields.io/badge/Version-0.4.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.5.2](https://img.shields.io/badge/AppVersion-10.5.2-informational?style=flat-square) A Helm chart for RADAR-base JDBC Kafka connector. This is a fork of the Kafka JDBC connector which allows data from topics to be imported into JDBC databases (including TimescaleDB databases which is used in the dashboard pipeline). @@ -49,6 +49,20 @@ A Helm chart for RADAR-base JDBC Kafka connector. This is a fork of the Kafka JD | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[{"name":"CONNECT_SECURITY_PROTOCOL","value":"PLAINTEXT"}]` | Additional environment variables to pass to the connector. These can be used to pass supported kafka and connect specifc [configs](https://docs.confluent.io/platform/current/installation/docker/config-reference.html#kconnect-long-configuration) | | extraEnvVars[0] | object | `{"name":"CONNECT_SECURITY_PROTOCOL","value":"PLAINTEXT"}` | Protocol used to communicate with brokers. Valid values are: PLAINTEXT, SSL, SASL_PLAINTEXT, SASL_SSL. | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `15` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `60` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `15` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `60` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | kafka | string | `"PLAINTEXT://cp-kafka-headless:9092"` | URI of Kafka brokers of the cluster | | kafka_num_brokers | string | `"3"` | Number of Kafka brokers. This is used to validate the cluster availability at connector init. | | schema_registry | string | `"http://cp-schema-registry:8081"` | URL of the Kafka schema registry | diff --git a/charts/radar-jdbc-connector/templates/deployment.yaml b/charts/radar-jdbc-connector/templates/deployment.yaml index 736aac94..6e788138 100644 --- a/charts/radar-jdbc-connector/templates/deployment.yaml +++ b/charts/radar-jdbc-connector/templates/deployment.yaml @@ -100,26 +100,34 @@ spec: - name: http containerPort: 8083 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: exec: command: - /bin/sh - /etc/kafka-connect/{{ $name }}/healthcheck.sh - initialDelaySeconds: 15 - periodSeconds: 60 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: exec: command: - /bin/sh - /etc/kafka-connect/{{ $name }}/healthcheck.sh - initialDelaySeconds: 15 - periodSeconds: 60 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/radar-jdbc-connector/values.yaml b/charts/radar-jdbc-connector/values.yaml index 11a3d918..129aa9ee 100644 --- a/charts/radar-jdbc-connector/values.yaml +++ b/charts/radar-jdbc-connector/values.yaml @@ -70,6 +70,40 @@ extraEnvVars: - name: CONNECT_SECURITY_PROTOCOL value: PLAINTEXT +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 15 + # -- Period seconds for livenessProbe + periodSeconds: 60 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 15 + # -- Period seconds for readinessProbe + periodSeconds: 60 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # -- URI of Kafka brokers of the cluster kafka: PLAINTEXT://cp-kafka-headless:9092 # -- Number of Kafka brokers. This is used to validate the cluster availability at connector init. diff --git a/charts/radar-push-endpoint/Chart.yaml b/charts/radar-push-endpoint/Chart.yaml index 2f76831c..b912aef2 100644 --- a/charts/radar-push-endpoint/Chart.yaml +++ b/charts/radar-push-endpoint/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.2.2" description: A Helm chart for RADAR-base Push Endpoint. REST Gateway to Kafka, for incoming data from Push or Subscription based WEB APIs. It performs authentication, authorization and content validation. For more details of the configurations, see https://github.com/RADAR-base/RADAR-PushEndpoint. name: radar-push-endpoint -version: 0.1.6 +version: 0.1.7 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-push-endpoint diff --git a/charts/radar-push-endpoint/README.md b/charts/radar-push-endpoint/README.md index 248c07b8..fb83fe20 100644 --- a/charts/radar-push-endpoint/README.md +++ b/charts/radar-push-endpoint/README.md @@ -3,7 +3,7 @@ # radar-push-endpoint [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-push-endpoint)](https://artifacthub.io/packages/helm/radar-base/radar-push-endpoint) -![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.2](https://img.shields.io/badge/AppVersion-0.2.2-informational?style=flat-square) +![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.2](https://img.shields.io/badge/AppVersion-0.2.2-informational?style=flat-square) A Helm chart for RADAR-base Push Endpoint. REST Gateway to Kafka, for incoming data from Push or Subscription based WEB APIs. It performs authentication, authorization and content validation. For more details of the configurations, see https://github.com/RADAR-base/RADAR-PushEndpoint. @@ -52,6 +52,20 @@ A Helm chart for RADAR-base Push Endpoint. REST Gateway to Kafka, for incoming d | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `20` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `90` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `20` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `90` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | serviceMonitor.enabled | bool | `true` | Enable metrics to be collected via Prometheus-operator | | managementportalHost | string | `"management-portal"` | Host name of the management portal application | | schemaRegistry | string | `"http://cp-schema-registry:8081"` | Schema Registry URL | diff --git a/charts/radar-push-endpoint/templates/deployment.yaml b/charts/radar-push-endpoint/templates/deployment.yaml index 7edc107c..43c09758 100644 --- a/charts/radar-push-endpoint/templates/deployment.yaml +++ b/charts/radar-push-endpoint/templates/deployment.yaml @@ -78,26 +78,34 @@ spec: - name: http containerPort: {{ .Values.service.port }} protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: exec: command: - - /bin/sh - - /etc/radar-push-endpoint/healthcheck.sh - initialDelaySeconds: 20 - periodSeconds: 90 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + - /bin/sh + - /etc/radar-push-endpoint/healthcheck.sh + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: exec: command: - - /bin/sh - - /etc/radar-push-endpoint/healthcheck.sh - initialDelaySeconds: 20 - periodSeconds: 90 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + - /bin/sh + - /etc/radar-push-endpoint/healthcheck.sh + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/radar-push-endpoint/values.yaml b/charts/radar-push-endpoint/values.yaml index 33dd3a4f..7b4f9900 100644 --- a/charts/radar-push-endpoint/values.yaml +++ b/charts/radar-push-endpoint/values.yaml @@ -103,6 +103,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 20 + # -- Period seconds for livenessProbe + periodSeconds: 90 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 20 + # -- Period seconds for readinessProbe + periodSeconds: 90 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + serviceMonitor: # -- Enable metrics to be collected via Prometheus-operator enabled: true diff --git a/charts/radar-rest-sources-authorizer/Chart.yaml b/charts/radar-rest-sources-authorizer/Chart.yaml index 78b11c47..617163e6 100644 --- a/charts/radar-rest-sources-authorizer/Chart.yaml +++ b/charts/radar-rest-sources-authorizer/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "4.3.0" description: A Helm chart for the front-end application of RADAR-base Rest Sources Authorizer which is a portal to authorize the Fitbit connector to read data from Fitbit accounts. name: radar-rest-sources-authorizer -version: 1.0.1 +version: 1.0.2 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-rest-sources-authorizer diff --git a/charts/radar-rest-sources-authorizer/README.md b/charts/radar-rest-sources-authorizer/README.md index 43455594..d5c5ac9c 100644 --- a/charts/radar-rest-sources-authorizer/README.md +++ b/charts/radar-rest-sources-authorizer/README.md @@ -3,7 +3,7 @@ # radar-rest-sources-authorizer [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-rest-sources-authorizer)](https://artifacthub.io/packages/helm/radar-base/radar-rest-sources-authorizer) -![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square) +![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square) A Helm chart for the front-end application of RADAR-base Rest Sources Authorizer which is a portal to authorize the Fitbit connector to read data from Fitbit accounts. @@ -54,5 +54,19 @@ A Helm chart for the front-end application of RADAR-base Rest Sources Authorizer | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `30` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `3` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `10` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `3` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | clientId | string | `"radar_rest_sources_authorizer"` | OAuth2 client id of the application registered in Management Portal. It is assumed that this is a public client with empty client secret. | | serverName | string | `"localhost"` | Domain name of the server | diff --git a/charts/radar-rest-sources-authorizer/templates/deployment.yaml b/charts/radar-rest-sources-authorizer/templates/deployment.yaml index 392218fd..5a3416dc 100644 --- a/charts/radar-rest-sources-authorizer/templates/deployment.yaml +++ b/charts/radar-rest-sources-authorizer/templates/deployment.yaml @@ -71,24 +71,32 @@ spec: - name: http containerPort: 8080 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: httpGet: path: /rest-sources/authorizer/ port: http - initialDelaySeconds: 5 - periodSeconds: 30 - timeoutSeconds: 3 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: httpGet: path: /rest-sources/authorizer/ port: http - initialDelaySeconds: 5 - periodSeconds: 10 - timeoutSeconds: 3 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/charts/radar-rest-sources-authorizer/values.yaml b/charts/radar-rest-sources-authorizer/values.yaml index db76a9dc..922bdc82 100644 --- a/charts/radar-rest-sources-authorizer/values.yaml +++ b/charts/radar-rest-sources-authorizer/values.yaml @@ -89,6 +89,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 5 + # -- Period seconds for livenessProbe + periodSeconds: 30 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 3 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 5 + # -- Period seconds for readinessProbe + periodSeconds: 10 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 3 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # -- OAuth2 client id of the application registered in Management Portal. It is assumed that this is a public client with empty client secret. clientId: radar_rest_sources_authorizer # -- Domain name of the server diff --git a/charts/radar-rest-sources-backend/Chart.yaml b/charts/radar-rest-sources-backend/Chart.yaml index 8ee417e0..1cc7e50b 100644 --- a/charts/radar-rest-sources-backend/Chart.yaml +++ b/charts/radar-rest-sources-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "4.3.0" description: A Helm chart for the backend application of RADAR-base Rest Sources Authorizer name: radar-rest-sources-backend -version: 1.0.1 +version: 1.0.2 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-rest-sources-backend diff --git a/charts/radar-rest-sources-backend/README.md b/charts/radar-rest-sources-backend/README.md index de89ac22..7cccf3e1 100644 --- a/charts/radar-rest-sources-backend/README.md +++ b/charts/radar-rest-sources-backend/README.md @@ -3,7 +3,7 @@ # radar-rest-sources-backend [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-rest-sources-backend)](https://artifacthub.io/packages/helm/radar-base/radar-rest-sources-backend) -![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square) +![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square) A Helm chart for the backend application of RADAR-base Rest Sources Authorizer @@ -54,6 +54,20 @@ A Helm chart for the backend application of RADAR-base Rest Sources Authorizer | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `30` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `3` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `15` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `3` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | authorizer.tokenExpiryTimeInMinutes | int | `15` | Within how many minutes an online authorization attempt should be finalized. Steps: logging in to Fitbit, returning to the authorizer. | | authorizer.persistentTokenExpiryInMin | int | `7200` | Within how many minutes an authorization attempt by a participant should be finalized. Steps: passing token to participant, them logging in to Fitbit, and returning to the authorizer. | | postgres.host | string | `"postgresql"` | host name of the postgres db | diff --git a/charts/radar-rest-sources-backend/templates/deployment.yaml b/charts/radar-rest-sources-backend/templates/deployment.yaml index f1d62c0f..ea0dc499 100644 --- a/charts/radar-rest-sources-backend/templates/deployment.yaml +++ b/charts/radar-rest-sources-backend/templates/deployment.yaml @@ -70,6 +70,9 @@ spec: - name: http containerPort: 8080 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: httpGet: path: /rest-sources/backend/health @@ -77,11 +80,15 @@ spec: httpHeaders: - name: Accept value: application/json - initialDelaySeconds: 5 - periodSeconds: 30 - timeoutSeconds: 3 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: httpGet: path: /rest-sources/backend/health @@ -89,11 +96,12 @@ spec: httpHeaders: - name: Accept value: application/json - initialDelaySeconds: 5 - periodSeconds: 15 - timeoutSeconds: 3 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/radar-rest-sources-backend/values.yaml b/charts/radar-rest-sources-backend/values.yaml index d8a3483b..e329ae10 100644 --- a/charts/radar-rest-sources-backend/values.yaml +++ b/charts/radar-rest-sources-backend/values.yaml @@ -95,6 +95,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 5 + # -- Period seconds for livenessProbe + periodSeconds: 30 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 3 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 5 + # -- Period seconds for readinessProbe + periodSeconds: 15 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 3 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # Additional authorizer configurations. authorizer: # -- Within how many minutes an online authorization attempt should be finalized. Steps: logging in to Fitbit, returning to the authorizer. diff --git a/charts/radar-s3-connector/Chart.yaml b/charts/radar-s3-connector/Chart.yaml index 222dad07..04b51476 100644 --- a/charts/radar-s3-connector/Chart.yaml +++ b/charts/radar-s3-connector/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "7.3.2-hotfix" description: A Helm chart for RADAR-base s3 connector. This connector uses Confluent s3 connector with a custom data transformers. These configurations enable a sink connector. See full list of properties here https://docs.confluent.io/kafka-connect-s3-sink/current/configuration_options.html#s3-configuration-options name: radar-s3-connector -version: 0.2.9 +version: 0.2.10 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-s3-connector diff --git a/charts/radar-s3-connector/README.md b/charts/radar-s3-connector/README.md index 80e8f8d6..e31406fb 100644 --- a/charts/radar-s3-connector/README.md +++ b/charts/radar-s3-connector/README.md @@ -3,7 +3,7 @@ # radar-s3-connector [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-s3-connector)](https://artifacthub.io/packages/helm/radar-base/radar-s3-connector) -![Version: 0.2.9](https://img.shields.io/badge/Version-0.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.3.2-hotfix](https://img.shields.io/badge/AppVersion-7.3.2--hotfix-informational?style=flat-square) +![Version: 0.2.10](https://img.shields.io/badge/Version-0.2.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.3.2-hotfix](https://img.shields.io/badge/AppVersion-7.3.2--hotfix-informational?style=flat-square) A Helm chart for RADAR-base s3 connector. This connector uses Confluent s3 connector with a custom data transformers. These configurations enable a sink connector. See full list of properties here https://docs.confluent.io/kafka-connect-s3-sink/current/configuration_options.html#s3-configuration-options @@ -49,6 +49,20 @@ A Helm chart for RADAR-base s3 connector. This connector uses Confluent s3 conne | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[{"name":"CONNECT_SECURITY_PROTOCOL","value":"PLAINTEXT"}]` | Additional environment variables to pass to the connector. These can be used to pass supported kafka and connect specifc [configs](https://docs.confluent.io/platform/current/installation/docker/config-reference.html#kconnect-long-configuration) | | extraEnvVars[0] | object | `{"name":"CONNECT_SECURITY_PROTOCOL","value":"PLAINTEXT"}` | Protocol used to communicate with brokers. Valid values are: PLAINTEXT, SSL, SASL_PLAINTEXT, SASL_SSL. | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `40` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `60` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `10` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `40` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `60` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `10` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | kafka.url | string | `"PLAINTEXT://cp-kafka-headless:9092"` | Kafka broker URLs | | schemaRegistry.url | string | `"http://cp-schema-registry:8081"` | Schema registry URL | | catalogServer.url | string | `"http://catalog-server:9010"` | Catalog server URL | diff --git a/charts/radar-s3-connector/templates/deployment.yaml b/charts/radar-s3-connector/templates/deployment.yaml index 8a0f7111..b25335b6 100644 --- a/charts/radar-s3-connector/templates/deployment.yaml +++ b/charts/radar-s3-connector/templates/deployment.yaml @@ -203,26 +203,34 @@ spec: - name: http containerPort: 8083 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: exec: command: - /bin/sh - /etc/kafka-connect/sink-s3/original/healthcheck.sh - initialDelaySeconds: 40 - periodSeconds: 60 - timeoutSeconds: 10 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: exec: command: - /bin/sh - /etc/kafka-connect/sink-s3/original/healthcheck.sh - initialDelaySeconds: 40 - periodSeconds: 60 - timeoutSeconds: 10 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/radar-s3-connector/values.yaml b/charts/radar-s3-connector/values.yaml index 114b7182..24ba4f6c 100644 --- a/charts/radar-s3-connector/values.yaml +++ b/charts/radar-s3-connector/values.yaml @@ -70,6 +70,40 @@ extraEnvVars: - name: CONNECT_SECURITY_PROTOCOL value: PLAINTEXT +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 40 + # -- Period seconds for livenessProbe + periodSeconds: 60 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 10 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 40 + # -- Period seconds for readinessProbe + periodSeconds: 60 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 10 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + kafka: # -- Kafka broker URLs url: PLAINTEXT://cp-kafka-headless:9092 diff --git a/charts/radar-upload-connect-backend/Chart.yaml b/charts/radar-upload-connect-backend/Chart.yaml index 1b6cc949..dd3f635e 100644 --- a/charts/radar-upload-connect-backend/Chart.yaml +++ b/charts/radar-upload-connect-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.5.10" description: A Helm chart for RADAR-base upload connector backend application. This application is an upload system that stores uploaded data and its metadata in PostgreSQL for later processing. name: radar-upload-connect-backend -version: 0.2.5 +version: 0.2.6 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-upload-connect-backend diff --git a/charts/radar-upload-connect-backend/README.md b/charts/radar-upload-connect-backend/README.md index 6be0c221..75585066 100644 --- a/charts/radar-upload-connect-backend/README.md +++ b/charts/radar-upload-connect-backend/README.md @@ -3,7 +3,7 @@ # radar-upload-connect-backend [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-upload-connect-backend)](https://artifacthub.io/packages/helm/radar-base/radar-upload-connect-backend) -![Version: 0.2.5](https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square) +![Version: 0.2.6](https://img.shields.io/badge/Version-0.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square) A Helm chart for RADAR-base upload connector backend application. This application is an upload system that stores uploaded data and its metadata in PostgreSQL for later processing. @@ -54,6 +54,20 @@ A Helm chart for RADAR-base upload connector backend application. This applicati | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `3` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `300` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `10` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `10` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `10` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | client_id | string | `"radar_upload_backend"` | OAuth2 client id of the upload connect backend application | | client_secret | string | `"secret"` | OAuth2 client secret of the upload connect backend | | postgres.host | string | `"radar-upload-postgresql"` | Host name of the database to store uploaded data and metadata | diff --git a/charts/radar-upload-connect-backend/templates/deployment.yaml b/charts/radar-upload-connect-backend/templates/deployment.yaml index 622bd983..07514f3a 100644 --- a/charts/radar-upload-connect-backend/templates/deployment.yaml +++ b/charts/radar-upload-connect-backend/templates/deployment.yaml @@ -60,19 +60,32 @@ spec: - name: http containerPort: 8085 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: httpGet: path: /upload/api/health port: 8085 - initialDelaySeconds: 5 - failureThreshold: 3 - periodSeconds: 300 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: httpGet: path: /upload/api/health port: 8085 - initialDelaySeconds: 5 - periodSeconds: 10 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/radar-upload-connect-backend/values.yaml b/charts/radar-upload-connect-backend/values.yaml index b4b88c42..2d7680a5 100644 --- a/charts/radar-upload-connect-backend/values.yaml +++ b/charts/radar-upload-connect-backend/values.yaml @@ -92,6 +92,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 3 + # -- Period seconds for livenessProbe + periodSeconds: 300 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 10 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 5 + # -- Period seconds for readinessProbe + periodSeconds: 10 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 10 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # -- OAuth2 client id of the upload connect backend application client_id: radar_upload_backend # -- OAuth2 client secret of the upload connect backend diff --git a/charts/radar-upload-connect-frontend/Chart.yaml b/charts/radar-upload-connect-frontend/Chart.yaml index 9613eb30..869b34a8 100644 --- a/charts/radar-upload-connect-frontend/Chart.yaml +++ b/charts/radar-upload-connect-frontend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.5.10" description: A Helm chart for RADAR-base upload connector frontend application that provides a UI for uploading files and sending them to the upload-backend. name: radar-upload-connect-frontend -version: 0.2.5 +version: 0.2.6 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-upload-connect-frontend diff --git a/charts/radar-upload-connect-frontend/README.md b/charts/radar-upload-connect-frontend/README.md index 956ac3a9..4fb7430f 100644 --- a/charts/radar-upload-connect-frontend/README.md +++ b/charts/radar-upload-connect-frontend/README.md @@ -3,7 +3,7 @@ # radar-upload-connect-frontend [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-upload-connect-frontend)](https://artifacthub.io/packages/helm/radar-base/radar-upload-connect-frontend) -![Version: 0.2.5](https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square) +![Version: 0.2.6](https://img.shields.io/badge/Version-0.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square) A Helm chart for RADAR-base upload connector frontend application that provides a UI for uploading files and sending them to the upload-backend. @@ -54,5 +54,19 @@ A Helm chart for RADAR-base upload connector frontend application that provides | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `3` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `300` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `10` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `10` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `10` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | server_name | string | `"localhost"` | Server name or domain name | | vue_app_client_id | string | `"radar_upload_frontend"` | OAuth2 client id of the upload connect frontend application | diff --git a/charts/radar-upload-connect-frontend/templates/deployment.yaml b/charts/radar-upload-connect-frontend/templates/deployment.yaml index fca29e8b..ef205476 100644 --- a/charts/radar-upload-connect-frontend/templates/deployment.yaml +++ b/charts/radar-upload-connect-frontend/templates/deployment.yaml @@ -65,16 +65,30 @@ spec: - name: http containerPort: 80 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: tcpSocket: port: 80 - initialDelaySeconds: 5 - periodSeconds: 10 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: tcpSocket: port: 80 - initialDelaySeconds: 5 - periodSeconds: 10 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/charts/radar-upload-connect-frontend/values.yaml b/charts/radar-upload-connect-frontend/values.yaml index d9b8de30..a2a2dc59 100644 --- a/charts/radar-upload-connect-frontend/values.yaml +++ b/charts/radar-upload-connect-frontend/values.yaml @@ -90,6 +90,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 3 + # -- Period seconds for livenessProbe + periodSeconds: 300 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 10 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 5 + # -- Period seconds for readinessProbe + periodSeconds: 10 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 10 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # -- Server name or domain name server_name: localhost # -- OAuth2 client id of the upload connect frontend application diff --git a/charts/radar-upload-source-connector/Chart.yaml b/charts/radar-upload-source-connector/Chart.yaml index f865802b..04d0b870 100644 --- a/charts/radar-upload-source-connector/Chart.yaml +++ b/charts/radar-upload-source-connector/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.5.10" description: A Helm chart for RADAR-base upload kafka connector. This is used for reading uploaded data from backend and sending them to Kafka cluster for later processing. name: radar-upload-source-connector -version: 0.2.5 +version: 0.2.6 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-upload-source-connector diff --git a/charts/radar-upload-source-connector/README.md b/charts/radar-upload-source-connector/README.md index 7abe5049..2dec8bb1 100644 --- a/charts/radar-upload-source-connector/README.md +++ b/charts/radar-upload-source-connector/README.md @@ -3,7 +3,7 @@ # radar-upload-source-connector [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-upload-source-connector)](https://artifacthub.io/packages/helm/radar-base/radar-upload-source-connector) -![Version: 0.2.5](https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square) +![Version: 0.2.6](https://img.shields.io/badge/Version-0.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square) A Helm chart for RADAR-base upload kafka connector. This is used for reading uploaded data from backend and sending them to Kafka cluster for later processing. @@ -47,6 +47,20 @@ A Helm chart for RADAR-base upload kafka connector. This is used for reading upl | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[{"name":"CONNECT_SECURITY_PROTOCOL","value":"PLAINTEXT"}]` | Additional environment variables to pass to the connector. These can be used to pass supported kafka and connect specifc [configs](https://docs.confluent.io/platform/current/installation/docker/config-reference.html#kconnect-long-configuration) | | extraEnvVars[0] | object | `{"name":"CONNECT_SECURITY_PROTOCOL","value":"PLAINTEXT"}` | Protocol used to communicate with brokers. Valid values are: PLAINTEXT, SSL, SASL_PLAINTEXT, SASL_SSL. | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `60` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `5` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `60` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `5` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | zookeeper | string | `"cp-zookeeper-headless:2181"` | Zookeeper URL | | kafka | string | `"PLAINTEXT://cp-kafka-headless:9092"` | Kafka broker URLs | | kafka_num_brokers | string | `"3"` | Number of brokers in the cluster | diff --git a/charts/radar-upload-source-connector/templates/deployment.yaml b/charts/radar-upload-source-connector/templates/deployment.yaml index 36a15ef7..521e39a7 100644 --- a/charts/radar-upload-source-connector/templates/deployment.yaml +++ b/charts/radar-upload-source-connector/templates/deployment.yaml @@ -108,26 +108,34 @@ spec: volumeMounts: - name: config mountPath: /etc/kafka-connect/upload/ + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: exec: command: - /bin/sh - /etc/kafka-connect/upload/healthcheck.sh - initialDelaySeconds: 5 - periodSeconds: 60 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: exec: command: - /bin/sh - /etc/kafka-connect/upload/healthcheck.sh - initialDelaySeconds: 5 - periodSeconds: 60 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} volumes: - name: config configMap: diff --git a/charts/radar-upload-source-connector/values.yaml b/charts/radar-upload-source-connector/values.yaml index 026ce9ec..7d939f63 100644 --- a/charts/radar-upload-source-connector/values.yaml +++ b/charts/radar-upload-source-connector/values.yaml @@ -69,6 +69,40 @@ extraEnvVars: - name: CONNECT_SECURITY_PROTOCOL value: PLAINTEXT +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 5 + # -- Period seconds for livenessProbe + periodSeconds: 60 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 5 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 5 + # -- Period seconds for readinessProbe + periodSeconds: 60 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 5 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + # -- Zookeeper URL zookeeper: cp-zookeeper-headless:2181 # -- Kafka broker URLs diff --git a/charts/s3-proxy/Chart.yaml b/charts/s3-proxy/Chart.yaml index 7f9a1696..49ea8f4a 100644 --- a/charts/s3-proxy/Chart.yaml +++ b/charts/s3-proxy/Chart.yaml @@ -5,7 +5,7 @@ sources: ["https://github.com/gaul/s3proxy"] type: application home: "https://radar-base.org" name: s3-proxy -version: 0.2.2 +version: 0.2.3 maintainers: - email: keyvan@thehyve.nl name: Keyvan Hedayati diff --git a/charts/s3-proxy/README.md b/charts/s3-proxy/README.md index 70d001b0..5ea8af8c 100644 --- a/charts/s3-proxy/README.md +++ b/charts/s3-proxy/README.md @@ -3,7 +3,7 @@ # s3-proxy [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/s3-proxy)](https://artifacthub.io/packages/helm/radar-base/s3-proxy) -![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) +![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) A Helm chart for S3 Proxy. It uses https://hub.docker.com/r/andrewgaul/s3proxy to proxy S3 API requests to any supported cloud provider. For more examples see Find some example configurations at https://github.com/gaul/s3proxy/wiki/Storage-backend-examples. @@ -46,6 +46,20 @@ A Helm chart for S3 Proxy. It uses https://hub.docker.com/r/andrewgaul/s3proxy t | tolerations | list | `[]` | Toleration labels for pod assignment | | affinity | object | `{}` | Affinity labels for pod assignment | | extraEnvVars | list | `[]` | Extra environment variables | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `15` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `60` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `3` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `15` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `60` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `3` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | | s3.identity | string | `nil` | Credentials used to access this proxy | | s3.credential | string | `""` | Credentials used to access this proxy | | target | object | Check below | Where requests should be proxied to | diff --git a/charts/s3-proxy/templates/deployment.yaml b/charts/s3-proxy/templates/deployment.yaml index d689626d..225b0bc0 100644 --- a/charts/s3-proxy/templates/deployment.yaml +++ b/charts/s3-proxy/templates/deployment.yaml @@ -117,22 +117,30 @@ spec: - name: http containerPort: {{ .Values.service.port }} protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: tcpSocket: port: 80 - initialDelaySeconds: 15 - periodSeconds: 60 - timeoutSeconds: 3 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: tcpSocket: port: 80 - initialDelaySeconds: 15 - periodSeconds: 60 - timeoutSeconds: 3 - successThreshold: 1 - failureThreshold: 3 + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/charts/s3-proxy/values.yaml b/charts/s3-proxy/values.yaml index 9e97e8db..d727c567 100644 --- a/charts/s3-proxy/values.yaml +++ b/charts/s3-proxy/values.yaml @@ -69,6 +69,40 @@ extraEnvVars: [] # - name: BEARER_AUTH # value: true +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 15 + # -- Period seconds for livenessProbe + periodSeconds: 60 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 3 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 15 + # -- Period seconds for readinessProbe + periodSeconds: 60 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 3 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 + s3: # -- Credentials used to access this proxy identity: null