diff --git a/charts/_templates.gotmpl b/charts/_templates.gotmpl index 5db57468..1ef6d0ff 100644 --- a/charts/_templates.gotmpl +++ b/charts/_templates.gotmpl @@ -1,7 +1,7 @@ {{ define "common.prerequisites" -}} ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ {{- end }} @@ -12,4 +12,4 @@ {{ define "common.header" -}} {{ template "chart.header" . }}[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/{{ template "chart.name" . }})](https://artifacthub.io/packages/helm/radar-base/{{ template "chart.name" . }}) -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/app-config-frontend/Chart.lock b/charts/app-config-frontend/Chart.lock new file mode 100644 index 00000000..71a2852b --- /dev/null +++ b/charts/app-config-frontend/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-26T14:17:51.005521202+01:00" diff --git a/charts/app-config-frontend/Chart.yaml b/charts/app-config-frontend/Chart.yaml index cda46385..eabfba0c 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: 2.1.1 +version: 2.2.0 # 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 @@ -41,3 +41,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/app-config-frontend/README.md b/charts/app-config-frontend/README.md index 3e445bd0..8cf9fc7f 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: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.2](https://img.shields.io/badge/AppVersion-0.5.2-informational?style=flat-square) +![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.2](https://img.shields.io/badge/AppVersion-0.5.2-informational?style=flat-square) A Helm chart for the frontend application of RADAR-base application config (app-config). @@ -23,19 +23,27 @@ A Helm chart for the frontend application of RADAR-base application config (app- * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number of Appconfig frontend replicas to deploy | -| image.repository | string | `"radarbase/radar-app-config-frontend"` | Appconfig frontend image repository | -| image.tag | string | `nil` | Appconfig frontend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | Appconfig frontend image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-app-config-frontend"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override app-config-frontend.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override app-config-frontend.fullname template with a string | | podAnnotations | object | `{}` | Annotations for Appconfig frontend pods | diff --git a/charts/app-config-frontend/charts/common-2.27.0.tgz b/charts/app-config-frontend/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/app-config-frontend/charts/common-2.27.0.tgz differ diff --git a/charts/app-config-frontend/templates/_helpers.tpl b/charts/app-config-frontend/templates/_helpers.tpl index 9f02f2cb..060794c1 100644 --- a/charts/app-config-frontend/templates/_helpers.tpl +++ b/charts/app-config-frontend/templates/_helpers.tpl @@ -5,6 +5,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} +{{/* +Return the proper image name +*/}} +{{- define "app-config-frontend.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "app-config-frontend.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/app-config-frontend/templates/deployment.yaml b/charts/app-config-frontend/templates/deployment.yaml index b43999f8..38121541 100644 --- a/charts/app-config-frontend/templates/deployment.yaml +++ b/charts/app-config-frontend/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "app-config-frontend.fullname" . }} - labels: - {{- include "app-config-frontend.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -18,10 +21,7 @@ spec: labels: {{- include "app-config-frontend.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "app-config-frontend.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -44,8 +44,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "app-config-frontend.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: BASE_HREF value: /appconfig/ diff --git a/charts/app-config-frontend/templates/ingress.yaml b/charts/app-config-frontend/templates/ingress.yaml index ecf64228..e470f935 100644 --- a/charts/app-config-frontend/templates/ingress.yaml +++ b/charts/app-config-frontend/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "app-config-frontend.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "app-config-frontend.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/app-config-frontend/templates/networkpolicy.yaml b/charts/app-config-frontend/templates/networkpolicy.yaml index 1f0265a0..b1182dfb 100644 --- a/charts/app-config-frontend/templates/networkpolicy.yaml +++ b/charts/app-config-frontend/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "app-config-frontend.fullname" . }} - labels: -{{ include "app-config-frontend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/app-config-frontend/templates/service.yaml b/charts/app-config-frontend/templates/service.yaml index d2f1758a..d8c4f364 100644 --- a/charts/app-config-frontend/templates/service.yaml +++ b/charts/app-config-frontend/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "app-config-frontend.fullname" . }} - labels: - {{- include "app-config-frontend.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,5 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - {{- include "app-config-frontend.selectorLabels" . | nindent 4 }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/app-config-frontend/values.yaml b/charts/app-config-frontend/values.yaml index d4d67aa7..2e158725 100644 --- a/charts/app-config-frontend/values.yaml +++ b/charts/app-config-frontend/values.yaml @@ -6,16 +6,24 @@ replicaCount: 2 image: - # -- Appconfig frontend image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-app-config-frontend - # -- Appconfig frontend image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- Appconfig frontend image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override app-config-frontend.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/app-config/Chart.lock b/charts/app-config/Chart.lock new file mode 100644 index 00000000..4d9291e7 --- /dev/null +++ b/charts/app-config/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-26T13:39:04.017625795+01:00" diff --git a/charts/app-config/Chart.yaml b/charts/app-config/Chart.yaml index 5f987aa8..1a79bba6 100644 --- a/charts/app-config/Chart.yaml +++ b/charts/app-config/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.5.2" 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.3.4 +version: 1.4.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/app-config @@ -24,3 +24,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/app-config/README.md b/charts/app-config/README.md index c2da4e3e..9b9ca896 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.3.4](https://img.shields.io/badge/Version-1.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.2](https://img.shields.io/badge/AppVersion-0.5.2-informational?style=flat-square) +![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.2](https://img.shields.io/badge/AppVersion-0.5.2-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. @@ -23,19 +23,27 @@ A Helm chart for RADAR-base application config (app-config) backend service whic * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number of Appconfig replicas to deploy | -| image.repository | string | `"radarbase/radar-app-config"` | Appconfig image repositorys | -| image.tag | string | `nil` | Appconfig image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | Appconfig image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-app-config"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override appconfig.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override appconfig.fullname template with a string | | namespace | string | `"default"` | Kubernetes namespace that Appconfig is going to be deployed on | diff --git a/charts/app-config/charts/common-2.27.0.tgz b/charts/app-config/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/app-config/charts/common-2.27.0.tgz differ diff --git a/charts/app-config/templates/_helpers.tpl b/charts/app-config/templates/_helpers.tpl index 3e0ee761..9d770c68 100644 --- a/charts/app-config/templates/_helpers.tpl +++ b/charts/app-config/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "app-config.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "app-config.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/app-config/templates/configmap.yaml b/charts/app-config/templates/configmap.yaml index 341de412..d483b845 100644 --- a/charts/app-config/templates/configmap.yaml +++ b/charts/app-config/templates/configmap.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "app-config.fullname" . }} - labels: - app: {{ template "app-config.name" . }} - chart: {{ template "app-config.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: healthcheck.sh: | #!/bin/sh diff --git a/charts/app-config/templates/deployment.yaml b/charts/app-config/templates/deployment.yaml index 1f7c1d72..86e4f5fe 100644 --- a/charts/app-config/templates/deployment.yaml +++ b/charts/app-config/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "app-config.fullname" . }} - labels: -{{ include "app-config.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} strategy: @@ -21,10 +24,7 @@ spec: app.kubernetes.io/name: {{ include "app-config.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "app-config.imagePullSecrets" . | nindent 6 }} serviceAccountName: {{ template "app-config.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} @@ -48,8 +48,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "app-config.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: JAVA_OPTS value: "{{ .Values.javaOpts }}" diff --git a/charts/app-config/templates/ingress.yaml b/charts/app-config/templates/ingress.yaml index 9d9f17e8..e470f935 100644 --- a/charts/app-config/templates/ingress.yaml +++ b/charts/app-config/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "app-config.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "app-config.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/app-config/templates/networkpolicy.yaml b/charts/app-config/templates/networkpolicy.yaml index c1674d3d..6d8c9bfe 100644 --- a/charts/app-config/templates/networkpolicy.yaml +++ b/charts/app-config/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "app-config.fullname" . }} - labels: -{{ include "app-config.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/app-config/templates/rbac.yaml b/charts/app-config/templates/rbac.yaml index b3f326d1..8041716d 100644 --- a/charts/app-config/templates/rbac.yaml +++ b/charts/app-config/templates/rbac.yaml @@ -2,7 +2,12 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "app-config.fullname" . }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/app-config/templates/secrets.yaml b/charts/app-config/templates/secrets.yaml index 792f6ebe..3c0f55d2 100644 --- a/charts/app-config/templates/secrets.yaml +++ b/charts/app-config/templates/secrets.yaml @@ -2,12 +2,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "app-config.fullname" . }} - labels: - app: {{ template "app-config.name" . }} - chart: {{ template "app-config.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: managementPortalClientId: {{ .Values.clientId | b64enc | quote }} diff --git a/charts/app-config/templates/service-hazelcast.yaml b/charts/app-config/templates/service-hazelcast.yaml index eb183b87..885a3f54 100644 --- a/charts/app-config/templates/service-hazelcast.yaml +++ b/charts/app-config/templates/service-hazelcast.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "app-config.fullname" . }}-hazelcast - labels: -{{ include "app-config.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }}-hazelcast + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: ClusterIP ports: diff --git a/charts/app-config/templates/service.yaml b/charts/app-config/templates/service.yaml index a1b57c3f..d8c4f364 100644 --- a/charts/app-config/templates/service.yaml +++ b/charts/app-config/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "app-config.fullname" . }} - labels: -{{ include "app-config.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "app-config.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/app-config/templates/serviceaccount.yaml b/charts/app-config/templates/serviceaccount.yaml index 64de00da..474f60cf 100644 --- a/charts/app-config/templates/serviceaccount.yaml +++ b/charts/app-config/templates/serviceaccount.yaml @@ -2,7 +2,10 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "app-config.serviceAccountName" . }} - labels: -{{ include "app-config.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} {{- end -}} diff --git a/charts/app-config/values.yaml b/charts/app-config/values.yaml index a11ac5b4..eb606333 100644 --- a/charts/app-config/values.yaml +++ b/charts/app-config/values.yaml @@ -6,16 +6,24 @@ replicaCount: 2 image: - # -- Appconfig image repositorys + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-app-config - # -- Appconfig image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- Appconfig image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override appconfig.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/catalog-server/Chart.lock b/charts/catalog-server/Chart.lock new file mode 100644 index 00000000..b9c31fe6 --- /dev/null +++ b/charts/catalog-server/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-26T14:52:19.256351885+01:00" diff --git a/charts/catalog-server/Chart.yaml b/charts/catalog-server/Chart.yaml index 56e94eea..89553f07 100644 --- a/charts/catalog-server/Chart.yaml +++ b/charts/catalog-server/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.8.11" 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.6.3 +version: 0.7.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/catalog-server @@ -21,3 +21,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/catalog-server/README.md b/charts/catalog-server/README.md index edd0c3d7..959d8e47 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.6.3](https://img.shields.io/badge/Version-0.6.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.11](https://img.shields.io/badge/AppVersion-0.8.11-informational?style=flat-square) +![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.11](https://img.shields.io/badge/AppVersion-0.8.11-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. @@ -22,20 +22,28 @@ A Helm chart for RADAR-base catalogue server. This application creates RADAR-bas * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ * PV provisioner support in the underlying infrastructure +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of catalog-server replicas to deploy | -| image.repository | string | `"radarbase/radar-schemas-tools"` | catalog-server image repository | -| image.tag | string | `nil` | catalog-server image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | catalog-server image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-schemas-tools"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override catalog-server.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override catalog-server.fullname template with a string | | podSecurityContext | object | `{"fsGroup":101}` | Configure catalog-server pods' Security Context | diff --git a/charts/catalog-server/charts/common-2.27.0.tgz b/charts/catalog-server/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/catalog-server/charts/common-2.27.0.tgz differ diff --git a/charts/catalog-server/templates/_helpers.tpl b/charts/catalog-server/templates/_helpers.tpl index c71f5de2..9d8fbb65 100644 --- a/charts/catalog-server/templates/_helpers.tpl +++ b/charts/catalog-server/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "catalog-server.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "catalog-server.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/catalog-server/templates/configmap.yaml b/charts/catalog-server/templates/configmap.yaml index 4b57222a..28a83575 100644 --- a/charts/catalog-server/templates/configmap.yaml +++ b/charts/catalog-server/templates/configmap.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "catalog-server.fullname" . }} - labels: - app: {{ template "catalog-server.name" . }} - chart: {{ template "catalog-server.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: config.yaml: | # Kafka diff --git a/charts/catalog-server/templates/deployment.yaml b/charts/catalog-server/templates/deployment.yaml index 064e8c34..ca0ffc1c 100644 --- a/charts/catalog-server/templates/deployment.yaml +++ b/charts/catalog-server/templates/deployment.yaml @@ -1,12 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "catalog-server.fullname" . }} - labels: - app.kubernetes.io/name: {{ include "catalog-server.name" . }} - helm.sh/chart: {{ include "catalog-server.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -25,10 +25,7 @@ spec: backup.velero.io/backup-volumes: config checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "catalog-server.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -51,7 +48,8 @@ spec: - name: kafka-init securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: {{ template "catalog-server.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} args: - topic_init.sh env: @@ -96,13 +94,13 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: {{ template "catalog-server.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} args: - radar-catalog-server - -c - /etc/radar-schemas-tools/config.yaml - /schema/merged - imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http containerPort: 9010 diff --git a/charts/catalog-server/templates/networkpolicy.yaml b/charts/catalog-server/templates/networkpolicy.yaml index 8d937ec4..ceb810f3 100644 --- a/charts/catalog-server/templates/networkpolicy.yaml +++ b/charts/catalog-server/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "catalog-server.fullname" . }} - labels: -{{ include "catalog-server.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/catalog-server/templates/pvc.yaml b/charts/catalog-server/templates/pvc.yaml index 00b74aa7..a62f3495 100644 --- a/charts/catalog-server/templates/pvc.yaml +++ b/charts/catalog-server/templates/pvc.yaml @@ -2,12 +2,12 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "catalog-server.fullname" . }} - labels: - app: "{{ template "catalog-server.fullname" . }}" - chart: "{{ template "catalog-server.chart" . }}" - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: accessModes: - {{ .Values.persistence.accessMode | quote }} diff --git a/charts/catalog-server/templates/secrets.yaml b/charts/catalog-server/templates/secrets.yaml index 5c124d39..06638ef1 100644 --- a/charts/catalog-server/templates/secrets.yaml +++ b/charts/catalog-server/templates/secrets.yaml @@ -2,12 +2,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "catalog-server.fullname" . }} - labels: - app: {{ template "catalog-server.name" . }} - chart: {{ template "catalog-server.chart" . }} - release: {{ .Release.Name | quote }} - heritage: {{ .Release.Service | quote }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: ccApiKey: {{ .Values.cc.apiKey | b64enc | quote }} diff --git a/charts/catalog-server/templates/service.yaml b/charts/catalog-server/templates/service.yaml index ebdc9233..d8c4f364 100644 --- a/charts/catalog-server/templates/service.yaml +++ b/charts/catalog-server/templates/service.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "catalog-server.fullname" . }} - labels: - app.kubernetes.io/name: {{ include "catalog-server.name" . }} - helm.sh/chart: {{ include "catalog-server.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -14,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "catalog-server.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/catalog-server/values.yaml b/charts/catalog-server/values.yaml index d500a480..a3226533 100644 --- a/charts/catalog-server/values.yaml +++ b/charts/catalog-server/values.yaml @@ -6,16 +6,24 @@ replicaCount: 1 image: - # -- catalog-server image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-schemas-tools - # -- catalog-server image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- catalog-server image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override catalog-server.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/cc-schema-registry-proxy/Chart.lock b/charts/cc-schema-registry-proxy/Chart.lock new file mode 100644 index 00000000..e735d401 --- /dev/null +++ b/charts/cc-schema-registry-proxy/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-26T14:42:51.777126847+01:00" diff --git a/charts/cc-schema-registry-proxy/Chart.yaml b/charts/cc-schema-registry-proxy/Chart.yaml index f0f13523..820c398b 100644 --- a/charts/cc-schema-registry-proxy/Chart.yaml +++ b/charts/cc-schema-registry-proxy/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "1.0" description: A Helm chart for Confluent Cloud schema registry proxy. This proxy service is used when RADAR-base platform is used with Confluent Cloud based schema registry. It forwards requests to schema registry with an additonal basic authentication header with Confluent Cloud schema registry credentials. This service will be enabled if `cc.enabled = true`. name: cc-schema-registry-proxy -version: 0.3.3 +version: 0.4.0 type: application home: "https://radar-base.org" icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" @@ -23,3 +23,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/cc-schema-registry-proxy/README.md b/charts/cc-schema-registry-proxy/README.md index 66b5fc28..93842aad 100644 --- a/charts/cc-schema-registry-proxy/README.md +++ b/charts/cc-schema-registry-proxy/README.md @@ -3,7 +3,7 @@ # cc-schema-registry-proxy [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cc-schema-registry-proxy)](https://artifacthub.io/packages/helm/radar-base/cc-schema-registry-proxy) -![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square) +![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square) A Helm chart for Confluent Cloud schema registry proxy. This proxy service is used when RADAR-base platform is used with Confluent Cloud based schema registry. It forwards requests to schema registry with an additonal basic authentication header with Confluent Cloud schema registry credentials. This service will be enabled if `cc.enabled = true`. @@ -22,10 +22,16 @@ A Helm chart for Confluent Cloud schema registry proxy. This proxy service is us * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | diff --git a/charts/cc-schema-registry-proxy/charts/common-2.27.0.tgz b/charts/cc-schema-registry-proxy/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/cc-schema-registry-proxy/charts/common-2.27.0.tgz differ diff --git a/charts/cc-schema-registry-proxy/templates/ingress.yaml b/charts/cc-schema-registry-proxy/templates/ingress.yaml index 06b84aff..6c0ed624 100644 --- a/charts/cc-schema-registry-proxy/templates/ingress.yaml +++ b/charts/cc-schema-registry-proxy/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "cc-schema-registry-proxy.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -13,19 +12,20 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "cc-schema-registry-proxy.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} nginx.ingress.kubernetes.io/configuration-snippet: | limit_except GET { deny all; } more_set_input_headers "Authorization: Basic {{ $credentials | b64enc }}"; nginx.ingress.kubernetes.io/upstream-vhost: {{ $externalName }} - {{- end }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -45,16 +45,7 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/cc-schema-registry-proxy/templates/service.yaml b/charts/cc-schema-registry-proxy/templates/service.yaml index 4c725c93..0546ca9c 100644 --- a/charts/cc-schema-registry-proxy/templates/service.yaml +++ b/charts/cc-schema-registry-proxy/templates/service.yaml @@ -1,15 +1,14 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "cc-schema-registry-proxy.fullname" . }} - labels: - app.kubernetes.io/name: {{ include "cc-schema-registry-proxy.name" . }} - helm.sh/chart: {{ include "cc-schema-registry-proxy.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} externalName: {{ .Values.service.externalName }} - selector: - app.kubernetes.io/name: {{ include "cc-schema-registry-proxy.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/cert-manager-letsencrypt/Chart.lock b/charts/cert-manager-letsencrypt/Chart.lock new file mode 100644 index 00000000..943f5411 --- /dev/null +++ b/charts/cert-manager-letsencrypt/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-26T14:51:53.454083895+01:00" diff --git a/charts/cert-manager-letsencrypt/Chart.yaml b/charts/cert-manager-letsencrypt/Chart.yaml index 11356bed..76a9e22b 100644 --- a/charts/cert-manager-letsencrypt/Chart.yaml +++ b/charts/cert-manager-letsencrypt/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "1.0" description: A Helm chart for a cert-manager ClusterIssuer for letsencrypt. Requires the cert-manager release to be activated. name: cert-manager-letsencrypt -version: 0.1.3 +version: 0.2.0 sources: ["https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/cert-manager-letsencrypt"] deprecated: false type: application @@ -16,3 +16,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/cert-manager-letsencrypt/README.md b/charts/cert-manager-letsencrypt/README.md index c07b1115..e4e1ea9e 100644 --- a/charts/cert-manager-letsencrypt/README.md +++ b/charts/cert-manager-letsencrypt/README.md @@ -3,7 +3,7 @@ # cert-manager-letsencrypt [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cert-manager-letsencrypt)](https://artifacthub.io/packages/helm/radar-base/cert-manager-letsencrypt) -![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square) +![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square) A Helm chart for a cert-manager ClusterIssuer for letsencrypt. Requires the cert-manager release to be activated. @@ -20,16 +20,23 @@ A Helm chart for a cert-manager ClusterIssuer for letsencrypt. Requires the cert * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | nameOverride | string | `"letsencrypt-prod"` | Name of the cluster issuer | | fullnameOverride | string | `"letsencrypt-prod"` | Full name of the cluster issuer | +| namespaceOverride | string | `"cert-manager"` | String to fully override common.names.namespace | | maintainerEmail | string | `"me@example.com"` | Email address of cluster maintainer | | httpIssuer.enabled | bool | `true` | Enable the letsencrypt HTTP issuer | | httpIssuer.environment | string | `"production"` | Environment to use. Either staging or production | diff --git a/charts/cert-manager-letsencrypt/charts/common-2.27.0.tgz b/charts/cert-manager-letsencrypt/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/cert-manager-letsencrypt/charts/common-2.27.0.tgz differ diff --git a/charts/cert-manager-letsencrypt/templates/clusterissuer.yaml b/charts/cert-manager-letsencrypt/templates/clusterissuer.yaml index 82c0dc5b..65888607 100644 --- a/charts/cert-manager-letsencrypt/templates/clusterissuer.yaml +++ b/charts/cert-manager-letsencrypt/templates/clusterissuer.yaml @@ -2,10 +2,12 @@ apiVersion: cert-manager.io/v1 kind: ClusterIssuer metadata: - labels: -{{ include "cert-manager-letsencrypt.labels" . | indent 4 }} - name: {{ include "cert-manager-letsencrypt.fullname" . }} - namespace: cert-manager + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: acme: # The ACME server URL diff --git a/charts/cert-manager-letsencrypt/values.yaml b/charts/cert-manager-letsencrypt/values.yaml index 0cf0fc52..b4215352 100644 --- a/charts/cert-manager-letsencrypt/values.yaml +++ b/charts/cert-manager-letsencrypt/values.yaml @@ -6,6 +6,8 @@ nameOverride: letsencrypt-prod # -- Full name of the cluster issuer fullnameOverride: letsencrypt-prod +# -- String to fully override common.names.namespace +namespaceOverride: "cert-manager" # -- Email address of cluster maintainer maintainerEmail: me@example.com diff --git a/charts/data-dashboard-backend/Chart.lock b/charts/data-dashboard-backend/Chart.lock new file mode 100644 index 00000000..6f575459 --- /dev/null +++ b/charts/data-dashboard-backend/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-26T14:57:18.911562604+01:00" diff --git a/charts/data-dashboard-backend/Chart.yaml b/charts/data-dashboard-backend/Chart.yaml index 571c7eca..71ab3a4a 100644 --- a/charts/data-dashboard-backend/Chart.yaml +++ b/charts/data-dashboard-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.2.2" name: data-dashboard-backend description: API for data in the data dashboard -version: 0.3.8 +version: 0.4.0 sources: ["https://github.com/thehyve/radar-data-dashboard-backend"] deprecated: false type: application @@ -14,3 +14,9 @@ maintainers: - email: pim@thehyve.nl name: Pim van Nierop url: https://www.thehyve.nl/experts/pim-van-nierop +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/data-dashboard-backend/README.md b/charts/data-dashboard-backend/README.md index 11e9cdec..b54a5aac 100644 --- a/charts/data-dashboard-backend/README.md +++ b/charts/data-dashboard-backend/README.md @@ -2,7 +2,7 @@ # data-dashboard-backend -![Version: 0.3.8](https://img.shields.io/badge/Version-0.3.8-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.4.0](https://img.shields.io/badge/Version-0.4.0-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) API for data in the data dashboard @@ -20,19 +20,27 @@ API for data in the data dashboard * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of replicas to deploy | -| image.repository | string | `"radarbase/radar-data-dashboard-backend"` | docker image repository | -| image.pullPolicy | string | `"Always"` | image pull policy | -| image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-data-dashboard-backend"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override fullname template with a string | | podSecurityContext | object | `{}` | Configure pod's Security Context | diff --git a/charts/data-dashboard-backend/charts/common-2.27.0.tgz b/charts/data-dashboard-backend/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/data-dashboard-backend/charts/common-2.27.0.tgz differ diff --git a/charts/data-dashboard-backend/templates/NOTES.txt b/charts/data-dashboard-backend/templates/NOTES.txt index 3a3c3f97..e69de29b 100644 --- a/charts/data-dashboard-backend/templates/NOTES.txt +++ b/charts/data-dashboard-backend/templates/NOTES.txt @@ -1,20 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host }}{{ $.Values.path }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "data-dashboard-backend.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "data-dashboard-backend.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "data-dashboard-backend.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "data-dashboard-backend.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:9000 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 9000:$CONTAINER_PORT -{{- end }} diff --git a/charts/data-dashboard-backend/templates/_helpers.tpl b/charts/data-dashboard-backend/templates/_helpers.tpl index f7a340f9..6e29cd3b 100644 --- a/charts/data-dashboard-backend/templates/_helpers.tpl +++ b/charts/data-dashboard-backend/templates/_helpers.tpl @@ -5,6 +5,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} +{{/* +Return the proper image name +*/}} +{{- define "data-dashboard-backend.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "data-dashboard-backend.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/data-dashboard-backend/templates/configmap.yaml b/charts/data-dashboard-backend/templates/configmap.yaml index 1ef324b7..39925906 100644 --- a/charts/data-dashboard-backend/templates/configmap.yaml +++ b/charts/data-dashboard-backend/templates/configmap.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "data-dashboard-backend.fullname" . }} - labels: - app: {{ template "data-dashboard-backend.name" . }} - chart: {{ template "data-dashboard-backend.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: dashboard.yml: | service: diff --git a/charts/data-dashboard-backend/templates/deployment.yaml b/charts/data-dashboard-backend/templates/deployment.yaml index 7012d484..434f1c40 100644 --- a/charts/data-dashboard-backend/templates/deployment.yaml +++ b/charts/data-dashboard-backend/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "data-dashboard-backend.fullname" . }} - labels: - {{- include "data-dashboard-backend.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} @@ -22,18 +25,31 @@ spec: labels: {{- include "data-dashboard-backend.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "data-dashboard-backend.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} + affinity: + podAntiAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 1 + podAffinityTerm: + labelSelector: + matchExpressions: + - key: "app.kubernetes.io/name" + operator: In + values: + - {{ template "data-dashboard-backend.name" . }} + - key: "app.kubernetes.io/instance" + operator: In + values: + - {{ .Release.Name }} + topologyKey: "kubernetes.io/hostname" containers: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "data-dashboard-backend.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} args: - "/etc/data-dashboard-backend/dashboard.yml" env: diff --git a/charts/data-dashboard-backend/templates/hpa.yaml b/charts/data-dashboard-backend/templates/hpa.yaml index bed41097..2a485932 100644 --- a/charts/data-dashboard-backend/templates/hpa.yaml +++ b/charts/data-dashboard-backend/templates/hpa.yaml @@ -2,9 +2,12 @@ apiVersion: autoscaling/v2beta1 kind: HorizontalPodAutoscaler metadata: - name: {{ include "data-dashboard-backend.fullname" . }} - labels: - {{- include "data-dashboard-backend.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: scaleTargetRef: apiVersion: apps/v1 diff --git a/charts/data-dashboard-backend/templates/ingress.yaml b/charts/data-dashboard-backend/templates/ingress.yaml index 54d6f6b5..e470f935 100644 --- a/charts/data-dashboard-backend/templates/ingress.yaml +++ b/charts/data-dashboard-backend/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "data-dashboard-backend.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,23 +10,24 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "data-dashboard-backend.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} - {{- if and .Values.ingress.tls (not .Values.disable_tls) }} +{{- if and .Values.ingress.tls (not .Values.disable_tls) }} tls: - hosts: - {{- range .Values.ingress.hosts }} + {{- range $hosts }} - {{ . | quote }} - {{- end }} + {{- end }} secretName: {{ .Values.ingress.tls.secretName }} - {{- end }} +{{- end }} rules: {{- range .Values.ingress.hosts }} - host: {{ . | quote }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/data-dashboard-backend/templates/networkpolicy.yaml b/charts/data-dashboard-backend/templates/networkpolicy.yaml index ee96faa4..8e3b5164 100644 --- a/charts/data-dashboard-backend/templates/networkpolicy.yaml +++ b/charts/data-dashboard-backend/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "data-dashboard-backend.fullname" . }} - labels: -{{ include "data-dashboard-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/data-dashboard-backend/templates/secrets.yaml b/charts/data-dashboard-backend/templates/secrets.yaml index d94eaf00..bcf20429 100644 --- a/charts/data-dashboard-backend/templates/secrets.yaml +++ b/charts/data-dashboard-backend/templates/secrets.yaml @@ -2,9 +2,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "data-dashboard-backend.fullname" . }} - labels: - {{- include "data-dashboard-backend.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: databaseUrl: {{ .Values.jdbc.url | b64enc | quote }} diff --git a/charts/data-dashboard-backend/templates/service.yaml b/charts/data-dashboard-backend/templates/service.yaml index e046b9e4..d8c4f364 100644 --- a/charts/data-dashboard-backend/templates/service.yaml +++ b/charts/data-dashboard-backend/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "data-dashboard-backend.fullname" . }} - labels: - {{- include "data-dashboard-backend.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,5 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - {{- include "data-dashboard-backend.selectorLabels" . | nindent 4 }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/data-dashboard-backend/values.yaml b/charts/data-dashboard-backend/values.yaml index 229e49c1..8533240f 100644 --- a/charts/data-dashboard-backend/values.yaml +++ b/charts/data-dashboard-backend/values.yaml @@ -6,15 +6,24 @@ replicaCount: 1 image: - # -- docker image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-data-dashboard-backend - # -- image pull policy - pullPolicy: Always - # -- Overrides the image tag whose default is the chart appVersion. + # -- Image tag (immutable tags are recommended) + # Overrides the image tag whose default is the chart appVersion. tag: - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy + pullPolicy: IfNotPresent + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 0c177bbd..881021b8 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "v0.77.1" description: A Helm chart for Prometheus operator stack. This chart is an overlay for original kube-prometheus-stack chart. It defines some the default values for namespaces to monitor, alert templates, Nginx configuration and authentication and a few extra charts for Grafana. For more details on how to customize those values refer to original chart. name: kube-prometheus-stack -version: 0.4.4 +version: 0.4.5 sources: ["https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack"] deprecated: false type: application diff --git a/charts/kube-prometheus-stack/README.md b/charts/kube-prometheus-stack/README.md index 679b1ee3..d7048b5f 100644 --- a/charts/kube-prometheus-stack/README.md +++ b/charts/kube-prometheus-stack/README.md @@ -3,7 +3,7 @@ # kube-prometheus-stack [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/kube-prometheus-stack)](https://artifacthub.io/packages/helm/radar-base/kube-prometheus-stack) -![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: v0.77.1](https://img.shields.io/badge/AppVersion-v0.77.1-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: v0.77.1](https://img.shields.io/badge/AppVersion-v0.77.1-informational?style=flat-square) A Helm chart for Prometheus operator stack. This chart is an overlay for original kube-prometheus-stack chart. It defines some the default values for namespaces to monitor, alert templates, Nginx configuration and authentication and a few extra charts for Grafana. For more details on how to customize those values refer to original chart. @@ -14,8 +14,8 @@ A Helm chart for Prometheus operator stack. This chart is an overlay for origina * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ * PV provisioner support in the underlying infrastructure diff --git a/charts/management-portal/Chart.lock b/charts/management-portal/Chart.lock new file mode 100644 index 00000000..99c669c6 --- /dev/null +++ b/charts/management-portal/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-26T15:11:23.962907546+01:00" diff --git a/charts/management-portal/Chart.yaml b/charts/management-portal/Chart.yaml index 8805335b..3f91f6d3 100644 --- a/charts/management-portal/Chart.yaml +++ b/charts/management-portal/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.1.5" description: A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base. name: management-portal -version: 1.3.1 +version: 1.4.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/management-portal @@ -25,3 +25,9 @@ maintainers: - email: mpgxvii@gmail.com name: Pauline Conde url: https://www.kcl.ac.uk/people/pauline-conde +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/management-portal/README.md b/charts/management-portal/README.md index 4ae8606e..5ab14dc2 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.3.1](https://img.shields.io/badge/Version-1.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.5](https://img.shields.io/badge/AppVersion-2.1.5-informational?style=flat-square) +![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.5](https://img.shields.io/badge/AppVersion-2.1.5-informational?style=flat-square) A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base. @@ -23,19 +23,27 @@ A Helm chart for RADAR-Base Management Portal to manage projects and participant * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of Management Portal replicas to deploy | -| image.repository | string | `"radarbase/management-portal"` | Management Portal image repository | -| image.tag | string | `nil` | Management Portal image tag (immutable tags are recommended) | -| image.pullPolicy | string | `"IfNotPresent"` | Management Portal image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/management-portal"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override management-portal.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override management-portal.fullname template with a string | | podSecurityContext | object | `{}` | Configure management-portal pods' Security Context | diff --git a/charts/management-portal/charts/common-2.27.0.tgz b/charts/management-portal/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/management-portal/charts/common-2.27.0.tgz differ diff --git a/charts/management-portal/templates/_helpers.tpl b/charts/management-portal/templates/_helpers.tpl index 41feb50a..19dd941a 100644 --- a/charts/management-portal/templates/_helpers.tpl +++ b/charts/management-portal/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "management-portal.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "management-portal.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/management-portal/templates/configmap.yaml b/charts/management-portal/templates/configmap.yaml index ec112e9c..7f9a49e4 100644 --- a/charts/management-portal/templates/configmap.yaml +++ b/charts/management-portal/templates/configmap.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "management-portal.fullname" . }} - labels: -{{ include "management-portal.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: healthcheck.sh: | #!/bin/sh diff --git a/charts/management-portal/templates/deployment.yaml b/charts/management-portal/templates/deployment.yaml index 8d96f064..f339e491 100644 --- a/charts/management-portal/templates/deployment.yaml +++ b/charts/management-portal/templates/deployment.yaml @@ -3,9 +3,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "management-portal.fullname" . }} - labels: -{{ include "management-portal.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -23,10 +26,7 @@ spec: app.kubernetes.io/name: {{ include "management-portal.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "management-portal.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -49,8 +49,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "management-portal.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: SPRING_PROFILES_ACTIVE value: "prod,swagger" diff --git a/charts/management-portal/templates/ingress.yaml b/charts/management-portal/templates/ingress.yaml index 8cf5cc1b..e470f935 100644 --- a/charts/management-portal/templates/ingress.yaml +++ b/charts/management-portal/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "management-portal.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "management-portal.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/management-portal/templates/networkpolicy.yaml b/charts/management-portal/templates/networkpolicy.yaml index 62ef6562..85be1f53 100644 --- a/charts/management-portal/templates/networkpolicy.yaml +++ b/charts/management-portal/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "management-portal.fullname" . }} - labels: -{{ include "management-portal.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/management-portal/templates/secrets-config.yaml b/charts/management-portal/templates/secrets-config.yaml index 0ba36ae6..57e13947 100644 --- a/charts/management-portal/templates/secrets-config.yaml +++ b/charts/management-portal/templates/secrets-config.yaml @@ -30,8 +30,11 @@ client_id;resource_ids;client_secret;scope;authorized_grant_types;redirect_uri;a apiVersion: v1 kind: Secret metadata: - name: {{ template "management-portal.fullname" . }}-config - labels: -{{ include "management-portal.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }}-config + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: oauth_client_details.csv: {{ include "oauth-clients-details.csv" . | b64enc | quote }} diff --git a/charts/management-portal/templates/secrets-keystore.yaml b/charts/management-portal/templates/secrets-keystore.yaml index ee19d878..ee1b7e77 100644 --- a/charts/management-portal/templates/secrets-keystore.yaml +++ b/charts/management-portal/templates/secrets-keystore.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "management-portal.fullname" . }}-keystore - labels: -{{ include "management-portal.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }}-keystore + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: keystore.p12: {{ .Values.keystore }} diff --git a/charts/management-portal/templates/secrets-postgres-keystore.yaml b/charts/management-portal/templates/secrets-postgres-keystore.yaml index 4fc585c4..dab535f7 100644 --- a/charts/management-portal/templates/secrets-postgres-keystore.yaml +++ b/charts/management-portal/templates/secrets-postgres-keystore.yaml @@ -2,9 +2,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "management-portal.fullname" . }}-root-cert - labels: -{{ include "management-portal.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }}-root-cert + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: root.crt: {{ .Values.postgres.ssl.keystore }} diff --git a/charts/management-portal/templates/secrets.yaml b/charts/management-portal/templates/secrets.yaml index de101f14..39a84df6 100644 --- a/charts/management-portal/templates/secrets.yaml +++ b/charts/management-portal/templates/secrets.yaml @@ -2,9 +2,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "management-portal.fullname" . }} - labels: -{{ include "management-portal.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: postgresql_password: {{ .Values.postgres.password | b64enc | quote }} diff --git a/charts/management-portal/templates/service.yaml b/charts/management-portal/templates/service.yaml index 61c4fbce..d8c4f364 100644 --- a/charts/management-portal/templates/service.yaml +++ b/charts/management-portal/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "management-portal.fullname" . }} - labels: -{{ include "management-portal.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "management-portal.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/management-portal/values.yaml b/charts/management-portal/values.yaml index 1c5a59a2..d869fd35 100644 --- a/charts/management-portal/values.yaml +++ b/charts/management-portal/values.yaml @@ -6,15 +6,24 @@ replicaCount: 1 image: - # -- Management Portal image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/management-portal - # -- Management Portal image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) + # Overrides the image tag whose default is the chart appVersion. tag: - # -- Management Portal image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override management-portal.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-appserver/Chart.lock b/charts/radar-appserver/Chart.lock new file mode 100644 index 00000000..c389016a --- /dev/null +++ b/charts/radar-appserver/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T13:14:52.685559173+01:00" diff --git a/charts/radar-appserver/Chart.yaml b/charts/radar-appserver/Chart.yaml index 43766dc4..5e024cf8 100644 --- a/charts/radar-appserver/Chart.yaml +++ b/charts/radar-appserver/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.4.3" description: A Helm chart for the backend application of RADAR-base Appserver name: radar-appserver -version: 0.7.2 +version: 0.8.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-appserver @@ -22,3 +22,9 @@ maintainers: - email: pauline.conde@kcl.ac.uk name: Pauline Conde url: https://www.kcl.ac.uk/people/pauline-conde +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-appserver/README.md b/charts/radar-appserver/README.md index 8611faa5..8618e0cb 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.7.2](https://img.shields.io/badge/Version-0.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.3](https://img.shields.io/badge/AppVersion-2.4.3-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.3](https://img.shields.io/badge/AppVersion-2.4.3-informational?style=flat-square) A Helm chart for the backend application of RADAR-base Appserver @@ -22,19 +22,27 @@ A Helm chart for the backend application of RADAR-base Appserver * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number of radar-appserver replicas to deploy | -| image.repository | string | `"radarbase/radar-appserver"` | radar-appserver image repository | -| image.tag | string | `nil` | radar-appserver image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-appserver image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-appserver"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-appserver.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-appserver.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-appserver pods' Security Context | diff --git a/charts/radar-appserver/charts/common-2.27.0.tgz b/charts/radar-appserver/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-appserver/charts/common-2.27.0.tgz differ diff --git a/charts/radar-appserver/templates/_helpers.tpl b/charts/radar-appserver/templates/_helpers.tpl index dc2182df..3ec9c04a 100644 --- a/charts/radar-appserver/templates/_helpers.tpl +++ b/charts/radar-appserver/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-appserver.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-appserver.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-appserver/templates/configmap.yaml b/charts/radar-appserver/templates/configmap.yaml index 3cb48015..8e670169 100644 --- a/charts/radar-appserver/templates/configmap.yaml +++ b/charts/radar-appserver/templates/configmap.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-appserver.fullname" . }} - labels: -{{ include "radar-appserver.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: healthcheck.sh: | #!/bin/sh diff --git a/charts/radar-appserver/templates/deployment.yaml b/charts/radar-appserver/templates/deployment.yaml index 4e652eee..abcc396e 100644 --- a/charts/radar-appserver/templates/deployment.yaml +++ b/charts/radar-appserver/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-appserver.fullname" . }} - labels: -{{ include "radar-appserver.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -19,10 +22,7 @@ spec: app.kubernetes.io/name: {{ include "radar-appserver.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-appserver.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -45,8 +45,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-appserver.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: RADAR_IS_CONFIG_LOCATION value: /etc/radar-appserver/radar_is.yml diff --git a/charts/radar-appserver/templates/ingress.yaml b/charts/radar-appserver/templates/ingress.yaml index 9be55a96..97f5ffbd 100644 --- a/charts/radar-appserver/templates/ingress.yaml +++ b/charts/radar-appserver/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "radar-appserver.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "radar-appserver.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} nginx.ingress.kubernetes.io/proxy-body-size: {{ .Values.upload.max_file_size | lower | trimAll "b" }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} @@ -38,15 +38,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/radar-appserver/templates/networkpolicy.yaml b/charts/radar-appserver/templates/networkpolicy.yaml index 174eef2a..a463843a 100644 --- a/charts/radar-appserver/templates/networkpolicy.yaml +++ b/charts/radar-appserver/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-appserver.fullname" . }} - labels: -{{ include "radar-appserver.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-appserver/templates/secrets.yaml b/charts/radar-appserver/templates/secrets.yaml index 18b377ce..0c0c81bb 100644 --- a/charts/radar-appserver/templates/secrets.yaml +++ b/charts/radar-appserver/templates/secrets.yaml @@ -2,9 +2,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "radar-appserver.fullname" . }} - labels: -{{ include "radar-appserver.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: managementPortalClientId: {{ .Values.radar_admin_user | b64enc | quote }} diff --git a/charts/radar-appserver/templates/service.yaml b/charts/radar-appserver/templates/service.yaml index 76d74102..d8c4f364 100644 --- a/charts/radar-appserver/templates/service.yaml +++ b/charts/radar-appserver/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-appserver.fullname" . }} - labels: -{{ include "radar-appserver.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-appserver.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-appserver/values.yaml b/charts/radar-appserver/values.yaml index 521df70d..845f800c 100644 --- a/charts/radar-appserver/values.yaml +++ b/charts/radar-appserver/values.yaml @@ -6,16 +6,24 @@ replicaCount: 2 image: - # -- radar-appserver image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-appserver - # -- radar-appserver image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-appserver image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-appserver.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-backend/Chart.lock b/charts/radar-backend/Chart.lock new file mode 100644 index 00000000..34b568a4 --- /dev/null +++ b/charts/radar-backend/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T13:56:45.982522711+01:00" diff --git a/charts/radar-backend/Chart.yaml b/charts/radar-backend/Chart.yaml index cd4e5a5d..fefaf77b 100644 --- a/charts/radar-backend/Chart.yaml +++ b/charts/radar-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.4.0" description: A Helm chart for RADAR-Base backend services which provides a layer to monitor and analyze streams of wearable data and write data to storage. name: radar-backend -version: 0.3.1 +version: 0.4.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-backend @@ -25,3 +25,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-backend/charts/common-2.27.0.tgz b/charts/radar-backend/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-backend/charts/common-2.27.0.tgz differ diff --git a/charts/radar-backend/templates/_helpers.tpl b/charts/radar-backend/templates/_helpers.tpl index 00986769..57ce5143 100644 --- a/charts/radar-backend/templates/_helpers.tpl +++ b/charts/radar-backend/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-backend.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-backend.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-backend/templates/configmap.yaml b/charts/radar-backend/templates/configmap.yaml index 23650347..7fd5c20f 100644 --- a/charts/radar-backend/templates/configmap.yaml +++ b/charts/radar-backend/templates/configmap.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-backend.fullname" . }} - labels: -{{ include "radar-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: radar.yml: | version: 1.0 diff --git a/charts/radar-backend/templates/deployment.yaml b/charts/radar-backend/templates/deployment.yaml index 36415017..44d511be 100644 --- a/charts/radar-backend/templates/deployment.yaml +++ b/charts/radar-backend/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-backend.fullname" . }} - labels: -{{ include "radar-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -21,10 +24,7 @@ spec: app.kubernetes.io/name: {{ include "radar-backend.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-backend.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -47,8 +47,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-backend.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} command: - radar-backend - -c diff --git a/charts/radar-backend/templates/networkpolicy.yaml b/charts/radar-backend/templates/networkpolicy.yaml index 71881ad2..31c7b8a9 100644 --- a/charts/radar-backend/templates/networkpolicy.yaml +++ b/charts/radar-backend/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-backend.fullname" . }} - labels: -{{ include "radar-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-backend/templates/pvc.yaml b/charts/radar-backend/templates/pvc.yaml index eb2511ef..d527dddb 100644 --- a/charts/radar-backend/templates/pvc.yaml +++ b/charts/radar-backend/templates/pvc.yaml @@ -2,9 +2,12 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "radar-backend.fullname" . }} - labels: -{{ include "radar-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: accessModes: - {{ .Values.persistence.accessMode | quote }} diff --git a/charts/radar-backend/templates/service.yaml b/charts/radar-backend/templates/service.yaml index 4a25a222..d8c4f364 100644 --- a/charts/radar-backend/templates/service.yaml +++ b/charts/radar-backend/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-backend.fullname" . }} - labels: -{{ include "radar-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-backend.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-backend/values.yaml b/charts/radar-backend/values.yaml index 72869c34..064c891b 100644 --- a/charts/radar-backend/values.yaml +++ b/charts/radar-backend/values.yaml @@ -5,13 +5,24 @@ replicaCount: 2 image: + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-backend - # -- Overrides the image tag whose default is the chart appVersion. + # -- Image tag (immutable tags are recommended) + # Overrides the image tag whose default is the chart appVersion. tag: + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-backend.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-fitbit-connector/Chart.lock b/charts/radar-fitbit-connector/Chart.lock new file mode 100644 index 00000000..565690fe --- /dev/null +++ b/charts/radar-fitbit-connector/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T13:57:19.682455203+01:00" diff --git a/charts/radar-fitbit-connector/Chart.yaml b/charts/radar-fitbit-connector/Chart.yaml index c88c3d60..229da55c 100644 --- a/charts/radar-fitbit-connector/Chart.yaml +++ b/charts/radar-fitbit-connector/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 0.6.0 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.6.0 +version: 0.7.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-fitbit-connector @@ -22,3 +22,9 @@ maintainers: - email: pim@thehyve.nl name: Pim van Nierop url: https://www.thehyve.nl/experts/pim-van-nierop +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-fitbit-connector/README.md b/charts/radar-fitbit-connector/README.md index 187e613f..0a948f1b 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.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.0](https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square) +![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.6.0](https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square) A Helm chart for RADAR-base fitbit connector. This application collects data from participants via the Fitbit Web API. @@ -22,20 +22,28 @@ A Helm chart for RADAR-base fitbit connector. This application collects data fro * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ * PV provisioner support in the underlying infrastructure +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of radar-fitbit-connector replicas to deploy | -| image.repository | string | `"radarbase/kafka-connect-rest-fitbit-source"` | radar-fitbit-connector image repository | -| image.tag | string | `nil` | radar-fitbit-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-fitbit-connector image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/kafka-connect-rest-fitbit-source"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-fitbit-connector.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-fitbit-connector.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-fitbit-connector pods' Security Context | diff --git a/charts/radar-fitbit-connector/charts/common-2.27.0.tgz b/charts/radar-fitbit-connector/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-fitbit-connector/charts/common-2.27.0.tgz differ diff --git a/charts/radar-fitbit-connector/templates/_helpers.tpl b/charts/radar-fitbit-connector/templates/_helpers.tpl index 64b34b31..ad15d239 100644 --- a/charts/radar-fitbit-connector/templates/_helpers.tpl +++ b/charts/radar-fitbit-connector/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-fitbit-connector.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-fitbit-connector.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-fitbit-connector/templates/configmap-properties.yaml b/charts/radar-fitbit-connector/templates/configmap-properties.yaml index ee45c1da..5ef292ab 100644 --- a/charts/radar-fitbit-connector/templates/configmap-properties.yaml +++ b/charts/radar-fitbit-connector/templates/configmap-properties.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-fitbit-connector.fullname" . }}-properties - labels: -{{ include "radar-fitbit-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }}-properties + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: source-fitbit.properties: | name=radar-fitbit-source diff --git a/charts/radar-fitbit-connector/templates/configmap-users.yaml b/charts/radar-fitbit-connector/templates/configmap-users.yaml index cf1a18ea..de0df101 100644 --- a/charts/radar-fitbit-connector/templates/configmap-users.yaml +++ b/charts/radar-fitbit-connector/templates/configmap-users.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-fitbit-connector.fullname" . }}-users - labels: -{{ include "radar-fitbit-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }}-users + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: fitbit-user.yml: | --- diff --git a/charts/radar-fitbit-connector/templates/deployment.yaml b/charts/radar-fitbit-connector/templates/deployment.yaml index 62966117..50cf071b 100644 --- a/charts/radar-fitbit-connector/templates/deployment.yaml +++ b/charts/radar-fitbit-connector/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-fitbit-connector.fullname" . }} - labels: -{{ include "radar-fitbit-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -23,10 +26,7 @@ spec: app.kubernetes.io/name: {{ include "radar-fitbit-connector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-fitbit-connector.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -49,8 +49,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-fitbit-connector.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: CONNECT_BOOTSTRAP_SERVERS value: "{{ .Values.kafka }}" diff --git a/charts/radar-fitbit-connector/templates/networkpolicy.yaml b/charts/radar-fitbit-connector/templates/networkpolicy.yaml index 0943941c..8e390842 100644 --- a/charts/radar-fitbit-connector/templates/networkpolicy.yaml +++ b/charts/radar-fitbit-connector/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-fitbit-connector.fullname" . }} - labels: -{{ include "radar-fitbit-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-fitbit-connector/templates/pvc.yaml b/charts/radar-fitbit-connector/templates/pvc.yaml index ca448cb5..d527dddb 100644 --- a/charts/radar-fitbit-connector/templates/pvc.yaml +++ b/charts/radar-fitbit-connector/templates/pvc.yaml @@ -2,9 +2,12 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "radar-fitbit-connector.fullname" . }} - labels: -{{ include "radar-fitbit-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: accessModes: - {{ .Values.persistence.accessMode | quote }} diff --git a/charts/radar-fitbit-connector/templates/service.yaml b/charts/radar-fitbit-connector/templates/service.yaml index faf7ab9a..d8c4f364 100644 --- a/charts/radar-fitbit-connector/templates/service.yaml +++ b/charts/radar-fitbit-connector/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-fitbit-connector.fullname" . }} - labels: -{{ include "radar-fitbit-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-fitbit-connector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-fitbit-connector/values.yaml b/charts/radar-fitbit-connector/values.yaml index 9d25f5f0..20deb4ee 100644 --- a/charts/radar-fitbit-connector/values.yaml +++ b/charts/radar-fitbit-connector/values.yaml @@ -6,16 +6,24 @@ replicaCount: 1 image: - # -- radar-fitbit-connector image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/kafka-connect-rest-fitbit-source - # -- radar-fitbit-connector image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-fitbit-connector image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-fitbit-connector.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-gateway/Chart.lock b/charts/radar-gateway/Chart.lock new file mode 100644 index 00000000..2b28a817 --- /dev/null +++ b/charts/radar-gateway/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T14:26:26.459914518+01:00" diff --git a/charts/radar-gateway/Chart.yaml b/charts/radar-gateway/Chart.yaml index 2b4e26fc..a5cd8df2 100644 --- a/charts/radar-gateway/Chart.yaml +++ b/charts/radar-gateway/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.7.7" 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.2.9 +version: 1.3.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-gateway @@ -22,3 +22,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-gateway/README.md b/charts/radar-gateway/README.md index 5999c81b..ff3b750a 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.2.9](https://img.shields.io/badge/Version-1.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.7](https://img.shields.io/badge/AppVersion-0.7.7-informational?style=flat-square) +![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.7](https://img.shields.io/badge/AppVersion-0.7.7-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. @@ -22,19 +22,27 @@ A Helm chart for RADAR-base gateway. REST Gateway to Kafka, for incoming partici * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number of radar-gateway replicas to deploy | -| image.repository | string | `"radarbase/radar-gateway"` | radar-gateway image repository | -| image.tag | string | `nil` | radar-gateway image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-gateway image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-gateway"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-gateway.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-gateway.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-gateway pods' Security Context | diff --git a/charts/radar-gateway/charts/common-2.27.0.tgz b/charts/radar-gateway/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-gateway/charts/common-2.27.0.tgz differ diff --git a/charts/radar-gateway/templates/_helpers.tpl b/charts/radar-gateway/templates/_helpers.tpl index 1b103573..fb4de08c 100644 --- a/charts/radar-gateway/templates/_helpers.tpl +++ b/charts/radar-gateway/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-gateway.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-gateway.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-gateway/templates/configmap-jmx.yaml b/charts/radar-gateway/templates/configmap-jmx.yaml new file mode 100644 index 00000000..de2a9019 --- /dev/null +++ b/charts/radar-gateway/templates/configmap-jmx.yaml @@ -0,0 +1,17 @@ +{{- if .Values.serviceMonitor.enabled }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "common.names.fullname" . }}-jmx-configmap + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: + config.yml: | + jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:9010/jmxrmi + lowercaseOutputName: true + lowercaseOutputLabelNames: true + ssl: false +{{- end }} diff --git a/charts/radar-gateway/templates/configmap.yaml b/charts/radar-gateway/templates/configmap.yaml index a18ca6e5..43dc0008 100644 --- a/charts/radar-gateway/templates/configmap.yaml +++ b/charts/radar-gateway/templates/configmap.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-gateway.fullname" . }} - labels: -{{ include "radar-gateway.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: healthcheck.sh: | #!/bin/sh diff --git a/charts/radar-gateway/templates/deployment.yaml b/charts/radar-gateway/templates/deployment.yaml index 9dbf8b2e..87831cdc 100644 --- a/charts/radar-gateway/templates/deployment.yaml +++ b/charts/radar-gateway/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-gateway.fullname" . }} - labels: -{{ include "radar-gateway.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -19,10 +22,7 @@ spec: app.kubernetes.io/name: {{ include "radar-gateway.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-gateway.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -63,8 +63,8 @@ spec: name: gateway-jmx-configmap {{- end }} - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-gateway.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} command: ["radar-gateway", "/etc/radar-gateway/gateway.yml"] env: - name: JAVA_OPTS diff --git a/charts/radar-gateway/templates/hpa.yaml b/charts/radar-gateway/templates/hpa.yaml index 56b5833e..14ec28cd 100644 --- a/charts/radar-gateway/templates/hpa.yaml +++ b/charts/radar-gateway/templates/hpa.yaml @@ -2,9 +2,12 @@ apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: - name: {{ include "radar-gateway.fullname" . }} - labels: -{{ include "radar-gateway.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: scaleTargetRef: apiVersion: apps/v1 diff --git a/charts/radar-gateway/templates/ingress.yaml b/charts/radar-gateway/templates/ingress.yaml index 973e8d71..e470f935 100644 --- a/charts/radar-gateway/templates/ingress.yaml +++ b/charts/radar-gateway/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "radar-gateway.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "radar-gateway.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/radar-gateway/templates/jmx-configmap.yaml b/charts/radar-gateway/templates/jmx-configmap.yaml deleted file mode 100644 index 037ae94b..00000000 --- a/charts/radar-gateway/templates/jmx-configmap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if .Values.serviceMonitor.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "radar-gateway.fullname" . }}-jmx-configmap - labels: -{{ include "radar-gateway.labels" . | indent 4 }} -data: - config.yml: | - jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:9010/jmxrmi - lowercaseOutputName: true - lowercaseOutputLabelNames: true - ssl: false -{{- end }} diff --git a/charts/radar-gateway/templates/networkpolicy.yaml b/charts/radar-gateway/templates/networkpolicy.yaml index 91484741..274d69e9 100644 --- a/charts/radar-gateway/templates/networkpolicy.yaml +++ b/charts/radar-gateway/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-gateway.fullname" . }} - labels: -{{ include "radar-gateway.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-gateway/templates/service.yaml b/charts/radar-gateway/templates/service.yaml index d318f253..e0a88bab 100644 --- a/charts/radar-gateway/templates/service.yaml +++ b/charts/radar-gateway/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-gateway.fullname" . }} - labels: -{{ include "radar-gateway.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -17,6 +20,5 @@ spec: protocol: TCP targetPort: metrics {{- end }} - selector: - app.kubernetes.io/name: {{ include "radar-gateway.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-gateway/templates/servicemonitor.yaml b/charts/radar-gateway/templates/servicemonitor.yaml index ff413781..31ebd828 100644 --- a/charts/radar-gateway/templates/servicemonitor.yaml +++ b/charts/radar-gateway/templates/servicemonitor.yaml @@ -2,9 +2,12 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ include "radar-gateway.fullname" . }} - labels: -{{ include "radar-gateway.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: selector: matchLabels: diff --git a/charts/radar-gateway/values.yaml b/charts/radar-gateway/values.yaml index fde1668c..194c712b 100644 --- a/charts/radar-gateway/values.yaml +++ b/charts/radar-gateway/values.yaml @@ -6,16 +6,24 @@ replicaCount: 2 image: - # -- radar-gateway image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-gateway - # -- radar-gateway image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-gateway image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-gateway.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-home/Chart.lock b/charts/radar-home/Chart.lock new file mode 100644 index 00000000..abaf2c12 --- /dev/null +++ b/charts/radar-home/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T14:45:02.338535521+01:00" diff --git a/charts/radar-home/Chart.yaml b/charts/radar-home/Chart.yaml index 4096b3f3..2bbb3da0 100644 --- a/charts/radar-home/Chart.yaml +++ b/charts/radar-home/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.1.4" description: RADAR-base home page. name: radar-home -version: 0.3.5 +version: 0.4.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-home @@ -21,3 +21,9 @@ maintainers: - email: pim@thehyve.nl name: Pim van Nierop url: https://www.thehyve.nl/experts/pim-van-nierop +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-home/README.md b/charts/radar-home/README.md index a7b19fb8..65531f70 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.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.4](https://img.shields.io/badge/AppVersion-0.1.4-informational?style=flat-square) +![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.4](https://img.shields.io/badge/AppVersion-0.1.4-informational?style=flat-square) RADAR-base home page. @@ -22,19 +22,27 @@ RADAR-base home page. * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of Appconfig replicas to deploy | -| image.repository | string | `"radarbase/radar-home"` | Appconfig image repository | -| image.tag | string | `nil` | Appconfig image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | Appconfig image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-home"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-home.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-home.fullname template with a string | | namespace | string | `"default"` | Kubernetes namespace that Appconfig is going to be deployed on | diff --git a/charts/radar-home/charts/common-2.27.0.tgz b/charts/radar-home/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-home/charts/common-2.27.0.tgz differ diff --git a/charts/radar-home/templates/_helpers.tpl b/charts/radar-home/templates/_helpers.tpl index 279c8d97..3064d5df 100644 --- a/charts/radar-home/templates/_helpers.tpl +++ b/charts/radar-home/templates/_helpers.tpl @@ -5,6 +5,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} +{{/* +Return the proper image name +*/}} +{{- define "radar-home.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-home.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-home/templates/deployment.yaml b/charts/radar-home/templates/deployment.yaml index 6969967f..a22c1623 100644 --- a/charts/radar-home/templates/deployment.yaml +++ b/charts/radar-home/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-home.fullname" . }} - labels: - {{- include "radar-home.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: diff --git a/charts/radar-home/templates/ingress.yaml b/charts/radar-home/templates/ingress.yaml index 94c7c5cf..460be382 100644 --- a/charts/radar-home/templates/ingress.yaml +++ b/charts/radar-home/templates/ingress.yaml @@ -11,13 +11,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: - {{- include "radar-home.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +38,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/radar-home/templates/networkpolicy.yaml b/charts/radar-home/templates/networkpolicy.yaml index 1351d85a..b9e74085 100644 --- a/charts/radar-home/templates/networkpolicy.yaml +++ b/charts/radar-home/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-home.fullname" . }} - labels: -{{ include "radar-home.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-home/templates/service.yaml b/charts/radar-home/templates/service.yaml index 687e01ea..d8c4f364 100644 --- a/charts/radar-home/templates/service.yaml +++ b/charts/radar-home/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-home.fullname" . }} - labels: - {{- include "radar-home.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,5 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - {{- include "radar-home.selectorLabels" . | nindent 4 }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-home/values.yaml b/charts/radar-home/values.yaml index ba59bbd0..c115e80b 100644 --- a/charts/radar-home/values.yaml +++ b/charts/radar-home/values.yaml @@ -6,16 +6,24 @@ replicaCount: 1 image: - # -- Appconfig image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-home - # -- Appconfig image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- Appconfig image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-home.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-integration/Chart.lock b/charts/radar-integration/Chart.lock new file mode 100644 index 00000000..7324cea3 --- /dev/null +++ b/charts/radar-integration/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T17:00:15.513872242+01:00" diff --git a/charts/radar-integration/Chart.yaml b/charts/radar-integration/Chart.yaml index 200bf52a..2049cf68 100644 --- a/charts/radar-integration/Chart.yaml +++ b/charts/radar-integration/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "1.0.5" description: A Helm chart for RADAR-Base REDCap survey integration application. name: radar-integration -version: 0.7.3 +version: 0.8.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-integration @@ -22,3 +22,9 @@ maintainers: - email: pauline.conde@kcl.ac.uk name: Pauline Conde url: https://www.kcl.ac.uk/people/pauline-conde +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-integration/README.md b/charts/radar-integration/README.md index ffe764be..2ad7a7ca 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.7.3](https://img.shields.io/badge/Version-0.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.5](https://img.shields.io/badge/AppVersion-1.0.5-informational?style=flat-square) +![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.5](https://img.shields.io/badge/AppVersion-1.0.5-informational?style=flat-square) A Helm chart for RADAR-Base REDCap survey integration application. @@ -22,19 +22,27 @@ A Helm chart for RADAR-Base REDCap survey integration application. * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number replicas to deploy | -| image.repository | string | `"radarbase/radar-redcapintegration"` | radar-integration image repository | -| image.tag | string | `nil` | radar-integration image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-integration image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-redcapintegration"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-integration.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-integration.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-integration pods' Security Context | diff --git a/charts/radar-integration/charts/common-2.27.0.tgz b/charts/radar-integration/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-integration/charts/common-2.27.0.tgz differ diff --git a/charts/radar-integration/templates/_helpers.tpl b/charts/radar-integration/templates/_helpers.tpl index e671cc3e..360cf240 100644 --- a/charts/radar-integration/templates/_helpers.tpl +++ b/charts/radar-integration/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-integration.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-integration.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-integration/templates/configmap.yaml b/charts/radar-integration/templates/configmap.yaml index e2fbd3d0..1fae80f6 100644 --- a/charts/radar-integration/templates/configmap.yaml +++ b/charts/radar-integration/templates/configmap.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-integration.fullname" . }} - labels: -{{ include "radar-integration.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: radar.yml: | # ManagementPortal configuration diff --git a/charts/radar-integration/templates/deployment.yaml b/charts/radar-integration/templates/deployment.yaml index c52de513..6b763f2a 100644 --- a/charts/radar-integration/templates/deployment.yaml +++ b/charts/radar-integration/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-integration.fullname" . }} - labels: -{{ include "radar-integration.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -18,10 +21,7 @@ spec: app.kubernetes.io/name: {{ include "radar-integration.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-integration.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -44,8 +44,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-integration.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} ports: - name: http containerPort: 8080 diff --git a/charts/radar-integration/templates/ingress.yaml b/charts/radar-integration/templates/ingress.yaml index 55242a1d..e470f935 100644 --- a/charts/radar-integration/templates/ingress.yaml +++ b/charts/radar-integration/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "radar-integration.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "radar-integration.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/radar-integration/templates/networkpolicy.yaml b/charts/radar-integration/templates/networkpolicy.yaml index 43f3978b..7e046bce 100644 --- a/charts/radar-integration/templates/networkpolicy.yaml +++ b/charts/radar-integration/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-integration.fullname" . }} - labels: -{{ include "radar-integration.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-integration/templates/service.yaml b/charts/radar-integration/templates/service.yaml index 86aca10e..d8c4f364 100644 --- a/charts/radar-integration/templates/service.yaml +++ b/charts/radar-integration/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-integration.fullname" . }} - labels: -{{ include "radar-integration.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-integration.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-integration/values.yaml b/charts/radar-integration/values.yaml index 6e8b3bb2..e33f624e 100644 --- a/charts/radar-integration/values.yaml +++ b/charts/radar-integration/values.yaml @@ -6,16 +6,24 @@ replicaCount: 2 image: - # -- radar-integration image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-redcapintegration - # -- radar-integration image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-integration image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-integration.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-jdbc-connector/Chart.lock b/charts/radar-jdbc-connector/Chart.lock new file mode 100644 index 00000000..e7b0c6f0 --- /dev/null +++ b/charts/radar-jdbc-connector/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T17:07:16.718838053+01:00" diff --git a/charts/radar-jdbc-connector/Chart.yaml b/charts/radar-jdbc-connector/Chart.yaml index 3f1de812..cb046437 100644 --- a/charts/radar-jdbc-connector/Chart.yaml +++ b/charts/radar-jdbc-connector/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "10.5.5" 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.5.5 +version: 0.6.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-jdbc-connector @@ -28,3 +28,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-jdbc-connector/README.md b/charts/radar-jdbc-connector/README.md index d23ee732..e19e672a 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.5.5](https://img.shields.io/badge/Version-0.5.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.5.5](https://img.shields.io/badge/AppVersion-10.5.5-informational?style=flat-square) +![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.5.5](https://img.shields.io/badge/AppVersion-10.5.5-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). @@ -24,19 +24,27 @@ A Helm chart for RADAR-base JDBC Kafka connector. This is a fork of the Kafka JD * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of radar-jdbc-connector replicas to deploy | -| image.repository | string | `"radarbase/radar-jdbc-connector"` | radar-jdbc-connector image repository | -| image.tag | string | `nil` | radar-jdbc-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-jdbc-connector image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-jdbc-connector"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-jdbc-connector.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-jdbc-connector.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-jdbc-connector pods' Security Context | diff --git a/charts/radar-jdbc-connector/charts/common-2.27.0.tgz b/charts/radar-jdbc-connector/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-jdbc-connector/charts/common-2.27.0.tgz differ diff --git a/charts/radar-jdbc-connector/templates/_helpers.tpl b/charts/radar-jdbc-connector/templates/_helpers.tpl index ae7f8007..52181b93 100644 --- a/charts/radar-jdbc-connector/templates/_helpers.tpl +++ b/charts/radar-jdbc-connector/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} +{{/* +Return the proper image name +*/}} +{{- define "radar-jdbc-connector.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-jdbc-connector.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). @@ -61,4 +75,4 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{- if not (has .Values.mode (list "sink" "source")) }} {{- fail "Mode must be 'source' for JDBC source connector or 'sink' for JDBC sink connector."}} {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/charts/radar-jdbc-connector/templates/configmap.yaml b/charts/radar-jdbc-connector/templates/configmap.yaml index c13fb47f..14221497 100644 --- a/charts/radar-jdbc-connector/templates/configmap.yaml +++ b/charts/radar-jdbc-connector/templates/configmap.yaml @@ -4,9 +4,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "radar-jdbc-connector.fullname" . }} - labels: - {{- include "radar-jdbc-connector.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: connector.properties: | # Kafka connector configuration diff --git a/charts/radar-jdbc-connector/templates/deployment.yaml b/charts/radar-jdbc-connector/templates/deployment.yaml index d68f0215..6675d428 100644 --- a/charts/radar-jdbc-connector/templates/deployment.yaml +++ b/charts/radar-jdbc-connector/templates/deployment.yaml @@ -3,9 +3,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-jdbc-connector.fullname" . }} - labels: - {{- include "radar-jdbc-connector.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -20,10 +23,7 @@ spec: app.kubernetes.io/name: {{ include "radar-jdbc-connector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-jdbc-connector.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -46,8 +46,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-jdbc-connector.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: CONNECT_BOOTSTRAP_SERVERS value: "{{ .Values.kafka }}" diff --git a/charts/radar-jdbc-connector/templates/networkpolicy.yaml b/charts/radar-jdbc-connector/templates/networkpolicy.yaml index 97fe25ba..b36af9fc 100644 --- a/charts/radar-jdbc-connector/templates/networkpolicy.yaml +++ b/charts/radar-jdbc-connector/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-jdbc-connector.fullname" . }} - labels: -{{ include "radar-jdbc-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-jdbc-connector/templates/pvc.yaml b/charts/radar-jdbc-connector/templates/pvc.yaml index e83b8e46..c3b2c249 100644 --- a/charts/radar-jdbc-connector/templates/pvc.yaml +++ b/charts/radar-jdbc-connector/templates/pvc.yaml @@ -4,12 +4,12 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "radar-jdbc-connector.fullname" $ }} - labels: - app: "{{ template "radar-jdbc-connector.fullname" $ }}" - chart: "{{ template "radar-jdbc-connector.chart" $ }}" - release: {{ $.Release.Name | quote }} - heritage: {{ $.Release.Service | quote }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: accessModes: - {{ .accessMode | quote }} diff --git a/charts/radar-jdbc-connector/templates/service.yaml b/charts/radar-jdbc-connector/templates/service.yaml index f0c5ae04..190726b2 100644 --- a/charts/radar-jdbc-connector/templates/service.yaml +++ b/charts/radar-jdbc-connector/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-jdbc-connector.fullname" . }} - labels: - {{- include "radar-jdbc-connector.labels" . | nindent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: diff --git a/charts/radar-jdbc-connector/values.yaml b/charts/radar-jdbc-connector/values.yaml index 74334026..44360619 100644 --- a/charts/radar-jdbc-connector/values.yaml +++ b/charts/radar-jdbc-connector/values.yaml @@ -6,16 +6,24 @@ replicaCount: 1 image: - # -- radar-jdbc-connector image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-jdbc-connector - # -- radar-jdbc-connector image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-jdbc-connector image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-jdbc-connector.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-mockserver/Chart.yaml b/charts/radar-mockserver/Chart.yaml index c2ccf10d..cf7d5fa7 100644 --- a/charts/radar-mockserver/Chart.yaml +++ b/charts/radar-mockserver/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: radar-mockserver -version: "0.1.0" +version: "0.1.1" appVersion: "5.15.0" description: Chart to deploy MockServer to Kubernetes. MockServer enables easy mocking of any system you integrate with via HTTP or HTTPS with clients written in Java, JavaScript and Ruby. MockServer also includes a proxy that introspects all proxied traffic including encrypted SSL traffic and supports Port Forwarding, Web Proxying (i.e. HTTP proxy), HTTPS Tunneling Proxying (using HTTP CONNECT) and SOCKS Proxying (i.e. dynamic port forwarding). maintainers: diff --git a/charts/radar-mockserver/DOCS.md.gotmpl b/charts/radar-mockserver/DOCS.md.gotmpl new file mode 100644 index 00000000..e69de29b diff --git a/charts/radar-mockserver/README.md b/charts/radar-mockserver/README.md index 6447b782..dfb56f14 100644 --- a/charts/radar-mockserver/README.md +++ b/charts/radar-mockserver/README.md @@ -1,8 +1,9 @@ # radar-mockserver +[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-mockserver)](https://artifacthub.io/packages/helm/radar-base/radar-mockserver) -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: 5.15.0](https://img.shields.io/badge/AppVersion-5.15.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: 5.15.0](https://img.shields.io/badge/AppVersion-5.15.0-informational?style=flat-square) Chart to deploy MockServer to Kubernetes. MockServer enables easy mocking of any system you integrate with via HTTP or HTTPS with clients written in Java, JavaScript and Ruby. MockServer also includes a proxy that introspects all proxied traffic including encrypted SSL traffic and supports Port Forwarding, Web Proxying (i.e. HTTP proxy), HTTPS Tunneling Proxying (using HTTP CONNECT) and SOCKS Proxying (i.e. dynamic port forwarding). @@ -13,6 +14,11 @@ Chart to deploy MockServer to Kubernetes. MockServer enables easy mocking of any | Pim van Nierop | | | | Nivethika Mahasivam | | | +## Prerequisites +* Kubernetes 1.28+ +* Kubectl 1.28+ +* Helm 3.1.0+ + ## Requirements | Repository | Name | Version | @@ -58,6 +64,3 @@ Chart to deploy MockServer to Kubernetes. MockServer enables easy mocking of any | mockserver.nodeSelector | object | `{}` | | | mockserver.tolerations | list | `[]` | | | mockserver.affinity | object | `{}` | | - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) diff --git a/charts/radar-mockserver/README.md.gotmpl b/charts/radar-mockserver/README.md.gotmpl new file mode 100644 index 00000000..fab382f7 --- /dev/null +++ b/charts/radar-mockserver/README.md.gotmpl @@ -0,0 +1,18 @@ +{{ template "common.header" . }} +{{ template "chart.deprecationWarning" . }} + +{{ template "chart.badgesSection" . }} + +{{ template "chart.description" . }} + +{{ template "chart.homepageLine" . }} + +{{ template "chart.maintainersSection" . }} + +{{ template "chart.sourcesSection" . }} + +{{ template "common.prerequisites" . }} + +{{ template "chart.requirementsSection" . }} + +{{ template "chart.valuesSection" . }} diff --git a/charts/radar-oura-connector/Chart.lock b/charts/radar-oura-connector/Chart.lock new file mode 100644 index 00000000..5d06dada --- /dev/null +++ b/charts/radar-oura-connector/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T17:15:02.992863091+01:00" diff --git a/charts/radar-oura-connector/Chart.yaml b/charts/radar-oura-connector/Chart.yaml index fd339b59..d5deadeb 100644 --- a/charts/radar-oura-connector/Chart.yaml +++ b/charts/radar-oura-connector/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 0.6.0 description: A Helm chart for RADAR-base oura connector. This application collects data from participants via the Oura Web API. name: radar-oura-connector -version: 0.1.0 +version: 0.2.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-oura-connector @@ -25,3 +25,9 @@ maintainers: - email: yatharth.ranjan@kcl.ac.uk name: Yatharth Ranjan url: https://www.kcl.ac.uk/people/yatharth-ranjan +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-oura-connector/README.md b/charts/radar-oura-connector/README.md index 7cc972f7..77c78d62 100644 --- a/charts/radar-oura-connector/README.md +++ b/charts/radar-oura-connector/README.md @@ -3,7 +3,7 @@ # radar-oura-connector [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-oura-connector)](https://artifacthub.io/packages/helm/radar-base/radar-oura-connector) -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-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: 0.2.0](https://img.shields.io/badge/Version-0.2.0-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 oura connector. This application collects data from participants via the Oura Web API. @@ -23,20 +23,28 @@ A Helm chart for RADAR-base oura connector. This application collects data from * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ * PV provisioner support in the underlying infrastructure +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of radar-oura-connector replicas to deploy | -| image.repository | string | `"radarbase/kafka-connect-rest-oura-source"` | radar-oura-connector image repository | -| image.tag | string | `nil` | radar-oura-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-oura-connector image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/kafka-connect-rest-oura-source"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-oura-connector.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-oura-connector.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-oura-connector pods' Security Context | diff --git a/charts/radar-oura-connector/charts/common-2.27.0.tgz b/charts/radar-oura-connector/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-oura-connector/charts/common-2.27.0.tgz differ diff --git a/charts/radar-oura-connector/templates/_helpers.tpl b/charts/radar-oura-connector/templates/_helpers.tpl index 704344ee..271e4d38 100644 --- a/charts/radar-oura-connector/templates/_helpers.tpl +++ b/charts/radar-oura-connector/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-oura-connector.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-oura-connector.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-oura-connector/templates/configmap-properties.yaml b/charts/radar-oura-connector/templates/configmap-properties.yaml index 673161ae..26b3fa4e 100644 --- a/charts/radar-oura-connector/templates/configmap-properties.yaml +++ b/charts/radar-oura-connector/templates/configmap-properties.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-oura-connector.fullname" . }}-properties - labels: -{{ include "radar-oura-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }}-properties + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: source-oura.properties: | name=radar-oura-source diff --git a/charts/radar-oura-connector/templates/deployment.yaml b/charts/radar-oura-connector/templates/deployment.yaml index 16167031..26489a6e 100644 --- a/charts/radar-oura-connector/templates/deployment.yaml +++ b/charts/radar-oura-connector/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-oura-connector.fullname" . }} - labels: -{{ include "radar-oura-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -22,10 +25,7 @@ spec: app.kubernetes.io/name: {{ include "radar-oura-connector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-oura-connector.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -48,8 +48,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-oura-connector.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: CONNECT_BOOTSTRAP_SERVERS value: "{{ .Values.kafka }}" diff --git a/charts/radar-oura-connector/templates/networkpolicy.yaml b/charts/radar-oura-connector/templates/networkpolicy.yaml index 009fbeec..7c9a2d2b 100644 --- a/charts/radar-oura-connector/templates/networkpolicy.yaml +++ b/charts/radar-oura-connector/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-oura-connector.fullname" . }} - labels: -{{ include "radar-oura-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-oura-connector/templates/pvc.yaml b/charts/radar-oura-connector/templates/pvc.yaml index fd090bda..d527dddb 100644 --- a/charts/radar-oura-connector/templates/pvc.yaml +++ b/charts/radar-oura-connector/templates/pvc.yaml @@ -2,9 +2,12 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: {{ template "radar-oura-connector.fullname" . }} - labels: -{{ include "radar-oura-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: accessModes: - {{ .Values.persistence.accessMode | quote }} diff --git a/charts/radar-oura-connector/templates/service.yaml b/charts/radar-oura-connector/templates/service.yaml index 37903a6b..d8c4f364 100644 --- a/charts/radar-oura-connector/templates/service.yaml +++ b/charts/radar-oura-connector/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-oura-connector.fullname" . }} - labels: -{{ include "radar-oura-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-oura-connector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-oura-connector/values.yaml b/charts/radar-oura-connector/values.yaml index a4d213a2..979872c9 100644 --- a/charts/radar-oura-connector/values.yaml +++ b/charts/radar-oura-connector/values.yaml @@ -6,16 +6,24 @@ replicaCount: 1 image: - # -- radar-oura-connector image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/kafka-connect-rest-oura-source - # -- radar-oura-connector image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-oura-connector image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-oura-connector.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-output/Chart.lock b/charts/radar-output/Chart.lock new file mode 100644 index 00000000..94e615a8 --- /dev/null +++ b/charts/radar-output/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T17:35:41.37460476+01:00" diff --git a/charts/radar-output/Chart.yaml b/charts/radar-output/Chart.yaml index e6119254..35d9bb81 100644 --- a/charts/radar-output/Chart.yaml +++ b/charts/radar-output/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "3.0.2" description: A Helm chart for RADAR-base output restructure service. This application reads data from intermediate storage and restructure the data into project-> subject-id-> data topic -> data split per hour. This service offers few options to choose the source and target of the pipeline. name: radar-output -version: 1.1.0 +version: 1.2.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-output @@ -21,3 +21,9 @@ maintainers: - email: pim@thehyve.nl name: Pim van Nierop url: https://www.thehyve.nl/experts/pim-van-nierop +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-output/README.md b/charts/radar-output/README.md index 3ec1efe8..b06d60ed 100644 --- a/charts/radar-output/README.md +++ b/charts/radar-output/README.md @@ -3,7 +3,7 @@ # radar-output [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-output)](https://artifacthub.io/packages/helm/radar-base/radar-output) -![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.2](https://img.shields.io/badge/AppVersion-3.0.2-informational?style=flat-square) +![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.2](https://img.shields.io/badge/AppVersion-3.0.2-informational?style=flat-square) A Helm chart for RADAR-base output restructure service. This application reads data from intermediate storage and restructure the data into project-> subject-id-> data topic -> data split per hour. This service offers few options to choose the source and target of the pipeline. @@ -22,19 +22,27 @@ A Helm chart for RADAR-base output restructure service. This application reads d * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of radar-output replicas to deploy | -| image.repository | string | `"radarbase/radar-output-restructure"` | radar-output image repository | -| image.tag | string | `nil` | radar-output image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-output image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-output-restructure"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-output.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-output.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-output pods' Security Context | diff --git a/charts/radar-output/charts/common-2.27.0.tgz b/charts/radar-output/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-output/charts/common-2.27.0.tgz differ diff --git a/charts/radar-output/templates/_helpers.tpl b/charts/radar-output/templates/_helpers.tpl index 7f41044d..ed21f07e 100644 --- a/charts/radar-output/templates/_helpers.tpl +++ b/charts/radar-output/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-output.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-output.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-output/templates/configmap.yaml b/charts/radar-output/templates/configmap.yaml index 8232ce29..080d81e7 100644 --- a/charts/radar-output/templates/configmap.yaml +++ b/charts/radar-output/templates/configmap.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-output.fullname" . }} - labels: -{{ include "radar-output.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: config.yaml: | service: diff --git a/charts/radar-output/templates/deployment.yaml b/charts/radar-output/templates/deployment.yaml index 5d7a0707..440299f0 100644 --- a/charts/radar-output/templates/deployment.yaml +++ b/charts/radar-output/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-output.fullname" . }} - labels: -{{ include "radar-output.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} strategy: @@ -23,10 +26,7 @@ spec: app.kubernetes.io/name: {{ include "radar-output.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-output.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -49,8 +49,8 @@ spec: - name: output securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-output.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} command: - radar-output-restructure args: diff --git a/charts/radar-output/templates/networkpolicy.yaml b/charts/radar-output/templates/networkpolicy.yaml index 3d5bfa83..a138c9c1 100644 --- a/charts/radar-output/templates/networkpolicy.yaml +++ b/charts/radar-output/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-output.fullname" . }} - labels: -{{ include "radar-output.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-output/templates/secrets.yaml b/charts/radar-output/templates/secrets.yaml index b00d74b6..73071e8a 100644 --- a/charts/radar-output/templates/secrets.yaml +++ b/charts/radar-output/templates/secrets.yaml @@ -2,9 +2,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "radar-output.fullname" . }} - labels: -{{ include "radar-output.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: sourceS3AccessToken: {{ .Values.source.s3.accessToken | b64enc | quote }} diff --git a/charts/radar-output/values.yaml b/charts/radar-output/values.yaml index 3c1d7b9b..cd0af0fe 100644 --- a/charts/radar-output/values.yaml +++ b/charts/radar-output/values.yaml @@ -6,16 +6,24 @@ replicaCount: 1 image: - # -- radar-output image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-output-restructure - # -- radar-output image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-output image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-output.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-postgresql/Chart.yaml b/charts/radar-postgresql/Chart.yaml index a0756025..69f546d7 100644 --- a/charts/radar-postgresql/Chart.yaml +++ b/charts/radar-postgresql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: radar-postgresql -version: 0.1.0 +version: 0.1.1 appVersion: 11.16.0 description: PostgreSQL (Postgres) is an open source object-relational database known for reliability and data integrity. ACID-compliant, it supports foreign keys, joins, diff --git a/charts/radar-postgresql/DOCS.md.gotmpl b/charts/radar-postgresql/DOCS.md.gotmpl new file mode 100644 index 00000000..e69de29b diff --git a/charts/radar-postgresql/README.md b/charts/radar-postgresql/README.md index 727537d6..79589d72 100644 --- a/charts/radar-postgresql/README.md +++ b/charts/radar-postgresql/README.md @@ -1,8 +1,9 @@ # radar-postgresql +[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-postgresql)](https://artifacthub.io/packages/helm/radar-base/radar-postgresql) -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: 11.16.0](https://img.shields.io/badge/AppVersion-11.16.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: 11.16.0](https://img.shields.io/badge/AppVersion-11.16.0-informational?style=flat-square) PostgreSQL (Postgres) is an open source object-relational database known for reliability and data integrity. ACID-compliant, it supports foreign keys, joins, views, triggers and stored procedures. @@ -13,6 +14,11 @@ PostgreSQL (Postgres) is an open source object-relational database known for rel | Keyvan Hedayati | | | | Pim van Nierop | | | +## Prerequisites +* Kubernetes 1.28+ +* Kubectl 1.28+ +* Helm 3.1.0+ + ## Requirements | Repository | Name | Version | @@ -53,6 +59,3 @@ PostgreSQL (Postgres) is an open source object-relational database known for rel | postgresql.primary.persistence.size | string | `"8Gi"` | | | postgresql.volumePermissions.enabled | bool | `true` | | | postgresql.metrics.enabled | bool | `true` | | - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) diff --git a/charts/radar-postgresql/README.md.gotmpl b/charts/radar-postgresql/README.md.gotmpl new file mode 100644 index 00000000..fab382f7 --- /dev/null +++ b/charts/radar-postgresql/README.md.gotmpl @@ -0,0 +1,18 @@ +{{ template "common.header" . }} +{{ template "chart.deprecationWarning" . }} + +{{ template "chart.badgesSection" . }} + +{{ template "chart.description" . }} + +{{ template "chart.homepageLine" . }} + +{{ template "chart.maintainersSection" . }} + +{{ template "chart.sourcesSection" . }} + +{{ template "common.prerequisites" . }} + +{{ template "chart.requirementsSection" . }} + +{{ template "chart.valuesSection" . }} diff --git a/charts/radar-push-endpoint/Chart.lock b/charts/radar-push-endpoint/Chart.lock new file mode 100644 index 00000000..1f5ac30b --- /dev/null +++ b/charts/radar-push-endpoint/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T17:51:56.268629627+01:00" diff --git a/charts/radar-push-endpoint/Chart.yaml b/charts/radar-push-endpoint/Chart.yaml index bf113db3..e3539ff6 100644 --- a/charts/radar-push-endpoint/Chart.yaml +++ b/charts/radar-push-endpoint/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.3.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.3.6 +version: 0.4.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-push-endpoint @@ -22,3 +22,9 @@ maintainers: - email: pauline.conde@kcl.ac.uk name: Pauline Conde url: https://www.kcl.ac.uk/people/pauline-conde +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-push-endpoint/README.md b/charts/radar-push-endpoint/README.md index c8cb7258..a7cece90 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.3.6](https://img.shields.io/badge/Version-0.3.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square) +![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.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. @@ -22,19 +22,27 @@ A Helm chart for RADAR-base Push Endpoint. REST Gateway to Kafka, for incoming d * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number of radar-push-endpoint replicas to deploy | -| image.repository | string | `"radarbase/radar-push-endpoint"` | radar-push-endpoint image repository | -| image.tag | string | `nil` | radar-push-endpoint image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-push-endpoint image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-push-endpoint"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-push-endpoint.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-push-endpoint.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-push-endpoint pods' Security Context | @@ -69,6 +77,9 @@ A Helm chart for RADAR-base Push Endpoint. REST Gateway to Kafka, for incoming d | 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 | +| hpa.enabled | bool | `false` | Enable HPA | +| hpa.maxReplicas | string | `"5"` | Maximum number of replicas | +| hpa.targetCPU | string | `"80"` | Target CPU utilization percentage | | networkpolicy | object | check `values.yaml` | Network policy defines who can access this application and who this applications has access to | | schemaRegistry | string | `"http://cp-schema-registry:8081"` | Schema Registry URL | | max_requests | int | `1000` | Not used. To be confirmed | diff --git a/charts/radar-push-endpoint/charts/common-2.27.0.tgz b/charts/radar-push-endpoint/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-push-endpoint/charts/common-2.27.0.tgz differ diff --git a/charts/radar-push-endpoint/templates/_helpers.tpl b/charts/radar-push-endpoint/templates/_helpers.tpl index 7db5cba9..e824dc7d 100644 --- a/charts/radar-push-endpoint/templates/_helpers.tpl +++ b/charts/radar-push-endpoint/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-push-endpoint.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-push-endpoint.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-push-endpoint/templates/configmap-jmx.yaml b/charts/radar-push-endpoint/templates/configmap-jmx.yaml new file mode 100644 index 00000000..de2a9019 --- /dev/null +++ b/charts/radar-push-endpoint/templates/configmap-jmx.yaml @@ -0,0 +1,17 @@ +{{- if .Values.serviceMonitor.enabled }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "common.names.fullname" . }}-jmx-configmap + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +data: + config.yml: | + jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:9010/jmxrmi + lowercaseOutputName: true + lowercaseOutputLabelNames: true + ssl: false +{{- end }} diff --git a/charts/radar-push-endpoint/templates/configmap.yaml b/charts/radar-push-endpoint/templates/configmap.yaml index 984d7e18..41fffc25 100644 --- a/charts/radar-push-endpoint/templates/configmap.yaml +++ b/charts/radar-push-endpoint/templates/configmap.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-push-endpoint.fullname" . }} - labels: -{{ include "radar-push-endpoint.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: healthcheck.sh: | #!/bin/sh diff --git a/charts/radar-push-endpoint/templates/deployment.yaml b/charts/radar-push-endpoint/templates/deployment.yaml index e2ff3565..78e623dd 100644 --- a/charts/radar-push-endpoint/templates/deployment.yaml +++ b/charts/radar-push-endpoint/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-push-endpoint.fullname" . }} - labels: -{{ include "radar-push-endpoint.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -19,10 +22,7 @@ spec: app.kubernetes.io/name: {{ include "radar-push-endpoint.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-push-endpoint.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -63,8 +63,8 @@ spec: name: gateway-jmx-configmap {{- end }} - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-push-endpoint.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} command: - radar-push-endpoint - /etc/radar-push-endpoint/push-endpoint.yml diff --git a/charts/radar-push-endpoint/templates/hpa.yaml b/charts/radar-push-endpoint/templates/hpa.yaml index 547cc485..0e19bcd3 100644 --- a/charts/radar-push-endpoint/templates/hpa.yaml +++ b/charts/radar-push-endpoint/templates/hpa.yaml @@ -1,24 +1,35 @@ -{{- if semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if .Values.hpa.enabled }} apiVersion: autoscaling/v2 -{{- else -}} -apiVersion: autoscaling/v2beta2 -{{- end }} kind: HorizontalPodAutoscaler metadata: - name: {{ include "radar-push-endpoint.fullname" . }} - labels: -{{ include "radar-push-endpoint.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: - maxReplicas: 5 - minReplicas: 1 scaleTargetRef: apiVersion: apps/v1 kind: Deployment name: {{ include "radar-push-endpoint.fullname" . }} + minReplicas: {{ .Values.replicaCount }} + maxReplicas: {{ .Values.hpa.maxReplicas }} metrics: + {{- if .Values.hpa.targetCPU }} - type: Resource resource: name: cpu target: type: Utilization - averageUtilization: 50 + averageUtilization: {{ .Values.hpa.targetCPU }} + {{- end }} + {{- if .Values.hpa.targetMemory }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.hpa.targetMemory }} + {{- end }} +{{- end }} diff --git a/charts/radar-push-endpoint/templates/ingress.yaml b/charts/radar-push-endpoint/templates/ingress.yaml index 7054ef9d..e470f935 100644 --- a/charts/radar-push-endpoint/templates/ingress.yaml +++ b/charts/radar-push-endpoint/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "radar-push-endpoint.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "radar-push-endpoint.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/radar-push-endpoint/templates/jmx-configmap.yaml b/charts/radar-push-endpoint/templates/jmx-configmap.yaml deleted file mode 100644 index b094e3aa..00000000 --- a/charts/radar-push-endpoint/templates/jmx-configmap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if .Values.serviceMonitor.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "radar-push-endpoint.fullname" . }}-jmx-configmap - labels: -{{ include "radar-push-endpoint.labels" . | indent 4 }} -data: - config.yml: | - jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:9010/jmxrmi - lowercaseOutputName: true - lowercaseOutputLabelNames: true - ssl: false -{{- end }} diff --git a/charts/radar-push-endpoint/templates/networkpolicy.yaml b/charts/radar-push-endpoint/templates/networkpolicy.yaml index bba44d1c..3e7532de 100644 --- a/charts/radar-push-endpoint/templates/networkpolicy.yaml +++ b/charts/radar-push-endpoint/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-push-endpoint.fullname" . }} - labels: -{{ include "radar-push-endpoint.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-push-endpoint/templates/service.yaml b/charts/radar-push-endpoint/templates/service.yaml index 62599e3c..e0a88bab 100644 --- a/charts/radar-push-endpoint/templates/service.yaml +++ b/charts/radar-push-endpoint/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-push-endpoint.fullname" . }} - labels: -{{ include "radar-push-endpoint.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -17,6 +20,5 @@ spec: protocol: TCP targetPort: metrics {{- end }} - selector: - app.kubernetes.io/name: {{ include "radar-push-endpoint.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-push-endpoint/templates/servicemonitor.yaml b/charts/radar-push-endpoint/templates/servicemonitor.yaml index 35f65282..32002119 100644 --- a/charts/radar-push-endpoint/templates/servicemonitor.yaml +++ b/charts/radar-push-endpoint/templates/servicemonitor.yaml @@ -2,9 +2,12 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ include "radar-push-endpoint.fullname" . }} - labels: -{{ include "radar-push-endpoint.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: selector: matchLabels: diff --git a/charts/radar-push-endpoint/values.yaml b/charts/radar-push-endpoint/values.yaml index 6ef7aa4e..d0d132be 100644 --- a/charts/radar-push-endpoint/values.yaml +++ b/charts/radar-push-endpoint/values.yaml @@ -6,16 +6,24 @@ replicaCount: 2 image: - # -- radar-push-endpoint image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-push-endpoint - # -- radar-push-endpoint image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-push-endpoint image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-push-endpoint.fullname template with a string (will prepend the release name) nameOverride: "" @@ -145,6 +153,14 @@ serviceMonitor: # -- Enable metrics to be collected via Prometheus-operator enabled: true +hpa: + # -- Enable HPA + enabled: false + # -- Maximum number of replicas + maxReplicas: "5" + # -- Target CPU utilization percentage + targetCPU: "80" + # -- Network policy defines who can access this application and who this applications has access to # @default -- check `values.yaml` networkpolicy: diff --git a/charts/radar-rest-sources-authorizer/Chart.lock b/charts/radar-rest-sources-authorizer/Chart.lock new file mode 100644 index 00000000..863aeb8d --- /dev/null +++ b/charts/radar-rest-sources-authorizer/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T17:58:02.826717796+01:00" diff --git a/charts/radar-rest-sources-authorizer/Chart.yaml b/charts/radar-rest-sources-authorizer/Chart.yaml index 63989ebf..847008f1 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.4.7" 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: 2.1.3 +version: 2.2.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-rest-sources-authorizer @@ -25,3 +25,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-rest-sources-authorizer/README.md b/charts/radar-rest-sources-authorizer/README.md index 007cfea5..5384a5b7 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: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.7](https://img.shields.io/badge/AppVersion-4.4.7-informational?style=flat-square) +![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.7](https://img.shields.io/badge/AppVersion-4.4.7-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. @@ -23,19 +23,27 @@ A Helm chart for the front-end application of RADAR-base Rest Sources Authorizer * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number of radar-rest-sources-authorizer replicas to deploy | -| image.repository | string | `"radarbase/radar-rest-source-authorizer"` | radar-rest-sources-authorizer image repository | -| image.tag | string | `nil` | radar-rest-sources-authorizer image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-rest-sources-authorizer image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-rest-source-authorizer"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-rest-sources-authorizer.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-rest-sources-authorizer.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-rest-sources-authorizer pods' Security Context | diff --git a/charts/radar-rest-sources-authorizer/charts/common-2.27.0.tgz b/charts/radar-rest-sources-authorizer/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-rest-sources-authorizer/charts/common-2.27.0.tgz differ diff --git a/charts/radar-rest-sources-authorizer/templates/_helpers.tpl b/charts/radar-rest-sources-authorizer/templates/_helpers.tpl index 88b66e0f..4db44ed7 100644 --- a/charts/radar-rest-sources-authorizer/templates/_helpers.tpl +++ b/charts/radar-rest-sources-authorizer/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-rest-sources-authorizer.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-rest-sources-authorizer.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-rest-sources-authorizer/templates/deployment.yaml b/charts/radar-rest-sources-authorizer/templates/deployment.yaml index 3afa8ae3..9b17adac 100644 --- a/charts/radar-rest-sources-authorizer/templates/deployment.yaml +++ b/charts/radar-rest-sources-authorizer/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-rest-sources-authorizer.fullname" . }} - labels: -{{ include "radar-rest-sources-authorizer.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -16,10 +19,7 @@ spec: app.kubernetes.io/name: {{ include "radar-rest-sources-authorizer.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-rest-sources-authorizer.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -42,8 +42,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-rest-sources-authorizer.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: BASE_HREF value: /rest-sources/authorizer/ diff --git a/charts/radar-rest-sources-authorizer/templates/ingress.yaml b/charts/radar-rest-sources-authorizer/templates/ingress.yaml index 9e6cb748..e470f935 100644 --- a/charts/radar-rest-sources-authorizer/templates/ingress.yaml +++ b/charts/radar-rest-sources-authorizer/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "radar-rest-sources-authorizer.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "radar-rest-sources-authorizer.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/radar-rest-sources-authorizer/templates/networkpolicy.yaml b/charts/radar-rest-sources-authorizer/templates/networkpolicy.yaml index e4af51bc..bfa608d6 100644 --- a/charts/radar-rest-sources-authorizer/templates/networkpolicy.yaml +++ b/charts/radar-rest-sources-authorizer/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-rest-sources-authorizer.fullname" . }} - labels: -{{ include "radar-rest-sources-authorizer.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-rest-sources-authorizer/templates/service.yaml b/charts/radar-rest-sources-authorizer/templates/service.yaml index c88d1ea4..d8c4f364 100644 --- a/charts/radar-rest-sources-authorizer/templates/service.yaml +++ b/charts/radar-rest-sources-authorizer/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-rest-sources-authorizer.fullname" . }} - labels: -{{ include "radar-rest-sources-authorizer.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-rest-sources-authorizer.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-rest-sources-authorizer/values.yaml b/charts/radar-rest-sources-authorizer/values.yaml index 24d1deb7..77d8c865 100644 --- a/charts/radar-rest-sources-authorizer/values.yaml +++ b/charts/radar-rest-sources-authorizer/values.yaml @@ -6,16 +6,24 @@ replicaCount: 2 image: - # -- radar-rest-sources-authorizer image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-rest-source-authorizer - # -- radar-rest-sources-authorizer image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-rest-sources-authorizer image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-rest-sources-authorizer.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-rest-sources-backend/Chart.lock b/charts/radar-rest-sources-backend/Chart.lock new file mode 100644 index 00000000..d72502d4 --- /dev/null +++ b/charts/radar-rest-sources-backend/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T18:23:44.324592821+01:00" diff --git a/charts/radar-rest-sources-backend/Chart.yaml b/charts/radar-rest-sources-backend/Chart.yaml index 8610f872..99a5275e 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.4.7" description: A Helm chart for the backend application of RADAR-base Rest Sources Authorizer name: radar-rest-sources-backend -version: 1.2.3 +version: 1.3.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-rest-sources-backend @@ -25,3 +25,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-rest-sources-backend/README.md b/charts/radar-rest-sources-backend/README.md index be3de08b..c8370c2c 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.2.3](https://img.shields.io/badge/Version-1.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.7](https://img.shields.io/badge/AppVersion-4.4.7-informational?style=flat-square) +![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.7](https://img.shields.io/badge/AppVersion-4.4.7-informational?style=flat-square) A Helm chart for the backend application of RADAR-base Rest Sources Authorizer @@ -23,18 +23,27 @@ A Helm chart for the backend application of RADAR-base Rest Sources Authorizer * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number of radar-rest-sources-backend replicas to deploy | -| image.repository | string | `"radarbase/radar-rest-source-auth-backend"` | radar-rest-sources-backend image repository | -| image.tag | string | `nil` | radar-rest-sources-backend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-rest-sources-backend image pull policy | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-rest-source-auth-backend"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | imagePullSecrets | list | `[]` | Docker registry secret names as an array | | nameOverride | string | `""` | String to partially override radar-rest-sources-backend.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-rest-sources-backend.fullname template with a string | diff --git a/charts/radar-rest-sources-backend/charts/common-2.27.0.tgz b/charts/radar-rest-sources-backend/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-rest-sources-backend/charts/common-2.27.0.tgz differ diff --git a/charts/radar-rest-sources-backend/templates/_helpers.tpl b/charts/radar-rest-sources-backend/templates/_helpers.tpl index 6ed5a23b..f1e2cdfc 100644 --- a/charts/radar-rest-sources-backend/templates/_helpers.tpl +++ b/charts/radar-rest-sources-backend/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-rest-sources-backend.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-rest-sources-backend.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-rest-sources-backend/templates/configmap.yaml b/charts/radar-rest-sources-backend/templates/configmap.yaml index 746c973a..5ed0eb7c 100644 --- a/charts/radar-rest-sources-backend/templates/configmap.yaml +++ b/charts/radar-rest-sources-backend/templates/configmap.yaml @@ -2,9 +2,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-rest-sources-backend.fullname" . }} - labels: -{{ include "radar-rest-sources-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: authorizer.yml: | service: diff --git a/charts/radar-rest-sources-backend/templates/deployment.yaml b/charts/radar-rest-sources-backend/templates/deployment.yaml index 700d9c6a..41bf5a94 100644 --- a/charts/radar-rest-sources-backend/templates/deployment.yaml +++ b/charts/radar-rest-sources-backend/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-rest-sources-backend.fullname" . }} - labels: -{{ include "radar-rest-sources-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -19,10 +22,7 @@ spec: app.kubernetes.io/name: {{ include "radar-rest-sources-backend.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-rest-sources-backend.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -45,8 +45,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-rest-sources-backend.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: REST_SOURCE_AUTHORIZER_SOURCE_CLIENTS_FILE_PATH value: /etc/radar-rest-sources-backend/authorizer.yml diff --git a/charts/radar-rest-sources-backend/templates/ingress.yaml b/charts/radar-rest-sources-backend/templates/ingress.yaml index ea8d87bf..e470f935 100644 --- a/charts/radar-rest-sources-backend/templates/ingress.yaml +++ b/charts/radar-rest-sources-backend/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "radar-rest-sources-backend.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "radar-rest-sources-backend.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/radar-rest-sources-backend/templates/networkpolicy.yaml b/charts/radar-rest-sources-backend/templates/networkpolicy.yaml index 522be962..61ba705d 100644 --- a/charts/radar-rest-sources-backend/templates/networkpolicy.yaml +++ b/charts/radar-rest-sources-backend/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-rest-sources-backend.fullname" . }} - labels: -{{ include "radar-rest-sources-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-rest-sources-backend/templates/secrets-postgres-crt.yaml b/charts/radar-rest-sources-backend/templates/secrets-postgres-crt.yaml index e7ff877b..0260d253 100644 --- a/charts/radar-rest-sources-backend/templates/secrets-postgres-crt.yaml +++ b/charts/radar-rest-sources-backend/templates/secrets-postgres-crt.yaml @@ -2,9 +2,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "radar-rest-sources-backend.fullname" . }}-root-cert - labels: -{{ include "radar-rest-sources-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }}-root-cert + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: root.crt: {{ .Files.Get "files/root.crt" | b64enc | quote }} diff --git a/charts/radar-rest-sources-backend/templates/secrets.yaml b/charts/radar-rest-sources-backend/templates/secrets.yaml index 6f5fddb3..dc17948c 100644 --- a/charts/radar-rest-sources-backend/templates/secrets.yaml +++ b/charts/radar-rest-sources-backend/templates/secrets.yaml @@ -2,9 +2,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "radar-rest-sources-backend.fullname" . }} - labels: -{{ include "radar-rest-sources-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: postgresql_password: {{ .Values.postgres.password | b64enc | quote }} diff --git a/charts/radar-rest-sources-backend/templates/service.yaml b/charts/radar-rest-sources-backend/templates/service.yaml index 9e8694c4..d8c4f364 100644 --- a/charts/radar-rest-sources-backend/templates/service.yaml +++ b/charts/radar-rest-sources-backend/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-rest-sources-backend.fullname" . }} - labels: -{{ include "radar-rest-sources-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-rest-sources-backend.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-rest-sources-backend/values.yaml b/charts/radar-rest-sources-backend/values.yaml index d176fd31..e5c86ce9 100644 --- a/charts/radar-rest-sources-backend/values.yaml +++ b/charts/radar-rest-sources-backend/values.yaml @@ -6,13 +6,24 @@ replicaCount: 2 image: - # -- radar-rest-sources-backend image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-rest-source-auth-backend - # -- radar-rest-sources-backend image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-rest-sources-backend image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- Docker registry secret names as an array imagePullSecrets: [] diff --git a/charts/radar-s3-connector/Chart.lock b/charts/radar-s3-connector/Chart.lock new file mode 100644 index 00000000..03e44cd7 --- /dev/null +++ b/charts/radar-s3-connector/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T18:49:31.278906468+01:00" diff --git a/charts/radar-s3-connector/Chart.yaml b/charts/radar-s3-connector/Chart.yaml index 34d89261..49745e04 100644 --- a/charts/radar-s3-connector/Chart.yaml +++ b/charts/radar-s3-connector/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "7.6.0-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.4.1 +version: 0.5.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-s3-connector @@ -25,3 +25,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-s3-connector/README.md b/charts/radar-s3-connector/README.md index 34b9747c..63333417 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.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.6.0-hotfix](https://img.shields.io/badge/AppVersion-7.6.0--hotfix-informational?style=flat-square) +![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.6.0-hotfix](https://img.shields.io/badge/AppVersion-7.6.0--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 @@ -24,19 +24,27 @@ A Helm chart for RADAR-base s3 connector. This connector uses Confluent s3 conne * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of radar-s3-connector replicas to deploy | -| image.repository | string | `"radarbase/kafka-connect-transform-s3"` | radar-s3-connector image repository | -| image.tag | string | `nil` | radar-s3-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-s3-connector image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/kafka-connect-transform-s3"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-s3-connector.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-s3-connector.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-s3-connector pods' Security Context | diff --git a/charts/radar-s3-connector/charts/common-2.27.0.tgz b/charts/radar-s3-connector/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-s3-connector/charts/common-2.27.0.tgz differ diff --git a/charts/radar-s3-connector/templates/_helpers.tpl b/charts/radar-s3-connector/templates/_helpers.tpl index 7fc21078..f3e8a0d5 100644 --- a/charts/radar-s3-connector/templates/_helpers.tpl +++ b/charts/radar-s3-connector/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-s3-connector.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-s3-connector.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-s3-connector/templates/configmap.yaml b/charts/radar-s3-connector/templates/configmap.yaml index 3bdbdfea..c575d529 100644 --- a/charts/radar-s3-connector/templates/configmap.yaml +++ b/charts/radar-s3-connector/templates/configmap.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-s3-connector.fullname" . }} - labels: -{{ include "radar-s3-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: sink-s3.properties: | name=radar-s3-sink-connector diff --git a/charts/radar-s3-connector/templates/deployment.yaml b/charts/radar-s3-connector/templates/deployment.yaml index e0580bf3..a4f25cf1 100644 --- a/charts/radar-s3-connector/templates/deployment.yaml +++ b/charts/radar-s3-connector/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-s3-connector.fullname" . }} - labels: -{{ include "radar-s3-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -19,10 +22,7 @@ spec: app.kubernetes.io/name: {{ include "radar-s3-connector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-s3-connector.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -45,8 +45,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-s3-connector.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: CONNECT_BOOTSTRAP_SERVERS value: "{{ .Values.kafka.url }}" diff --git a/charts/radar-s3-connector/templates/networkpolicy.yaml b/charts/radar-s3-connector/templates/networkpolicy.yaml index fd99d91b..70401d5e 100644 --- a/charts/radar-s3-connector/templates/networkpolicy.yaml +++ b/charts/radar-s3-connector/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-s3-connector.fullname" . }} - labels: -{{ include "radar-s3-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-s3-connector/templates/secrets.yaml b/charts/radar-s3-connector/templates/secrets.yaml index 86e6eddd..d8886d7c 100644 --- a/charts/radar-s3-connector/templates/secrets.yaml +++ b/charts/radar-s3-connector/templates/secrets.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "radar-s3-connector.fullname" . }} - labels: -{{ include "radar-s3-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: {{ if .Values.cc.enabled -}} diff --git a/charts/radar-s3-connector/templates/service.yaml b/charts/radar-s3-connector/templates/service.yaml index 8d12c595..d8c4f364 100644 --- a/charts/radar-s3-connector/templates/service.yaml +++ b/charts/radar-s3-connector/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-s3-connector.fullname" . }} - labels: -{{ include "radar-s3-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-s3-connector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-s3-connector/values.yaml b/charts/radar-s3-connector/values.yaml index 2cbef43a..f9e4d9b9 100644 --- a/charts/radar-s3-connector/values.yaml +++ b/charts/radar-s3-connector/values.yaml @@ -6,16 +6,24 @@ replicaCount: 1 image: - # -- radar-s3-connector image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/kafka-connect-transform-s3 - # -- radar-s3-connector image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-s3-connector image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-s3-connector.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-self-enrolment-ui/Chart.lock b/charts/radar-self-enrolment-ui/Chart.lock new file mode 100644 index 00000000..feb6e794 --- /dev/null +++ b/charts/radar-self-enrolment-ui/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-30T11:50:43.139762222+01:00" diff --git a/charts/radar-self-enrolment-ui/Chart.yaml b/charts/radar-self-enrolment-ui/Chart.yaml index 98870a46..61f68a03 100644 --- a/charts/radar-self-enrolment-ui/Chart.yaml +++ b/charts/radar-self-enrolment-ui/Chart.yaml @@ -1,6 +1,31 @@ apiVersion: v2 -appVersion: "0.0.1" -description: A Helm chart for ORY Kratos's example ui for Kubernetes +appVersion: "dev" +description: A Helm chart for RADAR-base Self Enrolment UI name: radar-self-enrolment-ui -version: 0.0.3 +version: 0.2.0 +icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" +sources: +- https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-self-enrolment-ui +keywords: + - radar-base + - remote-trial +annotations: + artifacthub.io/license: Apache-2.0 type: application +home: "https://radar-base.org" +maintainers: + - email: keyvan@thehyve.nl + name: Keyvan Hedayati + url: https://www.thehyve.nl + - email: pim@thehyve.nl + name: Pim van Nierop + url: https://www.thehyve.nl/experts/pim-van-nierop + - email: nivethika@thehyve.nl + name: Nivethika Mahasivam + url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-self-enrolment-ui/README.md b/charts/radar-self-enrolment-ui/README.md index 2ddfd905..33ad70b3 100644 --- a/charts/radar-self-enrolment-ui/README.md +++ b/charts/radar-self-enrolment-ui/README.md @@ -2,9 +2,29 @@ # radar-self-enrolment-ui -![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) +![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: dev](https://img.shields.io/badge/AppVersion-dev-informational?style=flat-square) -A Helm chart for ORY Kratos's example ui for Kubernetes +A Helm chart for RADAR-base Self Enrolment UI + +**Homepage:** + +## Maintainers + +| Name | Email | Url | +| ---- | ------ | --- | +| Keyvan Hedayati | | | +| Pim van Nierop | | | +| Nivethika Mahasivam | | | + +## Source Code + +* + +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | ## Values @@ -12,12 +32,14 @@ A Helm chart for ORY Kratos's example ui for Kubernetes |-----|------|---------|-------------| | replicaCount | int | `1` | Number of replicas in deployment | | revisionHistoryLimit | int | `5` | Number of revisions kept in history | -| image.repository | string | `"ghcr.io/radar-base/radar-self-enrolment-ui"` | | -| image.tag | string | `"dev"` | Image version | -| image.pullPolicy | string | `"IfNotPresent"` | | -| imagePullSecrets | list | `[]` | | -| nameOverride | string | `""` | | -| fullnameOverride | string | `""` | | +| image.registry | string | `"ghcr.io"` | Image registry | +| image.repository | string | `"radar-base/radar-self-enrolment-ui"` | Image repository | +| image.tag | string | `"dev"` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | +| nameOverride | string | `""` | String to partially override radar-self-enrolment-ui.fullname template with a string (will prepend the release name) | +| fullnameOverride | string | `""` | String to fully override radar-self-enrolment-ui.fullname template with a string | | config.csrfCookieName | string | `"radar_csrf"` | | | config.secrets | object | `{}` | | | service.type | string | `"ClusterIP"` | | @@ -29,14 +51,13 @@ A Helm chart for ORY Kratos's example ui for Kubernetes | secret.nameOverride | string | `""` | Provide custom name of existing secret, or custom name of secret to be created | | secret.secretAnnotations | object | `{"helm.sh/hook":"pre-install, pre-upgrade","helm.sh/hook-delete-policy":"before-hook-creation","helm.sh/hook-weight":"0","helm.sh/resource-policy":"keep"}` | Annotations to be added to secret. Annotations are added only when secret is being created. Existing secret will not be modified. | | secret.hashSumEnabled | bool | `true` | switch to false to prevent checksum annotations being maintained and propogated to the pods | -| ingress.enabled | bool | `true` | | -| ingress.className | string | `"nginx"` | | -| ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-prod"` | | -| ingress.hosts[0].host | string | `"localhost"` | | -| ingress.hosts[0].paths[0].path | string | `"/kratos-ui/?(.*)"` | | -| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | -| ingress.tls[0].secretName | string | `"radar-base-tls"` | | -| ingress.tls[0].hosts[0] | string | `"localhost"` | | +| ingress.enabled | bool | `true` | Enable ingress controller resource | +| ingress.annotations | object | check values.yaml | Annotations that define default ingress class, certificate issuer | +| ingress.path | string | `"/kratos-ui"` | Path within the url structure | +| ingress.pathType | string | `"ImplementationSpecific"` | Ingress Path type | +| ingress.ingressClassName | string | `"nginx"` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | +| ingress.hosts | list | `["localhost"]` | Hosts to accept requests from | +| ingress.tls.secretName | string | `"radar-base-tls"` | TLS Secret Name | | securityContext.capabilities.drop[0] | string | `"ALL"` | | | securityContext.readOnlyRootFilesystem | bool | `false` | | | securityContext.runAsNonRoot | bool | `true` | | diff --git a/charts/radar-self-enrolment-ui/charts/common-2.27.0.tgz b/charts/radar-self-enrolment-ui/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-self-enrolment-ui/charts/common-2.27.0.tgz differ diff --git a/charts/radar-self-enrolment-ui/templates/NOTES.txt b/charts/radar-self-enrolment-ui/templates/NOTES.txt index 2007d8f9..e69de29b 100644 --- a/charts/radar-self-enrolment-ui/templates/NOTES.txt +++ b/charts/radar-self-enrolment-ui/templates/NOTES.txt @@ -1,21 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "radar-self-enrolment-ui.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "radar-self-enrolment-ui.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "radar-self-enrolment-ui.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "radar-self-enrolment-ui.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl port-forward $POD_NAME 8080:80 -{{- end }} diff --git a/charts/radar-self-enrolment-ui/templates/_helpers.tpl b/charts/radar-self-enrolment-ui/templates/_helpers.tpl index 033567a1..064a92b3 100644 --- a/charts/radar-self-enrolment-ui/templates/_helpers.tpl +++ b/charts/radar-self-enrolment-ui/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-self-enrolment-ui.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-self-enrolment-ui.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). @@ -53,4 +67,4 @@ Create a secret name which can be overridden. {{- else -}} {{ include "radar-self-enrolment-ui.fullname" . }} {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/charts/radar-self-enrolment-ui/templates/deployment.yaml b/charts/radar-self-enrolment-ui/templates/deployment.yaml index d8aee44f..53666350 100644 --- a/charts/radar-self-enrolment-ui/templates/deployment.yaml +++ b/charts/radar-self-enrolment-ui/templates/deployment.yaml @@ -1,19 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-self-enrolment-ui.fullname" . }} - {{- if .Release.Namespace }} - namespace: {{ .Release.Namespace }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} - labels: - {{- include "radar-self-enrolment-ui.labels" . | nindent 4 }} - {{- with .Values.deployment.labels }} - {{- toYaml . | nindent 4 }} - {{- end }} - annotations: - {{- with .Values.deployment.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} spec: replicas: {{ .Values.replicaCount }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} @@ -33,10 +26,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-self-enrolment-ui.imagePullSecrets" . | nindent 6 }} automountServiceAccountToken: {{ .Values.deployment.automountServiceAccountToken }} {{- with .Values.deployment.extraVolumes }} volumes: @@ -45,8 +35,8 @@ spec: terminationGracePeriodSeconds: {{ .Values.deployment.terminationGracePeriodSeconds }} containers: - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-self-enrolment-ui.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: ORY_SDK_URL value: {{ .Values.kratosPublicUrl | quote }} diff --git a/charts/radar-self-enrolment-ui/templates/ingress.yaml b/charts/radar-self-enrolment-ui/templates/ingress.yaml index 3e393434..e470f935 100644 --- a/charts/radar-self-enrolment-ui/templates/ingress.yaml +++ b/charts/radar-self-enrolment-ui/templates/ingress.yaml @@ -1,54 +1,42 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "radar-self-enrolment-ui.fullname" . -}} +{{- $path := .Values.ingress.path -}} +{{- $hosts := .Values.ingress.hosts -}} +{{- $svcPort := .Values.service.port -}} +{{- $pathType := .Values.ingress.pathType -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1 {{- else -}} -apiVersion: networking.k8s.io/v1beta1 +apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - {{- if .Release.Namespace }} - namespace: {{ .Release.Namespace }} - {{- end }} - labels: - {{- include "radar-self-enrolment-ui.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: - ingressClassName: {{ .Values.ingress.className }} - {{- if .Values.ingress.tls }} + ingressClassName: {{ .Values.ingress.ingressClassName | quote }} +{{- if and .Values.ingress.tls (not .Values.disable_tls) }} tls: - {{- range .Values.ingress.tls }} - hosts: - {{- range .hosts }} + {{- range $hosts }} - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} + {{- end }} + secretName: {{ .Values.ingress.tls.secretName }} +{{- end }} rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} + {{- range .Values.ingress.hosts }} + - host: {{ . | quote }} http: paths: - {{- range .paths }} - - path: {{ .path }} - {{- if .pathType }} - pathType: {{ .pathType }} + - path: {{ $path | quote }} + {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - name: http - {{- else }} - serviceName: {{ $fullName }} - servicePort: http - {{- end }} - {{- end }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} + {{- end }} {{- end }} diff --git a/charts/radar-self-enrolment-ui/templates/networkpolicy.yaml b/charts/radar-self-enrolment-ui/templates/networkpolicy.yaml index 78e099dc..efbbdbc8 100644 --- a/charts/radar-self-enrolment-ui/templates/networkpolicy.yaml +++ b/charts/radar-self-enrolment-ui/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-self-enrolment-ui.fullname" . }} - labels: -{{ include "radar-self-enrolment-ui.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-self-enrolment-ui/templates/secret.yaml b/charts/radar-self-enrolment-ui/templates/secret.yaml index 1873b0c3..439f2ad3 100644 --- a/charts/radar-self-enrolment-ui/templates/secret.yaml +++ b/charts/radar-self-enrolment-ui/templates/secret.yaml @@ -2,16 +2,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ include "radar-self-enrolment-ui.secretname" . }} - {{- if .Release.Namespace }} - namespace: {{ .Release.Namespace }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} - labels: - {{- include "radar-self-enrolment-ui.labels" . | nindent 4 }} - annotations: - {{- with .Values.secret.secretAnnotations }} - {{- toYaml . | nindent 4 }} - {{- end }} type: Opaque data: # Generate a random secret if the user doesn't give one. User given secret has priority diff --git a/charts/radar-self-enrolment-ui/templates/service.yaml b/charts/radar-self-enrolment-ui/templates/service.yaml index 3216cea1..8c00a6ea 100644 --- a/charts/radar-self-enrolment-ui/templates/service.yaml +++ b/charts/radar-self-enrolment-ui/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-self-enrolment-ui.fullname" . }} - labels: -{{ include "radar-self-enrolment-ui.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} {{- if eq .Values.service.type "LoadBalancer" }} @@ -21,6 +24,5 @@ spec: nodePort: {{ . }} {{- end }} {{- end }} - selector: - app.kubernetes.io/name: {{ include "radar-self-enrolment-ui.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-self-enrolment-ui/values.yaml b/charts/radar-self-enrolment-ui/values.yaml index 96db8800..40540938 100644 --- a/charts/radar-self-enrolment-ui/values.yaml +++ b/charts/radar-self-enrolment-ui/values.yaml @@ -6,16 +6,30 @@ replicaCount: 1 # -- Number of revisions kept in history revisionHistoryLimit: 5 -## -- Deployment image settings + image: - # Portal image - repository: ghcr.io/radar-base/radar-self-enrolment-ui - # -- Image version + # -- Image registry + registry: ghcr.io + # -- Image repository + repository: radar-base/radar-self-enrolment-ui + # -- Image tag (immutable tags are recommended) + # Overrides the image tag whose default is the chart appVersion. tag: dev + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] -imagePullSecrets: [] +# -- String to partially override radar-self-enrolment-ui.fullname template with a string (will prepend the release name) nameOverride: "" +# -- String to fully override radar-self-enrolment-ui.fullname template with a string fullnameOverride: "" ## -- Application config @@ -52,19 +66,24 @@ secret: hashSumEnabled: true ingress: + # -- Enable ingress controller resource enabled: true - className: "nginx" + # -- Annotations that define default ingress class, certificate issuer + # @default -- check values.yaml annotations: cert-manager.io/cluster-issuer: letsencrypt-prod + # -- Path within the url structure + path: /kratos-ui + # -- Ingress Path type + pathType: ImplementationSpecific + # -- IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) + ingressClassName: nginx + # -- Hosts to accept requests from hosts: - - host: localhost - paths: - - path: "/kratos-ui/?(.*)" - pathType: ImplementationSpecific + - localhost tls: - - secretName: radar-base-tls - hosts: - - localhost + # -- TLS Secret Name + secretName: radar-base-tls ## -- Container level security context securityContext: diff --git a/charts/radar-timescaledb/Chart.yaml b/charts/radar-timescaledb/Chart.yaml index 13ca5d9c..99190c3d 100644 --- a/charts/radar-timescaledb/Chart.yaml +++ b/charts/radar-timescaledb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: radar-timescaledb -version: 0.1.0 +version: 0.1.1 appVersion: latest-pg12-bitnami description: TimescaleDB is an open-source time-series database optimized for fast ingest and complex queries, built as an extension to PostgreSQL. It leverages PostgreSQL's reliability and ecosystem while adding time-series specific diff --git a/charts/radar-timescaledb/DOCS.md.gotmpl b/charts/radar-timescaledb/DOCS.md.gotmpl new file mode 100644 index 00000000..e69de29b diff --git a/charts/radar-timescaledb/README.md b/charts/radar-timescaledb/README.md index 61efbb2d..2b4c6782 100644 --- a/charts/radar-timescaledb/README.md +++ b/charts/radar-timescaledb/README.md @@ -1,8 +1,9 @@ # radar-timescaledb +[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-timescaledb)](https://artifacthub.io/packages/helm/radar-base/radar-timescaledb) -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: latest-pg12-bitnami](https://img.shields.io/badge/AppVersion-latest--pg12--bitnami-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: latest-pg12-bitnami](https://img.shields.io/badge/AppVersion-latest--pg12--bitnami-informational?style=flat-square) TimescaleDB is an open-source time-series database optimized for fast ingest and complex queries, built as an extension to PostgreSQL. It leverages PostgreSQL's reliability and ecosystem while adding time-series specific optimizations and features, such as automatic partitioning and compression. @@ -13,6 +14,11 @@ TimescaleDB is an open-source time-series database optimized for fast ingest and | Keyvan Hedayati | | | | Pim van Nierop | | | +## Prerequisites +* Kubernetes 1.28+ +* Kubectl 1.28+ +* Helm 3.1.0+ + ## Requirements | Repository | Name | Version | @@ -53,6 +59,3 @@ TimescaleDB is an open-source time-series database optimized for fast ingest and | postgresql.primary.persistence.size | string | `"8Gi"` | | | postgresql.volumePermissions.enabled | bool | `true` | | | postgresql.metrics.enabled | bool | `true` | | - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) diff --git a/charts/radar-timescaledb/README.md.gotmpl b/charts/radar-timescaledb/README.md.gotmpl new file mode 100644 index 00000000..fab382f7 --- /dev/null +++ b/charts/radar-timescaledb/README.md.gotmpl @@ -0,0 +1,18 @@ +{{ template "common.header" . }} +{{ template "chart.deprecationWarning" . }} + +{{ template "chart.badgesSection" . }} + +{{ template "chart.description" . }} + +{{ template "chart.homepageLine" . }} + +{{ template "chart.maintainersSection" . }} + +{{ template "chart.sourcesSection" . }} + +{{ template "common.prerequisites" . }} + +{{ template "chart.requirementsSection" . }} + +{{ template "chart.valuesSection" . }} diff --git a/charts/radar-upload-connect-backend/Chart.lock b/charts/radar-upload-connect-backend/Chart.lock new file mode 100644 index 00000000..7915c599 --- /dev/null +++ b/charts/radar-upload-connect-backend/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T19:29:22.766824212+01:00" diff --git a/charts/radar-upload-connect-backend/Chart.yaml b/charts/radar-upload-connect-backend/Chart.yaml index b48a25c3..18887ffd 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.14" 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.5.3 +version: 0.6.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-upload-connect-backend @@ -25,3 +25,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-upload-connect-backend/README.md b/charts/radar-upload-connect-backend/README.md index aeef8849..ed0f7032 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.5.3](https://img.shields.io/badge/Version-0.5.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.14](https://img.shields.io/badge/AppVersion-0.5.14-informational?style=flat-square) +![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.14](https://img.shields.io/badge/AppVersion-0.5.14-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. @@ -23,19 +23,27 @@ A Helm chart for RADAR-base upload connector backend application. This applicati * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number of radar-upload-connect-backend replicas to deploy | -| image.repository | string | `"radarbase/radar-upload-connect-backend"` | radar-upload-connect-backend image repository | -| image.tag | string | `nil` | radar-upload-connect-backend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-upload-connect-backend image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-upload-connect-backend"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-upload-connect-backend.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-upload-connect-backend.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-upload-connect-backend pods' Security Context | diff --git a/charts/radar-upload-connect-backend/charts/common-2.27.0.tgz b/charts/radar-upload-connect-backend/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-upload-connect-backend/charts/common-2.27.0.tgz differ diff --git a/charts/radar-upload-connect-backend/templates/_helpers.tpl b/charts/radar-upload-connect-backend/templates/_helpers.tpl index aa52a744..1177a8d2 100644 --- a/charts/radar-upload-connect-backend/templates/_helpers.tpl +++ b/charts/radar-upload-connect-backend/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-upload-connect-backend.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-upload-connect-backend.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-upload-connect-backend/templates/configmap.yaml b/charts/radar-upload-connect-backend/templates/configmap.yaml index fb0a01a6..21dc2be2 100644 --- a/charts/radar-upload-connect-backend/templates/configmap.yaml +++ b/charts/radar-upload-connect-backend/templates/configmap.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-upload-connect-backend.fullname" . }} - labels: -{{ include "radar-upload-connect-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: upload.yml: | baseUri: "http://0.0.0.0:8085/upload/api/" diff --git a/charts/radar-upload-connect-backend/templates/deployment.yaml b/charts/radar-upload-connect-backend/templates/deployment.yaml index d832a155..f3c284a3 100644 --- a/charts/radar-upload-connect-backend/templates/deployment.yaml +++ b/charts/radar-upload-connect-backend/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-upload-connect-backend.fullname" . }} - labels: -{{ include "radar-upload-connect-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -16,10 +19,7 @@ spec: app.kubernetes.io/name: {{ include "radar-upload-connect-backend.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-upload-connect-backend.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -42,8 +42,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-upload-connect-backend.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} command: - radar-upload-backend - /etc/upload-backend/upload.yml diff --git a/charts/radar-upload-connect-backend/templates/ingress.yaml b/charts/radar-upload-connect-backend/templates/ingress.yaml index c176d8bd..e470f935 100644 --- a/charts/radar-upload-connect-backend/templates/ingress.yaml +++ b/charts/radar-upload-connect-backend/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "radar-upload-connect-backend.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "radar-upload-connect-backend.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/radar-upload-connect-backend/templates/networkpolicy.yaml b/charts/radar-upload-connect-backend/templates/networkpolicy.yaml index 2344464f..0705613d 100644 --- a/charts/radar-upload-connect-backend/templates/networkpolicy.yaml +++ b/charts/radar-upload-connect-backend/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-upload-connect-backend.fullname" . }} - labels: -{{ include "radar-upload-connect-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-upload-connect-backend/templates/service.yaml b/charts/radar-upload-connect-backend/templates/service.yaml index 3389c196..d8c4f364 100644 --- a/charts/radar-upload-connect-backend/templates/service.yaml +++ b/charts/radar-upload-connect-backend/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-upload-connect-backend.fullname" . }} - labels: -{{ include "radar-upload-connect-backend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-upload-connect-backend.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-upload-connect-backend/values.yaml b/charts/radar-upload-connect-backend/values.yaml index 2afdceb3..0fa1a4be 100644 --- a/charts/radar-upload-connect-backend/values.yaml +++ b/charts/radar-upload-connect-backend/values.yaml @@ -6,16 +6,24 @@ replicaCount: 2 image: - # -- radar-upload-connect-backend image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-upload-connect-backend - # -- radar-upload-connect-backend image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-upload-connect-backend image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-upload-connect-backend.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-upload-connect-frontend/Chart.lock b/charts/radar-upload-connect-frontend/Chart.lock new file mode 100644 index 00000000..d8a54f9d --- /dev/null +++ b/charts/radar-upload-connect-frontend/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T19:40:33.266601002+01:00" diff --git a/charts/radar-upload-connect-frontend/Chart.yaml b/charts/radar-upload-connect-frontend/Chart.yaml index 21a2ff5f..c743787a 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.14" 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.5.1 +version: 0.6.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-upload-connect-frontend @@ -25,3 +25,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-upload-connect-frontend/README.md b/charts/radar-upload-connect-frontend/README.md index 57cc73d4..4b0b01e2 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.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.14](https://img.shields.io/badge/AppVersion-0.5.14-informational?style=flat-square) +![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.14](https://img.shields.io/badge/AppVersion-0.5.14-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. @@ -23,19 +23,27 @@ A Helm chart for RADAR-base upload connector frontend application that provides * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number of radar-upload-connect-frontend replicas to deploy | -| image.repository | string | `"radarbase/radar-upload-connect-frontend"` | radar-upload-connect-frontend image repository | -| image.tag | string | `nil` | radar-upload-connect-frontend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| image.pullPolicy | string | `"IfNotPresent"` | radar-upload-connect-frontend image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-upload-connect-frontend"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-upload-connect-frontend.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-upload-connect-frontend.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-upload-connect-frontend pods' Security Context | diff --git a/charts/radar-upload-connect-frontend/charts/common-2.27.0.tgz b/charts/radar-upload-connect-frontend/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-upload-connect-frontend/charts/common-2.27.0.tgz differ diff --git a/charts/radar-upload-connect-frontend/templates/_helpers.tpl b/charts/radar-upload-connect-frontend/templates/_helpers.tpl index 86cad1d7..019d5088 100644 --- a/charts/radar-upload-connect-frontend/templates/_helpers.tpl +++ b/charts/radar-upload-connect-frontend/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-upload-connect-frontend.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-upload-connect-frontend.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-upload-connect-frontend/templates/deployment.yaml b/charts/radar-upload-connect-frontend/templates/deployment.yaml index c263f8d0..14eed7c3 100644 --- a/charts/radar-upload-connect-frontend/templates/deployment.yaml +++ b/charts/radar-upload-connect-frontend/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-upload-connect-frontend.fullname" . }} - labels: -{{ include "radar-upload-connect-frontend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -16,10 +19,7 @@ spec: app.kubernetes.io/name: {{ include "radar-upload-connect-frontend.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-upload-connect-frontend.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -42,8 +42,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-upload-connect-frontend.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: VUE_APP_BASE_URL value: "/upload" diff --git a/charts/radar-upload-connect-frontend/templates/ingress.yaml b/charts/radar-upload-connect-frontend/templates/ingress.yaml index ad60ab38..e470f935 100644 --- a/charts/radar-upload-connect-frontend/templates/ingress.yaml +++ b/charts/radar-upload-connect-frontend/templates/ingress.yaml @@ -1,5 +1,4 @@ {{- if .Values.ingress.enabled -}} -{{- $fullName := include "radar-upload-connect-frontend.fullname" . -}} {{- $path := .Values.ingress.path -}} {{- $hosts := .Values.ingress.hosts -}} {{- $svcPort := .Values.service.port -}} @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1 {{- end }} kind: Ingress metadata: - name: {{ $fullName }} - labels: -{{ include "radar-upload-connect-frontend.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} + name: {{ include "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} annotations: - {{- toYaml . | nindent 4 }} - {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }} + {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} spec: ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if and .Values.ingress.tls (not .Values.disable_tls) }} @@ -37,15 +37,6 @@ spec: {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} pathType: {{ $pathType }} {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- end }} diff --git a/charts/radar-upload-connect-frontend/templates/networkpolicy.yaml b/charts/radar-upload-connect-frontend/templates/networkpolicy.yaml index 3422aea0..3903f702 100644 --- a/charts/radar-upload-connect-frontend/templates/networkpolicy.yaml +++ b/charts/radar-upload-connect-frontend/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-upload-connect-frontend.fullname" . }} - labels: -{{ include "radar-upload-connect-frontend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-upload-connect-frontend/templates/service.yaml b/charts/radar-upload-connect-frontend/templates/service.yaml index 53a6eed7..d8c4f364 100644 --- a/charts/radar-upload-connect-frontend/templates/service.yaml +++ b/charts/radar-upload-connect-frontend/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-upload-connect-frontend.fullname" . }} - labels: -{{ include "radar-upload-connect-frontend.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-upload-connect-frontend.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-upload-connect-frontend/values.yaml b/charts/radar-upload-connect-frontend/values.yaml index 3d58d2fb..c2f86928 100644 --- a/charts/radar-upload-connect-frontend/values.yaml +++ b/charts/radar-upload-connect-frontend/values.yaml @@ -6,16 +6,24 @@ replicaCount: 2 image: - # -- radar-upload-connect-frontend image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-upload-connect-frontend - # -- radar-upload-connect-frontend image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-upload-connect-frontend image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-upload-connect-frontend.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/radar-upload-source-connector/Chart.lock b/charts/radar-upload-source-connector/Chart.lock new file mode 100644 index 00000000..b31f3782 --- /dev/null +++ b/charts/radar-upload-source-connector/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-27T19:51:45.770398012+01:00" diff --git a/charts/radar-upload-source-connector/Chart.yaml b/charts/radar-upload-source-connector/Chart.yaml index 45e121a6..523850c4 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.14" 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.3.4 +version: 0.4.0 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-upload-source-connector @@ -25,3 +25,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/radar-upload-source-connector/README.md b/charts/radar-upload-source-connector/README.md index 1c2c4dc8..ef4b2f6f 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.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.14](https://img.shields.io/badge/AppVersion-0.5.14-informational?style=flat-square) +![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.14](https://img.shields.io/badge/AppVersion-0.5.14-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. @@ -23,18 +23,27 @@ A Helm chart for RADAR-base upload kafka connector. This is used for reading upl * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `2` | Number of radar-upload-source-connector replicas to deploy | -| image.repository | string | `"radarbase/radar-connect-upload-source"` | radar-upload-source-connector image repository | -| image.tag | string | `nil` | radar-upload-source-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"radarbase/radar-connect-upload-source"` | Image repository | +| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override radar-upload-source-connector.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override radar-upload-source-connector.fullname template with a string | | podSecurityContext | object | `{}` | Configure radar-upload-source-connector pods' Security Context | diff --git a/charts/radar-upload-source-connector/charts/common-2.27.0.tgz b/charts/radar-upload-source-connector/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/radar-upload-source-connector/charts/common-2.27.0.tgz differ diff --git a/charts/radar-upload-source-connector/templates/_helpers.tpl b/charts/radar-upload-source-connector/templates/_helpers.tpl index 3284a7df..de074550 100644 --- a/charts/radar-upload-source-connector/templates/_helpers.tpl +++ b/charts/radar-upload-source-connector/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "radar-upload-source-connector.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "radar-upload-source-connector.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/radar-upload-source-connector/templates/configmap.yaml b/charts/radar-upload-source-connector/templates/configmap.yaml index 8b4a4b8f..09e5c82a 100644 --- a/charts/radar-upload-source-connector/templates/configmap.yaml +++ b/charts/radar-upload-source-connector/templates/configmap.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "radar-upload-source-connector.fullname" . }} - labels: -{{ include "radar-upload-source-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: source-upload.properties: | name=radar-upload-source diff --git a/charts/radar-upload-source-connector/templates/deployment.yaml b/charts/radar-upload-source-connector/templates/deployment.yaml index 0532ef18..a39d7e1e 100644 --- a/charts/radar-upload-source-connector/templates/deployment.yaml +++ b/charts/radar-upload-source-connector/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "radar-upload-source-connector.fullname" . }} - labels: -{{ include "radar-upload-source-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -16,10 +19,7 @@ spec: app.kubernetes.io/name: {{ include "radar-upload-source-connector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "radar-upload-source-connector.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -42,8 +42,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "radar-upload-source-connector.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: CONNECT_BOOTSTRAP_SERVERS value: "{{ .Values.kafka }}" diff --git a/charts/radar-upload-source-connector/templates/networkpolicy.yaml b/charts/radar-upload-source-connector/templates/networkpolicy.yaml index 7a0ce05e..a1865886 100644 --- a/charts/radar-upload-source-connector/templates/networkpolicy.yaml +++ b/charts/radar-upload-source-connector/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "radar-upload-source-connector.fullname" . }} - labels: -{{ include "radar-upload-source-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/radar-upload-source-connector/templates/service.yaml b/charts/radar-upload-source-connector/templates/service.yaml index a72abeb6..d8c4f364 100644 --- a/charts/radar-upload-source-connector/templates/service.yaml +++ b/charts/radar-upload-source-connector/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "radar-upload-source-connector.fullname" . }} - labels: -{{ include "radar-upload-source-connector.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "radar-upload-source-connector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/radar-upload-source-connector/values.yaml b/charts/radar-upload-source-connector/values.yaml index 5f56bba9..21f3f8f9 100644 --- a/charts/radar-upload-source-connector/values.yaml +++ b/charts/radar-upload-source-connector/values.yaml @@ -6,15 +6,24 @@ replicaCount: 2 image: - # -- radar-upload-source-connector image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: radarbase/radar-connect-upload-source - # -- radar-upload-source-connector image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. tag: - # -- radar-upload-source-connector image pull policy - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy + pullPolicy: IfNotPresent + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override radar-upload-source-connector.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/s3-proxy/Chart.lock b/charts/s3-proxy/Chart.lock new file mode 100644 index 00000000..35a2af0d --- /dev/null +++ b/charts/s3-proxy/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546 +generated: "2024-12-30T10:47:11.59768892+01:00" diff --git a/charts/s3-proxy/Chart.yaml b/charts/s3-proxy/Chart.yaml index bae55583..4cef4f5d 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.4.2 +version: 0.5.0 maintainers: - email: keyvan@thehyve.nl name: Keyvan Hedayati @@ -16,3 +16,9 @@ maintainers: - email: nivethika@thehyve.nl name: Nivethika Mahasivam url: https://www.thehyve.nl/experts/nivethika-mahasivam +dependencies: +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/s3-proxy/README.md b/charts/s3-proxy/README.md index d2c890d7..326df452 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.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: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square) +![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-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 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. @@ -22,19 +22,27 @@ A Helm chart for S3 Proxy. It uses https://hub.docker.com/r/andrewgaul/s3proxy t * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | + ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| | replicaCount | int | `1` | Number of s3-proxy replicas to deploy | -| image.repository | string | `"andrewgaul/s3proxy"` | s3-proxy image repository | -| image.tag | string | `"sha-85b0f98"` | s3-proxy image tag (immutable tags are recommended) | -| image.pullPolicy | string | `"IfNotPresent"` | s3-proxy image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| image.registry | string | `"docker.io"` | Image registry | +| image.repository | string | `"andrewgaul/s3proxy"` | Image repository | +| image.tag | string | `"sha-85b0f98"` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | nameOverride | string | `""` | String to partially override s3-proxy.fullname template with a string (will prepend the release name) | | fullnameOverride | string | `""` | String to fully override s3-proxy.fullname template with a string | | podSecurityContext | object | `{}` | Configure s3-proxy pods' Security Context | diff --git a/charts/s3-proxy/charts/common-2.27.0.tgz b/charts/s3-proxy/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/s3-proxy/charts/common-2.27.0.tgz differ diff --git a/charts/s3-proxy/templates/_helpers.tpl b/charts/s3-proxy/templates/_helpers.tpl index 4e528eb2..45a4bd93 100644 --- a/charts/s3-proxy/templates/_helpers.tpl +++ b/charts/s3-proxy/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "s3-proxy.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "s3-proxy.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/s3-proxy/templates/deployment.yaml b/charts/s3-proxy/templates/deployment.yaml index a92280d0..ec49a4d2 100644 --- a/charts/s3-proxy/templates/deployment.yaml +++ b/charts/s3-proxy/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "s3-proxy.fullname" . }} - labels: -{{ include "s3-proxy.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -16,10 +19,7 @@ spec: app.kubernetes.io/name: {{ include "s3-proxy.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "s3-proxy.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} affinity: @@ -42,8 +42,8 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + image: {{ template "s3-proxy.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: S3PROXY_AUTHORIZATION value: "aws-v2-or-v4" diff --git a/charts/s3-proxy/templates/networkpolicy.yaml b/charts/s3-proxy/templates/networkpolicy.yaml index fa4dba32..98dc66af 100644 --- a/charts/s3-proxy/templates/networkpolicy.yaml +++ b/charts/s3-proxy/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "s3-proxy.fullname" . }} - labels: -{{ include "s3-proxy.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/s3-proxy/templates/secrets.yaml b/charts/s3-proxy/templates/secrets.yaml index f09b5f5f..b3bb9069 100644 --- a/charts/s3-proxy/templates/secrets.yaml +++ b/charts/s3-proxy/templates/secrets.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "s3-proxy.fullname" . }} - labels: -{{ include "s3-proxy.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: Opaque data: s3Credential: {{ .Values.s3.credential | b64enc | quote }} diff --git a/charts/s3-proxy/templates/service.yaml b/charts/s3-proxy/templates/service.yaml index 54776126..d8c4f364 100644 --- a/charts/s3-proxy/templates/service.yaml +++ b/charts/s3-proxy/templates/service.yaml @@ -1,9 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "s3-proxy.fullname" . }} - labels: -{{ include "s3-proxy.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} ports: @@ -11,6 +14,5 @@ spec: targetPort: http protocol: TCP name: http - selector: - app.kubernetes.io/name: {{ include "s3-proxy.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} + selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} diff --git a/charts/s3-proxy/values.yaml b/charts/s3-proxy/values.yaml index 28ed5409..8247944b 100644 --- a/charts/s3-proxy/values.yaml +++ b/charts/s3-proxy/values.yaml @@ -6,15 +6,24 @@ replicaCount: 1 image: - # -- s3-proxy image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: andrewgaul/s3proxy - # -- s3-proxy image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) + # Overrides the image tag whose default is the chart appVersion. tag: sha-85b0f98 - # -- s3-proxy image pull policy + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- String to partially override s3-proxy.fullname template with a string (will prepend the release name) nameOverride: "" diff --git a/charts/velero-s3-deployment/Chart.lock b/charts/velero-s3-deployment/Chart.lock index 180cc652..4a0235da 100644 --- a/charts/velero-s3-deployment/Chart.lock +++ b/charts/velero-s3-deployment/Chart.lock @@ -2,5 +2,8 @@ dependencies: - name: velero repository: https://radar-base.github.io/radar-helm-charts version: 2.30.1 -digest: sha256:bf58d2a2d0568aed86c7b0c878c92eb83edbde43fd3fa424834b4be9cd67273c -generated: "2022-07-13T14:58:09.160726+02:00" +- name: common + repository: https://radar-base.github.io/radar-helm-charts + version: 2.27.0 +digest: sha256:3b90dc9dbdd49066c67cf36ea25e1372191bebbee99f99e2bb1f5edd461e093e +generated: "2024-12-30T10:34:56.873555377+01:00" diff --git a/charts/velero-s3-deployment/Chart.yaml b/charts/velero-s3-deployment/Chart.yaml index 84119017..7c501d9a 100644 --- a/charts/velero-s3-deployment/Chart.yaml +++ b/charts/velero-s3-deployment/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "1.0" +appVersion: "RELEASE.2024-11-21T17-21-54Z" description: A Helm chart for Velero S3 deployment, this chart holds resources used by Velero with a deployment to mirror the local object storage to a remote object storage. name: velero-s3-deployment -version: 0.3.2 +version: 0.4.0 sources: ["https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/velero-s3-deployment"] deprecated: false type: application @@ -11,6 +11,11 @@ dependencies: - name: velero version: 2.30.1 repository: https://radar-base.github.io/radar-helm-charts +- name: common + repository: https://radar-base.github.io/radar-helm-charts + tags: + - bitnami-common + version: 2.x.x maintainers: - email: keyvan@thehyve.nl name: Keyvan Hedayati diff --git a/charts/velero-s3-deployment/README.md b/charts/velero-s3-deployment/README.md index 80d03af4..88b07806 100644 --- a/charts/velero-s3-deployment/README.md +++ b/charts/velero-s3-deployment/README.md @@ -3,7 +3,7 @@ # velero-s3-deployment [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/velero-s3-deployment)](https://artifacthub.io/packages/helm/radar-base/velero-s3-deployment) -![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square) +![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: RELEASE.2024-11-21T17-21-54Z](https://img.shields.io/badge/AppVersion-RELEASE.2024--11--21T17--21--54Z-informational?style=flat-square) A Helm chart for Velero S3 deployment, this chart holds resources used by Velero with a deployment to mirror the local object storage to a remote object storage. @@ -22,8 +22,8 @@ A Helm chart for Velero S3 deployment, this chart holds resources used by Velero * ## Prerequisites -* Kubernetes 1.22+ -* Kubectl 1.22+ +* Kubernetes 1.28+ +* Kubectl 1.28+ * Helm 3.1.0+ * S3-compatible object storage @@ -31,6 +31,7 @@ A Helm chart for Velero S3 deployment, this chart holds resources used by Velero | Repository | Name | Version | |------------|------|---------| +| https://radar-base.github.io/radar-helm-charts | common | 2.x.x | | https://radar-base.github.io/radar-helm-charts | velero | 2.30.1 | ## Values @@ -38,10 +39,12 @@ A Helm chart for Velero S3 deployment, this chart holds resources used by Velero | Key | Type | Default | Description | |-----|------|---------|-------------| | objectStorageBackupReplicaCount | int | `1` | Number of replicas for object storage backup pod, should be 1 | -| mc_image.repository | string | `"minio/mc"` | Object storage backup pod image repository | -| mc_image.tag | string | `"RELEASE.2022-07-06T14-54-36Z"` | Object storage backup pod image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | -| mc_image.pullPolicy | string | `"IfNotPresent"` | Object storage backup pod image pull policy | -| imagePullSecrets | list | `[]` | Docker registry secret names as an array | +| mc_image.registry | string | `"docker.io"` | Image registry | +| mc_image.repository | string | `"minio/mc"` | Image repository | +| mc_image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. | +| mc_image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | +| mc_image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| mc_image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName | | podSecurityContext | object | `{}` | Configure object storage backup pod pods' Security Context | | securityContext | object | `{}` | Configure object storage backup pod containers' Security Context | | networkpolicy | object | check `values.yaml` | Network policy defines who can access this application and who this applications has access to | diff --git a/charts/velero-s3-deployment/charts/common-2.27.0.tgz b/charts/velero-s3-deployment/charts/common-2.27.0.tgz new file mode 100644 index 00000000..5c539c35 Binary files /dev/null and b/charts/velero-s3-deployment/charts/common-2.27.0.tgz differ diff --git a/charts/velero-s3-deployment/templates/_helpers.tpl b/charts/velero-s3-deployment/templates/_helpers.tpl index eeb5f305..354ac88a 100644 --- a/charts/velero-s3-deployment/templates/_helpers.tpl +++ b/charts/velero-s3-deployment/templates/_helpers.tpl @@ -6,6 +6,20 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the proper image name +*/}} +{{- define "velero-s3-deployment.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.mc_image "global" .Values.global "chart" .Chart ) }} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "velero-s3-deployment.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.mc_image) "global" .Values.global) -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/velero-s3-deployment/templates/deployment.yaml b/charts/velero-s3-deployment/templates/deployment.yaml index 53e15bb9..1412c703 100644 --- a/charts/velero-s3-deployment/templates/deployment.yaml +++ b/charts/velero-s3-deployment/templates/deployment.yaml @@ -1,9 +1,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "velero-s3-deployment.fullname" . }}-object-storage-backup - labels: -{{ include "velero-s3-deployment.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }}-object-storage-backup + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.objectStorageBackupReplicaCount }} selector: @@ -16,17 +19,15 @@ spec: app.kubernetes.io/name: {{ include "velero-s3-deployment.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "velero-s3-deployment.imagePullSecrets" . | nindent 6 }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - name: intermediate securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.mc_image.repository }}:{{ .Values.mc_image.tag }}" + image: {{ template "velero-s3-deployment.image" . }} + imagePullPolicy: {{ .Values.mc_image.pullPolicy | quote }} env: - name: MC_HOST_local value: "http://{{ .Values.local.accessKey }}:{{ .Values.local.secretKey }}@{{ .Values.local.address }}" @@ -43,7 +44,8 @@ spec: - name: output securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.mc_image.repository }}:{{ .Values.mc_image.tag | default .Chart.AppVersion }}" + image: {{ template "velero-s3-deployment.image" . }} + imagePullPolicy: {{ .Values.mc_image.pullPolicy | quote }} env: - name: MC_HOST_local value: "http://{{ .Values.local.accessKey }}:{{ .Values.local.secretKey }}@{{ .Values.local.address }}" diff --git a/charts/velero-s3-deployment/templates/networkpolicy.yaml b/charts/velero-s3-deployment/templates/networkpolicy.yaml index 6bc0697d..ba1fbd4d 100644 --- a/charts/velero-s3-deployment/templates/networkpolicy.yaml +++ b/charts/velero-s3-deployment/templates/networkpolicy.yaml @@ -2,9 +2,12 @@ kind: NetworkPolicy apiVersion: networking.k8s.io/v1 metadata: - name: {{ template "velero-s3-deployment.fullname" . }} - labels: -{{ include "velero-s3-deployment.labels" . | indent 4 }} + name: {{ template "common.names.fullname" . }} + namespace: {{ include "common.names.namespace" . | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if .Values.commonAnnotations }} + annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: diff --git a/charts/velero-s3-deployment/values.yaml b/charts/velero-s3-deployment/values.yaml index 53a70877..11b496e4 100644 --- a/charts/velero-s3-deployment/values.yaml +++ b/charts/velero-s3-deployment/values.yaml @@ -6,16 +6,24 @@ objectStorageBackupReplicaCount: 1 mc_image: - # -- Object storage backup pod image repository + # -- Image registry + registry: docker.io + # -- Image repository repository: minio/mc - # -- Object storage backup pod image tag (immutable tags are recommended) + # -- Image tag (immutable tags are recommended) # Overrides the image tag whose default is the chart appVersion. - tag: RELEASE.2022-07-06T14-54-36Z - # -- Object storage backup pod image pull policy + tag: + # -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + digest: "" + # -- Image pull policy pullPolicy: IfNotPresent - -# -- Docker registry secret names as an array -imagePullSecrets: [] + # -- Optionally specify an array of imagePullSecrets. + # Secrets must be manually created in the namespace. + # e.g: + # pullSecrets: + # - myRegistryKeySecretName + # + pullSecrets: [] # -- Configure object storage backup pod pods' Security Context podSecurityContext: {}