Charts CI

```
Updated:
  argo/argo-cd:
    - 5.46.6
  bitnami/airflow:
    - 15.0.6
  bitnami/kafka:
    - 25.1.11
  bitnami/mysql:
    - 9.12.3
  bitnami/postgresql:
    - 12.12.4
  bitnami/wordpress:
    - 17.1.9
  dell/csi-powermax:
    - 2.8.0
  prophetstor/federatorai:
    - 5.1.4
  redpanda/redpanda:
    - 5.4.6
  speedscale/speedscale-operator:
    - 1.3.34
```
pull/887/head
github-actions[bot] 2023-09-20 15:59:03 +00:00
parent 72ae8bfab2
commit f9843b6513
119 changed files with 1734 additions and 6799 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,7 @@
annotations:
artifacthub.io/changes: |
- kind: fixed
description: fixed issue with argocd-server servicemonitor annotation attribute being added even when no annotations where defined
description: fixed repo-server deployment not restarting when a cmp configmap is modified
artifacthub.io/signKey: |
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
@ -33,4 +33,4 @@ name: argo-cd
sources:
- https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd
- https://github.com/argoproj/argo-cd
version: 5.46.5
version: 5.46.6

View File

@ -33,6 +33,9 @@ spec:
{{- if (hasKey .Values.server "configEnabled") | ternary .Values.server.configEnabled .Values.configs.cm.create }}
checksum/cm: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cm.yaml") . | sha256sum }}
{{- end }}
{{- if .Values.configs.cmp.create }}
checksum/cmp-cm: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cmp-cm.yaml") . | sha256sum }}
{{- end }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.repoServer.podAnnotations) }}
{{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }}

View File

@ -6,17 +6,17 @@ annotations:
category: WorkFlow
images: |
- name: airflow-exporter
image: docker.io/bitnami/airflow-exporter:0.20220314.0-debian-11-r407
image: docker.io/bitnami/airflow-exporter:0.20220314.0-debian-11-r413
- name: airflow-scheduler
image: docker.io/bitnami/airflow-scheduler:2.7.1-debian-11-r0
image: docker.io/bitnami/airflow-scheduler:2.7.1-debian-11-r2
- name: airflow-worker
image: docker.io/bitnami/airflow-worker:2.7.1-debian-11-r0
image: docker.io/bitnami/airflow-worker:2.7.1-debian-11-r2
- name: airflow
image: docker.io/bitnami/airflow:2.7.1-debian-11-r0
image: docker.io/bitnami/airflow:2.7.1-debian-11-r5
- name: git
image: docker.io/bitnami/git:2.42.0-debian-11-r14
image: docker.io/bitnami/git:2.42.0-debian-11-r20
- name: os-shell
image: docker.io/bitnami/os-shell:11-debian-11-r60
image: docker.io/bitnami/os-shell:11-debian-11-r63
licenses: Apache-2.0
apiVersion: v2
appVersion: 2.7.1
@ -50,4 +50,4 @@ maintainers:
name: airflow
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/airflow
version: 15.0.5
version: 15.0.6

View File

@ -90,7 +90,7 @@ The command removes all the Kubernetes components associated with the chart and
| `dags.existingConfigmap` | Name of an existing ConfigMap with all the DAGs files you want to load in Airflow | `""` |
| `dags.image.registry` | Init container load-dags image registry | `docker.io` |
| `dags.image.repository` | Init container load-dags image repository | `bitnami/os-shell` |
| `dags.image.tag` | Init container load-dags image tag (immutable tags are recommended) | `11-debian-11-r60` |
| `dags.image.tag` | Init container load-dags image tag (immutable tags are recommended) | `11-debian-11-r63` |
| `dags.image.digest` | Init container load-dags image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `dags.image.pullPolicy` | Init container load-dags image pull policy | `IfNotPresent` |
| `dags.image.pullSecrets` | Init container load-dags image pull secrets | `[]` |
@ -109,7 +109,7 @@ The command removes all the Kubernetes components associated with the chart and
| ------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | -------------------- |
| `web.image.registry` | Airflow image registry | `docker.io` |
| `web.image.repository` | Airflow image repository | `bitnami/airflow` |
| `web.image.tag` | Airflow image tag (immutable tags are recommended) | `2.7.1-debian-11-r0` |
| `web.image.tag` | Airflow image tag (immutable tags are recommended) | `2.7.1-debian-11-r5` |
| `web.image.digest` | Airflow image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `web.image.pullPolicy` | Airflow image pull policy | `IfNotPresent` |
| `web.image.pullSecrets` | Airflow image pull secrets | `[]` |
@ -184,7 +184,7 @@ The command removes all the Kubernetes components associated with the chart and
| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | --------------------------- |
| `scheduler.image.registry` | Airflow Scheduler image registry | `docker.io` |
| `scheduler.image.repository` | Airflow Scheduler image repository | `bitnami/airflow-scheduler` |
| `scheduler.image.tag` | Airflow Scheduler image tag (immutable tags are recommended) | `2.7.1-debian-11-r0` |
| `scheduler.image.tag` | Airflow Scheduler image tag (immutable tags are recommended) | `2.7.1-debian-11-r2` |
| `scheduler.image.digest` | Airflow Schefuler image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `scheduler.image.pullPolicy` | Airflow Scheduler image pull policy | `IfNotPresent` |
| `scheduler.image.pullSecrets` | Airflow Scheduler image pull secrets | `[]` |
@ -238,7 +238,7 @@ The command removes all the Kubernetes components associated with the chart and
| ---------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | ------------------------ |
| `worker.image.registry` | Airflow Worker image registry | `docker.io` |
| `worker.image.repository` | Airflow Worker image repository | `bitnami/airflow-worker` |
| `worker.image.tag` | Airflow Worker image tag (immutable tags are recommended) | `2.7.1-debian-11-r0` |
| `worker.image.tag` | Airflow Worker image tag (immutable tags are recommended) | `2.7.1-debian-11-r2` |
| `worker.image.digest` | Airflow Worker image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `worker.image.pullPolicy` | Airflow Worker image pull policy | `IfNotPresent` |
| `worker.image.pullSecrets` | Airflow Worker image pull secrets | `[]` |
@ -318,7 +318,7 @@ The command removes all the Kubernetes components associated with the chart and
| ------------------------------ | --------------------------------------------------------------------------------------------------- | ---------------------- |
| `git.image.registry` | Git image registry | `docker.io` |
| `git.image.repository` | Git image repository | `bitnami/git` |
| `git.image.tag` | Git image tag (immutable tags are recommended) | `2.42.0-debian-11-r14` |
| `git.image.tag` | Git image tag (immutable tags are recommended) | `2.42.0-debian-11-r20` |
| `git.image.digest` | Git image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `git.image.pullPolicy` | Git image pull policy | `IfNotPresent` |
| `git.image.pullSecrets` | Git image pull secrets | `[]` |
@ -410,7 +410,7 @@ The command removes all the Kubernetes components associated with the chart and
| `metrics.enabled` | Whether or not to create a standalone Airflow exporter to expose Airflow metrics | `false` |
| `metrics.image.registry` | Airflow exporter image registry | `docker.io` |
| `metrics.image.repository` | Airflow exporter image repository | `bitnami/airflow-exporter` |
| `metrics.image.tag` | Airflow exporter image tag (immutable tags are recommended) | `0.20220314.0-debian-11-r407` |
| `metrics.image.tag` | Airflow exporter image tag (immutable tags are recommended) | `0.20220314.0-debian-11-r413` |
| `metrics.image.digest` | Airflow exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `metrics.image.pullPolicy` | Airflow exporter image pull policy | `IfNotPresent` |
| `metrics.image.pullSecrets` | Airflow exporter image pull secrets | `[]` |

View File

@ -121,7 +121,7 @@ dags:
image:
registry: docker.io
repository: bitnami/os-shell
tag: 11-debian-11-r60
tag: 11-debian-11-r63
digest: ""
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
@ -188,7 +188,7 @@ web:
image:
registry: docker.io
repository: bitnami/airflow
tag: 2.7.1-debian-11-r0
tag: 2.7.1-debian-11-r5
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@ -446,7 +446,7 @@ scheduler:
image:
registry: docker.io
repository: bitnami/airflow-scheduler
tag: 2.7.1-debian-11-r0
tag: 2.7.1-debian-11-r2
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@ -650,7 +650,7 @@ worker:
image:
registry: docker.io
repository: bitnami/airflow-worker
tag: 2.7.1-debian-11-r0
tag: 2.7.1-debian-11-r2
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@ -923,7 +923,7 @@ git:
image:
registry: docker.io
repository: bitnami/git
tag: 2.42.0-debian-11-r14
tag: 2.42.0-debian-11-r20
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@ -1286,7 +1286,7 @@ metrics:
image:
registry: docker.io
repository: bitnami/airflow-exporter
tag: 0.20220314.0-debian-11-r407
tag: 0.20220314.0-debian-11-r413
digest: ""
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.

View File

@ -1,9 +1,9 @@
dependencies:
- name: zookeeper
repository: oci://registry-1.docker.io/bitnamicharts
version: 12.1.2
version: 12.1.3
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.10.0
digest: sha256:5e278241ce8a477449715df19d6e50542ff7afb81802a2cc8b4e04b8c0b35833
generated: "2023-09-05T14:19:33.178442157Z"
version: 2.11.1
digest: sha256:7008d8cb5f82e0a99fbc97b8c42c87e5f7b45a90c7ff868d9ecb2778efa477ad
generated: "2023-09-18T14:18:33.491894+02:00"

View File

@ -45,4 +45,4 @@ maintainers:
name: kafka
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/kafka
version: 25.1.10
version: 25.1.11

View File

@ -2,7 +2,7 @@ annotations:
category: Infrastructure
licenses: Apache-2.0
apiVersion: v2
appVersion: 2.9.2
appVersion: 2.11.1
description: A Library Helm Chart for grouping common logic between bitnami charts.
This chart is not deployable by itself.
home: https://bitnami.com
@ -20,4 +20,4 @@ name: common
sources:
- https://github.com/bitnami/charts
type: library
version: 2.10.0
version: 2.11.1

View File

@ -83,3 +83,19 @@ imagePullSecrets:
{{- end }}
{{- end }}
{{- end -}}
{{/*
Return the proper image version (ingores image revision/prerelease info & fallbacks to chart appVersion)
{{ include "common.images.version" ( dict "imageRoot" .Values.path.to.the.image "chart" .Chart ) }}
*/}}
{{- define "common.images.version" -}}
{{- $imageTag := .imageRoot.tag | toString -}}
{{/* regexp from https://github.com/Masterminds/semver/blob/23f51de38a0866c5ef0bfc42b3f735c73107b700/version.go#L41-L44 */}}
{{- if regexMatch `^([0-9]+)(\.[0-9]+)?(\.[0-9]+)?(-([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?(\+([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?$` $imageTag -}}
{{- $version := semver $imageTag -}}
{{- printf "%d.%d.%d" $version.Major $version.Minor $version.Patch -}}
{{- else -}}
{{- print .chart.AppVersion -}}
{{- end -}}
{{- end -}}

View File

