diff --git a/assets/argo/argo-cd-5.45.2.tgz b/assets/argo/argo-cd-5.45.2.tgz index e59ed8097..d57ee804b 100644 Binary files a/assets/argo/argo-cd-5.45.2.tgz and b/assets/argo/argo-cd-5.45.2.tgz differ diff --git a/assets/argo/argo-cd-5.46.0.tgz b/assets/argo/argo-cd-5.46.0.tgz new file mode 100644 index 000000000..322a39aff Binary files /dev/null and b/assets/argo/argo-cd-5.46.0.tgz differ diff --git a/assets/bitnami/airflow-15.0.4.tgz b/assets/bitnami/airflow-15.0.4.tgz new file mode 100644 index 000000000..e85c23dd5 Binary files /dev/null and b/assets/bitnami/airflow-15.0.4.tgz differ diff --git a/assets/bitnami/kafka-25.1.10.tgz b/assets/bitnami/kafka-25.1.10.tgz new file mode 100644 index 000000000..77647c74d Binary files /dev/null and b/assets/bitnami/kafka-25.1.10.tgz differ diff --git a/assets/bitnami/postgresql-12.11.1.tgz b/assets/bitnami/postgresql-12.11.1.tgz new file mode 100644 index 000000000..df4eea5a2 Binary files /dev/null and b/assets/bitnami/postgresql-12.11.1.tgz differ diff --git a/assets/cockroach-labs/cockroachdb-11.1.6.tgz b/assets/cockroach-labs/cockroachdb-11.1.6.tgz new file mode 100644 index 000000000..19c7a1fb6 Binary files /dev/null and b/assets/cockroach-labs/cockroachdb-11.1.6.tgz differ diff --git a/assets/datadog/datadog-3.35.2.tgz b/assets/datadog/datadog-3.35.2.tgz new file mode 100644 index 000000000..2850f359a Binary files /dev/null and b/assets/datadog/datadog-3.35.2.tgz differ diff --git a/assets/jenkins/jenkins-4.6.4.tgz b/assets/jenkins/jenkins-4.6.4.tgz new file mode 100644 index 000000000..260ef696d Binary files /dev/null and b/assets/jenkins/jenkins-4.6.4.tgz differ diff --git a/assets/percona/psmdb-db-1.14.4.tgz b/assets/percona/psmdb-db-1.14.4.tgz new file mode 100644 index 000000000..ae5813f69 Binary files /dev/null and b/assets/percona/psmdb-db-1.14.4.tgz differ diff --git a/assets/percona/psmdb-operator-1.14.3.tgz b/assets/percona/psmdb-operator-1.14.3.tgz new file mode 100644 index 000000000..77f7a8f9e Binary files /dev/null and b/assets/percona/psmdb-operator-1.14.3.tgz differ diff --git a/assets/percona/pxc-db-1.13.2.tgz b/assets/percona/pxc-db-1.13.2.tgz new file mode 100644 index 000000000..359aa715f Binary files /dev/null and b/assets/percona/pxc-db-1.13.2.tgz differ diff --git a/assets/percona/pxc-operator-1.13.3.tgz b/assets/percona/pxc-operator-1.13.3.tgz new file mode 100644 index 000000000..10b96ebb2 Binary files /dev/null and b/assets/percona/pxc-operator-1.13.3.tgz differ diff --git a/assets/speedscale/speedscale-operator-1.3.31.tgz b/assets/speedscale/speedscale-operator-1.3.31.tgz new file mode 100644 index 000000000..4f2371b18 Binary files /dev/null and b/assets/speedscale/speedscale-operator-1.3.31.tgz differ diff --git a/charts/argo/argo-cd/Chart.yaml b/charts/argo/argo-cd/Chart.yaml index 126ef8dcf..edcc38010 100644 --- a/charts/argo/argo-cd/Chart.yaml +++ b/charts/argo/argo-cd/Chart.yaml @@ -1,7 +1,7 @@ annotations: artifacthub.io/changes: | - - kind: fixed - description: do not hardcode the pathtype of the grpc ingress rule when using a single ingress resource in aws alb + - kind: added + description: added a toggle for the shared Helm working directory artifacthub.io/signKey: | fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 url: https://argoproj.github.io/argo-helm/pgp_keys.asc @@ -11,7 +11,7 @@ annotations: catalog.cattle.io/kube-version: '>=1.23.0-0' catalog.cattle.io/release-name: argo-cd apiVersion: v2 -appVersion: v2.8.2 +appVersion: v2.8.3 dependencies: - condition: redis-ha.enabled name: redis-ha @@ -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.45.2 +version: 5.46.0 diff --git a/charts/argo/argo-cd/README.md b/charts/argo/argo-cd/README.md index 125fcf697..5b780b0bd 100644 --- a/charts/argo/argo-cd/README.md +++ b/charts/argo/argo-cd/README.md @@ -655,6 +655,7 @@ NAME: my-release | repoServer.serviceAccount.name | string | `""` | Repo server service account name | | repoServer.tolerations | list | `[]` (defaults to global.tolerations) | [Tolerations] for use with node taints | | repoServer.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the repo server | +| repoServer.useEphemeralHelmWorkingDir | bool | `true` | Toggle the usage of a ephemeral Helm working directory | | repoServer.volumeMounts | list | `[]` | Additional volumeMounts to the repo server main container | | repoServer.volumes | list | `[]` | Additional volumes to the repo server pod | @@ -998,17 +999,27 @@ The main options are listed here: | Key | Type | Default | Description | |-----|------|---------|-------------| +| redis-ha.additionalAffinities | object | `{}` | Additional affinities to add to the Redis server pods. | +| redis-ha.affinity | object | `{}` | Assign custom [affinity] rules to the Redis pods. | | redis-ha.enabled | bool | `false` | Enables the Redis HA subchart and disables the custom Redis single node deployment | | redis-ha.exporter.enabled | bool | `false` | Enable Prometheus redis-exporter sidecar | | redis-ha.exporter.image | string | `"public.ecr.aws/bitnami/redis-exporter"` | Repository to use for the redis-exporter | | redis-ha.exporter.tag | string | `"1.53.0"` | Tag to use for the redis-exporter | +| redis-ha.haproxy.additionalAffinities | object | `{}` | Additional affinities to add to the haproxy pods. | +| redis-ha.haproxy.affinity | object | `{}` | Assign custom [affinity] rules to the haproxy pods. | | redis-ha.haproxy.enabled | bool | `true` | Enabled HAProxy LoadBalancing/Proxy | +| redis-ha.haproxy.hardAntiAffinity | bool | `true` | Whether the haproxy pods should be forced to run on separate nodes. | | redis-ha.haproxy.metrics.enabled | bool | `true` | HAProxy enable prometheus metric scraping | +| redis-ha.haproxy.tolerations | list | `[]` | [Tolerations] for use with node taints for haproxy pods. | +| redis-ha.hardAntiAffinity | bool | `true` | Whether the Redis server pods should be forced to run on separate nodes. | +| redis-ha.image.repository | string | `"redis"` | Redis repository | | redis-ha.image.tag | string | `"7.0.11-alpine"` | Redis tag | | redis-ha.persistentVolume.enabled | bool | `false` | Configures persistence on Redis nodes | | redis-ha.redis.config | object | See [values.yaml] | Any valid redis config options in this section will be applied to each server (see `redis-ha` chart) | | redis-ha.redis.config.save | string | `'""'` | Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""` is disabled | | redis-ha.redis.masterGroupName | string | `"argocd"` | Redis convention for naming the cluster group: must match `^[\\w-\\.]+$` and can be templated | +| redis-ha.tolerations | list | `[]` | [Tolerations] for use with node taints for Redis pods. | +| redis-ha.topologySpreadConstraints | object | `{"enabled":false,"maxSkew":"","topologyKey":"","whenUnsatisfiable":""}` | Assign custom [TopologySpreadConstraints] rules to the Redis pods. | | redis-ha.topologySpreadConstraints.enabled | bool | `false` | Enable Redis HA topology spread constraints | | redis-ha.topologySpreadConstraints.maxSkew | string | `""` (defaults to `1`) | Max skew of pods tolerated | | redis-ha.topologySpreadConstraints.topologyKey | string | `""` (defaults to `topology.kubernetes.io/zone`) | Topology key for spread | diff --git a/charts/argo/argo-cd/templates/argocd-application-controller/statefulset.yaml b/charts/argo/argo-cd/templates/argocd-application-controller/statefulset.yaml index 8faac38da..3583a2b72 100644 --- a/charts/argo/argo-cd/templates/argocd-application-controller/statefulset.yaml +++ b/charts/argo/argo-cd/templates/argocd-application-controller/statefulset.yaml @@ -23,6 +23,9 @@ spec: metadata: annotations: checksum/cmd-params: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cmd-params-cm.yaml") . | sha256sum }} + {{- 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 }} {{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.controller.podAnnotations) }} {{- range $key, $value := . }} {{ $key }}: {{ $value | quote }} diff --git a/charts/argo/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo/argo-cd/templates/argocd-repo-server/deployment.yaml index b9959018e..3080c79fd 100644 --- a/charts/argo/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -30,6 +30,9 @@ spec: {{- if .Values.repoServer.certificateSecret.enabled }} checksum/repo-server-tls: {{ include (print $.Template.BasePath "/argocd-configs/argocd-repo-server-tls-secret.yaml") . | sha256sum }} {{- end }} + {{- 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 }} {{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.repoServer.podAnnotations) }} {{- range $key, $value := . }} {{ $key }}: {{ $value | quote }} @@ -228,12 +231,14 @@ spec: key: reposerver.enable.git.submodule name: argocd-cmd-params-cm optional: true + {{- if .Values.repoServer.useEphemeralHelmWorkingDir }} - name: HELM_CACHE_HOME value: /helm-working-dir - name: HELM_CONFIG_HOME value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir + {{- end }} {{- with .Values.repoServer.envFrom }} envFrom: {{- toYaml . | nindent 10 }} @@ -252,8 +257,10 @@ spec: name: gpg-keyring - mountPath: /app/config/reposerver/tls name: argocd-repo-server-tls + {{- if .Values.repoServer.useEphemeralHelmWorkingDir }} - mountPath: /helm-working-dir name: helm-working-dir + {{- end }} - mountPath: /home/argocd/cmp-server/plugins name: plugins - mountPath: /tmp @@ -346,8 +353,10 @@ spec: {{- with .Values.repoServer.volumes }} {{- toYaml . | nindent 6 }} {{- end }} + {{- if .Values.repoServer.useEphemeralHelmWorkingDir }} - name: helm-working-dir emptyDir: {} + {{- end }} - name: plugins emptyDir: {} - name: var-files diff --git a/charts/argo/argo-cd/values.yaml b/charts/argo/argo-cd/values.yaml index e0a605430..22dcfcc63 100644 --- a/charts/argo/argo-cd/values.yaml +++ b/charts/argo/argo-cd/values.yaml @@ -1371,12 +1371,17 @@ redis: # -- Prometheus ServiceMonitor annotations annotations: {} -# This key configures Redis-HA subchart and when enabled (redis-ha.enabled=true) -# the custom redis deployment is omitted -# Check the redis-ha chart for more properties +## Redis-HA subchart replaces custom redis deployment when `redis-ha.enabled=true` +# Ref: https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha/values.yaml redis-ha: # -- Enables the Redis HA subchart and disables the custom Redis single node deployment enabled: false + ## Redis image + image: + # -- Redis repository + repository: redis + # -- Redis tag + tag: 7.0.11-alpine ## Prometheus redis-exporter sidecar exporter: # -- Enable Prometheus redis-exporter sidecar @@ -1388,6 +1393,7 @@ redis-ha: persistentVolume: # -- Configures persistence on Redis nodes enabled: false + ## Redis specific configuration options redis: # -- Redis convention for naming the cluster group: must match `^[\\w-\\.]+$` and can be templated masterGroupName: argocd @@ -1397,16 +1403,35 @@ redis-ha: # -- Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""` is disabled # @default -- `'""'` save: '""' + ## Enables a HA Proxy for better LoadBalancing / Sentinel Master support. Automatically proxies to Redis master. haproxy: # -- Enabled HAProxy LoadBalancing/Proxy enabled: true metrics: # -- HAProxy enable prometheus metric scraping enabled: true - image: - # -- Redis tag - tag: 7.0.11-alpine + # -- Whether the haproxy pods should be forced to run on separate nodes. + hardAntiAffinity: true + # -- Additional affinities to add to the haproxy pods. + additionalAffinities: {} + # -- Assign custom [affinity] rules to the haproxy pods. + affinity: {} + # -- [Tolerations] for use with node taints for haproxy pods. + tolerations: [] + # -- Whether the Redis server pods should be forced to run on separate nodes. + hardAntiAffinity: true + + # -- Additional affinities to add to the Redis server pods. + additionalAffinities: {} + + # -- Assign custom [affinity] rules to the Redis pods. + affinity: {} + + # -- [Tolerations] for use with node taints for Redis pods. + tolerations: [] + + # -- Assign custom [TopologySpreadConstraints] rules to the Redis pods. ## https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ topologySpreadConstraints: # -- Enable Redis HA topology spread constraints @@ -2152,6 +2177,9 @@ repoServer: # - name: cmp-tmp # emptyDir: {} + # -- Toggle the usage of a ephemeral Helm working directory + useEphemeralHelmWorkingDir: true + # -- Annotations to be added to repo server Deployment deploymentAnnotations: {} diff --git a/charts/bitnami/airflow/Chart.lock b/charts/bitnami/airflow/Chart.lock index ba137a778..871067042 100644 --- a/charts/bitnami/airflow/Chart.lock +++ b/charts/bitnami/airflow/Chart.lock @@ -4,9 +4,9 @@ dependencies: version: 18.0.2 - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts - version: 12.10.0 + version: 12.11.0 - name: common repository: oci://registry-1.docker.io/bitnamicharts version: 2.10.0 -digest: sha256:909a1b88eddc7aa1b4f32055f052a679aed3f01b4790830724c09073d99c692b -generated: "2023-09-05T11:31:11.531432+02:00" +digest: sha256:a9692804079727667193897b873b895ad8314b76ea55c69c000633dc78f552d9 +generated: "2023-09-07T21:53:01.446886686Z" diff --git a/charts/bitnami/airflow/Chart.yaml b/charts/bitnami/airflow/Chart.yaml index 74dede86f..fa15f5b63 100644 --- a/charts/bitnami/airflow/Chart.yaml +++ b/charts/bitnami/airflow/Chart.yaml @@ -6,20 +6,20 @@ annotations: category: WorkFlow images: | - name: airflow-exporter - image: docker.io/bitnami/airflow-exporter:0.20220314.0-debian-11-r398 + image: docker.io/bitnami/airflow-exporter:0.20220314.0-debian-11-r407 - name: airflow-scheduler - image: docker.io/bitnami/airflow-scheduler:2.7.0-debian-11-r2 + image: docker.io/bitnami/airflow-scheduler:2.7.1-debian-11-r0 - name: airflow-worker - image: docker.io/bitnami/airflow-worker:2.7.0-debian-11-r2 + image: docker.io/bitnami/airflow-worker:2.7.1-debian-11-r0 - name: airflow - image: docker.io/bitnami/airflow:2.7.0-debian-11-r5 + image: docker.io/bitnami/airflow:2.7.1-debian-11-r0 - name: git - image: docker.io/bitnami/git:2.42.0-debian-11-r5 + image: docker.io/bitnami/git:2.42.0-debian-11-r14 - name: os-shell - image: docker.io/bitnami/os-shell:11-debian-11-r48 + image: docker.io/bitnami/os-shell:11-debian-11-r60 licenses: Apache-2.0 apiVersion: v2 -appVersion: 2.7.0 +appVersion: 2.7.1 dependencies: - condition: redis.enabled name: redis @@ -50,4 +50,4 @@ maintainers: name: airflow sources: - https://github.com/bitnami/charts/tree/main/bitnami/airflow -version: 15.0.3 +version: 15.0.4 diff --git a/charts/bitnami/airflow/README.md b/charts/bitnami/airflow/README.md index 88a3fa52c..1469716ab 100644 --- a/charts/bitnami/airflow/README.md +++ b/charts/bitnami/airflow/README.md @@ -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-r48` | +| `dags.image.tag` | Init container load-dags image tag (immutable tags are recommended) | `11-debian-11-r60` | | `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.0-debian-11-r5` | +| `web.image.tag` | Airflow image tag (immutable tags are recommended) | `2.7.1-debian-11-r0` | | `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.0-debian-11-r2` | +| `scheduler.image.tag` | Airflow Scheduler image tag (immutable tags are recommended) | `2.7.1-debian-11-r0` | | `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.0-debian-11-r2` | +| `worker.image.tag` | Airflow Worker image tag (immutable tags are recommended) | `2.7.1-debian-11-r0` | | `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 | `[]` | @@ -314,33 +314,33 @@ The command removes all the Kubernetes components associated with the chart and ### Airflow git sync parameters -| Name | Description | Value | -| ------------------------------ | --------------------------------------------------------------------------------------------------- | --------------------- | -| `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-r5` | -| `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 | `[]` | -| `git.dags.enabled` | Enable in order to download DAG files from git repositories. | `false` | -| `git.dags.repositories` | Array of repositories from which to download DAG files | `[]` | -| `git.plugins.enabled` | Enable in order to download Plugins files from git repositories. | `false` | -| `git.plugins.repositories` | Array of repositories from which to download DAG files | `[]` | -| `git.clone.command` | Override cmd | `[]` | -| `git.clone.args` | Override args | `[]` | -| `git.clone.extraVolumeMounts` | Add extra volume mounts | `[]` | -| `git.clone.extraEnvVars` | Add extra environment variables | `[]` | -| `git.clone.extraEnvVarsCM` | ConfigMap with extra environment variables | `""` | -| `git.clone.extraEnvVarsSecret` | Secret with extra environment variables | `""` | -| `git.clone.resources` | Clone init container resource requests and limits | `{}` | -| `git.sync.interval` | Interval in seconds to pull the git repository containing the plugins and/or DAG files | `60` | -| `git.sync.command` | Override cmd | `[]` | -| `git.sync.args` | Override args | `[]` | -| `git.sync.extraVolumeMounts` | Add extra volume mounts | `[]` | -| `git.sync.extraEnvVars` | Add extra environment variables | `[]` | -| `git.sync.extraEnvVarsCM` | ConfigMap with extra environment variables | `""` | -| `git.sync.extraEnvVarsSecret` | Secret with extra environment variables | `""` | -| `git.sync.resources` | Sync sidecar container resource requests and limits | `{}` | +| Name | Description | Value | +| ------------------------------ | --------------------------------------------------------------------------------------------------- | ---------------------- | +| `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.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 | `[]` | +| `git.dags.enabled` | Enable in order to download DAG files from git repositories. | `false` | +| `git.dags.repositories` | Array of repositories from which to download DAG files | `[]` | +| `git.plugins.enabled` | Enable in order to download Plugins files from git repositories. | `false` | +| `git.plugins.repositories` | Array of repositories from which to download DAG files | `[]` | +| `git.clone.command` | Override cmd | `[]` | +| `git.clone.args` | Override args | `[]` | +| `git.clone.extraVolumeMounts` | Add extra volume mounts | `[]` | +| `git.clone.extraEnvVars` | Add extra environment variables | `[]` | +| `git.clone.extraEnvVarsCM` | ConfigMap with extra environment variables | `""` | +| `git.clone.extraEnvVarsSecret` | Secret with extra environment variables | `""` | +| `git.clone.resources` | Clone init container resource requests and limits | `{}` | +| `git.sync.interval` | Interval in seconds to pull the git repository containing the plugins and/or DAG files | `60` | +| `git.sync.command` | Override cmd | `[]` | +| `git.sync.args` | Override args | `[]` | +| `git.sync.extraVolumeMounts` | Add extra volume mounts | `[]` | +| `git.sync.extraEnvVars` | Add extra environment variables | `[]` | +| `git.sync.extraEnvVarsCM` | ConfigMap with extra environment variables | `""` | +| `git.sync.extraEnvVarsSecret` | Secret with extra environment variables | `""` | +| `git.sync.resources` | Sync sidecar container resource requests and limits | `{}` | ### Airflow ldap parameters @@ -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-r398` | +| `metrics.image.tag` | Airflow exporter image tag (immutable tags are recommended) | `0.20220314.0-debian-11-r407` | | `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 | `[]` | diff --git a/charts/bitnami/airflow/charts/postgresql/Chart.lock b/charts/bitnami/airflow/charts/postgresql/Chart.lock index 089248ded..ac198523d 100644 --- a/charts/bitnami/airflow/charts/postgresql/Chart.lock +++ b/charts/bitnami/airflow/charts/postgresql/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.9.0 -digest: sha256:416ad278a896f0e9b51d5305bef5d875c7cca6fbb64b75e1f131b04763e2aff9 -generated: "2023-08-22T14:27:37.862238+02:00" + version: 2.10.0 +digest: sha256:023ded170632d04528f30332370f34fc8fb96efb2886a01d934cb3bd6e6d2e09 +generated: "2023-09-05T11:35:37.879743+02:00" diff --git a/charts/bitnami/airflow/charts/postgresql/Chart.yaml b/charts/bitnami/airflow/charts/postgresql/Chart.yaml index 1407b8eb1..f78238df0 100644 --- a/charts/bitnami/airflow/charts/postgresql/Chart.yaml +++ b/charts/bitnami/airflow/charts/postgresql/Chart.yaml @@ -34,4 +34,4 @@ maintainers: name: postgresql sources: - https://github.com/bitnami/charts/tree/main/bitnami/postgresql -version: 12.10.0 +version: 12.11.0 diff --git a/charts/bitnami/airflow/charts/postgresql/charts/common/Chart.yaml b/charts/bitnami/airflow/charts/postgresql/charts/common/Chart.yaml index 644d2a798..e35c2d0e7 100644 --- a/charts/bitnami/airflow/charts/postgresql/charts/common/Chart.yaml +++ b/charts/bitnami/airflow/charts/postgresql/charts/common/Chart.yaml @@ -2,7 +2,7 @@ annotations: category: Infrastructure licenses: Apache-2.0 apiVersion: v2 -appVersion: 2.9.0 +appVersion: 2.9.2 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.9.0 +version: 2.10.0 diff --git a/charts/bitnami/airflow/charts/postgresql/charts/common/templates/_affinities.tpl b/charts/bitnami/airflow/charts/postgresql/charts/common/templates/_affinities.tpl index b77534bb9..e85b1df45 100644 --- a/charts/bitnami/airflow/charts/postgresql/charts/common/templates/_affinities.tpl +++ b/charts/bitnami/airflow/charts/postgresql/charts/common/templates/_affinities.tpl @@ -60,12 +60,13 @@ Return a topologyKey definition {{/* Return a soft podAffinity/podAntiAffinity definition -{{ include "common.affinities.pods.soft" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "context" $) -}} +{{ include "common.affinities.pods.soft" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "context" $) -}} */}} {{- define "common.affinities.pods.soft" -}} {{- $component := default "" .component -}} {{- $customLabels := default (dict) .customLabels -}} {{- $extraMatchLabels := default (dict) .extraMatchLabels -}} +{{- $extraPodAffinityTerms := default (list) .extraPodAffinityTerms -}} preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: labelSelector: @@ -78,16 +79,30 @@ preferredDuringSchedulingIgnoredDuringExecution: {{- end }} topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }} weight: 1 + {{- range $extraPodAffinityTerms }} + - podAffinityTerm: + labelSelector: + matchLabels: {{- (include "common.labels.matchLabels" ( dict "customLabels" $customLabels "context" $.context )) | nindent 10 }} + {{- if not (empty $component) }} + {{ printf "app.kubernetes.io/component: %s" $component }} + {{- end }} + {{- range $key, $value := .extraMatchLabels }} + {{ $key }}: {{ $value | quote }} + {{- end }} + topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }} + weight: {{ .weight | default 1 -}} + {{- end -}} {{- end -}} {{/* Return a hard podAffinity/podAntiAffinity definition -{{ include "common.affinities.pods.hard" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "context" $) -}} +{{ include "common.affinities.pods.hard" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "context" $) -}} */}} {{- define "common.affinities.pods.hard" -}} {{- $component := default "" .component -}} {{- $customLabels := default (dict) .customLabels -}} {{- $extraMatchLabels := default (dict) .extraMatchLabels -}} +{{- $extraPodAffinityTerms := default (list) .extraPodAffinityTerms -}} requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchLabels: {{- (include "common.labels.matchLabels" ( dict "customLabels" $customLabels "context" .context )) | nindent 8 }} @@ -98,6 +113,17 @@ requiredDuringSchedulingIgnoredDuringExecution: {{ $key }}: {{ $value | quote }} {{- end }} topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }} + {{- range $extraPodAffinityTerms }} + - labelSelector: + matchLabels: {{- (include "common.labels.matchLabels" ( dict "customLabels" $customLabels "context" $.context )) | nindent 8 }} + {{- if not (empty $component) }} + {{ printf "app.kubernetes.io/component: %s" $component }} + {{- end }} + {{- range $key, $value := .extraMatchLabels }} + {{ $key }}: {{ $value | quote }} + {{- end }} + topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }} + {{- end -}} {{- end -}} {{/* diff --git a/charts/bitnami/airflow/charts/postgresql/charts/common/templates/_tplvalues.tpl b/charts/bitnami/airflow/charts/postgresql/charts/common/templates/_tplvalues.tpl index dc15f7fdc..a8ed7637e 100644 --- a/charts/bitnami/airflow/charts/postgresql/charts/common/templates/_tplvalues.tpl +++ b/charts/bitnami/airflow/charts/postgresql/charts/common/templates/_tplvalues.tpl @@ -11,17 +11,28 @@ Usage: {{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ "scope" $app ) }} */}} {{- define "common.tplvalues.render" -}} -{{- if .scope }} - {{- if typeIs "string" .value }} - {{- tpl (cat "{{- with $.RelativeScope -}}" .value "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }} +{{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }} +{{- if contains "{{" (toJson .value) }} + {{- if .scope }} + {{- tpl (cat "{{- with $.RelativeScope -}}" $value "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }} {{- else }} - {{- tpl (cat "{{- with $.RelativeScope -}}" (.value | toYaml) "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }} + {{- tpl $value .context }} {{- end }} {{- else }} - {{- if typeIs "string" .value }} - {{- tpl .value .context }} - {{- else }} - {{- tpl (.value | toYaml) .context }} - {{- end }} + {{- $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 -}} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/NOTES.txt b/charts/bitnami/airflow/charts/postgresql/templates/NOTES.txt index c996a005b..73c4a34e5 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/NOTES.txt +++ b/charts/bitnami/airflow/charts/postgresql/templates/NOTES.txt @@ -24,7 +24,7 @@ In order to replicate the container startup scripts execute this command: {{- else }} -{{- $customUser := include "postgresql.username" . }} +{{- $customUser := include "postgresql.v1.username" . }} {{- $postgresPassword := include "common.secrets.lookup" (dict "secret" (include "common.names.fullname" .) "key" .Values.auth.secretKeys.adminPasswordKey "defaultValue" (ternary .Values.auth.postgresPassword .Values.auth.password (eq $customUser "postgres")) "context" $) -}} {{- $authEnabled := and (not (or .Values.global.postgresql.auth.existingSecret .Values.auth.existingSecret)) (or $postgresPassword .Values.auth.enablePostgresUser (and (not (empty $customUser)) (ne $customUser "postgres"))) }} {{- if not $authEnabled }} @@ -32,13 +32,13 @@ In order to replicate the container startup scripts execute this command: WARNING: PostgreSQL has been configured without authentication, this is not recommended for production environments. {{- end }} -PostgreSQL can be accessed via port {{ include "postgresql.service.port" . }} on the following DNS names from within your cluster: +PostgreSQL can be accessed via port {{ include "postgresql.v1.service.port" . }} on the following DNS names from within your cluster: - {{ include "postgresql.primary.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read/Write connection + {{ include "postgresql.v1.primary.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read/Write connection {{- if eq .Values.architecture "replication" }} - {{ include "postgresql.readReplica.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read only connection + {{ include "postgresql.v1.readReplica.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read only connection {{- end }} @@ -47,30 +47,30 @@ PostgreSQL can be accessed via port {{ include "postgresql.service.port" . }} on To get the password for "postgres" run: - export POSTGRES_ADMIN_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ include "postgresql.secretName" . }} -o jsonpath="{.data.{{include "postgresql.adminPasswordKey" .}}}" | base64 -d) + export POSTGRES_ADMIN_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ include "postgresql.v1.secretName" . }} -o jsonpath="{.data.{{include "postgresql.v1.adminPasswordKey" .}}}" | base64 -d) {{- end }} To get the password for "{{ $customUser }}" run: - export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ include "postgresql.secretName" . }} -o jsonpath="{.data.{{include "postgresql.userPasswordKey" .}}}" | base64 -d) + export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ include "postgresql.v1.secretName" . }} -o jsonpath="{.data.{{include "postgresql.v1.userPasswordKey" .}}}" | base64 -d) {{- else }} {{- if .Values.auth.enablePostgresUser }} To get the password for "{{ default "postgres" $customUser }}" run: - export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ include "postgresql.secretName" . }} -o jsonpath="{.data.{{ ternary "password" (include "postgresql.adminPasswordKey" .) (and (not (empty $customUser)) (ne $customUser "postgres")) }}}" | base64 -d) + export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ include "postgresql.v1.secretName" . }} -o jsonpath="{.data.{{ ternary "password" (include "postgresql.v1.adminPasswordKey" .) (and (not (empty $customUser)) (ne $customUser "postgres")) }}}" | base64 -d) {{- end }} {{- end }} To connect to your database run the following command: {{- if $authEnabled }} - kubectl run {{ include "common.names.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ include "postgresql.image" . }} --env="PGPASSWORD=$POSTGRES_PASSWORD" \ - --command -- psql --host {{ include "postgresql.primary.fullname" . }} -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.database" . }} {{ include "postgresql.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.service.port" . }} + kubectl run {{ include "common.names.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ include "postgresql.v1.image" . }} --env="PGPASSWORD=$POSTGRES_PASSWORD" \ + --command -- psql --host {{ include "postgresql.v1.primary.fullname" . }} -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.v1.service.port" . }} {{- else }} - kubectl run {{ include "common.names.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ include "postgresql.image" . }} \ - --command -- psql --host {{ include "postgresql.primary.fullname" . }} -d {{- if include "postgresql.database" . }} {{ include "postgresql.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.service.port" . }} + kubectl run {{ include "common.names.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ include "postgresql.v1.image" . }} \ + --command -- psql --host {{ include "postgresql.v1.primary.fullname" . }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.v1.service.port" . }} {{- end }} > NOTE: If you access the container using bash, make sure that you execute "/opt/bitnami/scripts/postgresql/entrypoint.sh /bin/bash" in order to avoid the error "psql: local user with ID {{ .Values.primary.containerSecurityContext.runAsUser }}} does not exist" @@ -80,36 +80,36 @@ To connect to your database from outside the cluster execute the following comma {{- if contains "NodePort" .Values.primary.service.type }} export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "postgresql.primary.fullname" . }}) + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "postgresql.v1.primary.fullname" . }}) {{- if $authEnabled }} - PGPASSWORD="$POSTGRES_PASSWORD" psql --host $NODE_IP --port $NODE_PORT -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.database" . }} {{ include "postgresql.database" . }}{{- else }} postgres{{- end }} + PGPASSWORD="$POSTGRES_PASSWORD" psql --host $NODE_IP --port $NODE_PORT -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} {{- else }} - psql --host $NODE_IP --port $NODE_PORT -d {{- if include "postgresql.database" . }} {{ include "postgresql.database" . }}{{- else }} postgres{{- end }} + psql --host $NODE_IP --port $NODE_PORT -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} {{- end }} {{- else if contains "LoadBalancer" .Values.primary.service.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ include "postgresql.primary.fullname" . }}' + Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ include "postgresql.v1.primary.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "postgresql.primary.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "postgresql.v1.primary.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") {{- if $authEnabled }} - PGPASSWORD="$POSTGRES_PASSWORD" psql --host $SERVICE_IP --port {{ include "postgresql.service.port" . }} -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.database" . }} {{ include "postgresql.database" . }}{{- else }} postgres{{- end }} + PGPASSWORD="$POSTGRES_PASSWORD" psql --host $SERVICE_IP --port {{ include "postgresql.v1.service.port" . }} -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} {{- else }} - psql --host $SERVICE_IP --port {{ include "postgresql.service.port" . }} -d {{- if include "postgresql.database" . }} {{ include "postgresql.database" . }}{{- else }} postgres{{- end }} + psql --host $SERVICE_IP --port {{ include "postgresql.v1.service.port" . }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} {{- end }} {{- else if contains "ClusterIP" .Values.primary.service.type }} - kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ include "postgresql.primary.fullname" . }} {{ include "postgresql.service.port" . }}:{{ include "postgresql.service.port" . }} & + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ include "postgresql.v1.primary.fullname" . }} {{ include "postgresql.v1.service.port" . }}:{{ include "postgresql.v1.service.port" . }} & {{- if $authEnabled }} - PGPASSWORD="$POSTGRES_PASSWORD" psql --host 127.0.0.1 -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.database" . }} {{ include "postgresql.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.service.port" . }} + PGPASSWORD="$POSTGRES_PASSWORD" psql --host 127.0.0.1 -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.v1.service.port" . }} {{- else }} - psql --host 127.0.0.1 -d {{- if include "postgresql.database" . }} {{ include "postgresql.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.service.port" . }} + psql --host 127.0.0.1 -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.v1.service.port" . }} {{- end }} {{- end }} {{- end }} WARNING: The configured password will be ignored on new installation in case when previous PostgreSQL release was deleted through the helm command. In that case, old PVC will have an old password, and setting it through helm won't take effect. Deleting persistent volumes (PVs) will solve the issue. -{{- include "postgresql.validateValues" . -}} +{{- include "postgresql.v1.validateValues" . -}} {{- include "common.warnings.rollingTag" .Values.image -}} {{- include "common.warnings.rollingTag" .Values.volumePermissions.image }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/_helpers.tpl b/charts/bitnami/airflow/charts/postgresql/templates/_helpers.tpl index 368a0c67d..2c5c7f9f2 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/_helpers.tpl +++ b/charts/bitnami/airflow/charts/postgresql/templates/_helpers.tpl @@ -9,7 +9,7 @@ SPDX-License-Identifier: APACHE-2.0 Create a default fully qualified app name for PostgreSQL Primary objects We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "postgresql.primary.fullname" -}} +{{- define "postgresql.v1.primary.fullname" -}} {{- if eq .Values.architecture "replication" -}} {{- printf "%s-%s" (include "common.names.fullname" .) .Values.primary.name | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -21,7 +21,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this Create a default fully qualified app name for PostgreSQL read-only replicas objects We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "postgresql.readReplica.fullname" -}} +{{- define "postgresql.v1.readReplica.fullname" -}} {{- printf "%s-%s" (include "common.names.fullname" .) .Values.readReplicas.name | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -29,50 +29,50 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this Create the default FQDN for PostgreSQL primary headless service We truncate at 63 chars because of the DNS naming spec. */}} -{{- define "postgresql.primary.svc.headless" -}} -{{- printf "%s-hl" (include "postgresql.primary.fullname" .) | trunc 63 | trimSuffix "-" -}} +{{- define "postgresql.v1.primary.svc.headless" -}} +{{- printf "%s-hl" (include "postgresql.v1.primary.fullname" .) | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create the default FQDN for PostgreSQL read-only replicas headless service We truncate at 63 chars because of the DNS naming spec. */}} -{{- define "postgresql.readReplica.svc.headless" -}} -{{- printf "%s-hl" (include "postgresql.readReplica.fullname" .) | trunc 63 | trimSuffix "-" -}} +{{- define "postgresql.v1.readReplica.svc.headless" -}} +{{- printf "%s-hl" (include "postgresql.v1.readReplica.fullname" .) | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Return the proper PostgreSQL image name */}} -{{- define "postgresql.image" -}} +{{- define "postgresql.v1.image" -}} {{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }} {{- end -}} {{/* Return the proper PostgreSQL metrics image name */}} -{{- define "postgresql.metrics.image" -}} +{{- define "postgresql.v1.metrics.image" -}} {{ include "common.images.image" (dict "imageRoot" .Values.metrics.image "global" .Values.global) }} {{- end -}} {{/* Return the proper image name (for the init container volume-permissions image) */}} -{{- define "postgresql.volumePermissions.image" -}} +{{- define "postgresql.v1.volumePermissions.image" -}} {{ include "common.images.image" (dict "imageRoot" .Values.volumePermissions.image "global" .Values.global) }} {{- end -}} {{/* Return the proper Docker Image Registry Secret Names */}} -{{- define "postgresql.imagePullSecrets" -}} +{{- define "postgresql.v1.imagePullSecrets" -}} {{ include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.metrics.image .Values.volumePermissions.image) "global" .Values.global) }} {{- end -}} {{/* Return the name for a custom user to create */}} -{{- define "postgresql.username" -}} +{{- define "postgresql.v1.username" -}} {{- if .Values.global.postgresql.auth.username -}} {{- .Values.global.postgresql.auth.username -}} {{- else -}} @@ -83,7 +83,7 @@ Return the name for a custom user to create {{/* Return the name for a custom database to create */}} -{{- define "postgresql.database" -}} +{{- define "postgresql.v1.database" -}} {{- if .Values.global.postgresql.auth.database -}} {{- printf "%s" (tpl .Values.global.postgresql.auth.database $) -}} {{- else if .Values.auth.database -}} @@ -94,7 +94,7 @@ Return the name for a custom database to create {{/* Get the password secret. */}} -{{- define "postgresql.secretName" -}} +{{- define "postgresql.v1.secretName" -}} {{- if .Values.global.postgresql.auth.existingSecret -}} {{- printf "%s" (tpl .Values.global.postgresql.auth.existingSecret $) -}} {{- else if .Values.auth.existingSecret -}} @@ -107,7 +107,7 @@ Get the password secret. {{/* Get the replication-password key. */}} -{{- define "postgresql.replicationPasswordKey" -}} +{{- define "postgresql.v1.replicationPasswordKey" -}} {{- if or .Values.global.postgresql.auth.existingSecret .Values.auth.existingSecret -}} {{- if .Values.global.postgresql.auth.secretKeys.replicationPasswordKey -}} {{- printf "%s" (tpl .Values.global.postgresql.auth.secretKeys.replicationPasswordKey $) -}} @@ -124,7 +124,7 @@ Get the replication-password key. {{/* Get the admin-password key. */}} -{{- define "postgresql.adminPasswordKey" -}} +{{- define "postgresql.v1.adminPasswordKey" -}} {{- if or .Values.global.postgresql.auth.existingSecret .Values.auth.existingSecret -}} {{- if .Values.global.postgresql.auth.secretKeys.adminPasswordKey -}} {{- printf "%s" (tpl .Values.global.postgresql.auth.secretKeys.adminPasswordKey $) -}} @@ -139,10 +139,10 @@ Get the admin-password key. {{/* Get the user-password key. */}} -{{- define "postgresql.userPasswordKey" -}} +{{- define "postgresql.v1.userPasswordKey" -}} {{- if or .Values.global.postgresql.auth.existingSecret .Values.auth.existingSecret -}} - {{- if or (empty (include "postgresql.username" .)) (eq (include "postgresql.username" .) "postgres") -}} - {{- printf "%s" (include "postgresql.adminPasswordKey" .) -}} + {{- if or (empty (include "postgresql.v1.username" .)) (eq (include "postgresql.v1.username" .) "postgres") -}} + {{- printf "%s" (include "postgresql.v1.adminPasswordKey" .) -}} {{- else -}} {{- if .Values.global.postgresql.auth.secretKeys.userPasswordKey -}} {{- printf "%s" (tpl .Values.global.postgresql.auth.secretKeys.userPasswordKey $) -}} @@ -158,8 +158,8 @@ Get the user-password key. {{/* Return true if a secret object should be created */}} -{{- define "postgresql.createSecret" -}} -{{- $customUser := include "postgresql.username" . -}} +{{- define "postgresql.v1.createSecret" -}} +{{- $customUser := include "postgresql.v1.username" . -}} {{- $postgresPassword := include "common.secrets.lookup" (dict "secret" (include "common.names.fullname" .) "key" .Values.auth.secretKeys.adminPasswordKey "defaultValue" (ternary (coalesce .Values.global.postgresql.auth.postgresPassword .Values.auth.postgresPassword .Values.global.postgresql.auth.password .Values.auth.password) (coalesce .Values.global.postgresql.auth.postgresPassword .Values.auth.postgresPassword) (or (empty $customUser) (eq $customUser "postgres"))) "context" $) -}} {{- if and (not (or .Values.global.postgresql.auth.existingSecret .Values.auth.existingSecret)) (or $postgresPassword .Values.auth.enablePostgresUser (and (not (empty $customUser)) (ne $customUser "postgres")) (eq .Values.architecture "replication") (and .Values.ldap.enabled (or .Values.ldap.bind_password .Values.ldap.bindpw))) -}} {{- true -}} @@ -169,7 +169,7 @@ Return true if a secret object should be created {{/* Return PostgreSQL service port */}} -{{- define "postgresql.service.port" -}} +{{- define "postgresql.v1.service.port" -}} {{- if .Values.global.postgresql.service.ports.postgresql -}} {{- .Values.global.postgresql.service.ports.postgresql -}} {{- else -}} @@ -180,7 +180,7 @@ Return PostgreSQL service port {{/* Return PostgreSQL service port */}} -{{- define "postgresql.readReplica.service.port" -}} +{{- define "postgresql.v1.readReplica.service.port" -}} {{- if .Values.global.postgresql.service.ports.postgresql -}} {{- .Values.global.postgresql.service.ports.postgresql -}} {{- else -}} @@ -191,18 +191,18 @@ Return PostgreSQL service port {{/* Get the PostgreSQL primary configuration ConfigMap name. */}} -{{- define "postgresql.primary.configmapName" -}} +{{- define "postgresql.v1.primary.configmapName" -}} {{- if .Values.primary.existingConfigmap -}} {{- printf "%s" (tpl .Values.primary.existingConfigmap $) -}} {{- else -}} - {{- printf "%s-configuration" (include "postgresql.primary.fullname" .) -}} + {{- printf "%s-configuration" (include "postgresql.v1.primary.fullname" .) -}} {{- end -}} {{- end -}} {{/* Return true if a configmap object should be created for PostgreSQL primary with the configuration */}} -{{- define "postgresql.primary.createConfigmap" -}} +{{- define "postgresql.v1.primary.createConfigmap" -}} {{- if and (or .Values.primary.configuration .Values.primary.pgHbaConfiguration) (not .Values.primary.existingConfigmap) -}} {{- true -}} {{- else -}} @@ -212,25 +212,25 @@ Return true if a configmap object should be created for PostgreSQL primary with {{/* Get the PostgreSQL primary extended configuration ConfigMap name. */}} -{{- define "postgresql.primary.extendedConfigmapName" -}} +{{- define "postgresql.v1.primary.extendedConfigmapName" -}} {{- if .Values.primary.existingExtendedConfigmap -}} {{- printf "%s" (tpl .Values.primary.existingExtendedConfigmap $) -}} {{- else -}} - {{- printf "%s-extended-configuration" (include "postgresql.primary.fullname" .) -}} + {{- printf "%s-extended-configuration" (include "postgresql.v1.primary.fullname" .) -}} {{- end -}} {{- end -}} {{/* Get the PostgreSQL read replica extended configuration ConfigMap name. */}} -{{- define "postgresql.readReplicas.extendedConfigmapName" -}} - {{- printf "%s-extended-configuration" (include "postgresql.readReplica.fullname" .) -}} +{{- define "postgresql.v1.readReplicas.extendedConfigmapName" -}} + {{- printf "%s-extended-configuration" (include "postgresql.v1.readReplica.fullname" .) -}} {{- end -}} {{/* Return true if a configmap object should be created for PostgreSQL primary with the extended configuration */}} -{{- define "postgresql.primary.createExtendedConfigmap" -}} +{{- define "postgresql.v1.primary.createExtendedConfigmap" -}} {{- if and .Values.primary.extendedConfiguration (not .Values.primary.existingExtendedConfigmap) -}} {{- true -}} {{- else -}} @@ -240,7 +240,7 @@ Return true if a configmap object should be created for PostgreSQL primary with {{/* Return true if a configmap object should be created for PostgreSQL read replica with the extended configuration */}} -{{- define "postgresql.readReplicas.createExtendedConfigmap" -}} +{{- define "postgresql.v1.readReplicas.createExtendedConfigmap" -}} {{- if .Values.readReplicas.extendedConfiguration -}} {{- true -}} {{- else -}} @@ -250,7 +250,7 @@ Return true if a configmap object should be created for PostgreSQL read replica {{/* Create the name of the service account to use */}} -{{- define "postgresql.serviceAccountName" -}} +{{- define "postgresql.v1.serviceAccountName" -}} {{- if .Values.serviceAccount.create -}} {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }} {{- else -}} @@ -261,7 +261,7 @@ Return true if a configmap object should be created for PostgreSQL read replica {{/* Return true if a configmap should be mounted with PostgreSQL configuration */}} -{{- define "postgresql.mountConfigurationCM" -}} +{{- define "postgresql.v1.mountConfigurationCM" -}} {{- if or .Values.primary.configuration .Values.primary.pgHbaConfiguration .Values.primary.existingConfigmap -}} {{- true -}} {{- end -}} @@ -270,18 +270,18 @@ Return true if a configmap should be mounted with PostgreSQL configuration {{/* Get the initialization scripts ConfigMap name. */}} -{{- define "postgresql.initdb.scriptsCM" -}} +{{- define "postgresql.v1.initdb.scriptsCM" -}} {{- if .Values.primary.initdb.scriptsConfigMap -}} {{- printf "%s" (tpl .Values.primary.initdb.scriptsConfigMap $) -}} {{- else -}} - {{- printf "%s-init-scripts" (include "postgresql.primary.fullname" .) -}} + {{- printf "%s-init-scripts" (include "postgresql.v1.primary.fullname" .) -}} {{- end -}} {{- end -}} {{/* Return true if TLS is enabled for LDAP connection */}} -{{- define "postgresql.ldap.tls.enabled" -}} +{{- define "postgresql.v1.ldap.tls.enabled" -}} {{- if and (kindIs "string" .Values.ldap.tls) (not (empty .Values.ldap.tls)) -}} {{- true -}} {{- else if and (kindIs "map" .Values.ldap.tls) .Values.ldap.tls.enabled -}} @@ -292,13 +292,13 @@ Return true if TLS is enabled for LDAP connection {{/* Get the readiness probe command */}} -{{- define "postgresql.readinessProbeCommand" -}} -{{- $customUser := include "postgresql.username" . -}} +{{- define "postgresql.v1.readinessProbeCommand" -}} +{{- $customUser := include "postgresql.v1.username" . -}} - | -{{- if (include "postgresql.database" .) }} - exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if .Values.tls.enabled }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} +{{- if (include "postgresql.v1.database" .) }} + exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.v1.database" . }} {{- if .Values.tls.enabled }} sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} {{- else }} - exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if .Values.tls.enabled }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} + exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if .Values.tls.enabled }} -d "sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} {{- end }} {{- if contains "bitnami/" .Values.image.repository }} [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ] @@ -308,10 +308,10 @@ Get the readiness probe command {{/* Compile all warnings into a single message, and call fail. */}} -{{- define "postgresql.validateValues" -}} +{{- define "postgresql.v1.validateValues" -}} {{- $messages := list -}} -{{- $messages := append $messages (include "postgresql.validateValues.ldapConfigurationMethod" .) -}} -{{- $messages := append $messages (include "postgresql.validateValues.psp" .) -}} +{{- $messages := append $messages (include "postgresql.v1.validateValues.ldapConfigurationMethod" .) -}} +{{- $messages := append $messages (include "postgresql.v1.validateValues.psp" .) -}} {{- $messages := without $messages "" -}} {{- $message := join "\n" $messages -}} @@ -323,7 +323,7 @@ Compile all warnings into a single message, and call fail. {{/* Validate values of Postgresql - If ldap.url is used then you don't need the other settings for ldap */}} -{{- define "postgresql.validateValues.ldapConfigurationMethod" -}} +{{- define "postgresql.v1.validateValues.ldapConfigurationMethod" -}} {{- if and .Values.ldap.enabled (and (not (empty .Values.ldap.url)) (not (empty .Values.ldap.server))) -}} postgresql: ldap.url, ldap.server You cannot set both `ldap.url` and `ldap.server` at the same time. @@ -335,7 +335,7 @@ postgresql: ldap.url, ldap.server {{/* Validate values of Postgresql - If PSP is enabled RBAC should be enabled too */}} -{{- define "postgresql.validateValues.psp" -}} +{{- define "postgresql.v1.validateValues.psp" -}} {{- if and .Values.psp.create (not .Values.rbac.create) -}} postgresql: psp.create, rbac.create RBAC should be enabled if PSP is enabled in order for PSP to work. @@ -346,7 +346,7 @@ postgresql: psp.create, rbac.create {{/* Return the path to the cert file. */}} -{{- define "postgresql.tlsCert" -}} +{{- define "postgresql.v1.tlsCert" -}} {{- if .Values.tls.autoGenerated -}} {{- printf "/opt/bitnami/postgresql/certs/tls.crt" -}} {{- else -}} @@ -357,7 +357,7 @@ Return the path to the cert file. {{/* Return the path to the cert key file. */}} -{{- define "postgresql.tlsCertKey" -}} +{{- define "postgresql.v1.tlsCertKey" -}} {{- if .Values.tls.autoGenerated -}} {{- printf "/opt/bitnami/postgresql/certs/tls.key" -}} {{- else -}} @@ -368,7 +368,7 @@ Return the path to the cert key file. {{/* Return the path to the CA cert file. */}} -{{- define "postgresql.tlsCACert" -}} +{{- define "postgresql.v1.tlsCACert" -}} {{- if .Values.tls.autoGenerated -}} {{- printf "/opt/bitnami/postgresql/certs/ca.crt" -}} {{- else -}} @@ -379,7 +379,7 @@ Return the path to the CA cert file. {{/* Return the path to the CRL file. */}} -{{- define "postgresql.tlsCRL" -}} +{{- define "postgresql.v1.tlsCRL" -}} {{- if .Values.tls.crlFilename -}} {{- printf "/opt/bitnami/postgresql/certs/%s" .Values.tls.crlFilename -}} {{- end -}} @@ -388,7 +388,7 @@ Return the path to the CRL file. {{/* Return true if a TLS credentials secret object should be created */}} -{{- define "postgresql.createTlsSecret" -}} +{{- define "postgresql.v1.createTlsSecret" -}} {{- if and .Values.tls.autoGenerated (not .Values.tls.certificatesSecret) -}} {{- true -}} {{- end -}} @@ -397,7 +397,7 @@ Return true if a TLS credentials secret object should be created {{/* Return the path to the CA cert file. */}} -{{- define "postgresql.tlsSecretName" -}} +{{- define "postgresql.v1.tlsSecretName" -}} {{- if .Values.tls.autoGenerated -}} {{- printf "%s-crt" (include "common.names.fullname" .) -}} {{- else -}} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/backup/cronjob.yaml b/charts/bitnami/airflow/charts/postgresql/templates/backup/cronjob.yaml index d14bdd664..6fe99ec7a 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/backup/cronjob.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/backup/cronjob.yaml @@ -4,16 +4,16 @@ SPDX-License-Identifier: APACHE-2.0 */}} {{- if .Values.backup.enabled }} -{{- $customUser := include "postgresql.username" . }} +{{- $customUser := include "postgresql.v1.username" . }} apiVersion: batch/v1 kind: CronJob metadata: - name: {{ include "postgresql.primary.fullname" . }}-pgdumpall + name: {{ include "postgresql.v1.primary.fullname" . }}-pgdumpall namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.backup.cronjob.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.backup.cronjob.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: pg_dumpall - {{- $annotations := merge .Values.backup.cronjob.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.backup.cronjob.annotations .Values.commonAnnotations ) "context" . ) }} {{- if $annotations }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} @@ -39,8 +39,8 @@ spec: {{- end }} spec: containers: - - name: {{ include "postgresql.primary.fullname" . }}-pgdumpall - image: {{ include "postgresql.image" . }} + - name: {{ include "postgresql.v1.primary.fullname" . }}-pgdumpall + image: {{ include "postgresql.v1.image" . }} env: - name: PGUSER {{- if .Values.auth.enablePostgresUser }} @@ -50,16 +50,16 @@ spec: {{- end }} {{- if .Values.auth.usePasswordFiles }} - name: PGPASSFILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.adminPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }} {{- else }} - name: PGPASSWORD valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.adminPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.adminPasswordKey" . }} {{- end }} - name: PGHOST - value: {{ include "postgresql.primary.fullname" . }} + value: {{ include "postgresql.v1.primary.fullname" . }} - name: PGPORT value: {{ .Values.containerPorts.postgresql | quote }} - name: PGDUMP_DIR @@ -99,6 +99,6 @@ spec: {{- else }} - name: datadir persistentVolumeClaim: - claimName: {{ include "postgresql.primary.fullname" . }}-pgdumpall + claimName: {{ include "postgresql.v1.primary.fullname" . }}-pgdumpall {{- end }} {{- end }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/backup/pvc.yaml b/charts/bitnami/airflow/charts/postgresql/templates/backup/pvc.yaml index 7f86be1b2..6fe9cbf76 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/backup/pvc.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/backup/pvc.yaml @@ -7,15 +7,15 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: {{ include "postgresql.primary.fullname" . }}-pgdumpall + name: {{ include "postgresql.v1.primary.fullname" . }}-pgdumpall namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.backup.cronjob.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.backup.cronjob.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: pg_dumpall {{- if or .Values.backup.cronjob.annotations .Values.commonAnnotations .Values.backup.cronjob.storage.resourcePolicy }} annotations: {{- if or .Values.backup.cronjob.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.backup.cronjob.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.backup.cronjob.annotations .Values.commonAnnotations ) "context" . ) }} {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} {{- if .Values.backup.cronjob.storage.resourcePolicy }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/primary/configmap.yaml b/charts/bitnami/airflow/charts/postgresql/templates/primary/configmap.yaml index cc5e9cd87..7bb8b7f31 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/primary/configmap.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/primary/configmap.yaml @@ -3,11 +3,11 @@ Copyright VMware, Inc. SPDX-License-Identifier: APACHE-2.0 */}} -{{- if (include "postgresql.primary.createConfigmap" .) }} +{{- if (include "postgresql.v1.primary.createConfigmap" .) }} apiVersion: v1 kind: ConfigMap metadata: - name: {{ printf "%s-configuration" (include "postgresql.primary.fullname" .) }} + name: {{ printf "%s-configuration" (include "postgresql.v1.primary.fullname" .) }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: primary diff --git a/charts/bitnami/airflow/charts/postgresql/templates/primary/extended-configmap.yaml b/charts/bitnami/airflow/charts/postgresql/templates/primary/extended-configmap.yaml index 62e07fced..456f8ee55 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/primary/extended-configmap.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/primary/extended-configmap.yaml @@ -3,11 +3,11 @@ Copyright VMware, Inc. SPDX-License-Identifier: APACHE-2.0 */}} -{{- if (include "postgresql.primary.createExtendedConfigmap" .) }} +{{- if (include "postgresql.v1.primary.createExtendedConfigmap" .) }} apiVersion: v1 kind: ConfigMap metadata: - name: {{ printf "%s-extended-configuration" (include "postgresql.primary.fullname" .) }} + name: {{ printf "%s-extended-configuration" (include "postgresql.v1.primary.fullname" .) }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: primary diff --git a/charts/bitnami/airflow/charts/postgresql/templates/primary/initialization-configmap.yaml b/charts/bitnami/airflow/charts/postgresql/templates/primary/initialization-configmap.yaml index 8a359c663..80d804a0f 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/primary/initialization-configmap.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/primary/initialization-configmap.yaml @@ -7,7 +7,7 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: ConfigMap metadata: - name: {{ printf "%s-init-scripts" (include "postgresql.primary.fullname" .) }} + name: {{ printf "%s-init-scripts" (include "postgresql.v1.primary.fullname" .) }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} {{- if .Values.commonAnnotations }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/primary/metrics-configmap.yaml b/charts/bitnami/airflow/charts/postgresql/templates/primary/metrics-configmap.yaml index a219674fc..7da2bcd26 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/primary/metrics-configmap.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/primary/metrics-configmap.yaml @@ -7,7 +7,7 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: ConfigMap metadata: - name: {{ printf "%s-metrics" (include "postgresql.primary.fullname" .) }} + name: {{ printf "%s-metrics" (include "postgresql.v1.primary.fullname" .) }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} {{- if .Values.commonAnnotations }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/primary/metrics-svc.yaml b/charts/bitnami/airflow/charts/postgresql/templates/primary/metrics-svc.yaml index 07f2beb8f..3d94510c7 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/primary/metrics-svc.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/primary/metrics-svc.yaml @@ -7,12 +7,12 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: Service metadata: - name: {{ printf "%s-metrics" (include "postgresql.primary.fullname" .) }} + name: {{ printf "%s-metrics" (include "postgresql.v1.primary.fullname" .) }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: metrics {{- if or .Values.commonAnnotations .Values.metrics.service.annotations }} - {{- $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: @@ -25,7 +25,7 @@ spec: - name: http-metrics port: {{ .Values.metrics.service.ports.metrics }} targetPort: http-metrics - {{- $podLabels := merge .Values.primary.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: primary {{- end }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/primary/networkpolicy.yaml b/charts/bitnami/airflow/charts/postgresql/templates/primary/networkpolicy.yaml index 786c9e234..9da3fb491 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/primary/networkpolicy.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/primary/networkpolicy.yaml @@ -7,7 +7,7 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: - name: {{ printf "%s-ingress" (include "postgresql.primary.fullname" .) }} + name: {{ printf "%s-ingress" (include "postgresql.v1.primary.fullname" .) }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: primary @@ -15,7 +15,7 @@ metadata: annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} spec: - {{- $primaryPodLabels := merge .Values.primary.podLabels .Values.commonLabels }} + {{- $primaryPodLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }} podSelector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $primaryPodLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: primary @@ -48,7 +48,7 @@ spec: {{- end }} {{- if and .Values.networkPolicy.ingressRules.primaryAccessOnlyFrom.enabled (eq .Values.architecture "replication") }} - from: - {{- $readPodLabels := merge .Values.readReplicas.podLabels .Values.commonLabels }} + {{- $readPodLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.podLabels .Values.commonLabels ) "context" . ) }} - podSelector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $readPodLabels "context" $ ) | nindent 14 }} app.kubernetes.io/component: read diff --git a/charts/bitnami/airflow/charts/postgresql/templates/primary/servicemonitor.yaml b/charts/bitnami/airflow/charts/postgresql/templates/primary/servicemonitor.yaml index b2c937d32..05d54f3b3 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/primary/servicemonitor.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/primary/servicemonitor.yaml @@ -7,9 +7,9 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ include "postgresql.primary.fullname" . }} + name: {{ include "postgresql.v1.primary.fullname" . }} namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: metrics {{- if .Values.commonAnnotations }} @@ -20,7 +20,7 @@ spec: jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }} {{- end }} selector: - {{- $svcLabels := merge .Values.metrics.serviceMonitor.selector .Values.commonLabels }} + {{- $svcLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.selector .Values.commonLabels ) "context" . ) }} matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $svcLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: metrics endpoints: diff --git a/charts/bitnami/airflow/charts/postgresql/templates/primary/statefulset.yaml b/charts/bitnami/airflow/charts/postgresql/templates/primary/statefulset.yaml index 17bc03483..8f8d56dde 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/primary/statefulset.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/primary/statefulset.yaml @@ -3,40 +3,40 @@ Copyright VMware, Inc. SPDX-License-Identifier: APACHE-2.0 */}} -{{- $customUser := include "postgresql.username" . }} +{{- $customUser := include "postgresql.v1.username" . }} apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} kind: StatefulSet metadata: - name: {{ include "postgresql.primary.fullname" . }} + name: {{ include "postgresql.v1.primary.fullname" . }} namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.primary.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: primary {{- if or .Values.commonAnnotations .Values.primary.annotations }} - {{- $annotations := merge .Values.primary.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: replicas: 1 - serviceName: {{ include "postgresql.primary.svc.headless" . }} + serviceName: {{ include "postgresql.v1.primary.svc.headless" . }} {{- if .Values.primary.updateStrategy }} updateStrategy: {{- toYaml .Values.primary.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.primary.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: primary template: metadata: - name: {{ include "postgresql.primary.fullname" . }} + name: {{ include "postgresql.v1.primary.fullname" . }} labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }} app.kubernetes.io/component: primary - {{- if or (include "postgresql.primary.createConfigmap" .) (include "postgresql.primary.createExtendedConfigmap" .) .Values.primary.podAnnotations }} + {{- if or (include "postgresql.v1.primary.createConfigmap" .) (include "postgresql.v1.primary.createExtendedConfigmap" .) .Values.primary.podAnnotations }} annotations: - {{- if (include "postgresql.primary.createConfigmap" .) }} + {{- if (include "postgresql.v1.primary.createConfigmap" .) }} checksum/configuration: {{ pick (include (print $.Template.BasePath "/primary/configmap.yaml") . | fromYaml) "data" | toYaml | sha256sum }} {{- end }} - {{- if (include "postgresql.primary.createExtendedConfigmap" .) }} + {{- if (include "postgresql.v1.primary.createExtendedConfigmap" .) }} checksum/extended-configuration: {{ pick (include (print $.Template.BasePath "/primary/extended-configmap.yaml") . | fromYaml) "data" | toYaml | sha256sum }} {{- end }} {{- if .Values.primary.podAnnotations }} @@ -47,8 +47,8 @@ spec: {{- if .Values.primary.extraPodSpec }} {{- include "common.tplvalues.render" (dict "value" .Values.primary.extraPodSpec "context" $) | nindent 6 }} {{- end }} - serviceAccountName: {{ include "postgresql.serviceAccountName" . }} - {{- include "postgresql.imagePullSecrets" . | nindent 6 }} + serviceAccountName: {{ include "postgresql.v1.serviceAccountName" . }} + {{- include "postgresql.v1.imagePullSecrets" . | nindent 6 }} {{- if .Values.primary.hostAliases }} hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.primary.hostAliases "context" $) | nindent 8 }} {{- end }} @@ -87,7 +87,7 @@ spec: initContainers: {{- if and .Values.tls.enabled (not .Values.volumePermissions.enabled) }} - name: copy-certs - image: {{ include "postgresql.volumePermissions.image" . }} + image: {{ include "postgresql.v1.volumePermissions.image" . }} imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} {{- if .Values.primary.resources }} resources: {{- toYaml .Values.primary.resources | nindent 12 }} @@ -101,7 +101,7 @@ spec: - -ec - | cp /tmp/certs/* /opt/bitnami/postgresql/certs/ - chmod 600 {{ include "postgresql.tlsCertKey" . }} + chmod 600 {{ include "postgresql.v1.tlsCertKey" . }} volumeMounts: - name: raw-certificates mountPath: /tmp/certs @@ -109,7 +109,7 @@ spec: mountPath: /opt/bitnami/postgresql/certs {{- else if and .Values.volumePermissions.enabled (or .Values.primary.persistence.enabled .Values.shmVolume.enabled) }} - name: init-chmod-data - image: {{ include "postgresql.volumePermissions.image" . }} + image: {{ include "postgresql.v1.volumePermissions.image" . }} imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} {{- if .Values.volumePermissions.resources }} resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }} @@ -124,9 +124,9 @@ spec: {{- else }} chown {{ .Values.primary.containerSecurityContext.runAsUser }}:{{ .Values.primary.podSecurityContext.fsGroup }} {{ .Values.primary.persistence.mountPath }} {{- end }} - mkdir -p {{ .Values.primary.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.primary.persistence.mountPath }}/conf {{- end }} - chmod 700 {{ .Values.primary.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.primary.persistence.mountPath }}/conf {{- end }} - find {{ .Values.primary.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \ + mkdir -p {{ .Values.primary.persistence.mountPath }}/data {{- if (include "postgresql.v1.mountConfigurationCM" .) }} {{ .Values.primary.persistence.mountPath }}/conf {{- end }} + chmod 700 {{ .Values.primary.persistence.mountPath }}/data {{- if (include "postgresql.v1.mountConfigurationCM" .) }} {{ .Values.primary.persistence.mountPath }}/conf {{- end }} + find {{ .Values.primary.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.v1.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \ {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} xargs -r chown -R `id -u`:`id -G | cut -d " " -f2` {{- else }} @@ -143,7 +143,7 @@ spec: {{- else }} chown -R {{ .Values.primary.containerSecurityContext.runAsUser }}:{{ .Values.primary.podSecurityContext.fsGroup }} /opt/bitnami/postgresql/certs/ {{- end }} - chmod 600 {{ include "postgresql.tlsCertKey" . }} + chmod 600 {{ include "postgresql.v1.tlsCertKey" . }} {{- end }} {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} @@ -175,7 +175,7 @@ spec: {{- end }} containers: - name: postgresql - image: {{ include "postgresql.image" . }} + image: {{ include "postgresql.v1.image" . }} imagePullPolicy: {{ .Values.image.pullPolicy | quote }} {{- if .Values.primary.containerSecurityContext.enabled }} securityContext: {{- omit .Values.primary.containerSecurityContext "enabled" | toYaml | nindent 12 }} @@ -206,13 +206,13 @@ spec: {{- if .Values.auth.enablePostgresUser }} {{- if .Values.auth.usePasswordFiles }} - name: POSTGRES_PASSWORD_FILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.adminPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }} {{- else }} - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.adminPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.adminPasswordKey" . }} {{- end }} {{- else }} - name: ALLOW_EMPTY_PASSWORD @@ -223,30 +223,30 @@ spec: value: {{ $customUser | quote }} {{- if .Values.auth.usePasswordFiles }} - name: POSTGRES_PASSWORD_FILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.userPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.userPasswordKey" .) }} {{- else }} - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.userPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.userPasswordKey" . }} {{- end }} {{- if .Values.auth.enablePostgresUser }} {{- if .Values.auth.usePasswordFiles }} - name: POSTGRES_POSTGRES_PASSWORD_FILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.adminPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }} {{- else }} - name: POSTGRES_POSTGRES_PASSWORD valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.adminPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.adminPasswordKey" . }} {{- end }} {{- end }} {{- end }} - {{- if (include "postgresql.database" .) }} + {{- if (include "postgresql.v1.database" .) }} - name: POSTGRES_DATABASE - value: {{ (include "postgresql.database" .) | quote }} + value: {{ (include "postgresql.v1.database" .) | quote }} {{- end }} # Replication {{- if or (eq .Values.architecture "replication") .Values.primary.standby.enabled }} @@ -256,13 +256,13 @@ spec: value: {{ .Values.auth.replicationUsername | quote }} {{- if .Values.auth.usePasswordFiles }} - name: POSTGRES_REPLICATION_PASSWORD_FILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.replicationPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.replicationPasswordKey" .) }} {{- else }} - name: POSTGRES_REPLICATION_PASSWORD valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.replicationPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.replicationPasswordKey" . }} {{- end }} {{- if ne .Values.replication.synchronousCommit "off" }} - name: POSTGRES_SYNCHRONOUS_COMMIT_MODE @@ -311,7 +311,7 @@ spec: value: {{ .Values.ldap.port | quote }} - name: POSTGRESQL_LDAP_SCHEME value: {{ .Values.ldap.scheme }} - {{- if (include "postgresql.ldap.tls.enabled" .) }} + {{- if (include "postgresql.v1.ldap.tls.enabled" .) }} - name: POSTGRESQL_LDAP_TLS value: "1" {{- end }} @@ -327,7 +327,7 @@ spec: - name: POSTGRESQL_LDAP_BIND_PASSWORD valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} + name: {{ include "postgresql.v1.secretName" . }} key: ldap-password {{- end }} - name: POSTGRESQL_LDAP_SEARCH_ATTR @@ -343,16 +343,16 @@ spec: - name: POSTGRESQL_TLS_PREFER_SERVER_CIPHERS value: {{ ternary "yes" "no" .Values.tls.preferServerCiphers | quote }} - name: POSTGRESQL_TLS_CERT_FILE - value: {{ include "postgresql.tlsCert" . }} + value: {{ include "postgresql.v1.tlsCert" . }} - name: POSTGRESQL_TLS_KEY_FILE - value: {{ include "postgresql.tlsCertKey" . }} + value: {{ include "postgresql.v1.tlsCertKey" . }} {{- if .Values.tls.certCAFilename }} - name: POSTGRESQL_TLS_CA_FILE - value: {{ include "postgresql.tlsCACert" . }} + value: {{ include "postgresql.v1.tlsCACert" . }} {{- end }} {{- if .Values.tls.crlFilename }} - name: POSTGRESQL_TLS_CRL_FILE - value: {{ include "postgresql.tlsCRL" . }} + value: {{ include "postgresql.v1.tlsCRL" . }} {{- end }} {{- end }} # Audit @@ -407,10 +407,10 @@ spec: command: - /bin/sh - -c - {{- if (include "postgresql.database" .) }} - - exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} + {{- if (include "postgresql.v1.database" .) }} + - exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.v1.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} {{- else }} - - exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} + - exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} {{- end }} {{- end }} {{- if .Values.primary.customLivenessProbe }} @@ -421,10 +421,10 @@ spec: command: - /bin/sh - -c - {{- if (include "postgresql.database" .) }} - - exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} + {{- if (include "postgresql.v1.database" .) }} + - exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.v1.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} {{- else }} - - exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} + - exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} {{- end }} {{- end }} {{- if .Values.primary.customReadinessProbe }} @@ -436,7 +436,7 @@ spec: - /bin/sh - -c - -e - {{- include "postgresql.readinessProbeCommand" . | nindent 16 }} + {{- include "postgresql.v1.readinessProbeCommand" . | nindent 16 }} {{- end }} {{- end }} {{- if .Values.primary.resources }} @@ -487,7 +487,7 @@ spec: {{- end }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ include "postgresql.metrics.image" . }} + image: {{ include "postgresql.v1.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} {{- if .Values.metrics.containerSecurityContext.enabled }} securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} @@ -499,18 +499,18 @@ spec: args: ["--extend.query-path", "/conf/custom-metrics.yaml"] {{- end }} env: - {{- $database := required "In order to enable metrics you need to specify a database (.Values.auth.database or .Values.global.postgresql.auth.database)" (include "postgresql.database" .) }} + {{- $database := required "In order to enable metrics you need to specify a database (.Values.auth.database or .Values.global.postgresql.auth.database)" (include "postgresql.v1.database" .) }} - name: DATA_SOURCE_URI - value: {{ printf "127.0.0.1:%d/%s?sslmode=disable" (int (include "postgresql.service.port" .)) $database }} + value: {{ printf "127.0.0.1:%d/%s?sslmode=disable" (int (include "postgresql.v1.service.port" .)) $database }} {{- if .Values.auth.usePasswordFiles }} - name: DATA_SOURCE_PASS_FILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.userPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.userPasswordKey" .) }} {{- else }} - name: DATA_SOURCE_PASS valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.userPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.userPasswordKey" . }} {{- end }} - name: DATA_SOURCE_USER value: {{ default "postgres" $customUser | quote }} @@ -566,22 +566,22 @@ spec: {{- if or .Values.primary.configuration .Values.primary.pgHbaConfiguration .Values.primary.existingConfigmap }} - name: postgresql-config configMap: - name: {{ include "postgresql.primary.configmapName" . }} + name: {{ include "postgresql.v1.primary.configmapName" . }} {{- end }} {{- if or .Values.primary.extendedConfiguration .Values.primary.existingExtendedConfigmap }} - name: postgresql-extended-config configMap: - name: {{ include "postgresql.primary.extendedConfigmapName" . }} + name: {{ include "postgresql.v1.primary.extendedConfigmapName" . }} {{- end }} {{- if .Values.auth.usePasswordFiles }} - name: postgresql-password secret: - secretName: {{ include "postgresql.secretName" . }} + secretName: {{ include "postgresql.v1.secretName" . }} {{- end }} {{- if or .Values.primary.initdb.scriptsConfigMap .Values.primary.initdb.scripts }} - name: custom-init-scripts configMap: - name: {{ include "postgresql.initdb.scriptsCM" . }} + name: {{ include "postgresql.v1.initdb.scriptsCM" . }} {{- end }} {{- if .Values.primary.initdb.scriptsSecret }} - name: custom-init-scripts-secret @@ -591,7 +591,7 @@ spec: {{- if .Values.tls.enabled }} - name: raw-certificates secret: - secretName: {{ include "postgresql.tlsSecretName" . }} + secretName: {{ include "postgresql.v1.tlsSecretName" . }} - name: postgresql-certificates emptyDir: {} {{- end }} @@ -601,7 +601,7 @@ spec: {{- if and .Values.metrics.enabled .Values.metrics.customMetrics }} - name: custom-metrics configMap: - name: {{ printf "%s-metrics" (include "postgresql.primary.fullname" .) }} + name: {{ printf "%s-metrics" (include "postgresql.v1.primary.fullname" .) }} {{- end }} {{- if .Values.shmVolume.enabled }} - name: dshm diff --git a/charts/bitnami/airflow/charts/postgresql/templates/primary/svc-headless.yaml b/charts/bitnami/airflow/charts/postgresql/templates/primary/svc-headless.yaml index 58fc59089..b18565aea 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/primary/svc-headless.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/primary/svc-headless.yaml @@ -6,13 +6,13 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: Service metadata: - name: {{ include "postgresql.primary.svc.headless" . }} + name: {{ include "postgresql.v1.primary.svc.headless" . }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: primary annotations: {{- if or .Values.primary.service.headless.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.primary.service.headless.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.service.headless.annotations .Values.commonAnnotations ) "context" . ) }} {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} # Use this annotation in addition to the actual publishNotReadyAddresses @@ -29,8 +29,8 @@ spec: publishNotReadyAddresses: true ports: - name: tcp-postgresql - port: {{ template "postgresql.service.port" . }} + port: {{ template "postgresql.v1.service.port" . }} targetPort: tcp-postgresql - {{- $podLabels := merge .Values.primary.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: primary diff --git a/charts/bitnami/airflow/charts/postgresql/templates/primary/svc.yaml b/charts/bitnami/airflow/charts/postgresql/templates/primary/svc.yaml index 8fe53f9c7..90f7e4690 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/primary/svc.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/primary/svc.yaml @@ -6,12 +6,12 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: Service metadata: - name: {{ include "postgresql.primary.fullname" . }} + name: {{ include "postgresql.v1.primary.fullname" . }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: primary {{- if or .Values.commonAnnotations .Values.primary.service.annotations }} - {{- $annotations := merge .Values.primary.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -36,7 +36,7 @@ spec: {{- end }} ports: - name: tcp-postgresql - port: {{ template "postgresql.service.port" . }} + port: {{ template "postgresql.v1.service.port" . }} targetPort: tcp-postgresql {{- if and (or (eq .Values.primary.service.type "NodePort") (eq .Values.primary.service.type "LoadBalancer")) (not (empty .Values.primary.service.nodePorts.postgresql)) }} nodePort: {{ .Values.primary.service.nodePorts.postgresql }} @@ -46,6 +46,6 @@ spec: {{- if .Values.primary.service.extraPorts }} {{- include "common.tplvalues.render" (dict "value" .Values.primary.service.extraPorts "context" $) | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.primary.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: primary diff --git a/charts/bitnami/airflow/charts/postgresql/templates/prometheusrule.yaml b/charts/bitnami/airflow/charts/postgresql/templates/prometheusrule.yaml index 7c75103d7..6cdb08732 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/prometheusrule.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/prometheusrule.yaml @@ -9,7 +9,7 @@ kind: PrometheusRule metadata: name: {{ include "common.names.fullname" . }} namespace: {{ default .Release.Namespace .Values.metrics.prometheusRule.namespace | quote }} - {{- $labels := merge .Values.metrics.prometheusRule.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.prometheusRule.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: metrics {{- if .Values.commonAnnotations }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/read/extended-configmap.yaml b/charts/bitnami/airflow/charts/postgresql/templates/read/extended-configmap.yaml index ef188d7ce..efa87bb13 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/read/extended-configmap.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/read/extended-configmap.yaml @@ -3,11 +3,11 @@ Copyright VMware, Inc. SPDX-License-Identifier: APACHE-2.0 */}} -{{- if (include "postgresql.readReplicas.createExtendedConfigmap" .) }} +{{- if (include "postgresql.v1.readReplicas.createExtendedConfigmap" .) }} apiVersion: v1 kind: ConfigMap metadata: - name: {{ printf "%s-extended-configuration" (include "postgresql.readReplica.fullname" .) }} + name: {{ printf "%s-extended-configuration" (include "postgresql.v1.readReplica.fullname" .) }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: read diff --git a/charts/bitnami/airflow/charts/postgresql/templates/read/metrics-configmap.yaml b/charts/bitnami/airflow/charts/postgresql/templates/read/metrics-configmap.yaml index 911547502..a1e06bfc6 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/read/metrics-configmap.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/read/metrics-configmap.yaml @@ -7,7 +7,7 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: ConfigMap metadata: - name: {{ printf "%s-metrics" (include "postgresql.readReplica.fullname" .) }} + name: {{ printf "%s-metrics" (include "postgresql.v1.readReplica.fullname" .) }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} {{- if .Values.commonAnnotations }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/read/metrics-svc.yaml b/charts/bitnami/airflow/charts/postgresql/templates/read/metrics-svc.yaml index 76a0ea901..e9f13e067 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/read/metrics-svc.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/read/metrics-svc.yaml @@ -7,12 +7,12 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: Service metadata: - name: {{ printf "%s-metrics" (include "postgresql.readReplica.fullname" .) }} + name: {{ printf "%s-metrics" (include "postgresql.v1.readReplica.fullname" .) }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: metrics-read {{- if or .Values.commonAnnotations .Values.metrics.service.annotations }} - {{- $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: @@ -25,7 +25,7 @@ spec: - name: http-metrics port: {{ .Values.metrics.service.ports.metrics }} targetPort: http-metrics - {{- $podLabels := merge .Values.readReplicas.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: read {{- end }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/read/networkpolicy.yaml b/charts/bitnami/airflow/charts/postgresql/templates/read/networkpolicy.yaml index e9d02ee47..79d3a5aa8 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/read/networkpolicy.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/read/networkpolicy.yaml @@ -7,7 +7,7 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: - name: {{ printf "%s-ingress" (include "postgresql.readReplica.fullname" .) }} + name: {{ printf "%s-ingress" (include "postgresql.v1.readReplica.fullname" .) }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: read @@ -15,7 +15,7 @@ metadata: annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} spec: - {{- $podLabels := merge .Values.readReplicas.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.podLabels .Values.commonLabels ) "context" . ) }} podSelector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: read diff --git a/charts/bitnami/airflow/charts/postgresql/templates/read/servicemonitor.yaml b/charts/bitnami/airflow/charts/postgresql/templates/read/servicemonitor.yaml index 7be04f6e0..845734b1f 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/read/servicemonitor.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/read/servicemonitor.yaml @@ -7,9 +7,9 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ include "postgresql.readReplica.fullname" . }} + name: {{ include "postgresql.v1.readReplica.fullname" . }} namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} - {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: metrics-read {{- if .Values.commonAnnotations }} @@ -20,7 +20,7 @@ spec: jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }} {{- end }} selector: - {{- $svcLabels := merge .Values.metrics.serviceMonitor.selector .Values.commonLabels }} + {{- $svcLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.selector .Values.commonLabels ) "context" . ) }} matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $svcLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: metrics-read endpoints: diff --git a/charts/bitnami/airflow/charts/postgresql/templates/read/statefulset.yaml b/charts/bitnami/airflow/charts/postgresql/templates/read/statefulset.yaml index fabca9d0a..826870065 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/read/statefulset.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/read/statefulset.yaml @@ -4,37 +4,37 @@ SPDX-License-Identifier: APACHE-2.0 */}} {{- if eq .Values.architecture "replication" }} -{{- $customUser := include "postgresql.username" . }} +{{- $customUser := include "postgresql.v1.username" . }} apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} kind: StatefulSet metadata: - name: {{ include "postgresql.readReplica.fullname" . }} + name: {{ include "postgresql.v1.readReplica.fullname" . }} namespace: {{ .Release.Namespace | quote }} - {{- $labels := merge .Values.readReplicas.labels .Values.commonLabels }} + {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.labels .Values.commonLabels ) "context" . ) }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} app.kubernetes.io/component: read {{- if or .Values.commonAnnotations .Values.readReplicas.annotations }} - {{- $annotations := merge .Values.readReplicas.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: replicas: {{ .Values.readReplicas.replicaCount }} - serviceName: {{ include "postgresql.readReplica.svc.headless" . }} + serviceName: {{ include "postgresql.v1.readReplica.svc.headless" . }} {{- if .Values.readReplicas.updateStrategy }} updateStrategy: {{- toYaml .Values.readReplicas.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.readReplicas.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.podLabels .Values.commonLabels ) "context" . ) }} selector: matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }} app.kubernetes.io/component: read template: metadata: - name: {{ include "postgresql.readReplica.fullname" . }} + name: {{ include "postgresql.v1.readReplica.fullname" . }} labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }} app.kubernetes.io/component: read - {{- if or (include "postgresql.readReplicas.createExtendedConfigmap" .) .Values.readReplicas.podAnnotations }} + {{- if or (include "postgresql.v1.readReplicas.createExtendedConfigmap" .) .Values.readReplicas.podAnnotations }} annotations: - {{- if (include "postgresql.readReplicas.createExtendedConfigmap" .) }} + {{- if (include "postgresql.v1.readReplicas.createExtendedConfigmap" .) }} checksum/extended-configuration: {{ pick (include (print $.Template.BasePath "/primary/extended-configmap.yaml") . | fromYaml) "data" | toYaml | sha256sum }} {{- end }} {{- if .Values.readReplicas.podAnnotations }} @@ -45,8 +45,8 @@ spec: {{- if .Values.readReplicas.extraPodSpec }} {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.extraPodSpec "context" $) | nindent 6 }} {{- end }} - serviceAccountName: {{ include "postgresql.serviceAccountName" . }} - {{- include "postgresql.imagePullSecrets" . | nindent 6 }} + serviceAccountName: {{ include "postgresql.v1.serviceAccountName" . }} + {{- include "postgresql.v1.imagePullSecrets" . | nindent 6 }} {{- if .Values.readReplicas.hostAliases }} hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.hostAliases "context" $) | nindent 8 }} {{- end }} @@ -85,7 +85,7 @@ spec: initContainers: {{- if and .Values.tls.enabled (not .Values.volumePermissions.enabled) }} - name: copy-certs - image: {{ include "postgresql.volumePermissions.image" . }} + image: {{ include "postgresql.v1.volumePermissions.image" . }} imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} {{- if .Values.readReplicas.resources }} resources: {{- toYaml .Values.readReplicas.resources | nindent 12 }} @@ -99,7 +99,7 @@ spec: - -ec - | cp /tmp/certs/* /opt/bitnami/postgresql/certs/ - chmod 600 {{ include "postgresql.tlsCertKey" . }} + chmod 600 {{ include "postgresql.v1.tlsCertKey" . }} volumeMounts: - name: raw-certificates mountPath: /tmp/certs @@ -107,7 +107,7 @@ spec: mountPath: /opt/bitnami/postgresql/certs {{- else if and .Values.volumePermissions.enabled (or .Values.readReplicas.persistence.enabled .Values.shmVolume.enabled) }} - name: init-chmod-data - image: {{ include "postgresql.volumePermissions.image" . }} + image: {{ include "postgresql.v1.volumePermissions.image" . }} imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }} {{- if .Values.readReplicas.resources }} resources: {{- toYaml .Values.readReplicas.resources | nindent 12 }} @@ -122,9 +122,9 @@ spec: {{- else }} chown {{ .Values.readReplicas.containerSecurityContext.runAsUser }}:{{ .Values.readReplicas.podSecurityContext.fsGroup }} {{ .Values.readReplicas.persistence.mountPath }} {{- end }} - mkdir -p {{ .Values.readReplicas.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.readReplicas.persistence.mountPath }}/conf {{- end }} - chmod 700 {{ .Values.readReplicas.persistence.mountPath }}/data {{- if (include "postgresql.mountConfigurationCM" .) }} {{ .Values.readReplicas.persistence.mountPath }}/conf {{- end }} - find {{ .Values.readReplicas.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \ + mkdir -p {{ .Values.readReplicas.persistence.mountPath }}/data {{- if (include "postgresql.v1.mountConfigurationCM" .) }} {{ .Values.readReplicas.persistence.mountPath }}/conf {{- end }} + chmod 700 {{ .Values.readReplicas.persistence.mountPath }}/data {{- if (include "postgresql.v1.mountConfigurationCM" .) }} {{ .Values.readReplicas.persistence.mountPath }}/conf {{- end }} + find {{ .Values.readReplicas.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.v1.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \ {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} xargs -r chown -R `id -u`:`id -G | cut -d " " -f2` {{- else }} @@ -141,7 +141,7 @@ spec: {{- else }} chown -R {{ .Values.readReplicas.containerSecurityContext.runAsUser }}:{{ .Values.readReplicas.podSecurityContext.fsGroup }} /opt/bitnami/postgresql/certs/ {{- end }} - chmod 600 {{ include "postgresql.tlsCertKey" . }} + chmod 600 {{ include "postgresql.v1.tlsCertKey" . }} {{- end }} {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }} securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }} @@ -173,7 +173,7 @@ spec: {{- end }} containers: - name: postgresql - image: {{ include "postgresql.image" . }} + image: {{ include "postgresql.v1.image" . }} imagePullPolicy: {{ .Values.image.pullPolicy | quote }} {{- if .Values.readReplicas.containerSecurityContext.enabled }} securityContext: {{- omit .Values.readReplicas.containerSecurityContext "enabled" | toYaml | nindent 12 }} @@ -204,13 +204,13 @@ spec: {{- if .Values.auth.enablePostgresUser }} {{- if .Values.auth.usePasswordFiles }} - name: POSTGRES_PASSWORD_FILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.adminPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }} {{- else }} - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.adminPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.adminPasswordKey" . }} {{- end }} {{- else }} - name: ALLOW_EMPTY_PASSWORD @@ -221,24 +221,24 @@ spec: value: {{ $customUser | quote }} {{- if .Values.auth.usePasswordFiles }} - name: POSTGRES_PASSWORD_FILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.userPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.userPasswordKey" .) }} {{- else }} - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.userPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.userPasswordKey" . }} {{- end }} {{- if .Values.auth.enablePostgresUser }} {{- if .Values.auth.usePasswordFiles }} - name: POSTGRES_POSTGRES_PASSWORD_FILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.adminPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }} {{- else }} - name: POSTGRES_POSTGRES_PASSWORD valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.adminPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.adminPasswordKey" . }} {{- end }} {{- end }} {{- end }} @@ -249,20 +249,20 @@ spec: value: {{ .Values.auth.replicationUsername | quote }} {{- if .Values.auth.usePasswordFiles }} - name: POSTGRES_REPLICATION_PASSWORD_FILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.replicationPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.replicationPasswordKey" .) }} {{- else }} - name: POSTGRES_REPLICATION_PASSWORD valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.replicationPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.replicationPasswordKey" . }} {{- end }} - name: POSTGRES_CLUSTER_APP_NAME value: {{ .Values.replication.applicationName }} - name: POSTGRES_MASTER_HOST - value: {{ include "postgresql.primary.fullname" . }} + value: {{ include "postgresql.v1.primary.fullname" . }} - name: POSTGRES_MASTER_PORT_NUMBER - value: {{ include "postgresql.service.port" . | quote }} + value: {{ include "postgresql.v1.service.port" . | quote }} # TLS - name: POSTGRESQL_ENABLE_TLS value: {{ ternary "yes" "no" .Values.tls.enabled | quote }} @@ -270,16 +270,16 @@ spec: - name: POSTGRESQL_TLS_PREFER_SERVER_CIPHERS value: {{ ternary "yes" "no" .Values.tls.preferServerCiphers | quote }} - name: POSTGRESQL_TLS_CERT_FILE - value: {{ include "postgresql.tlsCert" . }} + value: {{ include "postgresql.v1.tlsCert" . }} - name: POSTGRESQL_TLS_KEY_FILE - value: {{ include "postgresql.tlsCertKey" . }} + value: {{ include "postgresql.v1.tlsCertKey" . }} {{- if .Values.tls.certCAFilename }} - name: POSTGRESQL_TLS_CA_FILE - value: {{ include "postgresql.tlsCACert" . }} + value: {{ include "postgresql.v1.tlsCACert" . }} {{- end }} {{- if .Values.tls.crlFilename }} - name: POSTGRESQL_TLS_CRL_FILE - value: {{ include "postgresql.tlsCRL" . }} + value: {{ include "postgresql.v1.tlsCRL" . }} {{- end }} {{- end }} # Audit @@ -334,10 +334,10 @@ spec: command: - /bin/sh - -c - {{- if (include "postgresql.database" .) }} - - exec pg_isready -U {{ default "postgres" $customUser| quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} + {{- if (include "postgresql.v1.database" .) }} + - exec pg_isready -U {{ default "postgres" $customUser| quote }} -d "dbname={{ include "postgresql.v1.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} {{- else }} - - exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} + - exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} {{- end }} {{- end }} {{- if .Values.readReplicas.customLivenessProbe }} @@ -348,10 +348,10 @@ spec: command: - /bin/sh - -c - {{- if (include "postgresql.database" .) }} - - exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} + {{- if (include "postgresql.v1.database" .) }} + - exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.v1.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} {{- else }} - - exec pg_isready -U {{default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} + - exec pg_isready -U {{default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }} {{- end }} {{- end }} {{- if .Values.readReplicas.customReadinessProbe }} @@ -363,7 +363,7 @@ spec: - /bin/sh - -c - -e - {{- include "postgresql.readinessProbeCommand" . | nindent 16 }} + {{- include "postgresql.v1.readinessProbeCommand" . | nindent 16 }} {{- end }} {{- end }} {{- if .Values.readReplicas.resources }} @@ -402,7 +402,7 @@ spec: {{- end }} {{- if .Values.metrics.enabled }} - name: metrics - image: {{ include "postgresql.metrics.image" . }} + image: {{ include "postgresql.v1.metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} {{- if .Values.metrics.containerSecurityContext.enabled }} securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }} @@ -414,18 +414,18 @@ spec: args: [ "--extend.query-path", "/conf/custom-metrics.yaml" ] {{- end }} env: - {{- $database := required "In order to enable metrics you need to specify a database (.Values.auth.database or .Values.global.postgresql.auth.database)" (include "postgresql.database" .) }} + {{- $database := required "In order to enable metrics you need to specify a database (.Values.auth.database or .Values.global.postgresql.auth.database)" (include "postgresql.v1.database" .) }} - name: DATA_SOURCE_URI - value: {{ printf "127.0.0.1:%d/%s?sslmode=disable" (int (include "postgresql.service.port" .)) $database }} + value: {{ printf "127.0.0.1:%d/%s?sslmode=disable" (int (include "postgresql.v1.service.port" .)) $database }} {{- if .Values.auth.usePasswordFiles }} - name: DATA_SOURCE_PASS_FILE - value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.userPasswordKey" .) }} + value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.userPasswordKey" .) }} {{- else }} - name: DATA_SOURCE_PASS valueFrom: secretKeyRef: - name: {{ include "postgresql.secretName" . }} - key: {{ include "postgresql.userPasswordKey" . }} + name: {{ include "postgresql.v1.secretName" . }} + key: {{ include "postgresql.v1.userPasswordKey" . }} {{- end }} - name: DATA_SOURCE_USER value: {{ default "postgres" $customUser | quote }} @@ -481,24 +481,24 @@ spec: {{- if .Values.readReplicas.extendedConfiguration }} - name: postgresql-extended-config configMap: - name: {{ include "postgresql.readReplicas.extendedConfigmapName" . }} + name: {{ include "postgresql.v1.readReplicas.extendedConfigmapName" . }} {{- end }} {{- if .Values.auth.usePasswordFiles }} - name: postgresql-password secret: - secretName: {{ include "postgresql.secretName" . }} + secretName: {{ include "postgresql.v1.secretName" . }} {{- end }} {{- if .Values.tls.enabled }} - name: raw-certificates secret: - secretName: {{ include "postgresql.tlsSecretName" . }} + secretName: {{ include "postgresql.v1.tlsSecretName" . }} - name: postgresql-certificates emptyDir: {} {{- end }} {{- if and .Values.metrics.enabled .Values.metrics.customMetrics }} - name: custom-metrics configMap: - name: {{ printf "%s-metrics" (include "postgresql.readReplica.fullname" .) }} + name: {{ printf "%s-metrics" (include "postgresql.v1.readReplica.fullname" .) }} {{- end }} {{- if .Values.shmVolume.enabled }} - name: dshm diff --git a/charts/bitnami/airflow/charts/postgresql/templates/read/svc-headless.yaml b/charts/bitnami/airflow/charts/postgresql/templates/read/svc-headless.yaml index 26d43e753..249af5f4a 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/read/svc-headless.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/read/svc-headless.yaml @@ -7,13 +7,13 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: Service metadata: - name: {{ include "postgresql.readReplica.svc.headless" . }} + name: {{ include "postgresql.v1.readReplica.svc.headless" . }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: read annotations: {{- if or .Values.readReplicas.service.headless.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.readReplicas.service.headless.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.service.headless.annotations .Values.commonAnnotations ) "context" . ) }} {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} # Use this annotation in addition to the actual publishNotReadyAddresses @@ -30,9 +30,9 @@ spec: publishNotReadyAddresses: true ports: - name: tcp-postgresql - port: {{ include "postgresql.readReplica.service.port" . }} + port: {{ include "postgresql.v1.readReplica.service.port" . }} targetPort: tcp-postgresql - {{- $podLabels := merge .Values.readReplicas.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: read {{- end }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/read/svc.yaml b/charts/bitnami/airflow/charts/postgresql/templates/read/svc.yaml index 9a0ce8ad4..d92c52340 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/read/svc.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/read/svc.yaml @@ -7,12 +7,12 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: Service metadata: - name: {{ include "postgresql.readReplica.fullname" . }} + name: {{ include "postgresql.v1.readReplica.fullname" . }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: read {{- if or .Values.commonAnnotations .Values.readReplicas.service.annotations }} - {{- $annotations := merge .Values.readReplicas.service.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.service.annotations .Values.commonAnnotations ) "context" . ) }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: @@ -37,7 +37,7 @@ spec: {{- end }} ports: - name: tcp-postgresql - port: {{ include "postgresql.readReplica.service.port" . }} + port: {{ include "postgresql.v1.readReplica.service.port" . }} targetPort: tcp-postgresql {{- if and (or (eq .Values.readReplicas.service.type "NodePort") (eq .Values.readReplicas.service.type "LoadBalancer")) (not (empty .Values.readReplicas.service.nodePorts.postgresql)) }} nodePort: {{ .Values.readReplicas.service.nodePorts.postgresql }} @@ -47,7 +47,7 @@ spec: {{- if .Values.readReplicas.service.extraPorts }} {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.service.extraPorts "context" $) | nindent 4 }} {{- end }} - {{- $podLabels := merge .Values.readReplicas.podLabels .Values.commonLabels }} + {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: read {{- end }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/rolebinding.yaml b/charts/bitnami/airflow/charts/postgresql/templates/rolebinding.yaml index c22deae0d..04323a0c4 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/rolebinding.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/rolebinding.yaml @@ -19,6 +19,6 @@ roleRef: apiGroup: rbac.authorization.k8s.io subjects: - kind: ServiceAccount - name: {{ include "postgresql.serviceAccountName" . }} + name: {{ include "postgresql.v1.serviceAccountName" . }} namespace: {{ .Release.Namespace | quote }} {{- end }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/secrets.yaml b/charts/bitnami/airflow/charts/postgresql/templates/secrets.yaml index 589c06deb..6d7f59aa3 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/secrets.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/secrets.yaml @@ -3,16 +3,16 @@ Copyright VMware, Inc. SPDX-License-Identifier: APACHE-2.0 */}} -{{- $host := include "postgresql.primary.fullname" . }} -{{- $port := include "postgresql.service.port" . }} -{{- $customUser := include "postgresql.username" . }} -{{- $postgresPassword := include "common.secrets.lookup" (dict "secret" (include "postgresql.secretName" .) "key" .Values.auth.secretKeys.adminPasswordKey "defaultValue" (ternary (coalesce .Values.global.postgresql.auth.password .Values.auth.password .Values.global.postgresql.auth.postgresPassword .Values.auth.postgresPassword) (coalesce .Values.global.postgresql.auth.postgresPassword .Values.auth.postgresPassword) (or (empty $customUser) (eq $customUser "postgres"))) "context" $) | trimAll "\"" | b64dec }} +{{- $host := include "postgresql.v1.primary.fullname" . }} +{{- $port := include "postgresql.v1.service.port" . }} +{{- $customUser := include "postgresql.v1.username" . }} +{{- $postgresPassword := include "common.secrets.lookup" (dict "secret" (include "postgresql.v1.secretName" .) "key" .Values.auth.secretKeys.adminPasswordKey "defaultValue" (ternary (coalesce .Values.global.postgresql.auth.password .Values.auth.password .Values.global.postgresql.auth.postgresPassword .Values.auth.postgresPassword) (coalesce .Values.global.postgresql.auth.postgresPassword .Values.auth.postgresPassword) (or (empty $customUser) (eq $customUser "postgres"))) "context" $) | trimAll "\"" | b64dec }} {{- if and (not $postgresPassword) .Values.auth.enablePostgresUser }} {{- $postgresPassword = randAlphaNum 10 }} {{- end }} {{- $replicationPassword := "" }} {{- if eq .Values.architecture "replication" }} -{{- $replicationPassword = include "common.secrets.passwords.manage" (dict "secret" (include "postgresql.secretName" .) "key" .Values.auth.secretKeys.replicationPasswordKey "providedValues" (list "auth.replicationPassword") "context" $) | trimAll "\"" | b64dec }} +{{- $replicationPassword = include "common.secrets.passwords.manage" (dict "secret" (include "postgresql.v1.secretName" .) "key" .Values.auth.secretKeys.replicationPasswordKey "providedValues" (list "auth.replicationPassword") "context" $) | trimAll "\"" | b64dec }} {{- end }} {{- $ldapPassword := "" }} {{- if and .Values.ldap.enabled (or .Values.ldap.bind_password .Values.ldap.bindpw) }} @@ -20,10 +20,10 @@ SPDX-License-Identifier: APACHE-2.0 {{- end }} {{- $password := "" }} {{- if and (not (empty $customUser)) (ne $customUser "postgres") }} -{{- $password = include "common.secrets.passwords.manage" (dict "secret" (include "postgresql.secretName" .) "key" .Values.auth.secretKeys.userPasswordKey "providedValues" (list "global.postgresql.auth.password" "auth.password") "context" $) | trimAll "\"" | b64dec }} +{{- $password = include "common.secrets.passwords.manage" (dict "secret" (include "postgresql.v1.secretName" .) "key" .Values.auth.secretKeys.userPasswordKey "providedValues" (list "global.postgresql.auth.password" "auth.password") "context" $) | trimAll "\"" | b64dec }} {{- end }} -{{- $database := include "postgresql.database" . }} -{{- if (include "postgresql.createSecret" .) }} +{{- $database := include "postgresql.v1.database" . }} +{{- if (include "postgresql.v1.createSecret" .) }} apiVersion: v1 kind: Secret metadata: diff --git a/charts/bitnami/airflow/charts/postgresql/templates/serviceaccount.yaml b/charts/bitnami/airflow/charts/postgresql/templates/serviceaccount.yaml index 245e66a91..8886bffc0 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/serviceaccount.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/serviceaccount.yaml @@ -7,11 +7,11 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "postgresql.serviceAccountName" . }} + name: {{ include "postgresql.v1.serviceAccountName" . }} namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} {{- if or .Values.serviceAccount.annotations .Values.commonAnnotations }} - {{- $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 }} diff --git a/charts/bitnami/airflow/charts/postgresql/templates/tls-secrets.yaml b/charts/bitnami/airflow/charts/postgresql/templates/tls-secrets.yaml index 3374206e8..7e44a437c 100644 --- a/charts/bitnami/airflow/charts/postgresql/templates/tls-secrets.yaml +++ b/charts/bitnami/airflow/charts/postgresql/templates/tls-secrets.yaml @@ -3,14 +3,14 @@ Copyright VMware, Inc. SPDX-License-Identifier: APACHE-2.0 */}} -{{- if (include "postgresql.createTlsSecret" . ) }} +{{- if (include "postgresql.v1.createTlsSecret" . ) }} {{- $secretName := printf "%s-crt" (include "common.names.fullname" .) }} {{- $ca := genCA "postgresql-ca" 365 }} {{- $fullname := include "common.names.fullname" . }} {{- $releaseNamespace := .Release.Namespace }} {{- $clusterDomain := .Values.clusterDomain }} -{{- $primaryHeadlessServiceName := include "postgresql.primary.svc.headless" . }} -{{- $readHeadlessServiceName := include "postgresql.readReplica.svc.headless" . }} +{{- $primaryHeadlessServiceName := include "postgresql.v1.primary.svc.headless" . }} +{{- $readHeadlessServiceName := include "postgresql.v1.readReplica.svc.headless" . }} {{- $altNames := list (printf "*.%s.%s.svc.%s" $fullname $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $fullname $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $primaryHeadlessServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $primaryHeadlessServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $readHeadlessServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $readHeadlessServiceName $releaseNamespace $clusterDomain) $fullname }} {{- $cert := genSignedCert $fullname nil $altNames 365 $ca }} apiVersion: v1 diff --git a/charts/bitnami/airflow/values.yaml b/charts/bitnami/airflow/values.yaml index 007d1e792..1064f883c 100644 --- a/charts/bitnami/airflow/values.yaml +++ b/charts/bitnami/airflow/values.yaml @@ -121,7 +121,7 @@ dags: image: registry: docker.io repository: bitnami/os-shell - tag: 11-debian-11-r48 + tag: 11-debian-11-r60 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -188,7 +188,7 @@ web: image: registry: docker.io repository: bitnami/airflow - tag: 2.7.0-debian-11-r5 + tag: 2.7.1-debian-11-r0 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.0-debian-11-r2 + tag: 2.7.1-debian-11-r0 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.0-debian-11-r2 + tag: 2.7.1-debian-11-r0 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-r5 + tag: 2.42.0-debian-11-r14 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-r398 + tag: 0.20220314.0-debian-11-r407 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/charts/bitnami/kafka/Chart.yaml b/charts/bitnami/kafka/Chart.yaml index 13e88d208..2c7aa0be9 100644 --- a/charts/bitnami/kafka/Chart.yaml +++ b/charts/bitnami/kafka/Chart.yaml @@ -10,7 +10,7 @@ annotations: - name: kafka-exporter image: docker.io/bitnami/kafka-exporter:1.7.0-debian-11-r102 - name: kafka - image: docker.io/bitnami/kafka:3.5.1-debian-11-r41 + image: docker.io/bitnami/kafka:3.5.1-debian-11-r44 - name: kubectl image: docker.io/bitnami/kubectl:1.25.13-debian-11-r11 - name: os-shell @@ -45,4 +45,4 @@ maintainers: name: kafka sources: - https://github.com/bitnami/charts/tree/main/bitnami/kafka -version: 25.1.8 +version: 25.1.10 diff --git a/charts/bitnami/kafka/README.md b/charts/bitnami/kafka/README.md index 0a2562fac..ee4a7f42b 100644 --- a/charts/bitnami/kafka/README.md +++ b/charts/bitnami/kafka/README.md @@ -82,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and | ------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | | `image.registry` | Kafka image registry | `docker.io` | | `image.repository` | Kafka image repository | `bitnami/kafka` | -| `image.tag` | Kafka image tag (immutable tags are recommended) | `3.5.1-debian-11-r41` | +| `image.tag` | Kafka image tag (immutable tags are recommended) | `3.5.1-debian-11-r44` | | `image.digest` | Kafka image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | Kafka image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | diff --git a/charts/bitnami/kafka/templates/controller-eligible/statefulset.yaml b/charts/bitnami/kafka/templates/controller-eligible/statefulset.yaml index 3d7749c1c..d661a455b 100644 --- a/charts/bitnami/kafka/templates/controller-eligible/statefulset.yaml +++ b/charts/bitnami/kafka/templates/controller-eligible/statefulset.yaml @@ -439,7 +439,7 @@ spec: resources: requests: storage: {{ .Values.controller.logPersistence.size | quote }} - {{- include "common.storage.class" (dict "persistence" .Values.controller.persistence "global" .Values.global) | nindent 8 }} + {{- include "common.storage.class" (dict "persistence" .Values.controller.logPersistence "global" .Values.global) | nindent 8 }} {{- if .Values.controller.logPersistence.selector }} selector: {{- include "common.tplvalues.render" (dict "value" .Values.controller.logPersistence.selector "context" $) | nindent 10 }} {{- end -}} diff --git a/charts/bitnami/kafka/values.yaml b/charts/bitnami/kafka/values.yaml index abd7ebb61..8198c07fa 100644 --- a/charts/bitnami/kafka/values.yaml +++ b/charts/bitnami/kafka/values.yaml @@ -80,7 +80,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/kafka - tag: 3.5.1-debian-11-r41 + tag: 3.5.1-debian-11-r44 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' diff --git a/charts/bitnami/postgresql/Chart.yaml b/charts/bitnami/postgresql/Chart.yaml index 1e91db1e3..56c4325be 100644 --- a/charts/bitnami/postgresql/Chart.yaml +++ b/charts/bitnami/postgresql/Chart.yaml @@ -38,4 +38,4 @@ maintainers: name: postgresql sources: - https://github.com/bitnami/charts/tree/main/bitnami/postgresql -version: 12.11.0 +version: 12.11.1 diff --git a/charts/cockroach-labs/cockroachdb/Chart.yaml b/charts/cockroach-labs/cockroachdb/Chart.yaml index d4f02c3b5..fb6c94b92 100644 --- a/charts/cockroach-labs/cockroachdb/Chart.yaml +++ b/charts/cockroach-labs/cockroachdb/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.cattle.io/kube-version: '>=1.8-0' catalog.cattle.io/release-name: cockroachdb apiVersion: v1 -appVersion: 23.1.8 +appVersion: 23.1.9 description: CockroachDB is a scalable, survivable, strongly-consistent SQL database. home: https://www.cockroachlabs.com icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png @@ -14,4 +14,4 @@ maintainers: name: cockroachdb sources: - https://github.com/cockroachdb/cockroach -version: 11.1.5 +version: 11.1.6 diff --git a/charts/cockroach-labs/cockroachdb/README.md b/charts/cockroach-labs/cockroachdb/README.md index c1e5ac65f..cd563881c 100644 --- a/charts/cockroach-labs/cockroachdb/README.md +++ b/charts/cockroach-labs/cockroachdb/README.md @@ -229,10 +229,10 @@ kubectl get pods \ ``` ``` -my-release-cockroachdb-0 cockroachdb/cockroach:v23.1.8 -my-release-cockroachdb-1 cockroachdb/cockroach:v23.1.8 -my-release-cockroachdb-2 cockroachdb/cockroach:v23.1.8 -my-release-cockroachdb-3 cockroachdb/cockroach:v23.1.8 +my-release-cockroachdb-0 cockroachdb/cockroach:v23.1.9 +my-release-cockroachdb-1 cockroachdb/cockroach:v23.1.9 +my-release-cockroachdb-2 cockroachdb/cockroach:v23.1.9 +my-release-cockroachdb-3 cockroachdb/cockroach:v23.1.9 ``` Resume normal operations. Once you are comfortable that the stability and performance of the cluster is what you'd expect post-upgrade, finalize the upgrade: @@ -316,7 +316,7 @@ For details see the [`values.yaml`](values.yaml) file. | `conf.store.size` | CockroachDB storage size | `""` | | `conf.store.attrs` | CockroachDB storage attributes | `""` | | `image.repository` | Container image name | `cockroachdb/cockroach` | -| `image.tag` | Container image tag | `v23.1.8` | +| `image.tag` | Container image tag | `v23.1.9` | | `image.pullPolicy` | Container pull policy | `IfNotPresent` | | `image.credentials` | `registry`, `user` and `pass` credentials to pull private image | `{}` | | `statefulset.replicas` | StatefulSet replicas number | `3` | diff --git a/charts/cockroach-labs/cockroachdb/templates/certificate.ca.yaml b/charts/cockroach-labs/cockroachdb/templates/certificate.ca.yaml new file mode 100644 index 000000000..297944629 --- /dev/null +++ b/charts/cockroach-labs/cockroachdb/templates/certificate.ca.yaml @@ -0,0 +1,31 @@ +{{- if and .Values.tls.enabled .Values.tls.certs.certManager }} + {{- if .Values.tls.certs.certManagerIssuer.isSelfSignedIssuer }} +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: {{ template "cockroachdb.fullname" . }}-ca-cert + namespace: {{ .Release.Namespace | quote }} + labels: + helm.sh/chart: {{ template "cockroachdb.chart" . }} + app.kubernetes.io/name: {{ template "cockroachdb.name" . }} + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + {{- with .Values.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + isCA: true + secretName: {{ .Values.tls.certs.caSecret }} + privateKey: + algorithm: ECDSA + size: 256 + commonName: root + subject: + organizations: + - Cockroach + issuerRef: + name: {{ .Values.tls.certs.certManagerIssuer.name }} + kind: {{ .Values.tls.certs.certManagerIssuer.kind }} + group: {{ .Values.tls.certs.certManagerIssuer.group }} + {{- end }} +{{- end }} diff --git a/charts/cockroach-labs/cockroachdb/templates/certificate.client.yaml b/charts/cockroach-labs/cockroachdb/templates/certificate.client.yaml index b32d0c760..d8bf96808 100644 --- a/charts/cockroach-labs/cockroachdb/templates/certificate.client.yaml +++ b/charts/cockroach-labs/cockroachdb/templates/certificate.client.yaml @@ -1,9 +1,5 @@ {{- if and .Values.tls.enabled .Values.tls.certs.certManager }} -{{- if .Values.tls.certs.useCertManagerV1CRDs }} apiVersion: cert-manager.io/v1 -{{- else }} -apiVersion: cert-manager.io/v1alpha2 -{{- end }} kind: Certificate metadata: name: {{ template "cockroachdb.fullname" . }}-root-client @@ -23,26 +19,16 @@ spec: - digital signature - key encipherment - client auth -{{- if .Values.tls.certs.useCertManagerV1CRDs }} privateKey: algorithm: RSA size: 2048 -{{- else }} - keySize: 2048 - keyAlgorithm: rsa -{{- end }} commonName: root -{{- if .Values.tls.certs.useCertManagerV1CRDs }} subject: organizations: - Cockroach -{{- else }} - organization: - - Cockroach -{{- end }} secretName: {{ .Values.tls.certs.clientRootSecret }} issuerRef: - name: {{ .Values.tls.certs.certManagerIssuer.name }} - kind: {{ .Values.tls.certs.certManagerIssuer.kind }} - group: {{ .Values.tls.certs.certManagerIssuer.group }} + name: {{ template "cockroachdb.fullname" . }}-ca-issuer + kind: Issuer + group: cert-manager.io {{- end }} diff --git a/charts/cockroach-labs/cockroachdb/templates/certificate.issuer.yaml b/charts/cockroach-labs/cockroachdb/templates/certificate.issuer.yaml new file mode 100644 index 000000000..5cf579ff9 --- /dev/null +++ b/charts/cockroach-labs/cockroachdb/templates/certificate.issuer.yaml @@ -0,0 +1,20 @@ +{{- if and .Values.tls.enabled .Values.tls.certs.certManager }} + {{- if .Values.tls.certs.certManagerIssuer.isSelfSignedIssuer }} +apiVersion: cert-manager.io/v1 +kind: Issuer +metadata: + name: {{ template "cockroachdb.fullname" . }}-ca-issuer + namespace: {{ .Release.Namespace | quote }} + labels: + helm.sh/chart: {{ template "cockroachdb.chart" . }} + app.kubernetes.io/name: {{ template "cockroachdb.name" . }} + app.kubernetes.io/instance: {{ .Release.Name | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service | quote }} + {{- with .Values.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + ca: + secretName: {{ .Values.tls.certs.caSecret }} + {{- end }} +{{- end }} diff --git a/charts/cockroach-labs/cockroachdb/templates/certificate.node.yaml b/charts/cockroach-labs/cockroachdb/templates/certificate.node.yaml index 38ff1bff8..3392008a8 100644 --- a/charts/cockroach-labs/cockroachdb/templates/certificate.node.yaml +++ b/charts/cockroach-labs/cockroachdb/templates/certificate.node.yaml @@ -1,9 +1,5 @@ {{- if and .Values.tls.enabled .Values.tls.certs.certManager }} -{{- if .Values.tls.certs.useCertManagerV1CRDs }} apiVersion: cert-manager.io/v1 -{{- else }} -apiVersion: cert-manager.io/v1alpha2 -{{- end }} kind: Certificate metadata: name: {{ template "cockroachdb.fullname" . }}-node @@ -24,23 +20,13 @@ spec: - key encipherment - server auth - client auth -{{- if .Values.tls.certs.useCertManagerV1CRDs }} privateKey: algorithm: RSA size: 2048 -{{- else }} - keySize: 2048 - keyAlgorithm: rsa -{{- end }} commonName: node -{{- if .Values.tls.certs.useCertManagerV1CRDs }} subject: organizations: - Cockroach -{{- else }} - organization: - - Cockroach -{{- end }} dnsNames: - "localhost" - "127.0.0.1" @@ -52,7 +38,7 @@ spec: - {{ printf "*.%s.%s.svc.%s" (include "cockroachdb.fullname" .) .Release.Namespace .Values.clusterDomain | quote }} secretName: {{ .Values.tls.certs.nodeSecret }} issuerRef: - name: {{ .Values.tls.certs.certManagerIssuer.name }} - kind: {{ .Values.tls.certs.certManagerIssuer.kind }} - group: {{ .Values.tls.certs.certManagerIssuer.group }} + name: {{ template "cockroachdb.fullname" . }}-ca-issuer + kind: Issuer + group: cert-manager.io {{- end }} diff --git a/charts/cockroach-labs/cockroachdb/values.yaml b/charts/cockroach-labs/cockroachdb/values.yaml index 00f06dd98..816b2807f 100644 --- a/charts/cockroach-labs/cockroachdb/values.yaml +++ b/charts/cockroach-labs/cockroachdb/values.yaml @@ -1,7 +1,13 @@ # Generated file, DO NOT EDIT. Source: build/templates/values.yaml +# Overrides the chart name against the label "app.kubernetes.io/name: " placed on every resource this chart creates. +nameOverride: "" + +# Override the resource names created by this chart which originally is generated using release and chart name. +fullnameOverride: "" + image: repository: cockroachdb/cockroach - tag: v23.1.8 + tag: v23.1.9 pullPolicy: IfNotPresent credentials: {} # registry: docker.io @@ -460,6 +466,8 @@ tls: clientRootSecret: cockroachdb-root # Secret name for node cert. nodeSecret: cockroachdb-node + # Secret name for CA cert + caSecret: cockroach-ca # Enable if the secret is a dedicated TLS. # TLS secrets are created by cert-mananger, for example. tlsSecret: false @@ -506,6 +514,8 @@ tls: group: cert-manager.io kind: Issuer name: cockroachdb + # Make it false when you are providing your own CA issuer + isSelfSignedIssuer: true # Duration of Client certificates in hours clientCertDuration: 672h # Expiry window of client certificates means a window before actual expiry in which client certs should be rotated. @@ -514,9 +524,6 @@ tls: nodeCertDuration: 8760h # Expiry window of node certificates means a window before actual expiry in which node certs should be rotated. nodeCertExpiryWindow: 168h - # Enable if you run cert-manager >=1.0 on K8s <=1.15 with legacy CRDs - # Legacy CRDs only support cert-manager.io/v1 API Versions - useCertManagerV1CRDs: false selfSigner: # Image Placeholder for the selfSigner utility. This will be changed once the CI workflows for the image is in place. diff --git a/charts/datadog/datadog/CHANGELOG.md b/charts/datadog/datadog/CHANGELOG.md index 756acba93..f56099d49 100644 --- a/charts/datadog/datadog/CHANGELOG.md +++ b/charts/datadog/datadog/CHANGELOG.md @@ -1,5 +1,10 @@ # Datadog changelog +## 3.35.2 + +* Fix Agent Service Account Name used in `RoleBinding` for Secret Backend permissions when in GKE Autopliot + + ## 3.35.1 * Add permissions to curl `/metrics/slis` to agent cluster role. diff --git a/charts/datadog/datadog/Chart.yaml b/charts/datadog/datadog/Chart.yaml index 6509178d0..1b5cbc260 100644 --- a/charts/datadog/datadog/Chart.yaml +++ b/charts/datadog/datadog/Chart.yaml @@ -19,4 +19,4 @@ name: datadog sources: - https://app.datadoghq.com/account/settings#agent/kubernetes - https://github.com/DataDog/datadog-agent -version: 3.35.1 +version: 3.35.2 diff --git a/charts/datadog/datadog/README.md b/charts/datadog/datadog/README.md index b066915c5..fa9be7620 100644 --- a/charts/datadog/datadog/README.md +++ b/charts/datadog/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 3.35.1](https://img.shields.io/badge/Version-3.35.1-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 3.35.2](https://img.shields.io/badge/Version-3.35.2-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) [Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds the Datadog Agent to all nodes in your cluster via a DaemonSet. It also optionally depends on the [kube-state-metrics chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics). For more information about monitoring Kubernetes with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/). diff --git a/charts/datadog/datadog/templates/rbac.yaml b/charts/datadog/datadog/templates/rbac.yaml index 2df90a93c..d4f5250c7 100644 --- a/charts/datadog/datadog/templates/rbac.yaml +++ b/charts/datadog/datadog/templates/rbac.yaml @@ -168,7 +168,7 @@ metadata: {{ include "datadog.labels" $ | indent 4 }} subjects: - kind: ServiceAccount - name: {{ template "datadog.fullname" $ }} + name: {{ include "agents.serviceAccountName" $ }} apiGroup: "" namespace: {{ $.Release.Namespace }} roleRef: diff --git a/charts/jenkins/jenkins/CHANGELOG.md b/charts/jenkins/jenkins/CHANGELOG.md index 016340308..d7f465dc4 100644 --- a/charts/jenkins/jenkins/CHANGELOG.md +++ b/charts/jenkins/jenkins/CHANGELOG.md @@ -12,6 +12,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0. The changelog until v1.5.7 was auto-generated based on git commits. Those entries include a reference to the git commit to be able to get more details. +## 4.6.4 + +Introducing TPL function on variables related to hostname in `./charts/jenkins/templates/jenkins-controller-ingress.yaml` + ## 4.6.3 Add values to documentation diff --git a/charts/jenkins/jenkins/Chart.yaml b/charts/jenkins/jenkins/Chart.yaml index 68595449c..5e9aba8e1 100644 --- a/charts/jenkins/jenkins/Chart.yaml +++ b/charts/jenkins/jenkins/Chart.yaml @@ -49,4 +49,4 @@ sources: - https://github.com/jenkinsci/docker-inbound-agent - https://github.com/maorfr/kube-tasks - https://github.com/jenkinsci/configuration-as-code-plugin -version: 4.6.3 +version: 4.6.4 diff --git a/charts/jenkins/jenkins/templates/jenkins-controller-ingress.yaml b/charts/jenkins/jenkins/templates/jenkins-controller-ingress.yaml index e7b6c6fd3..b3b344ff8 100644 --- a/charts/jenkins/jenkins/templates/jenkins-controller-ingress.yaml +++ b/charts/jenkins/jenkins/templates/jenkins-controller-ingress.yaml @@ -52,7 +52,7 @@ spec: {{ tpl (toYaml .Values.controller.ingress.paths | indent 6) . }} {{- end -}} {{- if .Values.controller.ingress.hostName }} - host: {{ .Values.controller.ingress.hostName | quote }} + host: {{ tpl .Values.controller.ingress.hostName . | quote }} {{- end }} {{- if .Values.controller.ingress.resourceRootUrl }} - http: @@ -68,10 +68,10 @@ spec: serviceName: {{ template "jenkins.fullname" . }} servicePort: {{ .Values.controller.servicePort }} {{- end }} - host: {{ .Values.controller.ingress.resourceRootUrl | quote }} + host: {{ tpl .Values.controller.ingress.resourceRootUrl . | quote }} {{- end }} {{- if .Values.controller.ingress.tls }} tls: -{{ toYaml .Values.controller.ingress.tls | indent 4 }} +{{ tpl (toYaml .Values.controller.ingress.tls ) . | indent 4 }} {{- end -}} {{- end }} diff --git a/charts/percona/psmdb-db/Chart.yaml b/charts/percona/psmdb-db/Chart.yaml index e6d8228a0..2f7c4db24 100644 --- a/charts/percona/psmdb-db/Chart.yaml +++ b/charts/percona/psmdb-db/Chart.yaml @@ -10,9 +10,9 @@ description: A Helm chart for installing Percona Server MongoDB Cluster Database home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html icon: https://raw.githubusercontent.com/percona/percona-server-mongodb-operator/main/operator.png maintainers: -- email: ivan.pylypenko@percona.com - name: cap1984 - email: tomislav.plavcic@percona.com name: tplavcic +- email: natalia.marukovich@percona.com + name: nmarukovich name: psmdb-db -version: 1.14.3 +version: 1.14.4 diff --git a/charts/percona/psmdb-db/templates/cluster-secret.yaml b/charts/percona/psmdb-db/templates/cluster-secret.yaml index 430fb0e11..c2019b278 100644 --- a/charts/percona/psmdb-db/templates/cluster-secret.yaml +++ b/charts/percona/psmdb-db/templates/cluster-secret.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ include "psmdb-database.fullname" . }}-secrets + namespace: {{ .Release.Namespace }} labels: {{ include "psmdb-database.labels" . | indent 4 }} type: Opaque diff --git a/charts/percona/psmdb-db/templates/cluster.yaml b/charts/percona/psmdb-db/templates/cluster.yaml index 8afe1e352..f868c4bfd 100644 --- a/charts/percona/psmdb-db/templates/cluster.yaml +++ b/charts/percona/psmdb-db/templates/cluster.yaml @@ -5,6 +5,7 @@ metadata: kubectl.kubernetes.io/last-applied-configuration: | {"apiVersion":"psmdb.percona.com/v1","kind":"PerconaServerMongoDB"} name: {{ include "psmdb-database.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{ include "psmdb-database.labels" . | indent 4 }} finalizers: diff --git a/charts/percona/psmdb-operator/Chart.yaml b/charts/percona/psmdb-operator/Chart.yaml index e0591a232..a9e6bb2ff 100644 --- a/charts/percona/psmdb-operator/Chart.yaml +++ b/charts/percona/psmdb-operator/Chart.yaml @@ -9,11 +9,11 @@ description: A Helm chart for deploying the Percona Operator for MongoDB home: https://docs.percona.com/percona-operator-for-mongodb/ icon: https://raw.githubusercontent.com/percona/percona-server-mongodb-operator/main/operator.png maintainers: -- email: ivan.pylypenko@percona.com - name: cap1984 - email: tomislav.plavcic@percona.com name: tplavcic +- email: natalia.marukovich@percona.com + name: nmarukovich - email: sergey.pronin@percona.com name: spron-in name: psmdb-operator -version: 1.14.2 +version: 1.14.3 diff --git a/charts/percona/psmdb-operator/templates/deployment.yaml b/charts/percona/psmdb-operator/templates/deployment.yaml index 0addbc94f..5d56d0dbf 100644 --- a/charts/percona/psmdb-operator/templates/deployment.yaml +++ b/charts/percona/psmdb-operator/templates/deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "psmdb-operator.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{ include "psmdb-operator.labels" . | indent 4 }} spec: diff --git a/charts/percona/psmdb-operator/templates/role-binding.yaml b/charts/percona/psmdb-operator/templates/role-binding.yaml index 599694984..3f4528400 100644 --- a/charts/percona/psmdb-operator/templates/role-binding.yaml +++ b/charts/percona/psmdb-operator/templates/role-binding.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "psmdb-operator.fullname" . }} + namespace: {{ .Release.Namespace }} --- {{- end }} {{- if .Values.rbac.create }} @@ -16,6 +17,8 @@ metadata: name: service-account-{{ include "psmdb-operator.fullname" . }} {{- if .Values.watchNamespace }} namespace: {{ .Values.watchNamespace }} + {{- else if not .Values.watchAllNamespaces }} + namespace: {{ .Release.Namespace }} {{- end }} labels: {{ include "psmdb-operator.labels" . | indent 4 }} diff --git a/charts/percona/psmdb-operator/templates/role.yaml b/charts/percona/psmdb-operator/templates/role.yaml index 5e99400f8..8586b184c 100644 --- a/charts/percona/psmdb-operator/templates/role.yaml +++ b/charts/percona/psmdb-operator/templates/role.yaml @@ -7,6 +7,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "psmdb-operator.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{ include "psmdb-operator.labels" . | indent 4 }} rules: diff --git a/charts/percona/pxc-db/Chart.yaml b/charts/percona/pxc-db/Chart.yaml index 625418810..4e6f434f3 100644 --- a/charts/percona/pxc-db/Chart.yaml +++ b/charts/percona/pxc-db/Chart.yaml @@ -17,4 +17,4 @@ maintainers: - email: natalia.marukovich@percona.com name: nmarukovich name: pxc-db -version: 1.13.1 +version: 1.13.2 diff --git a/charts/percona/pxc-db/templates/cluster-secret.yaml b/charts/percona/pxc-db/templates/cluster-secret.yaml index 1d7b552d0..da07f331a 100644 --- a/charts/percona/pxc-db/templates/cluster-secret.yaml +++ b/charts/percona/pxc-db/templates/cluster-secret.yaml @@ -7,6 +7,7 @@ metadata: {{- else }} name: {{ include "pxc-database.fullname" . }}-secrets {{- end }} + namespace: {{ .Release.Namespace }} labels: {{ include "pxc-database.labels" . | indent 4 }} type: Opaque diff --git a/charts/percona/pxc-db/templates/cluster-ssl-secret.yaml b/charts/percona/pxc-db/templates/cluster-ssl-secret.yaml index d5a5aa06e..4b870710c 100644 --- a/charts/percona/pxc-db/templates/cluster-ssl-secret.yaml +++ b/charts/percona/pxc-db/templates/cluster-ssl-secret.yaml @@ -11,6 +11,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ $nameDB }}-ssl + namespace: {{ .Release.Namespace }} labels: {{ include "pxc-database.labels" . | indent 4 }} type: kubernetes.io/tls @@ -28,6 +29,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ $nameDB }}-ssl-internal + namespace: {{ .Release.Namespace }} labels: {{ include "pxc-database.labels" . | indent 4 }} type: kubernetes.io/tls diff --git a/charts/percona/pxc-db/templates/cluster.yaml b/charts/percona/pxc-db/templates/cluster.yaml index 6eea25f51..a967aaa55 100644 --- a/charts/percona/pxc-db/templates/cluster.yaml +++ b/charts/percona/pxc-db/templates/cluster.yaml @@ -2,6 +2,7 @@ apiVersion: pxc.percona.com/v1 kind: PerconaXtraDBCluster metadata: name: {{ include "pxc-database.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{ include "pxc-database.labels" . | indent 4 }} finalizers: diff --git a/charts/percona/pxc-db/templates/s3-secret.yaml b/charts/percona/pxc-db/templates/s3-secret.yaml index b3d4fcbda..60413f896 100644 --- a/charts/percona/pxc-db/templates/s3-secret.yaml +++ b/charts/percona/pxc-db/templates/s3-secret.yaml @@ -5,6 +5,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ include "pxc-database.fullname" $ }}-s3-{{ $key }} + namespace: {{ .Release.Namespace }} labels: {{ include "pxc-database.labels" $ | indent 4 }} type: Opaque diff --git a/charts/percona/pxc-db/values.yaml b/charts/percona/pxc-db/values.yaml index 15a4d0b1b..ff40d3ee8 100644 --- a/charts/percona/pxc-db/values.yaml +++ b/charts/percona/pxc-db/values.yaml @@ -582,16 +582,16 @@ backup: secrets: ## You should be overriding these with your own or specify name for clusterSecretName. # passwords: - # root: insecure-root-password - # xtrabackup: insecure-xtrabackup-password - # monitor: insecure-monitor-password - # clustercheck: insecure-clustercheck-password - # proxyadmin: insecure-proxyadmin-password - # pmmserver: insecure-pmmserver-password - # # If pmmserverkey is set in that case pmmserver pass will not be included - # # pmmserverkey: set-pmmserver-api-key - # operator: insecure-operator-password - # replication: insecure-replication-password + # root: insecure-root-password + # xtrabackup: insecure-xtrabackup-password + # monitor: insecure-monitor-password + # clustercheck: insecure-clustercheck-password + # proxyadmin: insecure-proxyadmin-password + # pmmserver: insecure-pmmserver-password + # # If pmmserverkey is set in that case pmmserver pass will not be included + # # pmmserverkey: set-pmmserver-api-key + # operator: insecure-operator-password + # replication: insecure-replication-password ## If you are using `cert-manager` you can skip this next section. tls: {} # This should be the name of a secret that contains certificates. diff --git a/charts/percona/pxc-operator/Chart.yaml b/charts/percona/pxc-operator/Chart.yaml index bf5e18aac..5f973f15e 100644 --- a/charts/percona/pxc-operator/Chart.yaml +++ b/charts/percona/pxc-operator/Chart.yaml @@ -18,4 +18,4 @@ maintainers: - email: sergey.pronin@percona.com name: spron-in name: pxc-operator -version: 1.13.1 +version: 1.13.3 diff --git a/charts/percona/pxc-operator/templates/deployment.yaml b/charts/percona/pxc-operator/templates/deployment.yaml index 2a2dc98d1..69d615dcd 100644 --- a/charts/percona/pxc-operator/templates/deployment.yaml +++ b/charts/percona/pxc-operator/templates/deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "pxc-operator.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{ include "pxc-operator.labels" . | indent 4 }} spec: @@ -40,6 +41,11 @@ spec: protocol: TCP command: - percona-xtradb-cluster-operator + {{- if .Values.containerSecurityContext.readOnlyRootFilesystem }} + volumeMounts: + - name: tmpdir + mountPath: /tmp + {{- end }} env: - name: WATCH_NAMESPACE {{- if .Values.watchAllNamespaces }} @@ -83,6 +89,11 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- if .Values.containerSecurityContext.readOnlyRootFilesystem }} + volumes: + - name: tmpdir + emptyDir: {} + {{- end }} {{- if .Values.watchAllNamespaces }} --- apiVersion: v1 diff --git a/charts/percona/pxc-operator/templates/role-binding.yaml b/charts/percona/pxc-operator/templates/role-binding.yaml index a8450007e..57913f93d 100644 --- a/charts/percona/pxc-operator/templates/role-binding.yaml +++ b/charts/percona/pxc-operator/templates/role-binding.yaml @@ -3,11 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "pxc-operator.fullname" . }} ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: percona-xtradb-cluster-operator + namespace: {{ .Release.Namespace }} --- {{- end }} {{- if .Values.rbac.create }} @@ -21,6 +17,8 @@ metadata: name: {{ include "pxc-operator.fullname" . }} {{- if .Values.watchNamespace }} namespace: {{ .Values.watchNamespace }} + {{- else if not .Values.watchAllNamespaces }} + namespace: {{ .Release.Namespace }} {{- end }} labels: {{ include "pxc-operator.labels" . | indent 4 }} diff --git a/charts/percona/pxc-operator/templates/role.yaml b/charts/percona/pxc-operator/templates/role.yaml index d08bb12a2..7d3bc46c6 100644 --- a/charts/percona/pxc-operator/templates/role.yaml +++ b/charts/percona/pxc-operator/templates/role.yaml @@ -7,6 +7,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ include "pxc-operator.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{ include "pxc-operator.labels" . | indent 4 }} rules: diff --git a/charts/speedscale/speedscale-operator/Chart.yaml b/charts/speedscale/speedscale-operator/Chart.yaml index 85e849a45..eb56115a3 100644 --- a/charts/speedscale/speedscale-operator/Chart.yaml +++ b/charts/speedscale/speedscale-operator/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.cattle.io/kube-version: '>= 1.17.0-0' catalog.cattle.io/release-name: speedscale-operator apiVersion: v1 -appVersion: 1.3.352 +appVersion: 1.3.354 description: Stress test your APIs with real world scenarios. Collect and replay traffic without scripting. home: https://speedscale.com @@ -24,4 +24,4 @@ maintainers: - email: support@speedscale.com name: Speedscale Support name: speedscale-operator -version: 1.3.30 +version: 1.3.31 diff --git a/charts/speedscale/speedscale-operator/README.md b/charts/speedscale/speedscale-operator/README.md index 32509a2d4..1a3c6f541 100644 --- a/charts/speedscale/speedscale-operator/README.md +++ b/charts/speedscale/speedscale-operator/README.md @@ -101,10 +101,10 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. -### Upgrade to 1.3.30 +### Upgrade to 1.3.31 ```bash -kubectl apply --server-side -f https://raw.githubusercontent.com/speedscale/operator-helm/main/1.3.30/templates/crds/trafficreplays.yaml +kubectl apply --server-side -f https://raw.githubusercontent.com/speedscale/operator-helm/main/1.3.31/templates/crds/trafficreplays.yaml ``` ### Upgrade to 1.1.0 diff --git a/charts/speedscale/speedscale-operator/app-readme.md b/charts/speedscale/speedscale-operator/app-readme.md index 32509a2d4..1a3c6f541 100644 --- a/charts/speedscale/speedscale-operator/app-readme.md +++ b/charts/speedscale/speedscale-operator/app-readme.md @@ -101,10 +101,10 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. -### Upgrade to 1.3.30 +### Upgrade to 1.3.31 ```bash -kubectl apply --server-side -f https://raw.githubusercontent.com/speedscale/operator-helm/main/1.3.30/templates/crds/trafficreplays.yaml +kubectl apply --server-side -f https://raw.githubusercontent.com/speedscale/operator-helm/main/1.3.31/templates/crds/trafficreplays.yaml ``` ### Upgrade to 1.1.0 diff --git a/charts/speedscale/speedscale-operator/values.yaml b/charts/speedscale/speedscale-operator/values.yaml index b6f1ee91d..382e3010e 100644 --- a/charts/speedscale/speedscale-operator/values.yaml +++ b/charts/speedscale/speedscale-operator/values.yaml @@ -20,7 +20,7 @@ clusterName: "my-cluster" # Speedscale components image settings. image: registry: gcr.io/speedscale - tag: v1.3.352 + tag: v1.3.354 pullPolicy: Always # Log level for Speedscale components. diff --git a/index.yaml b/index.yaml index 612ee7414..5780ff35c 100644 --- a/index.yaml +++ b/index.yaml @@ -80,6 +80,63 @@ entries: - assets/datawiza/access-broker-0.1.1.tgz version: 0.1.1 airflow: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Apache Airflow + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: airflow + category: WorkFlow + images: | + - name: airflow-exporter + image: docker.io/bitnami/airflow-exporter:0.20220314.0-debian-11-r407 + - name: airflow-scheduler + image: docker.io/bitnami/airflow-scheduler:2.7.1-debian-11-r0 + - name: airflow-worker + image: docker.io/bitnami/airflow-worker:2.7.1-debian-11-r0 + - name: airflow + image: docker.io/bitnami/airflow:2.7.1-debian-11-r0 + - name: git + image: docker.io/bitnami/git:2.42.0-debian-11-r14 + - name: os-shell + image: docker.io/bitnami/os-shell:11-debian-11-r60 + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 2.7.1 + created: "2023-09-11T12:16:43.458077573Z" + dependencies: + - condition: redis.enabled + name: redis + repository: file://./charts/redis + version: 18.x.x + - condition: postgresql.enabled + name: postgresql + repository: file://./charts/postgresql + version: 12.x.x + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: Apache Airflow is a tool to express and execute workflows as directed + acyclic graphs (DAGs). It includes utilities to schedule tasks, monitor task + progress and handle task dependencies. + digest: 24fe4a1d694b47bbf4962539050fc92a0bd26c11d9b5bc00fbb02faaca649082 + home: https://bitnami.com + icon: https://svn.apache.org/repos/asf/comdev/project-logos/originals/airflow-1.svg + keywords: + - apache + - airflow + - workflow + - dag + maintainers: + - name: VMware, Inc. + url: https://github.com/bitnami/charts + name: airflow + sources: + - https://github.com/bitnami/charts/tree/main/bitnami/airflow + urls: + - assets/bitnami/airflow-15.0.4.tgz + version: 15.0.4 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Apache Airflow @@ -1608,8 +1665,8 @@ entries: argo-cd: - annotations: artifacthub.io/changes: | - - kind: fixed - description: do not hardcode the pathtype of the grpc ingress rule when using a single ingress resource in aws alb + - kind: added + description: added a toggle for the shared Helm working directory artifacthub.io/signKey: | fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 url: https://argoproj.github.io/argo-helm/pgp_keys.asc @@ -1619,8 +1676,8 @@ entries: catalog.cattle.io/kube-version: '>=1.23.0-0' catalog.cattle.io/release-name: argo-cd apiVersion: v2 - appVersion: v2.8.2 - created: "2023-09-07T17:00:39.282679727Z" + appVersion: v2.8.3 + created: "2023-09-11T12:16:42.139946304Z" dependencies: - condition: redis-ha.enabled name: redis-ha @@ -1628,7 +1685,46 @@ entries: version: 4.23.0 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. - digest: 60af17d4df40cbc45871fb0de0c0fa88c01d4e73e5592390b0e348ff83e90538 + digest: 8fb4e9bb5ef3c30f45569d9307840851499f1e58fed7176ba41ab09e5b77ffbc + home: https://github.com/argoproj/argo-helm + icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png + keywords: + - argoproj + - argocd + - gitops + kubeVersion: '>=1.23.0-0' + maintainers: + - name: argoproj + url: https://argoproj.github.io/ + name: argo-cd + sources: + - https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd + - https://github.com/argoproj/argo-cd + urls: + - assets/argo/argo-cd-5.46.0.tgz + version: 5.46.0 + - annotations: + artifacthub.io/changes: | + - kind: fixed + description: do not hardcode the pathtype of the grpc ingress rule when using a single ingress resource in aws alb + artifacthub.io/signKey: | + fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 + url: https://argoproj.github.io/argo-helm/pgp_keys.asc + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Argo CD + catalog.cattle.io/kube-version: '>=1.23.0-0' + catalog.cattle.io/release-name: argo-cd + apiVersion: v2 + appVersion: v2.8.2 + created: "2023-09-11T12:16:25.362919206Z" + dependencies: + - condition: redis-ha.enabled + name: redis-ha + repository: file://./charts/redis-ha + version: 4.23.0 + description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery + tool for Kubernetes. + digest: 6fbc5fa7e8bcd310f491f935b8df10730b1c7843b0f4362b2cce8d9aa6c57b0b home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -11684,6 +11780,27 @@ entries: - assets/cloudcasa/cloudcasa-0.1.000.tgz version: 0.1.000 cockroachdb: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: CockroachDB + catalog.cattle.io/kube-version: '>=1.8-0' + catalog.cattle.io/release-name: cockroachdb + apiVersion: v1 + appVersion: 23.1.9 + created: "2023-09-11T12:16:46.149356708Z" + description: CockroachDB is a scalable, survivable, strongly-consistent SQL database. + digest: 14d0aa9faca8202bf7096bb75bac24204d1fe5a00e868612a41000d11b27a3c2 + home: https://www.cockroachlabs.com + icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png + maintainers: + - email: helm-charts@cockroachlabs.com + name: cockroachlabs + name: cockroachdb + sources: + - https://github.com/cockroachdb/cockroach + urls: + - assets/cockroach-labs/cockroachdb-11.1.6.tgz + version: 11.1.6 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: CockroachDB @@ -15103,6 +15220,43 @@ entries: - assets/weka/csi-wekafsplugin-0.6.400.tgz version: 0.6.400 datadog: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Datadog + catalog.cattle.io/kube-version: '>=1.10-0' + catalog.cattle.io/release-name: datadog + apiVersion: v1 + appVersion: "7" + created: "2023-09-11T12:16:46.765486071Z" + dependencies: + - condition: clusterAgent.metricsProvider.useDatadogMetrics + name: datadog-crds + repository: https://helm.datadoghq.com + tags: + - install-crds + version: 1.0.1 + - condition: datadog.kubeStateMetricsEnabled + name: kube-state-metrics + repository: https://prometheus-community.github.io/helm-charts + version: 2.13.2 + description: Datadog Agent + digest: 509af1e12ef7c444f1374136f57ace3c63078e61f3a9b6866fcc424815212982 + home: https://www.datadoghq.com + icon: https://datadog-live.imgix.net/img/dd_logo_70x75.png + keywords: + - monitoring + - alerting + - metric + maintainers: + - email: support@datadoghq.com + name: Datadog + name: datadog + sources: + - https://app.datadoghq.com/account/settings#agent/kubernetes + - https://github.com/DataDog/datadog-agent + urls: + - assets/datadog/datadog-3.35.2.tgz + version: 3.35.2 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Datadog @@ -23803,6 +23957,62 @@ entries: - assets/jaeger/jaeger-operator-2.36.0.tgz version: 2.36.0 jenkins: + - annotations: + artifacthub.io/category: integration-delivery + artifacthub.io/images: | + - name: jenkins + image: jenkins/jenkins:2.414.1-jdk11 + - name: k8s-sidecar + image: kiwigrid/k8s-sidecar:1.24.4 + - name: inbound-agent + image: jenkins/inbound-agent:3107.v665000b_51092-15 + - name: backup + image: maorfr/kube-tasks:0.2.0 + artifacthub.io/license: Apache-2.0 + artifacthub.io/links: | + - name: Chart Source + url: https://github.com/jenkinsci/helm-charts/tree/main/charts/jenkins + - name: Jenkins + url: https://www.jenkins.io/ + - name: support + url: https://github.com/jenkinsci/helm-charts/issues + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Jenkins + catalog.cattle.io/kube-version: '>=1.14-0' + catalog.cattle.io/release-name: jenkins + apiVersion: v2 + appVersion: 2.414.1 + created: "2023-09-11T12:16:47.792846376Z" + description: Jenkins - Build great things at any scale! The leading open source + automation server, Jenkins provides over 1800 plugins to support building, deploying + and automating any project. + digest: 1a1eb48edee81d9c073415da2651a9510094aa976cf00688dd6ffcd025d2e7f1 + home: https://jenkins.io/ + icon: https://get.jenkins.io/art/jenkins-logo/logo.svg + keywords: + - jenkins + - ci + - devops + maintainers: + - email: maor.friedman@redhat.com + name: maorfr + - email: mail@torstenwalter.de + name: torstenwalter + - email: garridomota@gmail.com + name: mogaal + - email: wmcdona89@gmail.com + name: wmcdona89 + - email: timjacomb1@gmail.com + name: timja + name: jenkins + sources: + - https://github.com/jenkinsci/jenkins + - https://github.com/jenkinsci/docker-inbound-agent + - https://github.com/maorfr/kube-tasks + - https://github.com/jenkinsci/configuration-as-code-plugin + urls: + - assets/jenkins/jenkins-4.6.4.tgz + version: 4.6.4 - annotations: artifacthub.io/category: integration-delivery artifacthub.io/images: | @@ -27061,6 +27271,58 @@ entries: - assets/kasten/k10-4.5.900.tgz version: 4.5.900 kafka: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Apache Kafka + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: kafka + category: Infrastructure + images: | + - name: jmx-exporter + image: docker.io/bitnami/jmx-exporter:0.19.0-debian-11-r66 + - name: kafka-exporter + image: docker.io/bitnami/kafka-exporter:1.7.0-debian-11-r102 + - name: kafka + image: docker.io/bitnami/kafka:3.5.1-debian-11-r44 + - name: kubectl + image: docker.io/bitnami/kubectl:1.25.13-debian-11-r11 + - name: os-shell + image: docker.io/bitnami/os-shell:11-debian-11-r60 + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 3.5.1 + created: "2023-09-11T12:16:43.962640242Z" + dependencies: + - condition: zookeeper.enabled + name: zookeeper + repository: file://./charts/zookeeper + version: 12.x.x + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: Apache Kafka is a distributed streaming platform designed to build + real-time pipelines and can be used as a message broker or as a replacement + for a log aggregation solution for big data applications. + digest: 839b3af4b290774949323e22dc83b6ccd0d017cb03f9e3c9789f107a3446f75b + home: https://bitnami.com + icon: https://svn.apache.org/repos/asf/comdev/project-logos/originals/kafka.svg + keywords: + - kafka + - zookeeper + - streaming + - producer + - consumer + maintainers: + - name: VMware, Inc. + url: https://github.com/bitnami/charts + name: kafka + sources: + - https://github.com/bitnami/charts/tree/main/bitnami/kafka + urls: + - assets/bitnami/kafka-25.1.10.tgz + version: 25.1.10 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Apache Kafka @@ -40202,6 +40464,51 @@ entries: - assets/portworx/portworx-essentials-2.9.100.tgz version: 2.9.100 postgresql: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: PostgreSQL + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: postgresql + category: Database + images: | + - name: os-shell + image: docker.io/bitnami/os-shell:11-debian-11-r43 + - name: postgres-exporter + image: docker.io/bitnami/postgres-exporter:0.13.2-debian-11-r25 + - name: postgresql + image: docker.io/bitnami/postgresql:15.4.0-debian-11-r10 + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 15.4.0 + created: "2023-09-11T12:16:44.356520415Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: PostgreSQL (Postgres) is an open source object-relational database + known for reliability and data integrity. ACID-compliant, it supports foreign + keys, joins, views, triggers and stored procedures. + digest: d44081c4f6681945dbf635e3c66e984d1e2507903ef78a73901f41d7b62bcf58 + home: https://bitnami.com + icon: https://wiki.postgresql.org/images/a/a4/PostgreSQL_logo.3colors.svg + keywords: + - postgresql + - postgres + - database + - sql + - replication + - cluster + maintainers: + - name: VMware, Inc. + url: https://github.com/bitnami/charts + name: postgresql + sources: + - https://github.com/bitnami/charts/tree/main/bitnami/postgresql + urls: + - assets/bitnami/postgresql-12.11.1.tgz + version: 12.11.1 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: PostgreSQL @@ -42123,6 +42430,28 @@ entries: - assets/bitnami/postgresql-11.9.12.tgz version: 11.9.12 psmdb-db: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Percona Server for MongoDB + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: psmdb-db + apiVersion: v2 + appVersion: 1.14.0 + created: "2023-09-11T12:16:50.711832678Z" + description: A Helm chart for installing Percona Server MongoDB Cluster Databases + using the PSMDB Operator. + digest: d34d9f7c7da57668b46f90e97002f774937d4eb28adeb492ddf0336cd8961789 + home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html + icon: https://raw.githubusercontent.com/percona/percona-server-mongodb-operator/main/operator.png + maintainers: + - email: tomislav.plavcic@percona.com + name: tplavcic + - email: natalia.marukovich@percona.com + name: nmarukovich + name: psmdb-db + urls: + - assets/percona/psmdb-db-1.14.4.tgz + version: 1.14.4 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Percona Server for MongoDB @@ -42234,6 +42563,29 @@ entries: - assets/percona/psmdb-db-1.13.0.tgz version: 1.13.0 psmdb-operator: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Percona Operator for MongoDB + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: psmdb-operator + apiVersion: v2 + appVersion: 1.14.0 + created: "2023-09-11T12:16:50.731380343Z" + description: A Helm chart for deploying the Percona Operator for MongoDB + digest: a5fd9ffbe9d3c1b9fa605343b825ff459b50a60e5e14c5ded97d4ca0aaef2dc3 + home: https://docs.percona.com/percona-operator-for-mongodb/ + icon: https://raw.githubusercontent.com/percona/percona-server-mongodb-operator/main/operator.png + maintainers: + - email: tomislav.plavcic@percona.com + name: tplavcic + - email: natalia.marukovich@percona.com + name: nmarukovich + - email: sergey.pronin@percona.com + name: spron-in + name: psmdb-operator + urls: + - assets/percona/psmdb-operator-1.14.3.tgz + version: 1.14.3 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Percona Operator for MongoDB @@ -42372,6 +42724,30 @@ entries: - assets/percona/psmdb-operator-1.13.1.tgz version: 1.13.1 pxc-db: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Percona XtraDB Cluster + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: pxc-db + apiVersion: v2 + appVersion: 1.13.0 + created: "2023-09-11T12:16:50.746771716Z" + description: A Helm chart for installing Percona XtraDB Cluster Databases using + the PXC Operator. + digest: e2728e278ebcca3f4ad4c0ac5ac6863be7ba183dc0b72e28a18608f228bf2ab9 + home: https://www.percona.com/doc/kubernetes-operator-for-pxc/kubernetes.html + icon: https://raw.githubusercontent.com/percona/percona-xtradb-cluster-operator/main/operator.png + maintainers: + - email: tomislav.plavcic@percona.com + name: tplavcic + - email: sergey.pronin@percona.com + name: spron-in + - email: natalia.marukovich@percona.com + name: nmarukovich + name: pxc-db + urls: + - assets/percona/pxc-db-1.13.2.tgz + version: 1.13.2 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Percona XtraDB Cluster @@ -42523,6 +42899,31 @@ entries: - assets/percona/pxc-db-1.12.0.tgz version: 1.12.0 pxc-operator: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Percona Operator For MySQL based on Percona + XtraDB Cluster + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: pxc-operator + apiVersion: v2 + appVersion: 1.13.0 + created: "2023-09-11T12:16:50.755906Z" + description: A Helm chart for deploying the Percona Operator for MySQL (based + on Percona XtraDB Cluster) + digest: 7047bc0e3138a12d925c8e358fb850cacc5bbfc1d103c37eb151cf9e5d83e9b1 + home: https://docs.percona.com/percona-operator-for-mysql/pxc/ + icon: https://raw.githubusercontent.com/percona/percona-xtradb-cluster-operator/main/operator.png + maintainers: + - email: tomislav.plavcic@percona.com + name: tplavcic + - email: natalia.marukovich@percona.com + name: nmarukovich + - email: sergey.pronin@percona.com + name: spron-in + name: pxc-operator + urls: + - assets/percona/pxc-operator-1.13.3.tgz + version: 1.13.3 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Percona Operator For MySQL based on Percona @@ -49378,6 +49779,37 @@ entries: - assets/bitnami/spark-6.3.8.tgz version: 6.3.8 speedscale-operator: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Speedscale Operator + catalog.cattle.io/kube-version: '>= 1.17.0-0' + catalog.cattle.io/release-name: speedscale-operator + apiVersion: v1 + appVersion: 1.3.354 + created: "2023-09-11T12:16:51.243944738Z" + description: Stress test your APIs with real world scenarios. Collect and replay + traffic without scripting. + digest: 7d92c31c4f3afeb465ee8192a4ca9ace29b28de30479f95b83eb1fc66103065d + home: https://speedscale.com + icon: https://raw.githubusercontent.com/speedscale/assets/main/logo/gold_logo_only.png + keywords: + - speedscale + - test + - testing + - regression + - reliability + - load + - replay + - network + - traffic + kubeVersion: '>= 1.17.0-0' + maintainers: + - email: support@speedscale.com + name: Speedscale Support + name: speedscale-operator + urls: + - assets/speedscale/speedscale-operator-1.3.31.tgz + version: 1.3.31 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Speedscale Operator