diff --git a/assets/argo/argo-cd-5.40.0.tgz b/assets/argo/argo-cd-5.40.0.tgz index c6f392fcc..f027b9324 100644 Binary files a/assets/argo/argo-cd-5.40.0.tgz and b/assets/argo/argo-cd-5.40.0.tgz differ diff --git a/assets/argo/argo-cd-5.41.0.tgz b/assets/argo/argo-cd-5.41.0.tgz new file mode 100644 index 000000000..4866e818b Binary files /dev/null and b/assets/argo/argo-cd-5.41.0.tgz differ diff --git a/assets/bitnami/kafka-23.0.5.tgz b/assets/bitnami/kafka-23.0.5.tgz new file mode 100644 index 000000000..ed4aaf757 Binary files /dev/null and b/assets/bitnami/kafka-23.0.5.tgz differ diff --git a/assets/bitnami/mysql-9.10.7.tgz b/assets/bitnami/mysql-9.10.7.tgz new file mode 100644 index 000000000..41d1b5a78 Binary files /dev/null and b/assets/bitnami/mysql-9.10.7.tgz differ diff --git a/assets/bitnami/zookeeper-11.4.7.tgz b/assets/bitnami/zookeeper-11.4.7.tgz new file mode 100644 index 000000000..49ee6e69c Binary files /dev/null and b/assets/bitnami/zookeeper-11.4.7.tgz differ diff --git a/assets/datadog/datadog-3.33.2.tgz b/assets/datadog/datadog-3.33.2.tgz new file mode 100644 index 000000000..7edf13ec8 Binary files /dev/null and b/assets/datadog/datadog-3.33.2.tgz differ diff --git a/charts/argo/argo-cd/Chart.yaml b/charts/argo/argo-cd/Chart.yaml index 56ec8f3ee..3429aba72 100644 --- a/charts/argo/argo-cd/Chart.yaml +++ b/charts/argo/argo-cd/Chart.yaml @@ -1,7 +1,7 @@ annotations: artifacthub.io/changes: | - kind: changed - description: Allow configurable metrics in server and repoServer HPAs + description: Make ServiceMonitor deployment conditional on CRD existence artifacthub.io/signKey: | fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 url: https://argoproj.github.io/argo-helm/pgp_keys.asc @@ -33,4 +33,4 @@ name: argo-cd sources: - https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd - https://github.com/argoproj/argo-cd -version: 5.40.0 +version: 5.41.0 diff --git a/charts/argo/argo-cd/templates/argocd-application-controller/servicemonitor.yaml b/charts/argo/argo-cd/templates/argocd-application-controller/servicemonitor.yaml index 10ba77678..3ce0c10da 100644 --- a/charts/argo/argo-cd/templates/argocd-application-controller/servicemonitor.yaml +++ b/charts/argo/argo-cd/templates/argocd-application-controller/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled }} +{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/argo/argo-cd/templates/argocd-applicationset/servicemonitor.yaml b/charts/argo/argo-cd/templates/argocd-applicationset/servicemonitor.yaml index bb814a254..b3554675a 100644 --- a/charts/argo/argo-cd/templates/argocd-applicationset/servicemonitor.yaml +++ b/charts/argo/argo-cd/templates/argocd-applicationset/servicemonitor.yaml @@ -1,5 +1,5 @@ {{- if .Values.applicationSet.enabled }} -{{- if and .Values.applicationSet.metrics.enabled .Values.applicationSet.metrics.serviceMonitor.enabled }} +{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.applicationSet.metrics.enabled .Values.applicationSet.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/argo/argo-cd/templates/argocd-notifications/servicemonitor.yaml b/charts/argo/argo-cd/templates/argocd-notifications/servicemonitor.yaml index de3cc5a35..18849886b 100644 --- a/charts/argo/argo-cd/templates/argocd-notifications/servicemonitor.yaml +++ b/charts/argo/argo-cd/templates/argocd-notifications/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.notifications.enabled .Values.notifications.metrics.enabled .Values.notifications.metrics.serviceMonitor.enabled }} +{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.notifications.enabled .Values.notifications.metrics.enabled .Values.notifications.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/argo/argo-cd/templates/argocd-repo-server/servicemonitor.yaml b/charts/argo/argo-cd/templates/argocd-repo-server/servicemonitor.yaml index aec96461c..c41520b72 100644 --- a/charts/argo/argo-cd/templates/argocd-repo-server/servicemonitor.yaml +++ b/charts/argo/argo-cd/templates/argocd-repo-server/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.repoServer.metrics.enabled .Values.repoServer.metrics.serviceMonitor.enabled }} +{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.repoServer.metrics.enabled .Values.repoServer.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/argo/argo-cd/templates/argocd-server/servicemonitor.yaml b/charts/argo/argo-cd/templates/argocd-server/servicemonitor.yaml index 65d102e3b..f876a1a18 100644 --- a/charts/argo/argo-cd/templates/argocd-server/servicemonitor.yaml +++ b/charts/argo/argo-cd/templates/argocd-server/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.server.metrics.enabled .Values.server.metrics.serviceMonitor.enabled }} +{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.server.metrics.enabled .Values.server.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/argo/argo-cd/templates/dex/servicemonitor.yaml b/charts/argo/argo-cd/templates/dex/servicemonitor.yaml index 21d12be25..00f2a238d 100644 --- a/charts/argo/argo-cd/templates/dex/servicemonitor.yaml +++ b/charts/argo/argo-cd/templates/dex/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.dex.metrics.enabled .Values.dex.metrics.serviceMonitor.enabled }} +{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.dex.metrics.enabled .Values.dex.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/argo/argo-cd/templates/redis/servicemonitor.yaml b/charts/argo/argo-cd/templates/redis/servicemonitor.yaml index 46a7e32ca..6f036a804 100644 --- a/charts/argo/argo-cd/templates/redis/servicemonitor.yaml +++ b/charts/argo/argo-cd/templates/redis/servicemonitor.yaml @@ -1,5 +1,5 @@ {{- $redisHa := (index .Values "redis-ha") -}} -{{- if and .Values.redis.enabled (not $redisHa.enabled) .Values.redis.metrics.enabled .Values.redis.metrics.serviceMonitor.enabled -}} +{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.redis.enabled (not $redisHa.enabled) .Values.redis.metrics.enabled .Values.redis.metrics.serviceMonitor.enabled -}} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/bitnami/kafka/Chart.lock b/charts/bitnami/kafka/Chart.lock index 5b17d2c79..47b846cc6 100644 --- a/charts/bitnami/kafka/Chart.lock +++ b/charts/bitnami/kafka/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: zookeeper repository: oci://registry-1.docker.io/bitnamicharts - version: 11.4.3 + version: 11.4.4 - name: common repository: oci://registry-1.docker.io/bitnamicharts version: 2.6.0 -digest: sha256:4271c5c11b86e9fd012122ff557d14248e61e0f36c88c5f55b4bbc1ea0fb2500 -generated: "2023-07-05T20:04:24.503191641Z" +digest: sha256:eb441c9e4ac242b2344186ba0bb571fb8e64cf8352c0bc269f7dddf62acafe2e +generated: "2023-07-17T16:00:14.115937769Z" diff --git a/charts/bitnami/kafka/Chart.yaml b/charts/bitnami/kafka/Chart.yaml index 110508940..f281d1672 100644 --- a/charts/bitnami/kafka/Chart.yaml +++ b/charts/bitnami/kafka/Chart.yaml @@ -34,4 +34,4 @@ maintainers: name: kafka sources: - https://github.com/bitnami/charts/tree/main/bitnami/kafka -version: 23.0.4 +version: 23.0.5 diff --git a/charts/bitnami/kafka/README.md b/charts/bitnami/kafka/README.md index 6dee70c5e..231d1bd13 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.0-debian-11-r7` | +| `image.tag` | Kafka image tag (immutable tags are recommended) | `3.5.0-debian-11-r21` | | `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 | `[]` | @@ -256,7 +256,7 @@ The command removes all the Kubernetes components associated with the chart and | `externalAccess.autoDiscovery.enabled` | Enable using an init container to auto-detect external IPs/ports by querying the K8s API | `false` | | `externalAccess.autoDiscovery.image.registry` | Init container auto-discovery image registry | `docker.io` | | `externalAccess.autoDiscovery.image.repository` | Init container auto-discovery image repository | `bitnami/kubectl` | -| `externalAccess.autoDiscovery.image.tag` | Init container auto-discovery image tag (immutable tags are recommended) | `1.25.11-debian-11-r10` | +| `externalAccess.autoDiscovery.image.tag` | Init container auto-discovery image tag (immutable tags are recommended) | `1.25.11-debian-11-r33` | | `externalAccess.autoDiscovery.image.digest` | Kubectl image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `externalAccess.autoDiscovery.image.pullPolicy` | Init container auto-discovery image pull policy | `IfNotPresent` | | `externalAccess.autoDiscovery.image.pullSecrets` | Init container auto-discovery image pull secrets | `[]` | @@ -312,7 +312,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/os-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r2` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r11` | | `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Init container volume-permissions image pull secrets | `[]` | @@ -337,7 +337,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.kafka.enabled` | Whether or not to create a standalone Kafka exporter to expose Kafka metrics | `false` | | `metrics.kafka.image.registry` | Kafka exporter image registry | `docker.io` | | `metrics.kafka.image.repository` | Kafka exporter image repository | `bitnami/kafka-exporter` | -| `metrics.kafka.image.tag` | Kafka exporter image tag (immutable tags are recommended) | `1.7.0-debian-11-r16` | +| `metrics.kafka.image.tag` | Kafka exporter image tag (immutable tags are recommended) | `1.7.0-debian-11-r53` | | `metrics.kafka.image.digest` | Kafka exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.kafka.image.pullPolicy` | Kafka exporter image pull policy | `IfNotPresent` | | `metrics.kafka.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -385,7 +385,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.jmx.enabled` | Whether or not to expose JMX metrics to Prometheus | `false` | | `metrics.jmx.image.registry` | JMX exporter image registry | `docker.io` | | `metrics.jmx.image.repository` | JMX exporter image repository | `bitnami/jmx-exporter` | -| `metrics.jmx.image.tag` | JMX exporter image tag (immutable tags are recommended) | `0.19.0-debian-11-r4` | +| `metrics.jmx.image.tag` | JMX exporter image tag (immutable tags are recommended) | `0.19.0-debian-11-r16` | | `metrics.jmx.image.digest` | JMX exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.jmx.image.pullPolicy` | JMX exporter image pull policy | `IfNotPresent` | | `metrics.jmx.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | diff --git a/charts/bitnami/kafka/charts/zookeeper/Chart.lock b/charts/bitnami/kafka/charts/zookeeper/Chart.lock index 5812ea269..6bc47be4a 100644 --- a/charts/bitnami/kafka/charts/zookeeper/Chart.lock +++ b/charts/bitnami/kafka/charts/zookeeper/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.4.0 -digest: sha256:8c1a5dc923412d11d4d841420494b499cb707305c8b9f87f45ea1a8bf3172cb3 -generated: "2023-05-21T17:05:21.743633346Z" + version: 2.6.0 +digest: sha256:6ce7c85dcb43ad1fc5ff600850f28820ddc2f1a7c8cb25c5ff542fe1f852165a +generated: "2023-07-13T12:43:51.718158501Z" diff --git a/charts/bitnami/kafka/charts/zookeeper/Chart.yaml b/charts/bitnami/kafka/charts/zookeeper/Chart.yaml index 595255232..bada2eadd 100644 --- a/charts/bitnami/kafka/charts/zookeeper/Chart.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/Chart.yaml @@ -21,4 +21,4 @@ maintainers: name: zookeeper sources: - https://github.com/bitnami/charts/tree/main/bitnami/zookeeper -version: 11.4.3 +version: 11.4.4 diff --git a/charts/bitnami/kafka/charts/zookeeper/README.md b/charts/bitnami/kafka/charts/zookeeper/README.md index 79a780990..4a9bd2b9b 100644 --- a/charts/bitnami/kafka/charts/zookeeper/README.md +++ b/charts/bitnami/kafka/charts/zookeeper/README.md @@ -20,6 +20,8 @@ This chart bootstraps a [ZooKeeper](https://github.com/bitnami/containers/tree/m Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters. +Looking to use Apache ZooKeeper in production? Try [VMware Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. + ## Prerequisites - Kubernetes 1.19+ @@ -80,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and | ----------------------------- | -------------------------------------------------------------------------------------------------------------------------- | ----------------------- | | `image.registry` | ZooKeeper image registry | `docker.io` | | `image.repository` | ZooKeeper image repository | `bitnami/zookeeper` | -| `image.tag` | ZooKeeper image tag (immutable tags are recommended) | `3.8.1-debian-11-r46` | +| `image.tag` | ZooKeeper image tag (immutable tags are recommended) | `3.8.1-debian-11-r54` | | `image.digest` | ZooKeeper image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | ZooKeeper image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -241,19 +243,19 @@ The command removes all the Kubernetes components associated with the chart and ### Volume Permissions parameters -| Name | Description | Value | -| ------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------- | ----------------------- | -| `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` | -| `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | -| `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r127` | -| `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | -| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | -| `volumePermissions.image.pullSecrets` | Init container volume-permissions image pull secrets | `[]` | -| `volumePermissions.resources.limits` | Init container volume-permissions resource limits | `{}` | -| `volumePermissions.resources.requests` | Init container volume-permissions resource requests | `{}` | -| `volumePermissions.containerSecurityContext.enabled` | Enabled init container Security Context | `true` | -| `volumePermissions.containerSecurityContext.runAsUser` | User ID for the init container | `0` | +| Name | Description | Value | +| ------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------- | ------------------ | +| `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` | +| `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | +| `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/os-shell` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r2` | +| `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | +| `volumePermissions.image.pullSecrets` | Init container volume-permissions image pull secrets | `[]` | +| `volumePermissions.resources.limits` | Init container volume-permissions resource limits | `{}` | +| `volumePermissions.resources.requests` | Init container volume-permissions resource requests | `{}` | +| `volumePermissions.containerSecurityContext.enabled` | Enabled init container Security Context | `true` | +| `volumePermissions.containerSecurityContext.runAsUser` | User ID for the init container | `0` | ### Metrics parameters diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/Chart.yaml b/charts/bitnami/kafka/charts/zookeeper/charts/common/Chart.yaml index 4fc56bbb7..191699db1 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/Chart.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/Chart.yaml @@ -2,7 +2,7 @@ annotations: category: Infrastructure licenses: Apache-2.0 apiVersion: v2 -appVersion: 2.4.0 +appVersion: 2.6.0 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.4.0 +version: 2.6.0 diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/README.md b/charts/bitnami/kafka/charts/zookeeper/charts/common/README.md index 72fca33da..b48bb7a25 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/README.md +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/README.md @@ -2,8 +2,6 @@ A [Helm Library Chart](https://helm.sh/docs/topics/library_charts/#helm) for grouping common logic between Bitnami charts. -Looking to use our applications in production? Try [VMware Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. - ## TL;DR ```yaml @@ -32,6 +30,8 @@ This chart provides a common template helpers which can be used to develop new c Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters. +Looking to use our applications in production? Try [VMware Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog. + ## Prerequisites - Kubernetes 1.19+ @@ -220,7 +220,7 @@ helm install test mychart --set path.to.value00="",path.to.value01="" ## License -Copyright © 2023 Bitnami +Copyright © 2023 VMware, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_affinities.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_affinities.tpl index 81902a681..0e571028f 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_affinities.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_affinities.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_capabilities.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_capabilities.tpl index 697486a31..c6d115fe5 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_capabilities.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_capabilities.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_errors.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_errors.tpl index a79cc2e32..07ded6f64 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_errors.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_errors.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Through error when upgrading using empty passwords values that must not be empty. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_images.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_images.tpl index d60c22e25..2181f3224 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_images.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_images.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Return the proper image name diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_ingress.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_ingress.tpl index 831da9caa..efa5b85c7 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_ingress.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_ingress.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_labels.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_labels.tpl index 252066c7e..a1d7a95bc 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_labels.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_labels.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Kubernetes standard labels diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_names.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_names.tpl index 617a23489..a222924f1 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_names.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_names.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Expand the name of the chart. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_secrets.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_secrets.tpl index a1708b2e8..a193c46b6 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_secrets.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_secrets.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Generate secret name. @@ -72,7 +77,7 @@ Params: - strong - Boolean - Optional - Whether to add symbols to the generated random password. - chartName - String - Optional - Name of the chart used when said chart is deployed as a subchart. - context - Context - Required - Parent context. - + - failOnNew - Boolean - Optional - Default to true. If set to false, skip errors adding new keys to existing secrets. The order in which this function returns a secret password: 1. Already existing 'Secret' resource (If a 'Secret' resource is found under the name provided to the 'secret' parameter to this function and that 'Secret' resource contains a key with the name passed as the 'key' parameter to this function then the value of this existing secret password will be returned) @@ -86,6 +91,7 @@ The order in which this function returns a secret password: {{- $password := "" }} {{- $subchart := "" }} +{{- $failOnNew := default true .failOnNew }} {{- $chartName := default "" .chartName }} {{- $passwordLength := default 10 .length }} {{- $providedPasswordKey := include "common.utils.getKeyFromList" (dict "keys" .providedValues "context" $.context) }} @@ -94,7 +100,7 @@ The order in which this function returns a secret password: {{- if $secretData }} {{- if hasKey $secretData .key }} {{- $password = index $secretData .key | quote }} - {{- else }} + {{- else if $failOnNew }} {{- printf "\nPASSWORDS ERROR: The secret \"%s\" does not contain the key \"%s\"\n" .secret .key | fail -}} {{- end -}} {{- else if $providedPasswordValue }} @@ -137,15 +143,16 @@ Params: */}} {{- define "common.secrets.lookup" -}} {{- $value := "" -}} -{{- $defaultValue := required "\n'common.secrets.lookup': Argument 'defaultValue' missing or empty" .defaultValue -}} {{- $secretData := (lookup "v1" "Secret" (include "common.names.namespace" .context) .secret).data -}} {{- if and $secretData (hasKey $secretData .key) -}} {{- $value = index $secretData .key -}} -{{- else -}} - {{- $value = $defaultValue | toString | b64enc -}} +{{- else if .defaultValue -}} + {{- $value = .defaultValue | toString | b64enc -}} {{- end -}} +{{- if $value -}} {{- printf "%s" $value -}} {{- end -}} +{{- end -}} {{/* Returns whether a previous generated secret already exists diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_storage.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_storage.tpl index 60e2a844f..16405a0f8 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_storage.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_storage.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Return the proper Storage Class diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_tplvalues.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_tplvalues.tpl index 2db166851..dc15f7fdc 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_tplvalues.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_tplvalues.tpl @@ -1,13 +1,27 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* -Renders a value that contains template. +Renders a value that contains template perhaps with scope if the scope is present. Usage: -{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ ) }} +{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ "scope" $app ) }} */}} {{- define "common.tplvalues.render" -}} - {{- if typeIs "string" .value }} - {{- tpl .value .context }} - {{- else }} - {{- tpl (.value | toYaml) .context }} - {{- end }} +{{- if .scope }} + {{- if typeIs "string" .value }} + {{- tpl (cat "{{- with $.RelativeScope -}}" .value "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }} + {{- else }} + {{- tpl (cat "{{- with $.RelativeScope -}}" (.value | toYaml) "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }} + {{- end }} +{{- else }} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} {{- end -}} diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_utils.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_utils.tpl index b1ead50cf..c87040cd9 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_utils.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_utils.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Print instructions to get a secret value. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_warnings.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_warnings.tpl index ae10fa41e..66dffc1fe 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_warnings.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/_warnings.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Warning about using rolling tag. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_cassandra.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_cassandra.tpl index ded1ae3bc..eda9aada5 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_cassandra.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_cassandra.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Validate Cassandra required passwords are not empty. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mariadb.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mariadb.tpl index b6906ff77..17d83a2fd 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mariadb.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mariadb.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Validate MariaDB required passwords are not empty. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mongodb.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mongodb.tpl index f820ec107..bbb445b86 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mongodb.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mongodb.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Validate MongoDB® required passwords are not empty. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mysql.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mysql.tpl index 74472a061..ca3953f86 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mysql.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_mysql.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Validate MySQL required passwords are not empty. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_postgresql.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_postgresql.tpl index 164ec0d01..8c9aa570e 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_postgresql.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_postgresql.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Validate PostgreSQL required passwords are not empty. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_redis.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_redis.tpl index dcccfc1ae..fc0d208dd 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_redis.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_redis.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_validations.tpl b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_validations.tpl index 9a814cf40..31ceda871 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_validations.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/templates/validations/_validations.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* Validate values must not be empty. diff --git a/charts/bitnami/kafka/charts/zookeeper/charts/common/values.yaml b/charts/bitnami/kafka/charts/zookeeper/charts/common/values.yaml index f2df68e5e..9abe0e154 100644 --- a/charts/bitnami/kafka/charts/zookeeper/charts/common/values.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/charts/common/values.yaml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + ## bitnami/common ## It is required by CI/CD tools and processes. ## @skip exampleValue diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/_helpers.tpl b/charts/bitnami/kafka/charts/zookeeper/templates/_helpers.tpl index d855bada0..0e2e8e588 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/_helpers.tpl +++ b/charts/bitnami/kafka/charts/zookeeper/templates/_helpers.tpl @@ -1,3 +1,8 @@ +{{/* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{/* vim: set filetype=mustache: */}} {{/* diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/configmap.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/configmap.yaml index 12b4f489f..75f013767 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/configmap.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/configmap.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{- if (include "zookeeper.createConfigmap" .) }} apiVersion: v1 kind: ConfigMap diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/extra-list.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/extra-list.yaml index 9ac65f9e1..2d35a580e 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/extra-list.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/extra-list.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{- range .Values.extraDeploy }} --- {{ include "common.tplvalues.render" (dict "value" . "context" $) }} diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/metrics-svc.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/metrics-svc.yaml index 5afc4b3e5..ebb73ec02 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/metrics-svc.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/metrics-svc.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{- if .Values.metrics.enabled }} apiVersion: v1 kind: Service diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/networkpolicy.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/networkpolicy.yaml index 63532832c..a96b33396 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/networkpolicy.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/networkpolicy.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{- if .Values.networkPolicy.enabled }} kind: NetworkPolicy apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/pdb.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/pdb.yaml index f7faf65f9..7a9a67a09 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/pdb.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/pdb.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{- $replicaCount := int .Values.replicaCount }} {{- if and .Values.pdb.create (gt $replicaCount 1) }} apiVersion: {{ include "common.capabilities.policy.apiVersion" . }} diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/prometheusrule.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/prometheusrule.yaml index 87dcd3565..70818e6c9 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/prometheusrule.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/prometheusrule.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled .Values.metrics.prometheusRule.rules }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/scripts-configmap.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/scripts-configmap.yaml index d77ab857b..794ba4fe6 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/scripts-configmap.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/scripts-configmap.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + apiVersion: v1 kind: ConfigMap metadata: diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/secrets.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/secrets.yaml index 82ebc2eed..7a9b3e2db 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/secrets.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/secrets.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{- if (include "zookeeper.client.createSecret" .) }} apiVersion: v1 kind: Secret diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/serviceaccount.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/serviceaccount.yaml index 958a57ac2..eda2e4a8b 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/serviceaccount.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/serviceaccount.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{- if .Values.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/servicemonitor.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/servicemonitor.yaml index 2c8af3350..936a8c68b 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/servicemonitor.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/servicemonitor.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/statefulset.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/statefulset.yaml index aa4f1a971..3ed040f8d 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/statefulset.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/statefulset.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }} kind: StatefulSet metadata: diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/svc-headless.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/svc-headless.yaml index e7ab496cf..0040bca81 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/svc-headless.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/svc-headless.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + apiVersion: v1 kind: Service metadata: diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/svc.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/svc.yaml index 6ad0b1096..5077eb925 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/svc.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/svc.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + apiVersion: v1 kind: Service metadata: diff --git a/charts/bitnami/kafka/charts/zookeeper/templates/tls-secrets.yaml b/charts/bitnami/kafka/charts/zookeeper/templates/tls-secrets.yaml index 3d7e15926..df8442190 100644 --- a/charts/bitnami/kafka/charts/zookeeper/templates/tls-secrets.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/templates/tls-secrets.yaml @@ -1,3 +1,8 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + {{- if (include "zookeeper.client.createTlsSecret" .) }} {{- $secretName := printf "%s-client-crt" (include "common.names.fullname" .) }} {{- $ca := genCA "zookeeper-client-ca" 365 }} diff --git a/charts/bitnami/kafka/charts/zookeeper/values.yaml b/charts/bitnami/kafka/charts/zookeeper/values.yaml index d1e00b370..096fc5c82 100644 --- a/charts/bitnami/kafka/charts/zookeeper/values.yaml +++ b/charts/bitnami/kafka/charts/zookeeper/values.yaml @@ -1,3 +1,6 @@ +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 + ## @section Global parameters ## Global Docker image parameters ## Please, note that this will override the image parameters, including dependencies, configured to use the global value @@ -76,7 +79,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/zookeeper - tag: 3.8.1-debian-11-r46 + tag: 3.8.1-debian-11-r54 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -659,8 +662,8 @@ volumePermissions: ## image: registry: docker.io - repository: bitnami/bitnami-shell - tag: 11-debian-11-r127 + repository: bitnami/os-shell + tag: 11-debian-11-r2 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/charts/bitnami/kafka/values.yaml b/charts/bitnami/kafka/values.yaml index de5280a9c..a1d0f5876 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.0-debian-11-r7 + tag: 3.5.0-debian-11-r21 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -784,7 +784,7 @@ externalAccess: image: registry: docker.io repository: bitnami/kubectl - tag: 1.25.11-debian-11-r10 + tag: 1.25.11-debian-11-r33 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1033,7 +1033,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/os-shell - tag: 11-debian-11-r2 + tag: 11-debian-11-r11 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -1115,7 +1115,7 @@ metrics: image: registry: docker.io repository: bitnami/kafka-exporter - tag: 1.7.0-debian-11-r16 + tag: 1.7.0-debian-11-r53 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1351,7 +1351,7 @@ metrics: image: registry: docker.io repository: bitnami/jmx-exporter - tag: 0.19.0-debian-11-r4 + tag: 0.19.0-debian-11-r16 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' diff --git a/charts/bitnami/mysql/Chart.yaml b/charts/bitnami/mysql/Chart.yaml index 3b24ebfdb..4f3c84b00 100644 --- a/charts/bitnami/mysql/Chart.yaml +++ b/charts/bitnami/mysql/Chart.yaml @@ -6,7 +6,7 @@ annotations: category: Database licenses: Apache-2.0 apiVersion: v2 -appVersion: 8.0.33 +appVersion: 8.0.34 dependencies: - name: common repository: file://./charts/common @@ -29,4 +29,4 @@ maintainers: name: mysql sources: - https://github.com/bitnami/charts/tree/main/bitnami/mysql -version: 9.10.6 +version: 9.10.7 diff --git a/charts/bitnami/mysql/README.md b/charts/bitnami/mysql/README.md index 1b2698940..cf6fa1fc8 100644 --- a/charts/bitnami/mysql/README.md +++ b/charts/bitnami/mysql/README.md @@ -79,28 +79,28 @@ The command removes all the Kubernetes components associated with the chart and ### MySQL common parameters -| Name | Description | Value | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------- | -| `image.registry` | MySQL image registry | `docker.io` | -| `image.repository` | MySQL image repository | `bitnami/mysql` | -| `image.tag` | MySQL image tag (immutable tags are recommended) | `8.0.33-debian-11-r30` | -| `image.digest` | MySQL image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | -| `image.pullPolicy` | MySQL image pull policy | `IfNotPresent` | -| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | -| `image.debug` | Specify if debug logs should be enabled | `false` | -| `architecture` | MySQL architecture (`standalone` or `replication`) | `standalone` | -| `auth.rootPassword` | Password for the `root` user. Ignored if existing secret is provided | `""` | -| `auth.createDatabase` | Whether to create the .Values.auth.database or not | `true` | -| `auth.database` | Name for a custom database to create | `my_database` | -| `auth.username` | Name for a custom user to create | `""` | -| `auth.password` | Password for the new user. Ignored if existing secret is provided | `""` | -| `auth.replicationUser` | MySQL replication user | `replicator` | -| `auth.replicationPassword` | MySQL replication user password. Ignored if existing secret is provided | `""` | -| `auth.existingSecret` | Use existing secret for password details. The secret has to contain the keys `mysql-root-password`, `mysql-replication-password` and `mysql-password` | `""` | -| `auth.usePasswordFiles` | Mount credentials as files instead of using an environment variable | `false` | -| `auth.customPasswordFiles` | Use custom password files when `auth.usePasswordFiles` is set to `true`. Define path for keys `root` and `user`, also define `replicator` if `architecture` is set to `replication` | `{}` | -| `initdbScripts` | Dictionary of initdb scripts | `{}` | -| `initdbScriptsConfigMap` | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`) | `""` | +| Name | Description | Value | +| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | +| `image.registry` | MySQL image registry | `docker.io` | +| `image.repository` | MySQL image repository | `bitnami/mysql` | +| `image.tag` | MySQL image tag (immutable tags are recommended) | `8.0.34-debian-11-r0` | +| `image.digest` | MySQL image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `image.pullPolicy` | MySQL image pull policy | `IfNotPresent` | +| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | +| `image.debug` | Specify if debug logs should be enabled | `false` | +| `architecture` | MySQL architecture (`standalone` or `replication`) | `standalone` | +| `auth.rootPassword` | Password for the `root` user. Ignored if existing secret is provided | `""` | +| `auth.createDatabase` | Whether to create the .Values.auth.database or not | `true` | +| `auth.database` | Name for a custom database to create | `my_database` | +| `auth.username` | Name for a custom user to create | `""` | +| `auth.password` | Password for the new user. Ignored if existing secret is provided | `""` | +| `auth.replicationUser` | MySQL replication user | `replicator` | +| `auth.replicationPassword` | MySQL replication user password. Ignored if existing secret is provided | `""` | +| `auth.existingSecret` | Use existing secret for password details. The secret has to contain the keys `mysql-root-password`, `mysql-replication-password` and `mysql-password` | `""` | +| `auth.usePasswordFiles` | Mount credentials as files instead of using an environment variable | `false` | +| `auth.customPasswordFiles` | Use custom password files when `auth.usePasswordFiles` is set to `true`. Define path for keys `root` and `user`, also define `replicator` if `architecture` is set to `replication` | `{}` | +| `initdbScripts` | Dictionary of initdb scripts | `{}` | +| `initdbScriptsConfigMap` | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`) | `""` | ### MySQL Primary parameters @@ -307,7 +307,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume(s) mountpoint to `runAsUser:fsGroup` | `false` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/os-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r2` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r11` | | `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -320,7 +320,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.image.registry` | Exporter image registry | `docker.io` | | `metrics.image.repository` | Exporter image repository | `bitnami/mysqld-exporter` | -| `metrics.image.tag` | Exporter image tag (immutable tags are recommended) | `0.14.0-debian-11-r138` | +| `metrics.image.tag` | Exporter image tag (immutable tags are recommended) | `0.14.0-debian-11-r344` | | `metrics.image.digest` | Exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.image.pullPolicy` | Exporter image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | diff --git a/charts/bitnami/mysql/values.yaml b/charts/bitnami/mysql/values.yaml index e1bbb552a..df401b100 100644 --- a/charts/bitnami/mysql/values.yaml +++ b/charts/bitnami/mysql/values.yaml @@ -85,7 +85,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/mysql - tag: 8.0.33-debian-11-r30 + tag: 8.0.34-debian-11-r0 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1009,7 +1009,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/os-shell - tag: 11-debian-11-r2 + tag: 11-debian-11-r11 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -1043,7 +1043,7 @@ metrics: image: registry: docker.io repository: bitnami/mysqld-exporter - tag: 0.14.0-debian-11-r138 + tag: 0.14.0-debian-11-r344 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/charts/bitnami/zookeeper/Chart.yaml b/charts/bitnami/zookeeper/Chart.yaml index ad4d90847..743d2c623 100644 --- a/charts/bitnami/zookeeper/Chart.yaml +++ b/charts/bitnami/zookeeper/Chart.yaml @@ -25,4 +25,4 @@ maintainers: name: zookeeper sources: - https://github.com/bitnami/charts/tree/main/bitnami/zookeeper -version: 11.4.5 +version: 11.4.7 diff --git a/charts/bitnami/zookeeper/README.md b/charts/bitnami/zookeeper/README.md index 26c28a430..51c55b1a6 100644 --- a/charts/bitnami/zookeeper/README.md +++ b/charts/bitnami/zookeeper/README.md @@ -80,9 +80,9 @@ The command removes all the Kubernetes components associated with the chart and | Name | Description | Value | | ----------------------------- | -------------------------------------------------------------------------------------------------------------------------- | ----------------------- | -| `image.registry` | ZooKeeper image registry | `registry-1.docker.io` | +| `image.registry` | ZooKeeper image registry | `docker.io` | | `image.repository` | ZooKeeper image repository | `bitnami/zookeeper` | -| `image.tag` | ZooKeeper image tag (immutable tags are recommended) | `3.8.1-debian-11-r145` | +| `image.tag` | ZooKeeper image tag (immutable tags are recommended) | `3.8.1-debian-11-r147` | | `image.digest` | ZooKeeper image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | ZooKeeper image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -243,19 +243,19 @@ The command removes all the Kubernetes components associated with the chart and ### Volume Permissions parameters -| Name | Description | Value | -| ------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------- | ---------------------- | -| `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` | -| `volumePermissions.image.registry` | Init container volume-permissions image registry | `registry-1.docker.io` | -| `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/os-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r11` | -| `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | -| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | -| `volumePermissions.image.pullSecrets` | Init container volume-permissions image pull secrets | `[]` | -| `volumePermissions.resources.limits` | Init container volume-permissions resource limits | `{}` | -| `volumePermissions.resources.requests` | Init container volume-permissions resource requests | `{}` | -| `volumePermissions.containerSecurityContext.enabled` | Enabled init container Security Context | `true` | -| `volumePermissions.containerSecurityContext.runAsUser` | User ID for the init container | `0` | +| Name | Description | Value | +| ------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------- | ------------------ | +| `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` | +| `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | +| `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/os-shell` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r11` | +| `volumePermissions.image.digest` | Init container volume-permissions image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | +| `volumePermissions.image.pullSecrets` | Init container volume-permissions image pull secrets | `[]` | +| `volumePermissions.resources.limits` | Init container volume-permissions resource limits | `{}` | +| `volumePermissions.resources.requests` | Init container volume-permissions resource requests | `{}` | +| `volumePermissions.containerSecurityContext.enabled` | Enabled init container Security Context | `true` | +| `volumePermissions.containerSecurityContext.runAsUser` | User ID for the init container | `0` | ### Metrics parameters diff --git a/charts/bitnami/zookeeper/values.yaml b/charts/bitnami/zookeeper/values.yaml index 6c69b179d..d3f5ec1ba 100644 --- a/charts/bitnami/zookeeper/values.yaml +++ b/charts/bitnami/zookeeper/values.yaml @@ -77,9 +77,9 @@ diagnosticMode: ## @param image.debug Specify if debug values should be set ## image: - registry: registry-1.docker.io + registry: docker.io repository: bitnami/zookeeper - tag: 3.8.1-debian-11-r145 + tag: 3.8.1-debian-11-r147 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -661,7 +661,7 @@ volumePermissions: ## @param volumePermissions.image.pullSecrets Init container volume-permissions image pull secrets ## image: - registry: registry-1.docker.io + registry: docker.io repository: bitnami/os-shell tag: 11-debian-11-r11 digest: "" diff --git a/charts/datadog/datadog/CHANGELOG.md b/charts/datadog/datadog/CHANGELOG.md index d34ee026e..75cebd4be 100644 --- a/charts/datadog/datadog/CHANGELOG.md +++ b/charts/datadog/datadog/CHANGELOG.md @@ -1,5 +1,9 @@ # Datadog changelog +## 3.33.2 + +* Add emptyDir and volumeMounts for Agent log files in Windows containers to fix log file access + # 3.33.0 * Default `Agent` and `Cluster-Agent` to `7.46.0` version. diff --git a/charts/datadog/datadog/Chart.yaml b/charts/datadog/datadog/Chart.yaml index a0e979c64..d265a7c9a 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.33.1 +version: 3.33.2 diff --git a/charts/datadog/datadog/README.md b/charts/datadog/datadog/README.md index dc72fa2b5..7122fba40 100644 --- a/charts/datadog/datadog/README.md +++ b/charts/datadog/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 3.33.1](https://img.shields.io/badge/Version-3.33.1-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 3.33.2](https://img.shields.io/badge/Version-3.33.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/_container-agent.yaml b/charts/datadog/datadog/templates/_container-agent.yaml index 4b860ab85..88b95f8a3 100644 --- a/charts/datadog/datadog/templates/_container-agent.yaml +++ b/charts/datadog/datadog/templates/_container-agent.yaml @@ -153,14 +153,14 @@ {{- include "additional-env-entries" .Values.agents.containers.agent.env | indent 4 }} {{- include "additional-env-dict-entries" .Values.agents.containers.agent.envDict | indent 4 }} volumeMounts: + - name: logdatadog + mountPath: {{ template "datadog.logDirectoryPath" . }} + readOnly: false # Need RW to write logs {{- if eq .Values.targetSystem "linux" }} - name: installinfo subPath: install_info mountPath: /etc/datadog-agent/install_info readOnly: true - - name: logdatadog - mountPath: /var/log/datadog - readOnly: false # Need RW to write logs - name: tmpdir mountPath: /tmp readOnly: false # Need RW to write to /tmp directory diff --git a/charts/datadog/datadog/templates/_container-process-agent.yaml b/charts/datadog/datadog/templates/_container-process-agent.yaml index 57fe62712..d9383bcc7 100644 --- a/charts/datadog/datadog/templates/_container-process-agent.yaml +++ b/charts/datadog/datadog/templates/_container-process-agent.yaml @@ -58,6 +58,9 @@ - name: config mountPath: {{ template "datadog.confPath" . }} readOnly: true + - name: logdatadog + mountPath: {{ template "datadog.logDirectoryPath" . }} + readOnly: false # Need RW to write logs {{- if eq .Values.targetSystem "linux" }} {{- if (not .Values.providers.gke.autopilot) }} - name: auth-token @@ -67,9 +70,6 @@ mountPath: {{ (dir .Values.datadog.dogstatsd.socketPath) }} readOnly: false # Need RW for UDS DSD socket {{- end }} - - name: logdatadog - mountPath: /var/log/datadog - readOnly: false # Need RW to write logs - name: tmpdir mountPath: /tmp readOnly: false # Need RW to write to tmp directory diff --git a/charts/datadog/datadog/templates/_container-security-agent.yaml b/charts/datadog/datadog/templates/_container-security-agent.yaml index bf3237f36..35561102b 100644 --- a/charts/datadog/datadog/templates/_container-security-agent.yaml +++ b/charts/datadog/datadog/templates/_container-security-agent.yaml @@ -59,6 +59,9 @@ - name: config mountPath: {{ template "datadog.confPath" . }} readOnly: true + - name: logdatadog + mountPath: {{ template "datadog.logDirectoryPath" . }} + readOnly: false # Need RW to write logs {{- if (not .Values.providers.gke.autopilot) }} - name: auth-token mountPath: {{ template "datadog.confPath" . }}/auth @@ -68,9 +71,6 @@ readOnly: false # Need RW for UDS DSD socket {{- end }} {{- if eq .Values.targetSystem "linux" }} - - name: logdatadog - mountPath: /var/log/datadog - readOnly: false # Need RW to write logs - name: tmpdir mountPath: /tmp readOnly: false # Need RW to write to tmp directory diff --git a/charts/datadog/datadog/templates/_container-system-probe.yaml b/charts/datadog/datadog/templates/_container-system-probe.yaml index 23b403c2c..c891a30d1 100644 --- a/charts/datadog/datadog/templates/_container-system-probe.yaml +++ b/charts/datadog/datadog/templates/_container-system-probe.yaml @@ -34,7 +34,7 @@ mountPath: {{ template "datadog.confPath" . }}/auth readOnly: true - name: logdatadog - mountPath: /var/log/datadog + mountPath: {{ template "datadog.logDirectoryPath" . }} readOnly: false # Need RW to write logs - name: tmpdir mountPath: /tmp diff --git a/charts/datadog/datadog/templates/_container-trace-agent.yaml b/charts/datadog/datadog/templates/_container-trace-agent.yaml index 69a11c9b2..af5e5d38d 100644 --- a/charts/datadog/datadog/templates/_container-trace-agent.yaml +++ b/charts/datadog/datadog/templates/_container-trace-agent.yaml @@ -56,6 +56,9 @@ - name: config mountPath: {{ template "datadog.confPath" . }} readOnly: true + - name: logdatadog + mountPath: {{ template "datadog.logDirectoryPath" . }} + readOnly: false # Need RW to write logs {{- if (not .Values.providers.gke.autopilot) }} - name: auth-token mountPath: {{ template "datadog.confPath" . }}/auth @@ -78,9 +81,6 @@ mountPropagation: {{ .Values.datadog.hostVolumeMountPropagation }} readOnly: true {{- end }} - - name: logdatadog - mountPath: /var/log/datadog - readOnly: false # Need RW to write logs - name: tmpdir mountPath: /tmp readOnly: false # Need RW for tmp directory diff --git a/charts/datadog/datadog/templates/_containers-init-linux.yaml b/charts/datadog/datadog/templates/_containers-init-linux.yaml index 0d6671832..e4daa628c 100644 --- a/charts/datadog/datadog/templates/_containers-init-linux.yaml +++ b/charts/datadog/datadog/templates/_containers-init-linux.yaml @@ -27,7 +27,7 @@ - for script in $(find /etc/cont-init.d/ -type f -name '*.sh' | sort) ; do bash $script ; done volumeMounts: - name: logdatadog - mountPath: /var/log/datadog + mountPath: {{ template "datadog.logDirectoryPath" . }} readOnly: false # Need RW to write logs - name: config mountPath: /etc/datadog-agent diff --git a/charts/datadog/datadog/templates/_daemonset-volumes-windows.yaml b/charts/datadog/datadog/templates/_daemonset-volumes-windows.yaml index 8a5b45dcf..4d0b34f91 100644 --- a/charts/datadog/datadog/templates/_daemonset-volumes-windows.yaml +++ b/charts/datadog/datadog/templates/_daemonset-volumes-windows.yaml @@ -35,3 +35,5 @@ {{- end }} {{- end }} {{- end -}} +- name: logdatadog + emptyDir: {} diff --git a/charts/datadog/datadog/templates/_helpers.tpl b/charts/datadog/datadog/templates/_helpers.tpl index 9293b484f..a027ee14b 100644 --- a/charts/datadog/datadog/templates/_helpers.tpl +++ b/charts/datadog/datadog/templates/_helpers.tpl @@ -185,6 +185,18 @@ Return the container runtime socket {{- end -}} {{- end -}} +{{/* +Return agent log directory path +*/}} +{{- define "datadog.logDirectoryPath" -}} +{{- if eq .Values.targetSystem "linux" -}} +/var/log/datadog +{{- end -}} +{{- if eq .Values.targetSystem "windows" -}} +C:/ProgramData/Datadog/logs +{{- end -}} +{{- end -}} + {{/* Return agent config path */}} diff --git a/index.yaml b/index.yaml index f1bb5fd38..f0dabeb8f 100644 --- a/index.yaml +++ b/index.yaml @@ -1361,7 +1361,7 @@ entries: - annotations: artifacthub.io/changes: | - kind: changed - description: Allow configurable metrics in server and repoServer HPAs + description: Make ServiceMonitor deployment conditional on CRD existence artifacthub.io/signKey: | fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 url: https://argoproj.github.io/argo-helm/pgp_keys.asc @@ -1372,7 +1372,7 @@ entries: catalog.cattle.io/release-name: argo-cd apiVersion: v2 appVersion: v2.7.7 - created: "2023-07-17T16:51:29.638745593Z" + created: "2023-07-18T19:38:27.867503019Z" dependencies: - condition: redis-ha.enabled name: redis-ha @@ -1380,7 +1380,46 @@ entries: version: 4.23.0 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. - digest: 8026a237f5c415017da313f2b769ca2689cd9deaf8db5f4b6a4cc14cc5cc8a0e + digest: 472e03ebdcbca53f982229f8f208bc5546fe89f9d5de7c43cb2ea19104dd5860 + 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.41.0.tgz + version: 5.41.0 + - annotations: + artifacthub.io/changes: | + - kind: changed + description: Allow configurable metrics in server and repoServer HPAs + 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.7.7 + created: "2023-07-18T19:38:14.819364349Z" + 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: fc6652f01f208854f2ea284cbf0a74a9815acce6d9fdb04f8736580d31d16506 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -12858,6 +12897,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-07-18T19:38:32.37166633Z" + 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: 7f83691c3eee9f4807cd28ddbf46faf8031bd7b85bb3b56e08412f6b96e5618c + 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.33.2.tgz + version: 3.33.2 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Datadog @@ -23376,6 +23452,47 @@ 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 + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 3.5.0 + created: "2023-07-18T19:38:29.705875271Z" + dependencies: + - condition: zookeeper.enabled + name: zookeeper + repository: file://./charts/zookeeper + version: 11.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: 2db2b0165560a763de0fe2f518a77a420fd56abff40a95527ef34d544ed4004d + 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-23.0.5.tgz + version: 23.0.5 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Apache Kafka @@ -28565,6 +28682,43 @@ entries: - assets/minio/minio-operator-4.4.1700.tgz version: 4.4.1700 mysql: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: MySQL + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: mysql + category: Database + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 8.0.34 + created: "2023-07-18T19:38:29.85901293Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: MySQL is a fast, reliable, scalable, and easy to use open source + relational database system. Designed to handle mission-critical, heavy-load + production applications. + digest: fdf9720ad88bad94a3a3fa78ad1849ddc0d41f1945448b5c26e561521363caac + home: https://bitnami.com + icon: https://www.mysql.com/common/logos/logo-mysql-170x115.png + keywords: + - mysql + - database + - sql + - cluster + - high availability + maintainers: + - name: VMware, Inc. + url: https://github.com/bitnami/charts + name: mysql + sources: + - https://github.com/bitnami/charts/tree/main/bitnami/mysql + urls: + - assets/bitnami/mysql-9.10.7.tgz + version: 9.10.7 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: MySQL @@ -50232,6 +50386,38 @@ entries: - assets/netfoundry/ziti-host-1.5.1.tgz version: 1.5.1 zookeeper: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Apache Zookeeper + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: zookeeper + category: Infrastructure + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 3.8.1 + created: "2023-07-18T19:38:31.560730041Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: Apache ZooKeeper provides a reliable, centralized register of configuration + data and services for distributed applications. + digest: 4e4f88583f7ce62a351dc48902d37886bd9f6a47b826e8040f704346f5af00cd + home: https://bitnami.com + icon: https://svn.apache.org/repos/asf/comdev/project-logos/originals/zookeeper.svg + keywords: + - zookeeper + maintainers: + - name: VMware, Inc. + url: https://github.com/bitnami/charts + name: zookeeper + sources: + - https://github.com/bitnami/charts/tree/main/bitnami/zookeeper + urls: + - assets/bitnami/zookeeper-11.4.7.tgz + version: 11.4.7 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Apache Zookeeper