@ -11,21 +11,13 @@ Kubernetes standard labels
*/}}
{{- define "common.labels.standard" -}}
{{- if and (hasKey . "customLabels") (hasKey . "context") -}}
{{ merge
(include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml)
(dict
"app.kubernetes.io/name" (include "common.names.name" .context)
"helm.sh/chart" (include "common.names.chart" .context)
"app.kubernetes.io/instance" .context.Release.Name
"app.kubernetes.io/managed-by" .context.Release.Service
)
| toYaml
}}
{{ merge (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) (dict "app.kubernetes.io/name" (include "common.names.name" .context) "helm.sh/chart" (include "common.names.chart" .context) "app.kubernetes.io/instance" .context.Release.Name "app.kubernetes.io/managed-by" .context.Release.Service "app.kubernetes.io/version" .context.Chart.AppVersion) | toYaml }}
{{- else -}}
app.kubernetes.io/name: {{ include "common.names.name" . }}
helm.sh/chart: {{ include "common.names.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end -}}
{{- end -}}
@ -40,14 +32,7 @@ overwrote them on metadata.labels fields.
*/}}
{{- define "common.labels.matchLabels" -}}
{{- if and (hasKey . "customLabels") (hasKey . "context") -}}
{{ merge
(pick (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) "app.kubernetes.io/name" "app.kubernetes.io/instance")
(dict
"app.kubernetes.io/name" (include "common.names.name" .context)
"app.kubernetes.io/instance" .context.Release.Name
)
| toYaml
}}
{{ merge (pick (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) "app.kubernetes.io/name" "app.kubernetes.io/instance") (dict "app.kubernetes.io/name" (include "common.names.name" .context) "app.kubernetes.io/instance" .context.Release.Name ) | toYaml }}
{{- else -}}
app.kubernetes.io/name: {{ include "common.names.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

View File

@ -0,0 +1,11 @@
{
"title": "Chart Values",
"type": "object",
"properties": {
"exampleValue": {
"type": "string",
"description": "",
"default": "common-chart"
}
}
}

View File

@ -1,6 +1,6 @@
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.9.2
digest: sha256:0d1ed3ab5c6a7e3ab3bfaea47851d574aae674797326572c51719718026e1f63
generated: "2023-08-31T16:47:39.182152921Z"
version: 2.10.0
digest: sha256:023ded170632d04528f30332370f34fc8fb96efb2886a01d934cb3bd6e6d2e09
generated: "2023-09-05T11:24:06.99508+02:00"

View File

@ -26,4 +26,4 @@ maintainers:
name: zookeeper
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/zookeeper
version: 12.1.2
version: 12.1.3

View File

@ -20,4 +20,4 @@ name: common
sources:
- https://github.com/bitnami/charts
type: library
version: 2.9.2
version: 2.10.0

View File

@ -22,3 +22,17 @@ Usage:
{{- $value }}
{{- end }}
{{- end -}}
{{/*
Merge a list of values that contains template after rendering them.
Merge precedence is consistent with http://masterminds.github.io/sprig/dicts.html#merge-mustmerge
Usage:
{{ include "common.tplvalues.merge" ( dict "values" (list .Values.path.to.the.Value1 .Values.path.to.the.Value2) "context" $ ) }}
*/}}
{{- define "common.tplvalues.merge" -}}
{{- $dst := dict -}}
{{- range .values -}}
{{- $dst = include "common.tplvalues.render" (dict "value" . "context" $.context "scope" $.scope) | fromYaml | merge $dst -}}
{{- end -}}
{{ $dst | toYaml }}
{{- end -}}

View File

@ -12,7 +12,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: metrics
{{- if or .Values.metrics.service.annotations .Values.commonAnnotations }}
{{- $annotations := merge .Values.metrics.service.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.service.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
@ -21,7 +21,7 @@ spec:
- name: tcp-metrics
port: {{ .Values.metrics.service.port }}
targetPort: metrics
{{- $podLabels := merge .Values.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: zookeeper
{{- end }}

View File

@ -14,7 +14,7 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
{{- $podLabels := merge .Values.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }}
podSelector:
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
policyTypes:

View File

@ -22,7 +22,7 @@ spec:
{{- if .Values.pdb.maxUnavailable }}
maxUnavailable: {{ .Values.pdb.maxUnavailable }}
{{- end }}
{{- $podLabels := merge .Values.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }}
selector:
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
app.kubernetes.io/component: zookeeper

View File

@ -13,7 +13,7 @@ metadata:
app.kubernetes.io/component: zookeeper
role: zookeeper
{{- if or .Values.commonAnnotations .Values.serviceAccount.annotations }}
{{- $annotations := merge .Values.serviceAccount.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}

View File

@ -17,7 +17,7 @@ metadata:
spec:
replicas: {{ .Values.replicaCount }}
podManagementPolicy: {{ .Values.podManagementPolicy }}
{{- $podLabels := merge .Values.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }}
selector:
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
app.kubernetes.io/component: zookeeper

View File

@ -11,7 +11,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: zookeeper
{{- if or .Values.commonAnnotations .Values.service.headless.annotations }}
{{- $annotations := merge .Values.service.headless.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.service.headless.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
@ -35,6 +35,6 @@ spec:
- name: tcp-election
port: {{ .Values.service.ports.election }}
targetPort: election
{{- $podLabels := merge .Values.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: zookeeper

View File

@ -11,7 +11,7 @@ metadata:
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: zookeeper
{{- if or .Values.commonAnnotations .Values.service.annotations }}
{{- $annotations := merge .Values.service.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.service.annotations .Values.commonAnnotations ) "context" . ) }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
@ -64,6 +64,6 @@ spec:
{{- if .Values.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
{{- $podLabels := merge .Values.podLabels .Values.commonLabels }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: zookeeper

View File

@ -13,14 +13,16 @@ kind: Deployment
metadata:
name: {{ include "kafka.metrics.kafka.fullname" . }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.metrics.kafka.image "chart" .Chart ) ) }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.commonLabels $versionLabel ) "context" . ) }}
labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: cluster-metrics
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
replicas: 1
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.kafka.podLabels .Values.commonLabels ) "context" . ) }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.kafka.podLabels .Values.commonLabels $versionLabel ) "context" . ) }}
selector:
matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
app.kubernetes.io/component: cluster-metrics

View File

@ -9,7 +9,8 @@ kind: PrometheusRule
metadata:
name: {{ include "common.names.fullname" . }}
namespace: {{ default (include "common.names.namespace" .) .Values.metrics.prometheusRule.namespace }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.prometheusRule.labels .Values.commonLabels ) "context" . ) }}
{{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.metrics.kafka.image "chart" .Chart ) ) }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.prometheusRule.labels .Values.commonLabels $versionLabel ) "context" . ) }}
labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: metrics
{{- if .Values.commonAnnotations }}

View File

@ -9,7 +9,9 @@ kind: ServiceAccount
metadata:
name: {{ template "kafka.metrics.kafka.serviceAccountName" . }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.metrics.kafka.image "chart" .Chart ) ) }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.commonLabels $versionLabel ) "context" . ) }}
labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: cluster-metrics
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}

View File

@ -9,7 +9,8 @@ kind: ServiceMonitor
metadata:
name: {{ printf "%s-metrics" (include "common.names.fullname" .) }}
namespace: {{ default (include "common.names.namespace" .) .Values.metrics.serviceMonitor.namespace | quote }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
{{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.metrics.kafka.image "chart" .Chart ) ) }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels $versionLabel ) "context" . ) }}
labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: cluster-metrics
{{- if .Values.commonAnnotations }}

View File

@ -9,7 +9,9 @@ kind: Service
metadata:
name: {{ printf "%s-metrics" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- $versionLabel := dict "app.kubernetes.io/version" ( include "common.images.version" ( dict "imageRoot" .Values.metrics.kafka.image "chart" .Chart ) ) }}
{{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.commonLabels $versionLabel ) "context" . ) }}
labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: cluster-metrics
{{- if or .Values.metrics.kafka.service.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.kafka.service.annotations .Values.commonAnnotations ) "context" . ) }}

View File

@ -1,6 +1,6 @@
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.10.0
digest: sha256:023ded170632d04528f30332370f34fc8fb96efb2886a01d934cb3bd6e6d2e09
generated: "2023-09-05T11:34:55.400631+02:00"
version: 2.11.1
digest: sha256:ead8f26c76a9ec082f23629a358e8efd8f88d87aaed734bf41febcb8a7bc5d4c
generated: "2023-09-19T07:52:06.908924822Z"

View File

@ -6,11 +6,11 @@ annotations:
category: Database
images: |
- name: mysql
image: docker.io/bitnami/mysql:8.0.34-debian-11-r31
image: docker.io/bitnami/mysql:8.0.34-debian-11-r56
- name: mysqld-exporter
image: docker.io/bitnami/mysqld-exporter:0.15.0-debian-11-r24
image: docker.io/bitnami/mysqld-exporter:0.15.0-debian-11-r50
- name: os-shell
image: docker.io/bitnami/os-shell:11-debian-11-r43
image: docker.io/bitnami/os-shell:11-debian-11-r72
licenses: Apache-2.0
apiVersion: v2
appVersion: 8.0.34
@ -36,4 +36,4 @@ maintainers:
name: mysql
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/mysql
version: 9.12.2
version: 9.12.3

View File

@ -83,7 +83,7 @@ The command removes all the Kubernetes components associated with the chart and
| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------- |
| `image.registry` | MySQL image registry | `docker.io` |
| `image.repository` | MySQL image repository | `bitnami/mysql` |
| `image.tag` | MySQL image tag (immutable tags are recommended) | `8.0.34-debian-11-r31` |
| `image.tag` | MySQL image tag (immutable tags are recommended) | `8.0.34-debian-11-r56` |
| `image.digest` | MySQL image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `image.pullPolicy` | MySQL image pull policy | `IfNotPresent` |
| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
@ -309,7 +309,7 @@ The command removes all the Kubernetes components associated with the chart and
| `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume(s) mountpoint to `runAsUser:fsGroup` | `false` |
| `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` |
| `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/os-shell` |
| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r43` |
| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r72` |
| `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` |
| `volumePermissions.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
@ -322,7 +322,7 @@ The command removes all the Kubernetes components associated with the chart and
| `metrics.enabled` | Start a side-car prometheus exporter | `false` |
| `metrics.image.registry` | Exporter image registry | `docker.io` |
| `metrics.image.repository` | Exporter image repository | `bitnami/mysqld-exporter` |
| `metrics.image.tag` | Exporter image tag (immutable tags are recommended) | `0.15.0-debian-11-r24` |
| `metrics.image.tag` | Exporter image tag (immutable tags are recommended) | `0.15.0-debian-11-r50` |
| `metrics.image.digest` | Exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `metrics.image.pullPolicy` | Exporter image pull policy | `IfNotPresent` |
| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |

View File

@ -2,7 +2,7 @@ annotations:
category: Infrastructure
licenses: Apache-2.0
apiVersion: v2
appVersion: 2.9.2
appVersion: 2.11.1
description: A Library Helm Chart for grouping common logic between bitnami charts.
This chart is not deployable by itself.
home: https://bitnami.com
@ -20,4 +20,4 @@ name: common
sources:
- https://github.com/bitnami/charts
type: library
version: 2.10.0
version: 2.11.1

View File

@ -83,3 +83,19 @@ imagePullSecrets:
{{- end }}
{{- end }}
{{- end -}}
{{/*
Return the proper image version (ingores image revision/prerelease info & fallbacks to chart appVersion)
{{ include "common.images.version" ( dict "imageRoot" .Values.path.to.the.image "chart" .Chart ) }}
*/}}
{{- define "common.images.version" -}}
{{- $imageTag := .imageRoot.tag | toString -}}
{{/* regexp from https://github.com/Masterminds/semver/blob/23f51de38a0866c5ef0bfc42b3f735c73107b700/version.go#L41-L44 */}}
{{- if regexMatch `^([0-9]+)(\.[0-9]+)?(\.[0-9]+)?(-([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?(\+([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?$` $imageTag -}}
{{- $version := semver $imageTag -}}
{{- printf "%d.%d.%d" $version.Major $version.Minor $version.Patch -}}
{{- else -}}
{{- print .chart.AppVersion -}}
{{- end -}}
{{- end -}}

View File

@ -11,21 +11,13 @@ Kubernetes standard labels
*/}}
{{- define "common.labels.standard" -}}
{{- if and (hasKey . "customLabels") (hasKey . "context") -}}
{{ merge
(include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml)
(dict
"app.kubernetes.io/name" (include "common.names.name" .context)
"helm.sh/chart" (include "common.names.chart" .context)
"app.kubernetes.io/instance" .context.Release.Name
"app.kubernetes.io/managed-by" .context.Release.Service
)
| toYaml
}}
{{ merge (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) (dict "app.kubernetes.io/name" (include "common.names.name" .context) "helm.sh/chart" (include "common.names.chart" .context) "app.kubernetes.io/instance" .context.Release.Name "app.kubernetes.io/managed-by" .context.Release.Service "app.kubernetes.io/version" .context.Chart.AppVersion) | toYaml }}
{{- else -}}
app.kubernetes.io/name: {{ include "common.names.name" . }}
helm.sh/chart: {{ include "common.names.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end -}}
{{- end -}}
@ -40,14 +32,7 @@ overwrote them on metadata.labels fields.
*/}}
{{- define "common.labels.matchLabels" -}}
{{- if and (hasKey . "customLabels") (hasKey . "context") -}}
{{ merge
(pick (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) "app.kubernetes.io/name" "app.kubernetes.io/instance")
(dict
"app.kubernetes.io/name" (include "common.names.name" .context)
"app.kubernetes.io/instance" .context.Release.Name
)
| toYaml
}}
{{ merge (pick (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) "app.kubernetes.io/name" "app.kubernetes.io/instance") (dict "app.kubernetes.io/name" (include "common.names.name" .context) "app.kubernetes.io/instance" .context.Release.Name ) | toYaml }}
{{- else -}}
app.kubernetes.io/name: {{ include "common.names.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

View File

@ -0,0 +1,11 @@
{
"title": "Chart Values",
"type": "object",
"properties": {
"exampleValue": {
"type": "string",
"description": "",
"default": "common-chart"
}
}
}

View File

@ -29,7 +29,7 @@ spec:
externalTrafficPolicy: {{ .Values.primary.service.externalTrafficPolicy | quote }}
{{- end }}
{{- if and (eq .Values.primary.service.type "LoadBalancer") (not (empty .Values.primary.service.loadBalancerSourceRanges)) }}
loadBalancerSourceRanges: {{ .Values.primary.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: {{- toYaml .Values.primary.service.loadBalancerSourceRanges | nindent 4}}
{{- end }}
{{- if and (eq .Values.primary.service.type "LoadBalancer") (not (empty .Values.primary.service.loadBalancerIP)) }}
loadBalancerIP: {{ .Values.primary.service.loadBalancerIP }}

View File

@ -30,7 +30,7 @@ spec:
externalTrafficPolicy: {{ .Values.secondary.service.externalTrafficPolicy | quote }}
{{- end }}
{{- if and (eq .Values.secondary.service.type "LoadBalancer") (not (empty .Values.secondary.service.loadBalancerSourceRanges)) }}
loadBalancerSourceRanges: {{ .Values.secondary.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: {{- toYaml .Values.secondary.service.loadBalancerSourceRanges | nindent 4}}
{{- end }}
{{- if and (eq .Values.secondary.service.type "LoadBalancer") (not (empty .Values.secondary.service.loadBalancerIP)) }}
loadBalancerIP: {{ .Values.secondary.service.loadBalancerIP }}

File diff suppressed because it is too large Load Diff

View File

@ -85,7 +85,7 @@ diagnosticMode:
image:
registry: docker.io
repository: bitnami/mysql
tag: 8.0.34-debian-11-r31
tag: 8.0.34-debian-11-r56
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@ -1021,7 +1021,7 @@ volumePermissions:
image:
registry: docker.io
repository: bitnami/os-shell
tag: 11-debian-11-r43
tag: 11-debian-11-r72
digest: ""
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
@ -1055,7 +1055,7 @@ metrics:
image:
registry: docker.io
repository: bitnami/mysqld-exporter
tag: 0.15.0-debian-11-r24
tag: 0.15.0-debian-11-r50
digest: ""
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.

View File

@ -1,6 +1,6 @@
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.10.0
digest: sha256:023ded170632d04528f30332370f34fc8fb96efb2886a01d934cb3bd6e6d2e09
generated: "2023-09-05T11:35:37.879743+02:00"
version: 2.11.1
digest: sha256:ead8f26c76a9ec082f23629a358e8efd8f88d87aaed734bf41febcb8a7bc5d4c
generated: "2023-09-18T13:15:45.397687963Z"

View File

@ -6,11 +6,11 @@ annotations:
category: Database
images: |
- name: os-shell
image: docker.io/bitnami/os-shell:11-debian-11-r43
image: docker.io/bitnami/os-shell:11-debian-11-r72
- name: postgres-exporter
image: docker.io/bitnami/postgres-exporter:0.13.2-debian-11-r25
image: docker.io/bitnami/postgres-exporter:0.14.0-debian-11-r0
- name: postgresql
image: docker.io/bitnami/postgresql:15.4.0-debian-11-r10
image: docker.io/bitnami/postgresql:15.4.0-debian-11-r39
licenses: Apache-2.0
apiVersion: v2
appVersion: 15.4.0
@ -38,4 +38,4 @@ maintainers:
name: postgresql
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/postgresql
version: 12.11.2
version: 12.12.4

View File

@ -100,7 +100,7 @@ kubectl delete pvc -l release=my-release
| ---------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------- |
| `image.registry` | PostgreSQL image registry | `docker.io` |
| `image.repository` | PostgreSQL image repository | `bitnami/postgresql` |
| `image.tag` | PostgreSQL image tag (immutable tags are recommended) | `15.4.0-debian-11-r10` |
| `image.tag` | PostgreSQL image tag (immutable tags are recommended) | `15.4.0-debian-11-r39` |
| `image.digest` | PostgreSQL image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `image.pullPolicy` | PostgreSQL image pull policy | `IfNotPresent` |
| `image.pullSecrets` | Specify image pull secrets | `[]` |
@ -389,6 +389,7 @@ kubectl delete pvc -l release=my-release
| `backup.cronjob.command` | Set backup container's command to run | `["/bin/sh","-c","pg_dumpall --clean --if-exists --load-via-partition-root --quote-all-identifiers --no-password --file=${PGDUMP_DIR}/pg_dumpall-$(date '+%Y-%m-%d-%H-%M').pgdump"]` |
| `backup.cronjob.labels` | Set the cronjob labels | `{}` |
| `backup.cronjob.annotations` | Set the cronjob annotations | `{}` |
| `backup.cronjob.nodeSelector` | Node labels for PostgreSQL backup CronJob pod assignment | `{}` |
| `backup.cronjob.storage.existingClaim` | Provide an existing `PersistentVolumeClaim` (only when `architecture=standalone`) | `""` |
| `backup.cronjob.storage.resourcePolicy` | Setting it to "keep" to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted | `""` |
| `backup.cronjob.storage.storageClass` | PVC Storage Class for the backup data volume | `""` |
@ -425,7 +426,7 @@ kubectl delete pvc -l release=my-release
| `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` |
| `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` |
| `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/os-shell` |
| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r43` |
| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r72` |
| `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` |
| `volumePermissions.image.pullSecrets` | Init container volume-permissions image pull secrets | `[]` |
@ -456,7 +457,7 @@ kubectl delete pvc -l release=my-release
| `metrics.enabled` | Start a prometheus exporter | `false` |
| `metrics.image.registry` | PostgreSQL Prometheus Exporter image registry | `docker.io` |
| `metrics.image.repository` | PostgreSQL Prometheus Exporter image repository | `bitnami/postgres-exporter` |
| `metrics.image.tag` | PostgreSQL Prometheus Exporter image tag (immutable tags are recommended) | `0.13.2-debian-11-r25` |
| `metrics.image.tag` | PostgreSQL Prometheus Exporter image tag (immutable tags are recommended) | `0.14.0-debian-11-r0` |
| `metrics.image.digest` | PostgreSQL image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `metrics.image.pullPolicy` | PostgreSQL Prometheus Exporter image pull policy | `IfNotPresent` |
| `metrics.image.pullSecrets` | Specify image pull secrets | `[]` |

View File

@ -2,7 +2,7 @@ annotations:
category: Infrastructure
licenses: Apache-2.0
apiVersion: v2
appVersion: 2.9.2
appVersion: 2.11.1
description: A Library Helm Chart for grouping common logic between bitnami charts.
This chart is not deployable by itself.
home: https://bitnami.com
@ -20,4 +20,4 @@ name: common
sources:
- https://github.com/bitnami/charts
type: library
version: 2.10.0
version: 2.11.1

View File

@ -83,3 +83,19 @@ imagePullSecrets:
{{- end }}
{{- end }}
{{- end -}}
{{/*
Return the proper image version (ingores image revision/prerelease info & fallbacks to chart appVersion)
{{ include "common.images.version" ( dict "imageRoot" .Values.path.to.the.image "chart" .Chart ) }}
*/}}
{{- define "common.images.version" -}}
{{- $imageTag := .imageRoot.tag | toString -}}
{{/* regexp from https://github.com/Masterminds/semver/blob/23f51de38a0866c5ef0bfc42b3f735c73107b700/version.go#L41-L44 */}}
{{- if regexMatch `^([0-9]+)(\.[0-9]+)?(\.[0-9]+)?(-([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?(\+([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?$` $imageTag -}}
{{- $version := semver $imageTag -}}
{{- printf "%d.%d.%d" $version.Major $version.Minor $version.Patch -}}
{{- else -}}
{{- print .chart.AppVersion -}}
{{- end -}}
{{- end -}}

View File

@ -11,21 +11,13 @@ Kubernetes standard labels
*/}}
{{- define "common.labels.standard" -}}
{{- if and (hasKey . "customLabels") (hasKey . "context") -}}
{{ merge
(include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml)
(dict
"app.kubernetes.io/name" (include "common.names.name" .context)
"helm.sh/chart" (include "common.names.chart" .context)
"app.kubernetes.io/instance" .context.Release.Name
"app.kubernetes.io/managed-by" .context.Release.Service
)
| toYaml
}}
{{ merge (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) (dict "app.kubernetes.io/name" (include "common.names.name" .context) "helm.sh/chart" (include "common.names.chart" .context) "app.kubernetes.io/instance" .context.Release.Name "app.kubernetes.io/managed-by" .context.Release.Service "app.kubernetes.io/version" .context.Chart.AppVersion) | toYaml }}
{{- else -}}
app.kubernetes.io/name: {{ include "common.names.name" . }}
helm.sh/chart: {{ include "common.names.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end -}}
{{- end -}}
@ -40,14 +32,7 @@ overwrote them on metadata.labels fields.
*/}}
{{- define "common.labels.matchLabels" -}}
{{- if and (hasKey . "customLabels") (hasKey . "context") -}}
{{ merge
(pick (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) "app.kubernetes.io/name" "app.kubernetes.io/instance")
(dict
"app.kubernetes.io/name" (include "common.names.name" .context)
"app.kubernetes.io/instance" .context.Release.Name
)
| toYaml
}}
{{ merge (pick (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) "app.kubernetes.io/name" "app.kubernetes.io/instance") (dict "app.kubernetes.io/name" (include "common.names.name" .context) "app.kubernetes.io/instance" .context.Release.Name ) | toYaml }}
{{- else -}}
app.kubernetes.io/name: {{ include "common.names.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}

View File

@ -0,0 +1,11 @@
{
"title": "Chart Values",
"type": "object",
"properties": {
"exampleValue": {
"type": "string",
"description": "",
"default": "common-chart"
}
}
}

View File

@ -38,6 +38,9 @@ spec:
annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 12 }}
{{- end }}
spec:
{{- if .Values.backup.cronjob.nodeSelector }}
nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.backup.cronjob.nodeSelector "context" $) | nindent 12 }}
{{- end }}
containers:
- name: {{ include "postgresql.v1.primary.fullname" . }}-pgdumpall
image: {{ include "postgresql.v1.image" . }}

File diff suppressed because it is too large Load Diff

View File

@ -98,7 +98,7 @@ diagnosticMode:
image:
registry: docker.io
repository: bitnami/postgresql
tag: 15.4.0-debian-11-r10
tag: 15.4.0-debian-11-r39
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@ -1129,6 +1129,10 @@ backup:
labels: {}
## @param backup.cronjob.annotations Set the cronjob annotations
annotations: {}
## @param backup.cronjob.nodeSelector Node labels for PostgreSQL backup CronJob pod assignment
## ref: https://kubernetes.io/docs/user-guide/node-selection/
##
nodeSelector: {}
storage:
## @param backup.cronjob.storage.existingClaim Provide an existing `PersistentVolumeClaim` (only when `architecture=standalone`)
## If defined, PVC must be created manually before volume will be bound
@ -1286,7 +1290,7 @@ volumePermissions:
image:
registry: docker.io
repository: bitnami/os-shell
tag: 11-debian-11-r43
tag: 11-debian-11-r72
digest: ""
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
@ -1387,7 +1391,7 @@ metrics:
image:
registry: docker.io
repository: bitnami/postgres-exporter
tag: 0.13.2-debian-11-r25
tag: 0.14.0-debian-11-r0
digest: ""
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.

View File

@ -7,6 +7,6 @@ dependencies:
version: 13.1.3
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.11.0
digest: sha256:ff0afc3f2e4eeae2e6aaad5cded81bbfd65a82b8c4b3cef4b6b5e370956f0ab4
generated: "2023-09-15T01:58:58.949665927Z"
version: 2.11.1
digest: sha256:e79bf475c8f60746fc1c2051b9f02ac05609544ef559f063fb188450b45713e2
generated: "2023-09-20T07:04:27.359744247Z"

View File

@ -6,11 +6,11 @@ annotations:
category: CMS
images: |
- name: apache-exporter
image: docker.io/bitnami/apache-exporter:1.0.1-debian-11-r44
image: docker.io/bitnami/apache-exporter:1.0.1-debian-11-r50
- name: os-shell
image: docker.io/bitnami/os-shell:11-debian-11-r66
image: docker.io/bitnami/os-shell:11-debian-11-r72
- name: wordpress
image: docker.io/bitnami/wordpress:6.3.1-debian-11-r14
image: docker.io/bitnami/wordpress:6.3.1-debian-11-r19
licenses: Apache-2.0
apiVersion: v2
appVersion: 6.3.1
@ -47,4 +47,4 @@ maintainers:
name: wordpress
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/wordpress
version: 17.1.8
version: 17.1.9

View File

@ -82,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and
| ------------------- | --------------------------------------------------------------------------------------------------------- | --------------------- |
| `image.registry` | WordPress image registry | `docker.io` |
| `image.repository` | WordPress image repository | `bitnami/wordpress` |
| `image.tag` | WordPress image tag (immutable tags are recommended) | `6.3.1-debian-11-r14` |
| `image.tag` | WordPress image tag (immutable tags are recommended) | `6.3.1-debian-11-r19` |
| `image.digest` | WordPress image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `image.pullPolicy` | WordPress image pull policy | `IfNotPresent` |
| `image.pullSecrets` | WordPress image pull secrets | `[]` |
@ -249,7 +249,7 @@ The command removes all the Kubernetes components associated with the chart and
| `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` |
| `volumePermissions.image.registry` | OS Shell + Utility image registry | `docker.io` |
| `volumePermissions.image.repository` | OS Shell + Utility image repository | `bitnami/os-shell` |
| `volumePermissions.image.tag` | OS Shell + Utility image tag (immutable tags are recommended) | `11-debian-11-r66` |
| `volumePermissions.image.tag` | OS Shell + Utility image tag (immutable tags are recommended) | `11-debian-11-r72` |
| `volumePermissions.image.digest` | OS Shell + Utility image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `volumePermissions.image.pullPolicy` | OS Shell + Utility image pull policy | `IfNotPresent` |
| `volumePermissions.image.pullSecrets` | OS Shell + Utility image pull secrets | `[]` |
@ -281,7 +281,7 @@ The command removes all the Kubernetes components associated with the chart and
| `metrics.enabled` | Start a sidecar prometheus exporter to expose metrics | `false` |
| `metrics.image.registry` | Apache exporter image registry | `docker.io` |
| `metrics.image.repository` | Apache exporter image repository | `bitnami/apache-exporter` |
| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `1.0.1-debian-11-r44` |
| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `1.0.1-debian-11-r50` |
| `metrics.image.digest` | Apache exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `metrics.image.pullPolicy` | Apache exporter image pull policy | `IfNotPresent` |
| `metrics.image.pullSecrets` | Apache exporter image pull secrets | `[]` |
@ -444,7 +444,7 @@ externalCache.port=11211
### Ingress
This chart provides support for Ingress resources. If an Ingress controller, such as nginx-ingress or traefik, that Ingress controller can be used to serve WordPress.
This chart provides support for Ingress resources. If you have an ingress controller installed on your cluster, such as [nginx-ingress-controller](https://github.com/bitnami/charts/tree/main/bitnami/nginx-ingress-controller) or [contour](https://github.com/bitnami/charts/tree/main/bitnami/contour) you can utilize the ingress controller to serve your application.
To enable Ingress integration, set `ingress.enabled` to `true`. The `ingress.hostname` property can be used to set the host name. The `ingress.tls` parameter can be used to add the TLS configuration for this host. It is also possible to have more than one host, with a separate TLS configuration for each host. [Learn more about configuring and using Ingress](https://docs.bitnami.com/kubernetes/apps/wordpress/configuration/configure-ingress/).

View File

@ -2,7 +2,7 @@ annotations:
category: Infrastructure
licenses: Apache-2.0
apiVersion: v2
appVersion: 2.11.0
appVersion: 2.11.1
description: A Library Helm Chart for grouping common logic between bitnami charts.
This chart is not deployable by itself.
home: https://bitnami.com
@ -20,4 +20,4 @@ name: common
sources:
- https://github.com/bitnami/charts
type: library
version: 2.11.0
version: 2.11.1

View File

@ -11,12 +11,13 @@ Kubernetes standard labels
*/}}
{{- define "common.labels.standard" -}}
{{- if and (hasKey . "customLabels") (hasKey . "context") -}}
{{ merge (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) (dict "app.kubernetes.io/name" (include "common.names.name" .context) "helm.sh/chart" (include "common.names.chart" .context) "app.kubernetes.io/instance" .context.Release.Name "app.kubernetes.io/managed-by" .context.Release.Service) | toYaml }}
{{ merge (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) (dict "app.kubernetes.io/name" (include "common.names.name" .context) "helm.sh/chart" (include "common.names.chart" .context) "app.kubernetes.io/instance" .context.Release.Name "app.kubernetes.io/managed-by" .context.Release.Service "app.kubernetes.io/version" .context.Chart.AppVersion) | toYaml }}
{{- else -}}
app.kubernetes.io/name: {{ include "common.names.name" . }}
helm.sh/chart: {{ include "common.names.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end -}}
{{- end -}}

File diff suppressed because it is too large Load Diff

View File

@ -76,7 +76,7 @@ diagnosticMode:
image:
registry: docker.io
repository: bitnami/wordpress
tag: 6.3.1-debian-11-r14
tag: 6.3.1-debian-11-r19
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@ -766,7 +766,7 @@ volumePermissions:
image:
registry: docker.io
repository: bitnami/os-shell
tag: 11-debian-11-r66
tag: 11-debian-11-r72
digest: ""
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
@ -860,7 +860,7 @@ metrics:
image:
registry: docker.io
repository: bitnami/apache-exporter
tag: 1.0.1-debian-11-r44
tag: 1.0.1-debian-11-r50
digest: ""
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.

View File

@ -1,15 +1,15 @@
annotations:
catalog.cattle.io/certified: partner
catalog.cattle.io/display-name: Dell CSI PowerMax
catalog.cattle.io/kube-version: '>= 1.23.0 < 1.28.0'
catalog.cattle.io/kube-version: '>= 1.23.0 < 1.29.0'
catalog.cattle.io/release-name: csi-powermax
apiVersion: v2
appVersion: 2.7.0
appVersion: 2.8.0
dependencies:
- condition: required
name: csireverseproxy
repository: file://./charts/csireverseproxy
version: 2.6.0
version: 2.7.0
description: 'PowerMax CSI (Container Storage Interface) driver Kubernetes integration.
This chart includes everything required to provision via CSI as well as a PowerMax
StorageClass. '
@ -18,11 +18,11 @@ icon: https://partner-charts.rancher.io/assets/logos/dell.png
keywords:
- csi
- storage
kubeVersion: '>= 1.23.0 < 1.28.0'
kubeVersion: '>= 1.23.0 < 1.29.0'
maintainers:
- name: DellEMC
name: csi-powermax
sources:
- https://github.com/dell/csi-powermax
type: application
version: 2.7.0
version: 2.8.0

View File

@ -1,6 +1,6 @@
apiVersion: v2
appVersion: 2.6.0
appVersion: 2.7.0
description: A Helm chart for CSI PowerMax ReverseProxy
name: csireverseproxy
type: application
version: 2.6.0
version: 2.7.0

View File

@ -1,4 +1,4 @@
image: dellemc/csipowermax-reverseproxy:v2.6.0
image: dellemc/csipowermax-reverseproxy:v2.7.0
port: 2222
# TLS secret which is used for setting up the proxy HTTPS server

View File

@ -3,48 +3,56 @@ Return the appropriate sidecar images based on k8s version
*/}}
{{- define "csi-powermax.attacherImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "k8s.gcr.io/sig-storage/csi-attacher:v4.3.0" -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- define "csi-powermax.provisionerImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "k8s.gcr.io/sig-storage/csi-provisioner:v3.5.0" -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- define "csi-powermax.snapshotterImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "k8s.gcr.io/sig-storage/csi-snapshotter:v6.2.2" -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- define "csi-powermax.resizerImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "k8s.gcr.io/sig-storage/csi-resizer:v1.8.0" -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- define "csi-powermax.registrarImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- print "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- define "csi-powermax.healthmonitorImage" -}}
{{- if eq .Capabilities.KubeVersion.Major "1" }}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "27") -}}
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
{{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- define "csi-powermax.isStorageCapacitySupported" -}}
{{- if eq .Values.storageCapacity.enabled true -}}
{{- if and (eq .Capabilities.KubeVersion.Major "1") (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}}
{{- true -}}
{{- end -}}
{{- end -}}
{{- end -}}

View File

@ -91,7 +91,19 @@ rules:
- apiGroups: [""]
resources: ["configmaps"]
verbs: ["create", "delete", "get", "list", "watch", "update", "patch"]
{{- end}}
{{- end}}
# Permissions for Storage Capacity
{{- if eq (include "csi-powermax.isStorageCapacitySupported" .) "true" }}
- apiGroups: ["storage.k8s.io"]
resources: ["csistoragecapacities"]
verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
- apiGroups: [""]
resources: ["pods"]
verbs: ["get"]
- apiGroups: ["apps"]
resources: ["replicasets"]
verbs: ["get"]
{{- end }}
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
@ -184,9 +196,20 @@ spec:
- "--leader-election"
- "--extra-create-metadata"
- "--feature-gates=Topology=true"
- "--enable-capacity={{ (include "csi-powermax.isStorageCapacitySupported" .) | default false }}"
- "--capacity-ownerref-level=2"
- "--capacity-poll-interval={{ .Values.storageCapacity.pollInterval | default "5m" }}"
env:
- name: ADDRESS
value: /var/run/csi/csi.sock
- name: NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
volumeMounts:
- name: socket-dir
mountPath: /var/run/csi
@ -487,4 +510,4 @@ spec:
secret:
secretName: proxy-server-root-certificate
{{ end }}
{{ end }}
{{ end }}

View File

@ -7,5 +7,7 @@ metadata:
name: csi-powermax
{{- end }}
spec:
podInfoOnMount: true
attachRequired: true
fsGroupPolicy: {{ .Values.fsGroupPolicy }}
storageCapacity: {{ (include "csi-powermax.isStorageCapacitySupported" .) | default false }}
fsGroupPolicy: {{ .Values.fsGroupPolicy }}

View File

@ -1,4 +1,3 @@
{{- if or (eq .Values.migration.enabled true) (eq .Values.openshift true) }}
apiVersion: v1
kind: ServiceAccount
metadata:
@ -14,6 +13,9 @@ metadata:
name: {{ .Release.Name }}-node
{{- end }}
rules:
- apiGroups: [""]
resources: ["nodes"]
verbs: ["get", "list", "watch", "update", "patch"]
{{- if eq .Values.openshift true }}
- apiGroups: ["security.openshift.io"]
resources: ["securitycontextconstraints"]
@ -60,7 +62,6 @@ roleRef:
{{- end }}
apiGroup: rbac.authorization.k8s.io
---
{{ end }}
kind: DaemonSet
apiVersion: apps/v1
metadata:
@ -81,9 +82,7 @@ spec:
labels:
app: {{ .Release.Name }}-node
spec:
{{- if or (eq .Values.migration.enabled true) (eq .Values.openshift true) }}
serviceAccountName: {{ .Release.Name }}-node
{{ end }}
{{ if .Values.node.nodeSelector }}
nodeSelector:
{{- toYaml .Values.node.nodeSelector | nindent 8 }}
@ -121,6 +120,8 @@ spec:
value: unix://{{ .Values.kubeletConfigDir }}/plugins/powermax.emc.dell.com/csi_sock
- name: X_CSI_MODE
value: node
- name: X_CSI_MAX_VOLUMES_PER_NODE
value: "{{ .Values.maxPowerMaxVolumesPerNode }}"
- name: X_CSI_PRIVATE_MOUNT_DIR
value: "{{ .Values.kubeletConfigDir }}/plugins/powermax.emc.dell.com/disks"
- name: X_CSI_MANAGED_ARRAYS
@ -395,4 +396,4 @@ spec:
secret:
secretName: proxy-server-root-certificate
{{ end }}
{{ end }}
{{ end }}

View File

@ -49,7 +49,7 @@ global:
# Current version of the driver
# Don't modify this value as this value will be used by the install script
version: "v2.7.0"
version: "v2.8.0"
images:
# "driver" defines the container image, used for the driver container.
@ -101,6 +101,13 @@ kubeletConfigDir: /var/lib/kubelet
# Default value: ReadWriteOnceWithFSType
fsGroupPolicy: ReadWriteOnceWithFSType
# maxPowermaxVolumesPerNode: Specify default value for maximum number of volumes that controller can publish to the node.
# If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node.
# This limit is applicable to all the nodes in the cluster for which node label 'max-Powermax-volumes-per-node' is not set.
# Allowed values: n, where n >= 0
# Default value: 0
maxPowerMaxVolumesPerNode: 0
# controller: configure controller specific parameters
controller:
# controllerCount: Define the number of PowerMax controller nodes
@ -255,8 +262,8 @@ enableCHAP: false
csireverseproxy:
# image: Define the container images used for the reverse proxy
# Default value: None
# Example: "csipowermax-reverseproxy:v2.6.0"
image: dellemc/csipowermax-reverseproxy:v2.6.0
# Example: "csipowermax-reverseproxy:v2.7.0"
image: dellemc/csipowermax-reverseproxy:v2.7.0
# "tlsSecret" defines the TLS secret that is created with certificate
# and its associated key
# Default value: None
@ -375,7 +382,7 @@ replication:
enabled: false
# Change this to use any specific version of the dell-csi-replicator sidecar
# Default value: None
image: dellemc/dell-csi-replicator:v1.5.0
image: dellemc/dell-csi-replicator:v1.6.0
# replicationContextPrefix enables side cars to read
# required information from the volume context
# Default value: "powermax"
@ -396,10 +403,10 @@ migration:
enabled: false
# Change this to use any specific version of the dell-csi-migrator sidecar
# Default value: None
image: dellemc/dell-csi-migrator:v1.1.1
image: dellemc/dell-csi-migrator:v1.2.0
# Node rescan sidecar does a rescan on nodes for identifying new paths
# Default value: dellemc/dell-csi-node-rescanner:v1.0.1
nodeRescanSidecarImage: dellemc/dell-csi-node-rescanner:v1.0.1
# Default value: None
nodeRescanSidecarImage: dellemc/dell-csi-node-rescanner:v1.1.0
# migrationPrefix: Determine if migration is enabled
# Default value: "migration.storage.dell.com"
# Examples: "migration.storage.dell.com"
@ -415,8 +422,8 @@ migration:
authorization:
enabled: false
# sidecarProxyImage: the container image used for the csm-authorization-sidecar.
# Default value: dellemc/csm-authorization-sidecar:v1.7.0
sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.7.0
# Default value: dellemc/csm-authorization-sidecar:v1.8.0
sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0
# proxyHost: hostname of the csm-authorization server
# Default value: None
proxyHost:
@ -427,6 +434,20 @@ authorization:
# Default value: "true"
skipCertificateValidation: true
# Storage Capacity Tracking
# Note: Capacity tracking is supported in kubernetes v1.24 and above, this feature will be automatically disabled in older versions.
storageCapacity:
# enabled : Enable/Disable storage capacity tracking
# Allowed values:
# true: enable storage capacity tracking
# false: disable storage capacity tracking
# Default value: true
enabled: true
# pollInterval : Configure how often external-provisioner polls the driver to detect changed capacity
# Allowed values: 1m,2m,3m,...,10m,...,60m etc
# Default value: 5m
pollInterval: 5m
# VMware/vSphere virtualization support
# set enable to true, if you to enable VMware virtualized environment support via RDM
# Allowed Values:

View File

@ -4,7 +4,7 @@ annotations:
catalog.cattle.io/kube-version: '>= 1.16.0-0'
catalog.cattle.io/release-name: federatorai
apiVersion: v2
appVersion: 5.1.3-ga
appVersion: 5.1.4-b2262
description: Federator.ai helps enterprises optimize cloud resources, maximize application
performance, and save significant cost without excessive over-provisioning or under-provisioning
of resources, meeting the service-level requirements of their applications.
@ -24,4 +24,4 @@ maintainers:
name: federatorai
sources:
- https://www.prophetstor.com
version: 5.1.3
version: 5.1.4

View File

@ -15,7 +15,7 @@ questions:
group: "Container Images"
label: Federator.ai Image Registry
- variable: global.imageTag
default: "v5.1.3-ga"
default: "v5.1.4-b2262"
description: "Federator.ai image tag"
type: string
group: "Container Images"

View File

@ -54,6 +54,8 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: LOG_LEVEL
value: warning
- name: DATAHUB_ADDRESS
value: alameda-datahub.{{ .Release.Namespace }}.svc:50050
- name: PREDICT_QUEUE_URL

View File

@ -516,6 +516,7 @@ data:
group_names = []
historical_data_restart_limit = $HISTORICAL_DATA_RESTART_LIMIT
handle_missing_data_times = $HANDLE_MISSING_DATA_TIMES
stop_when_no_data = $STOP_WHEN_NO_DATA
## Rancher Prometheus integration: inputs.data_collector ##
[[inputs.data_collector]]
@ -548,6 +549,7 @@ data:
group_names = []
historical_data_restart_limit = $HISTORICAL_DATA_RESTART_LIMIT
handle_missing_data_times = $HANDLE_MISSING_DATA_TIMES
stop_when_no_data = $STOP_WHEN_NO_DATA
## Prometheus integration: inputs.data_collector ##
[[inputs.data_collector]]
@ -580,6 +582,7 @@ data:
group_names = []
historical_data_restart_limit = $HISTORICAL_DATA_RESTART_LIMIT
handle_missing_data_times = $HANDLE_MISSING_DATA_TIMES
stop_when_no_data = $STOP_WHEN_NO_DATA
## Datadog integration: inputs.data_collector
[[inputs.data_collector]]
@ -609,6 +612,7 @@ data:
cluster_name = "default"
historical_data_restart_limit = $HISTORICAL_DATA_RESTART_LIMIT
handle_missing_data_times = $HANDLE_MISSING_DATA_TIMES
stop_when_no_data = $STOP_WHEN_NO_DATA
## Sysdig integration: inputs.data_collector ##
[[inputs.data_collector]]
@ -641,6 +645,7 @@ data:
group_names = []
historical_data_restart_limit = $HISTORICAL_DATA_RESTART_LIMIT
handle_missing_data_times = $HANDLE_MISSING_DATA_TIMES
stop_when_no_data = $STOP_WHEN_NO_DATA
## VMware integration: inputs.data_collector ##
#[[inputs.data_collector]]
@ -706,38 +711,40 @@ data:
group_names = []
historical_data_restart_limit = $HISTORICAL_DATA_RESTART_LIMIT
handle_missing_data_times = $HANDLE_MISSING_DATA_TIMES
stop_when_no_data = $STOP_WHEN_NO_DATA
## Azure integration: inputs.data_collector
#[[inputs.data_collector]]
# alias = "azure_metrics_collector"
# #interval = "5m"
# query_start_time_offset = "-10m"
# query_end_time_offset = "0m" #Support s(second),m(minute),h(hour)
# retry_interval = "$DATASOURCE_METRICS_RETRY_INTERVAL"
# max_retry_times = $DATASOURCE_METRICS_MAX_RETRY_TIMES
# ## data source type from which to query data
# ## accept values: vmware
# source = "azure"
# ## which collector to handle the data collection
# collector = "azure"
# ## account name
# account = ""
# ## authenticated token path
# token= ""
# ## TLS Insecure skip verify
# insecure_skip_verify = true
# ## one URL from which to read formatted metrics
# url = ""
# ## metrics schema path
# metric_path = ["/etc/telegraf/schema/azure_historical_metrics.json"]
# config_file = "/etc/telegraf/schema/collector_azure_config.json"
# cluster_name = "${CLUSTER_NAME}"
# discover_path = ""
# controller_name = []
# node_uids = []
# group_names = []
# historical_data_restart_limit = $HISTORICAL_DATA_RESTART_LIMIT
# handle_missing_data_times = $HANDLE_MISSING_DATA_TIMES
[[inputs.data_collector]]
alias = "azure_metrics_collector"
#interval = "5m"
query_start_time_offset = "-10m"
query_end_time_offset = "0m" #Support s(second),m(minute),h(hour)
retry_interval = "$DATASOURCE_METRICS_RETRY_INTERVAL"
max_retry_times = $DATASOURCE_METRICS_MAX_RETRY_TIMES
## data source type from which to query data
## accept values: vmware
source = "azure"
## which collector to handle the data collection
collector = "azure"
## account name
account = ""
## authenticated token path
token= ""
## TLS Insecure skip verify
insecure_skip_verify = true
## one URL from which to read formatted metrics
url = ""
## metrics schema path
metric_path = ["/etc/telegraf/schema/azure_historical_metrics.json"]
config_file = "/etc/telegraf/schema/collector_azure_config.json"
cluster_name = "${CLUSTER_NAME}"
discover_path = ""
controller_name = []
node_uids = []
group_names = []
historical_data_restart_limit = $HISTORICAL_DATA_RESTART_LIMIT
handle_missing_data_times = $HANDLE_MISSING_DATA_TIMES
stop_when_no_data = $STOP_WHEN_NO_DATA
## GCP integration: inputs.data_collector
[[inputs.data_collector]]
@ -770,6 +777,7 @@ data:
group_names = []
historical_data_restart_limit = $HISTORICAL_DATA_RESTART_LIMIT
handle_missing_data_times = $HANDLE_MISSING_DATA_TIMES
stop_when_no_data = $STOP_WHEN_NO_DATA
## Federation Prometheus/Prometheus integration: outputs.alameda_datahub ##
[[outputs.alameda_datahub]]

View File

@ -939,34 +939,34 @@ data:
# group_names = []
## Azure integration: inputs.data_collector
#[[inputs.data_collector]]
# alias = "azure_metrics_collector"
# interval = "5m"
# query_start_time_offset = "-10m"
# query_end_time_offset = "0m" #Support s(second),m(minute),h(hour)
# retry_interval = "$DATASOURCE_METRICS_RETRY_INTERVAL"
# max_retry_times = $DATASOURCE_METRICS_MAX_RETRY_TIMES
# ## data source type from which to query data
# ## accept values: vmware
# source = "azure"
# ## which collector to handle the data collection
# collector = "azure"
# ## account name
# account = ""
# ## authenticated token path
# token= ""
# ## TLS Insecure skip verify
# insecure_skip_verify = true
# ## one URL from which to read formatted metrics
# url = ""
# ## metrics schema path
# metric_path = ["/etc/telegraf/schema/azure_metrics.json"]
# config_file = "/etc/telegraf/schema/collector_azure_config.json"
# cluster_name = "${CLUSTER_NAME}"
# discover_path = ""
# controller_name = []
# node_uids = []
# group_names = []
[[inputs.data_collector]]
alias = "azure_metrics_collector"
interval = "5m"
query_start_time_offset = "-10m"
query_end_time_offset = "0m" #Support s(second),m(minute),h(hour)
retry_interval = "$DATASOURCE_METRICS_RETRY_INTERVAL"
max_retry_times = $DATASOURCE_METRICS_MAX_RETRY_TIMES
## data source type from which to query data
## accept values: vmware
source = "azure"
## which collector to handle the data collection
collector = "azure"
## account name
account = ""
## authenticated token path
token= ""
## TLS Insecure skip verify
insecure_skip_verify = true
## one URL from which to read formatted metrics
url = ""
## metrics schema path
metric_path = ["/etc/telegraf/schema/azure_metrics.json"]
config_file = "/etc/telegraf/schema/collector_azure_config.json"
cluster_name = "${CLUSTER_NAME}"
discover_path = ""
controller_name = []
node_uids = []
group_names = []
## GCP integration: inputs.data_collector
#[[inputs.data_collector]]
@ -2056,3 +2056,22 @@ data:
path = "/test-metrics"
metric_prefix = "federatorai_sysdig_"
expiration_interval = "5m"
## Export DA's metrics for health status check and performance analysis
[[inputs.data_adapter_statistics]]
datahub_enable = true
aws_enable = true
prometheus_enable = true
sysdig_enable = true
vmware_enable = true
datadog_enable = true
[[outputs.prometheus_client]]
namepass = ["federatorai_data_adapter_datasource_*"]
collectors_exclude = ["gocollector", "process"]
default_value = -1
export_all_metrics = true
## Address to listen on
listen = ":8084"
## Path to publish the metrics on.
path = "/test-metrics"
expiration_interval = "5m"

View File

@ -162,6 +162,8 @@ spec:
value: "1"
- name: AWS_METRIC_LIST
value: "CPUUtilization,mem_used_percent,Memory % Committed Bytes In Use,NetworkIn,NetworkOut,DiskReadBytes,EBSReadBytes,DiskWriteBytes,EBSWriteBytes,GroupMinSize,GroupMaxSize,GroupDesiredCapacity,GroupInServiceInstances,GroupPendingInstances,GroupStandbyInstances,GroupTerminatingInstances,GroupTotalInstances"
- name: STOP_WHEN_NO_DATA
value: "true"
{{- if .Values.federatoraiDataAdapter.image }}
image: {{ .Values.federatoraiDataAdapter.image }}
{{- else }}

View File

@ -2384,9 +2384,9 @@ data:
exit $err_code
fi
# Still use kubectl version to verify server connection
$verify_cmd version|grep -q "^Server"
$verify_cmd version -o yaml | grep -q "^serverVersion:"
else
$kube_cmd version|grep -q "^Server"
$kube_cmd version -o yaml | grep -q "^serverVersion:"
fi
if [ "$?" != "0" ];then

View File

@ -25,6 +25,7 @@ rules:
- ""
resources:
- pods
- services
verbs:
- get
- list

View File

@ -8,7 +8,7 @@ global:
## @param global.imageTag Image tag of Federator.ai
## For example:
## imageTag: "v5.1.2-ga"
imageTag: "v5.1.3-ga"
imageTag: "v5.1.4-b2262"
## @param global.imagePullPolicy Specify a imagePullPolicy
## For example:
## imagePullPolicy: "IfNotPresent"

View File

@ -6,4 +6,4 @@ dependencies:
repository: https://charts.redpanda.com
version: 0.1.5
digest: sha256:1c770fac6e8dee7fb5731db478dd04350e310e5cf1dccf2a74ae5d6e6ee85dc8
generated: "2023-09-15T11:53:46.309229737Z"
generated: "2023-09-20T15:34:49.205852605Z"

View File

@ -37,4 +37,4 @@ name: redpanda
sources:
- https://github.com/redpanda-data/helm-charts
type: application
version: 5.4.2
version: 5.4.6

View File

@ -22,4 +22,5 @@ storage:
cloud_storage_region: "${AWS_REGION}"
cloud_storage_bucket: "${TEST_BUCKET}"
cloud_storage_segment_max_upload_interval_sec: 1
license_key: "${REDPANDA_SAMPLE_LICENSE}"
enterprise:
license: "${REDPANDA_SAMPLE_LICENSE}"

View File

@ -23,7 +23,8 @@ storage:
cloud_storage_segment_max_upload_interval_sec: 1
cloud_storage_access_key: "${GCP_ACCESS_KEY_ID}"
cloud_storage_secret_key: "${GCP_SECRET_ACCESS_KEY}"
license_key: "${REDPANDA_SAMPLE_LICENSE}"
enterprise:
license: "${REDPANDA_SAMPLE_LICENSE}"
resources:

View File

@ -23,7 +23,8 @@ storage:
cloud_storage_azure_storage_account: ${TEST_STORAGE_ACCOUNT}
cloud_storage_azure_container: ${TEST_STORAGE_CONTAINER}
cloud_storage_azure_shared_key: ${TEST_AZURE_SHARED_KEY}
license_key: "${REDPANDA_SAMPLE_LICENSE}"
enterprise:
license: "${REDPANDA_SAMPLE_LICENSE}"
resources:
cpu:

View File

@ -13,9 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
---
license_secret_ref:
secret_name: redpanda-license
secret_key: license-key
enterprise:
licenseSecretRef:
name: redpanda-license
key: license-key
storage:
tieredConfig:

View File

@ -625,7 +625,7 @@ advertised-host returns a json string with the data needed for configuring the a
{{- end -}}
{{- define "is-licensed" -}}
{{- toJson (dict "bool" (or (not (empty .Values.license_key)) (not (empty .Values.license_secret_ref)))) -}}
{{- toJson (dict "bool" (or (not (empty (include "enterprise-license" . ))) (not (empty (include "enterprise-secret" . ))))) -}}
{{- end -}}
{{/*
@ -682,7 +682,99 @@ return correct secretName to use based if secretRef exists
{{- define "cert-secret-name" -}}
{{- if .tempCert.cert.secretRef -}}
{{- .tempCert.cert.secretRef.name -}}
{{- else }}
{{- else -}}
{{- include "redpanda.fullname" . }}-{{ .tempCert.name }}-cert
{{- end -}}
{{- end -}}
{{/*
return license checks deprecated values if current values is empty
*/}}
{{- define "enterprise-license" -}}
{{- if dig "license" dict .Values.enterprise -}}
{{- .Values.enterprise.license -}}
{{- else -}}
{{- .Values.license_key -}}
{{- end -}}
{{- end -}}
{{/*
return licenseSecretRef checks deprecated values entry if current values empty
*/}}
{{- define "enterprise-secret" -}}
{{- if ( dig "licenseSecretRef" dict .Values.enterprise ) -}}
{{- .Values.enterprise.licenseSecretRef -}}
{{- else if not (empty .Values.license_secret_ref ) -}}
{{- .Values.license_secret_ref -}}
{{- end -}}
{{- end -}}
{{/*
return licenseSecretRef.name checks deprecated values entry if current values empty
*/}}
{{- define "enterprise-secret-name" -}}
{{- if ( dig "licenseSecretRef" dict .Values.enterprise ) -}}
{{- dig "name" "" .Values.enterprise.licenseSecretRef -}}
{{- else if not (empty .Values.license_secret_ref ) -}}
{{- dig "secret_name" "" .Values.license_secret_ref -}}
{{- end -}}
{{- end -}}
{{/*
return licenseSecretRef.key checks deprecated values entry if current values empty
*/}}
{{- define "enterprise-secret-key" -}}
{{- if ( dig "licenseSecretRef" dict .Values.enterprise ) -}}
{{- dig "key" "" .Values.enterprise.licenseSecretRef -}}
{{- else if not (empty .Values.license_secret_ref ) -}}
{{- dig "secret_key" "" .Values.license_secret_ref -}}
{{- end -}}
{{- end -}}
{{/* mounts that are common to all containers */}}
{{- define "common-mounts" -}}
{{- if and .Values.auth.sasl.enabled (not (empty .Values.auth.sasl.secretRef )) }}
- name: users
mountPath: /etc/secrets/users
readOnly: true
{{- end }}
{{- if (include "tls-enabled" . | fromJson).bool }}
{{- range $name, $cert := .Values.tls.certs }}
- name: redpanda-{{ $name }}-cert
mountPath: {{ printf "/etc/tls/certs/%s" $name }}
{{- end }}
{{- end }}
{{- end -}}
{{/* mounts that are common to most containers */}}
{{- define "default-mounts" -}}
- name: config
mountPath: /etc/redpanda
{{- include "common-mounts" . }}
{{- end -}}
{{/* volumes that are common to all pods */}}
{{- define "common-volumes" -}}
{{- if (include "tls-enabled" . | fromJson).bool -}}
{{- range $name, $cert := .Values.tls.certs }}
{{- $r := set $ "tempCert" ( dict "name" $name "cert" $cert ) }}
- name: redpanda-{{ $name }}-cert
secret:
secretName: {{ template "cert-secret-name" $r }}
defaultMode: 0o440
{{- end }}
{{- end -}}
{{- if and .Values.auth.sasl.enabled (not (empty .Values.auth.sasl.secretRef )) }}
- name: users
secret:
secretName: {{ .Values.auth.sasl.secretRef }}
{{- end }}
{{- end -}}
{{/* the default set of volumes for most pods, except the sts pod */}}
{{- define "default-volumes" -}}
- name: config
configMap:
name: {{ include "redpanda.fullname" . }}
{{- include "common-volumes" . }}
{{- end -}}

View File

@ -15,6 +15,28 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{ $values := .Values }}
{{/* Secret */}}
{{ $secretConfig := dict }}
{{ if and .Values.console.enabled (not .Values.console.secret.create) }}
{{ $licenseKey := ( include "enterprise-license" . ) }}
{{ $secretConfig = ( dict
"create" true
"enterprise" ( dict "license" $licenseKey)
)
}}
{{ $config := dict
"Values" (dict
"secret" $secretConfig
)}}
{{ $console := deepCopy .Subcharts.console }}
{{ $console = merge $config $console }}
---
{{ include (print .Subcharts.console.Template.BasePath "/secret.yaml") $console }}
{{ end }}
{{ $configmap := dict }}
{{/* if the console chart has the creation of the configmap disabled, create it here instead */}}
{{ if and .Values.console.enabled (not .Values.console.configmap.create) }}
@ -93,19 +115,22 @@ limitations under the License.
"kafka" $consoleConfigKafka
"connect" $connectConfig
}}
{{ $config := dict
"Values" (dict
"console" (dict "config" $consoleConfig)
"configmap" $consoleConfigmap
"secret" $secretConfig
)
}}
{{ $console := deepCopy .Subcharts.console }}
{{ $console = merge $config $console }}
---
{{ include (print .Subcharts.console.Template.BasePath "/configmap.yaml") $console }}
{{ $configmap = include (print .Subcharts.console.Template.BasePath "/configmap.yaml") $console }}
{{ end }}
{{/* Deployment */}}
{{ if and .Values.console.enabled (not .Values.console.deployment.create) }}
@ -229,12 +254,26 @@ limitations under the License.
"value" (print (include "admin-http-protocol" .) "://" (include "admin-api-service-url" .))
)}}
{{ $enterprise := dict }}
{{ if ( include "enterprise-secret" .) }}
{{ $enterprise = dict
"licenseSecretRef" ( dict
"name" ( include "enterprise-secret-name" . )
"key" ( include "enterprise-secret-key" . )
)
}}
{{ end }}
{{ $extraEnv := concat $kafkaTLS $schemaRegistryTLS $adminAPI}}
{{ $consoleValues := dict "Values" (dict
{{ $consoleValues := dict
"Values" (dict
"extraVolumes" $extraVolumes
"extraVolumeMounts" $extraVolumeMounts
"extraEnv" $extraEnv
"secret" $secretConfig
"enterprise" $enterprise
)}}
{{ if not (empty $command) }}
{{ $consoleValues := merge $consoleValues (dict "Values" (dict "deployment" (dict "command" $command))) }}
{{ end }}
@ -246,6 +285,7 @@ limitations under the License.
{{ $helmVars := deepCopy .Subcharts.console }}
{{ $helmVars := merge $consoleValues $helmVars }}
---
{{ include (print .Subcharts.console.Template.BasePath "/deployment.yaml") $helmVars }}
{{ end }}

View File

@ -70,23 +70,23 @@ spec:
containers:
- name: {{ template "redpanda.name" . }}-post-install
image: {{ .Values.image.repository }}:{{ template "redpanda.tag" . }}
{{- if not (empty .Values.license_secret_ref) }}
{{- if not ( empty (include "enterprise-secret" . ) ) }}
env:
- name: REDPANDA_LICENSE
valueFrom:
secretKeyRef:
name: {{ .Values.license_secret_ref.secret_name }}
key: {{ .Values.license_secret_ref.secret_key }}
name: {{ include "enterprise-secret-name" . }}
key: {{ include "enterprise-secret-key" . }}
{{- end }}
command: ["bash","-c"]
args:
- |
set -e
{{- if (include "redpanda-atleast-22-2-0" . | fromJson).bool }}
{{- if not (empty .Values.license_secret_ref) }}
{{- if not (empty (include "enterprise-secret" . ) ) }}
rpk cluster license set "$REDPANDA_LICENSE" {{ template "rpk-acl-user-flags" $ }}
{{- else if not (empty .Values.license_key) }}
rpk cluster license set {{ .Values.license_key | quote }} {{ template "rpk-acl-user-flags" $ }}
{{- else if not ( empty (include "enterprise-license" . ) ) }}
rpk cluster license set {{ include "enterprise-license" . | quote }} {{ template "rpk-acl-user-flags" $ }}
{{- end }}
{{- end }}
{{- with .Values.post_install_job.resources }}
@ -94,51 +94,7 @@ spec:
{{- toYaml . | nindent 10 }}
{{- end }}
securityContext: {{ include "container-security-context" . | nindent 10 }}
volumeMounts:
- name: {{ template "redpanda.fullname" . }}
mountPath: /tmp/base-config
- name: config
mountPath: /etc/redpanda
{{- if (include "tls-enabled" . | fromJson).bool }}
{{- range $name, $cert := .Values.tls.certs }}
- name: redpanda-{{ $name }}-cert
mountPath: {{ printf "/etc/tls/certs/%s" $name }}
{{- end }}
{{- end }}
{{- if and $sasl.enabled (not (empty $sasl.secretRef )) }}
- name: {{ $sasl.secretRef }}
mountPath: "/etc/secrets/users"
readOnly: true
{{- end}}
volumes:
- name: {{ template "redpanda.fullname" . }}
configMap:
name: {{ template "redpanda.fullname" . }}
- name: config
emptyDir: {}
{{- if (include "tls-enabled" . | fromJson).bool }}
{{- range $name, $cert := .Values.tls.certs }}
{{- $r := set $root "tempCert" ( dict "name" $name "cert" $cert ) }}
- name: redpanda-{{ $name }}-cert
secret:
defaultMode: 420
items:
- key: tls.key
path: tls.key
- key: tls.crt
path: tls.crt
{{- if $cert.caEnabled }}
- key: ca.crt
path: ca.crt
{{- end }}
secretName: {{ template "cert-secret-name" $r }}
{{- end }}
{{- end -}}
{{- if and $sasl.enabled (not (empty $sasl.secretRef )) }}
- name: {{ $sasl.secretRef }}
secret:
secretName: {{ $sasl.secretRef }}
optional: false
{{- end }}
volumeMounts: {{- include "default-mounts" . | nindent 10 }}
volumes: {{ include "default-volumes" . | nindent 8 }}
serviceAccountName: {{ include "redpanda.serviceAccountName" . }}
{{- end -}}

View File

@ -91,50 +91,6 @@ spec:
envFrom:
{{- include "common.tplvalues.render" (dict "value" .Values.post_upgrade_job.extraEnvFrom "context" $) | nindent 10 }}
{{- end }}
volumeMounts:
- name: {{ template "redpanda.fullname" . }}
mountPath: /tmp/base-config
- name: config
mountPath: /etc/redpanda
{{- if (include "tls-enabled" . | fromJson).bool }}
{{- range $name, $cert := .Values.tls.certs }}
- name: redpanda-{{ $name }}-cert
mountPath: {{ printf "/etc/tls/certs/%s" $name }}
{{- end }}
{{- end }}
{{- if and $sasl.enabled (not (empty $sasl.secretRef )) }}
- name: {{ $sasl.secretRef }}
mountPath: "/etc/secrets/users"
readOnly: true
{{- end}}
volumes:
- name: {{ template "redpanda.fullname" . }}
configMap:
name: {{ template "redpanda.fullname" . }}
- name: config
emptyDir: {}
{{- if (include "tls-enabled" . | fromJson).bool }}
{{- range $name, $cert := .Values.tls.certs }}
{{- $r := set $root "tempCert" ( dict "name" $name "cert" $cert ) }}
- name: redpanda-{{ $name }}-cert
secret:
defaultMode: 420
items:
- key: tls.key
path: tls.key
- key: tls.crt
path: tls.crt
{{- if $cert.caEnabled }}
- key: ca.crt
path: ca.crt
{{- end }}
secretName: {{ template "cert-secret-name" $r }}
{{- end }}
{{- end -}}
{{- if and $sasl.enabled (not (empty $sasl.secretRef )) }}
- name: {{ $sasl.secretRef }}
secret:
secretName: {{ $sasl.secretRef }}
optional: false
{{- end }}
volumeMounts: {{- include "default-mounts" . | nindent 10 }}
volumes: {{ include "default-volumes" . | nindent 8 }}
{{- end }}

View File

@ -78,43 +78,43 @@ spec:
privileged: true
runAsUser: 0
runAsGroup: 0
volumeMounts:
{{- if dig "initContainers" "tuning" "extraVolumeMounts" false .Values.statefulset -}}
{{ tpl .Values.statefulset.initContainers.tuning.extraVolumeMounts . | nindent 12 }}
{{- end }}
volumeMounts: {{ include "common-mounts" . | nindent 12 }}
{{- if dig "initContainers" "tuning" "extraVolumeMounts" false .Values.statefulset -}}
{{ tpl .Values.statefulset.initContainers.tuning.extraVolumeMounts . | nindent 12 }}
{{- end }}
- name: {{ template "redpanda.fullname" . }}
mountPath: /etc/redpanda
{{- if get .Values.statefulset.initContainers.tuning "resources" }}
{{- if get .Values.statefulset.initContainers.tuning "resources" }}
resources: {{- toYaml .Values.statefulset.initContainers.tuning.resources | nindent 12 }}
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.statefulset.initContainers.setDataDirOwnership.enabled }}
- name: set-datadir-ownership
image: {{ .Values.statefulset.initContainerImage.repository }}:{{ .Values.statefulset.initContainerImage.tag }}
command: ["/bin/sh", "-c", "chown {{ $uid }}:{{ $gid }} -R /var/lib/redpanda/data"]
volumeMounts:
{{- if dig "initContainers" "setDataDirOwnership" "extraVolumeMounts" false .Values.statefulset -}}
{{ tpl .Values.statefulset.initContainers.setDataDirOwnership.extraVolumeMounts . | nindent 12 }}
{{- end }}
volumeMounts: {{ include "common-mounts" . | nindent 12 }}
{{- if dig "initContainers" "setDataDirOwnership" "extraVolumeMounts" false .Values.statefulset -}}
{{ tpl .Values.statefulset.initContainers.setDataDirOwnership.extraVolumeMounts . | nindent 12 }}
{{- end }}
- name: datadir
mountPath: /var/lib/redpanda/data
{{- if .Values.statefulset.initContainers.setDataDirOwnership.resources }}
{{- if .Values.statefulset.initContainers.setDataDirOwnership.resources }}
resources: {{- toYaml .Values.statefulset.initContainers.setDataDirOwnership.resources | nindent 12 }}
{{- end }}
{{- end }}
{{- end }}
{{- if and (include "is-licensed" . | fromJson).bool .Values.storage.tieredConfig.cloud_storage_enabled }}
- name: set-tiered-storage-cache-dir-ownership
image: {{ .Values.statefulset.initContainerImage.repository }}:{{ .Values.statefulset.initContainerImage.tag }}
command: ["/bin/sh", "-c", 'chown {{ $uid }}:{{ $gid }} -R {{ template "tieredStorage.cacheDirectory" . }}']
volumeMounts:
{{- if dig "initContainers" "setTieredStorageCacheDirOwnership" "extraVolumeMounts" false .Values.statefulset -}}
{{ tpl .Values.statefulset.initContainers.setTieredStorageCacheDirOwnership.extraVolumeMounts . | nindent 12 }}
{{- end }}
volumeMounts: {{ include "common-mounts" . | nindent 12 }}
{{- if dig "initContainers" "setTieredStorageCacheDirOwnership" "extraVolumeMounts" false .Values.statefulset -}}
{{ tpl .Values.statefulset.initContainers.setTieredStorageCacheDirOwnership.extraVolumeMounts . | nindent 12 }}
{{- end }}
- name: tiered-storage-dir
mountPath: {{ template "tieredStorage.cacheDirectory" . }}
{{- if get .Values.statefulset.initContainers.setTieredStorageCacheDirOwnership "resources" }}
{{- if get .Values.statefulset.initContainers.setTieredStorageCacheDirOwnership "resources" }}
resources: {{- toYaml .Values.statefulset.initContainers.setTieredStorageCacheDirOwnership.resources | nindent 12 }}
{{- end }}
{{- end }}
{{- end }}
- name: {{ (include "redpanda.name" .) | trunc 51 }}-configurator
image: {{ .Values.image.repository }}:{{ template "redpanda.tag" . }}
@ -134,21 +134,21 @@ spec:
fieldRef:
fieldPath: spec.nodeName
securityContext: {{ include "container-security-context" . | nindent 12 }}
volumeMounts:
volumeMounts: {{ include "common-mounts" . | nindent 12 }}
{{- if dig "initContainers" "configurator" "extraVolumeMounts" false .Values.statefulset -}}
{{ tpl .Values.statefulset.initContainers.configurator.extraVolumeMounts . | nindent 12 }}
{{ tpl .Values.statefulset.initContainers.configurator.extraVolumeMounts . | nindent 12 }}
{{- end }}
- name: {{ template "redpanda.fullname" . }}
mountPath: /tmp/base-config
- name: config
mountPath: /etc/redpanda
- name: {{ template "redpanda.fullname" . }}
mountPath: /tmp/base-config
- name: {{ (include "redpanda.name" .) | trunc 51 }}-configurator
mountPath: /etc/secrets/configurator/scripts/
{{- if get .Values.statefulset.initContainers.configurator "resources" }}
{{- if get .Values.statefulset.initContainers.configurator "resources" }}
resources: {{- toYaml .Values.statefulset.initContainers.configurator.resources | nindent 12 }}
{{- end }}
{{- end }}
{{- if dig "initContainers" "extraInitContainers" false .Values.statefulset -}}
{{ tpl .Values.statefulset.initContainers.extraInitContainers . | nindent 8 }}
{{ tpl .Values.statefulset.initContainers.extraInitContainers . | nindent 8 }}
{{- end }}
containers:
- name: {{ template "redpanda.name" . }}
@ -250,10 +250,14 @@ spec:
{{- end }}
{{- end }}
securityContext: {{ include "container-security-context" . | nindent 12 }}
volumeMounts:
volumeMounts: {{ include "common-mounts" . | nindent 12 }}
{{- if dig "extraVolumeMounts" false .Values.statefulset -}}
{{ tpl .Values.statefulset.extraVolumeMounts . | nindent 12 }}
{{ tpl .Values.statefulset.extraVolumeMounts . | nindent 12 }}
{{- end }}
- name: config
mountPath: /etc/redpanda
- name: {{ template "redpanda.fullname" . }}
mountPath: /tmp/base-config
- name: lifecycle-scripts
mountPath: /var/lifecycle
- name: datadir
@ -262,19 +266,6 @@ spec:
- name: tiered-storage-dir
mountPath: {{ template "tieredStorage.cacheDirectory" . }}
{{- end }}
- name: config
mountPath: /etc/redpanda
{{- if (include "tls-enabled" . | fromJson).bool }}
{{- range $name, $cert := .Values.tls.certs }}
- name: redpanda-{{ $name }}-cert
mountPath: {{ printf "/etc/tls/certs/%s" $name }}
{{- end }}
{{- end }}
{{- if and .Values.auth.sasl.enabled (not (empty .Values.auth.sasl.secretRef )) }}
- name: {{ .Values.auth.sasl.secretRef }}
mountPath: /etc/secrets/users
readOnly: true
{{- end}}
resources:
{{- if hasKey .Values.resources.memory "min" }}
requests:
@ -284,7 +275,7 @@ spec:
limits:
cpu: {{ .Values.resources.cpu.cores }}
memory: {{ .Values.resources.memory.container.max }}
{{- if .Values.statefulset.sideCars.configWatcher.enabled }}
{{- if .Values.statefulset.sideCars.configWatcher.enabled }}
- name: config-watcher
image: {{ .Values.image.repository }}:{{ template "redpanda.tag" . }}
command:
@ -292,32 +283,20 @@ spec:
args:
- -c
- 'trap "exit 0" TERM; exec /etc/secrets/config-watcher/scripts/sasl-user.sh & wait $!'
{{- if get .Values.statefulset.sideCars.configWatcher "resources" }}
{{- if get .Values.statefulset.sideCars.configWatcher "resources" }}
resources: {{- toYaml .Values.statefulset.sideCars.configWatcher.resources | nindent 12 }}
{{- end }}
{{- if get .Values.statefulset.sideCars.configWatcher "securityContext" }}
{{- end }}
{{- if get .Values.statefulset.sideCars.configWatcher "securityContext" }}
securityContext: {{- toYaml .Values.statefulset.sideCars.configWatcher.securityContext | nindent 12 }}
{{- end }}
volumeMounts:
{{- if dig "sideCars" "configWatcher" "extraVolumeMounts" false .Values.statefulset -}}
{{ tpl .Values.statefulset.sideCars.configWatcher.extraVolumeMounts . | nindent 12 }}
{{- end }}
{{- end }}
volumeMounts: {{ include "common-mounts" . | nindent 12 }}
{{- if dig "sideCars" "configWatcher" "extraVolumeMounts" false .Values.statefulset -}}
{{ tpl .Values.statefulset.sideCars.configWatcher.extraVolumeMounts . | nindent 12 }}
{{- end }}
- name: {{ template "redpanda.fullname" . }}-config-watcher
mountPath: /etc/secrets/config-watcher/scripts
readOnly: true
{{- if and .Values.auth.sasl.enabled (not (empty .Values.auth.sasl.secretRef )) }}
- name: {{ .Values.auth.sasl.secretRef }}
mountPath: /etc/secrets/users
readOnly: true
{{- end }}
{{- if (include "tls-enabled" . | fromJson).bool }}
{{- range $name, $cert := .Values.tls.certs }}
- name: redpanda-{{ $name }}-cert
mountPath: {{ printf "/etc/tls/certs/%s" $name }}
readOnly: true
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- if and .Values.rbac.enabled .Values.statefulset.sideCars.controllers.enabled }}
- name: redpanda-controllers
image: {{ .Values.statefulset.sideCars.controllers.image.repository }}:{{ .Values.statefulset.sideCars.controllers.image.tag }}
@ -339,66 +318,42 @@ spec:
securityContext: {{- toYaml .Values.statefulset.sideCars.controllers.securityContext | nindent 12 }}
{{- end }}
{{- end }}
volumes:
{{- if dig "extraVolumes" false .Values.statefulset -}}
{{ tpl .Values.statefulset.extraVolumes . | nindent 8 }}
{{- end }}
volumes: {{ include "common-volumes" . | nindent 8 }}
{{- if dig "extraVolumes" false .Values.statefulset -}}
{{ tpl .Values.statefulset.extraVolumes . | nindent 8 }}
{{- end }}
- name: lifecycle-scripts
secret:
secretName: {{ (include "redpanda.fullname" . | trunc 50 ) }}-sts-lifecycle
defaultMode: 0o775
- name: datadir
{{- if .Values.storage.persistentVolume.enabled }}
{{- if .Values.storage.persistentVolume.enabled }}
persistentVolumeClaim:
claimName: datadir
{{- else if .Values.storage.hostPath }}
{{- else if .Values.storage.hostPath }}
hostPath:
path: {{ .Values.storage.hostPath | quote }}
{{- else }}
{{- else }}
emptyDir: {}
{{- end }}
{{- if and (include "is-licensed" . | fromJson).bool .Values.storage.tieredConfig.cloud_storage_enabled }}
{{- end }}
{{- if and (include "is-licensed" . | fromJson).bool .Values.storage.tieredConfig.cloud_storage_enabled }}
- name: tiered-storage-dir
{{- if .Values.storage.tieredStoragePersistentVolume.enabled }}
{{- if .Values.storage.tieredStoragePersistentVolume.enabled }}
persistentVolumeClaim:
claimName: tiered-storage-dir
{{- else if .Values.storage.tieredStorageHostPath }}
{{- else if .Values.storage.tieredStorageHostPath }}
hostPath:
path: {{ .Values.storage.tieredStorageHostPath | quote }}
{{- else }}
{{- else }}
emptyDir:
sizeLimit: {{ .Values.storage.tieredConfig.cloud_storage_cache_size }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
- name: {{ template "redpanda.fullname" . }}
configMap:
name: {{ template "redpanda.fullname" . }}
- name: config
emptyDir: {}
{{- if (include "tls-enabled" . | fromJson).bool }}
{{- range $name, $cert := .Values.tls.certs }}
{{- $r := set $root "tempCert" ( dict "name" $name "cert" $cert ) }}
- name: redpanda-{{ $name }}-cert
secret:
defaultMode: 420
items:
- key: tls.key
path: tls.key
- key: tls.crt
path: tls.crt
{{- if $cert.caEnabled }}
- key: ca.crt
path: ca.crt
{{- end }}
secretName: {{ template "cert-secret-name" $r }}
{{- end }}
{{- end }}
{{- if and .Values.auth.sasl.enabled (not (empty .Values.auth.sasl.secretRef )) }}
- name: {{ .Values.auth.sasl.secretRef }}
secret:
secretName: {{ .Values.auth.sasl.secretRef }}
optional: false
{{- end }}
- name: {{ (include "redpanda.name" .) | trunc 51 }}-configurator
secret:
secretName: {{ (include "redpanda.name" .) | trunc 51 }}-configurator

View File

@ -29,9 +29,7 @@ metadata:
"helm.sh/hook-delete-policy": before-hook-creation
spec:
restartPolicy: Never
securityContext:
runAsUser: 65535
runAsGroup: 65535
securityContext: {{ include "pod-security-context" . | nindent 4 }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets: {{- toYaml . | nindent 4 }}
{{- end }}
@ -48,13 +46,7 @@ spec:
--brokers {{ include "redpanda.fullname" . }}-0.{{ include "redpanda.internal.domain" . }}:{{ .Values.listeners.kafka.port }}
do sleep 2
done
volumeMounts:
- name: {{ template "redpanda.fullname" . }}
mountPath: /tmp/base-config
volumes:
- name: {{ template "redpanda.fullname" . }}
configMap:
name: {{ template "redpanda.fullname" . }}
- name: config
emptyDir: {}
volumeMounts: {{ include "default-mounts" . | nindent 8 }}
securityContext: {{ include "container-security-context" . | nindent 8 }}
volumes: {{ include "default-volumes" . | nindent 4 }}
{{- end }}

View File

@ -41,9 +41,7 @@ metadata:
"helm.sh/hook-delete-policy": before-hook-creation
spec:
restartPolicy: Never
securityContext:
runAsUser: 65535
runAsGroup: 65535
securityContext: {{ include "pod-security-context" . | nindent 4 }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets: {{- toYaml . | nindent 4 }}
{{- end }}
@ -179,32 +177,7 @@ spec:
rpk topic list {{ include "rpk-topic-flags" . }}
rpk topic delete {{ $testTopic }} source.{{ $testTopic }} mm2-offset-syncs.test-only-redpanda.internal {{ include "rpk-topic-flags" . }}
volumeMounts:
{{- if (include "tls-enabled" . | fromJson).bool -}}
{{- range $name, $cert := .Values.tls.certs }}
- name: redpanda-{{ $name }}-cert
mountPath: {{ printf "/etc/tls/certs/%s" $name }}
{{- end }}
{{- end }}
{{- if $sasl.enabled }}
- name: {{ $sasl.secretRef }}
mountPath: "/etc/secrets/users"
readOnly: true
{{- end}}
volumes:
{{- if $sasl.enabled }}
- name: {{ $sasl.secretRef }}
secret:
secretName: {{ $sasl.secretRef }}
optional: false
{{- end }}
{{- if (include "tls-enabled" . | fromJson).bool }}
{{- range $name, $cert := .Values.tls.certs }}
{{- $r := set $root "tempCert" ( dict "name" $name "cert" $cert ) }}
- name: redpanda-{{ $name }}-cert
secret:
defaultMode: 0644
secretName: {{ template "cert-secret-name" $r }}
{{- end }}
{{- end -}}
volumeMounts: {{ include "default-mounts" . | nindent 8 }}
securityContext: {{ include "container-security-context" . | nindent 8 }}
volumes: {{ include "default-volumes" . | nindent 4 }}
{{- end }}

View File

@ -29,9 +29,7 @@ metadata:
"helm.sh/hook-delete-policy": before-hook-creation
spec:
restartPolicy: Never
securityContext:
runAsUser: 65535
runAsGroup: 65535
securityContext: {{ include "pod-security-context" . | nindent 4 }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets: {{- toYaml . | nindent 4 }}
{{- end }}
@ -45,13 +43,7 @@ spec:
- -c
- |
curl -svm3 --fail --retry 120 --retry-max-time 120 --retry-all-errors http://{{ include "redpanda.fullname" . }}-console.{{ .Release.Namespace }}.svc:{{ include "console.containerPort" (dict "Values" .Values.console) }}/api/cluster
volumeMounts:
- name: {{ template "redpanda.fullname" . }}
mountPath: /tmp/base-config
volumes:
- name: {{ template "redpanda.fullname" . }}
configMap:
name: {{ template "redpanda.fullname" . }}
- name: config
emptyDir: {}
volumeMounts: {{ include "default-mounts" . | nindent 8 }}
securityContext: {{ include "container-security-context" . | nindent 8 }}
volumes: {{ include "default-volumes" . | nindent 4 }}
{{- end }}

View File

@ -31,9 +31,7 @@ metadata:
"helm.sh/hook-delete-policy": before-hook-creation
spec:
restartPolicy: Never
securityContext:
runAsUser: 65535
runAsGroup: 65535
securityContext: {{ include "pod-security-context" . | nindent 4 }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets: {{- toYaml . | nindent 4 }}
{{- end }}
@ -119,26 +117,7 @@ spec:
{{- end }}
{{- end }}
volumeMounts:
{{- range $name, $cert := .Values.tls.certs }}
- name: redpanda-{{ $name }}-cert
mountPath: {{ printf "/etc/tls/certs/%s" $name }}
{{- end }}
volumes:
{{- range $name, $cert := .Values.tls.certs }}
{{- $r := set $root "tempCert" ( dict "name" $name "cert" $cert ) }}
- name: redpanda-{{ $name }}-cert
secret:
defaultMode: 420
items:
- key: tls.key
path: tls.key
- key: tls.crt
path: tls.crt
{{- if $cert.caEnabled }}
- key: ca.crt
path: ca.crt
{{- end }}
secretName: {{ template "cert-secret-name" $r }}
{{- end }}
volumeMounts: {{ include "default-mounts" . | nindent 8 }}
securityContext: {{ include "container-security-context" . | nindent 8 }}
volumes: {{ include "default-volumes" . | nindent 4 }}
{{- end }}

View File

@ -32,9 +32,8 @@ metadata:
"helm.sh/hook-delete-policy": before-hook-creation
spec:
restartPolicy: Never
securityContext:
runAsUser: 65535
runAsGroup: 65535
securityContext: {{ include "pod-security-context" . | nindent 4 }}
fsGroup: 65535
{{- with .Values.imagePullSecrets }}
imagePullSecrets: {{- toYaml . | nindent 4 }}
{{- end }}
@ -59,26 +58,7 @@ spec:
do sleep 2
done
resources: {{ toYaml .Values.statefulset.resources | nindent 12 }}
volumeMounts:
- name: {{ template "redpanda.fullname" . }}
mountPath: /tmp/base-config
- name: config
mountPath: /etc/redpanda
{{- range $name, $cert := .Values.tls.certs }}
- name: redpanda-{{ $name }}-cert
mountPath: {{ printf "/etc/tls/certs/%s" $name }}
{{- end }}
volumes:
- name: {{ template "redpanda.fullname" . }}
configMap:
name: {{ template "redpanda.fullname" . }}
- name: config
emptyDir: {}
{{- range $name, $cert := .Values.tls.certs }}
{{- $r := set $root "tempCert" ( dict "name" $name "cert" $cert ) }}
- name: redpanda-{{ $name }}-cert
secret:
defaultMode: 0644
secretName: {{ template "cert-secret-name" $r }}
{{- end }}
volumeMounts: {{ include "default-mounts" . | nindent 8 }}
securityContext: {{ include "container-security-context" . | nindent 8 }}
volumes: {{ include "default-volumes" . | nindent 4 }}
{{- end }}

View File

@ -31,9 +31,7 @@ metadata:
"helm.sh/hook-delete-policy": before-hook-creation
spec:
restartPolicy: Never
securityContext:
runAsUser: 65535
runAsGroup: 65535
securityContext: {{ include "pod-security-context" . | nindent 4 }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets: {{- toYaml . | nindent 4 }}
{{- end }}
@ -69,39 +67,7 @@ spec:
rpk topic consume produce.consume.test.$POD_NAME -n 1 {{ include "rpk-topic-flags" . }} | grep "Pandas are awesome!"
rpk topic delete produce.consume.test.$POD_NAME {{ include "rpk-topic-flags" . }}
{{- end }}
volumeMounts:
- name: config
mountPath: /etc/redpanda
{{- if (include "tls-enabled" . | fromJson).bool -}}
{{- range $name, $cert := .Values.tls.certs }}
- name: redpanda-{{ $name }}-cert
mountPath: {{ printf "/etc/tls/certs/%s" $name }}
{{- end }}
{{- end }}
{{- if $sasl.enabled }}
- name: {{ $sasl.secretRef }}
mountPath: "/etc/secrets/users"
readOnly: true
{{- end}}
volumeMounts: {{ include "default-mounts" . | nindent 8 }}
resources: {{ toYaml .Values.statefulset.resources | nindent 12 }}
volumes:
- name: {{ template "redpanda.fullname" . }}
configMap:
name: {{ template "redpanda.fullname" . }}
- name: config
emptyDir: {}
{{- if $sasl.enabled }}
- name: {{ $sasl.secretRef }}
secret:
secretName: {{ $sasl.secretRef }}
optional: false
{{- end }}
{{- if (include "tls-enabled" . | fromJson).bool }}
{{- range $name, $cert := .Values.tls.certs }}
{{- $r := set $root "tempCert" ( dict "name" $name "cert" $cert ) }}
- name: redpanda-{{ $name }}-cert
secret:
defaultMode: 0644
secretName: {{ template "cert-secret-name" $r }}
{{- end }}
{{- end -}}
securityContext: {{ include "container-security-context" . | nindent 8 }}
volumes: {{ include "default-volumes" . | nindent 4 }}

Some files were not shown because too many files have changed in this diff Show More