diff --git a/assets/argo/argo-cd-5.39.0.tgz b/assets/argo/argo-cd-5.39.0.tgz index d9ad051d6..0f91e7a7e 100644 Binary files a/assets/argo/argo-cd-5.39.0.tgz and b/assets/argo/argo-cd-5.39.0.tgz differ diff --git a/assets/argo/argo-cd-5.40.0.tgz b/assets/argo/argo-cd-5.40.0.tgz new file mode 100644 index 000000000..c6f392fcc Binary files /dev/null and b/assets/argo/argo-cd-5.40.0.tgz differ diff --git a/assets/bitnami/airflow-14.3.4.tgz b/assets/bitnami/airflow-14.3.4.tgz new file mode 100644 index 000000000..72d756e26 Binary files /dev/null and b/assets/bitnami/airflow-14.3.4.tgz differ diff --git a/assets/bitnami/cassandra-10.4.4.tgz b/assets/bitnami/cassandra-10.4.4.tgz new file mode 100644 index 000000000..63c467041 Binary files /dev/null and b/assets/bitnami/cassandra-10.4.4.tgz differ diff --git a/assets/bitnami/mysql-9.10.6.tgz b/assets/bitnami/mysql-9.10.6.tgz new file mode 100644 index 000000000..4749c6ec4 Binary files /dev/null and b/assets/bitnami/mysql-9.10.6.tgz differ diff --git a/assets/bitnami/postgresql-12.6.6.tgz b/assets/bitnami/postgresql-12.6.6.tgz new file mode 100644 index 000000000..40928e63b Binary files /dev/null and b/assets/bitnami/postgresql-12.6.6.tgz differ diff --git a/assets/bitnami/redis-17.13.2.tgz b/assets/bitnami/redis-17.13.2.tgz new file mode 100644 index 000000000..e4b6d37a3 Binary files /dev/null and b/assets/bitnami/redis-17.13.2.tgz differ diff --git a/assets/bitnami/wordpress-16.1.27.tgz b/assets/bitnami/wordpress-16.1.27.tgz new file mode 100644 index 000000000..92c4914b6 Binary files /dev/null and b/assets/bitnami/wordpress-16.1.27.tgz differ diff --git a/assets/bitnami/zookeeper-11.4.5.tgz b/assets/bitnami/zookeeper-11.4.5.tgz new file mode 100644 index 000000000..96a990b27 Binary files /dev/null and b/assets/bitnami/zookeeper-11.4.5.tgz differ diff --git a/assets/clastix/kamaji-console-0.0.5.tgz b/assets/clastix/kamaji-console-0.0.5.tgz new file mode 100644 index 000000000..8ecba2b1d Binary files /dev/null and b/assets/clastix/kamaji-console-0.0.5.tgz differ diff --git a/assets/confluent/confluent-for-kubernetes-0.771.29.tgz b/assets/confluent/confluent-for-kubernetes-0.771.29.tgz new file mode 100644 index 000000000..01201921f Binary files /dev/null and b/assets/confluent/confluent-for-kubernetes-0.771.29.tgz differ diff --git a/assets/gopaddle/gopaddle-4.2.9.tgz b/assets/gopaddle/gopaddle-4.2.9.tgz new file mode 100644 index 000000000..10dcb39f4 Binary files /dev/null and b/assets/gopaddle/gopaddle-4.2.9.tgz differ diff --git a/assets/jaeger/jaeger-operator-2.46.2.tgz b/assets/jaeger/jaeger-operator-2.46.2.tgz new file mode 100644 index 000000000..238602adf Binary files /dev/null and b/assets/jaeger/jaeger-operator-2.46.2.tgz differ diff --git a/assets/jenkins/jenkins-4.4.1.tgz b/assets/jenkins/jenkins-4.4.1.tgz new file mode 100644 index 000000000..d1b74b5e9 Binary files /dev/null and b/assets/jenkins/jenkins-4.4.1.tgz differ diff --git a/assets/kasten/k10-6.0.301.tgz b/assets/kasten/k10-6.0.301.tgz new file mode 100644 index 000000000..d69bdd4bc Binary files /dev/null and b/assets/kasten/k10-6.0.301.tgz differ diff --git a/assets/kong/kong-2.25.0.tgz b/assets/kong/kong-2.25.0.tgz new file mode 100644 index 000000000..605e09f64 Binary files /dev/null and b/assets/kong/kong-2.25.0.tgz differ diff --git a/assets/kubecost/cost-analyzer-1.104.4.tgz b/assets/kubecost/cost-analyzer-1.104.4.tgz index bb98dcfeb..9b93c95c1 100644 Binary files a/assets/kubecost/cost-analyzer-1.104.4.tgz and b/assets/kubecost/cost-analyzer-1.104.4.tgz differ diff --git a/assets/kubecost/cost-analyzer-1.105.0.tgz b/assets/kubecost/cost-analyzer-1.105.0.tgz new file mode 100644 index 000000000..54d8377d1 Binary files /dev/null and b/assets/kubecost/cost-analyzer-1.105.0.tgz differ diff --git a/assets/nats/nats-0.19.17.tgz b/assets/nats/nats-0.19.17.tgz new file mode 100644 index 000000000..4e6ee5572 Binary files /dev/null and b/assets/nats/nats-0.19.17.tgz differ diff --git a/charts/argo/argo-cd/Chart.yaml b/charts/argo/argo-cd/Chart.yaml index 1c4b4cd7f..56ec8f3ee 100644 --- a/charts/argo/argo-cd/Chart.yaml +++ b/charts/argo/argo-cd/Chart.yaml @@ -1,7 +1,7 @@ annotations: artifacthub.io/changes: | - - kind: added - description: Allow configuring Dex's init image resources separately + - 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 @@ -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.39.0 +version: 5.40.0 diff --git a/charts/argo/argo-cd/README.md b/charts/argo/argo-cd/README.md index deaad2ba2..863ae8bbe 100644 --- a/charts/argo/argo-cd/README.md +++ b/charts/argo/argo-cd/README.md @@ -576,6 +576,7 @@ NAME: my-release | repoServer.autoscaling.behavior | object | `{}` | Configures the scaling behavior of the target in both Up and Down directions. This is only available on HPA apiVersion `autoscaling/v2beta2` and newer | | repoServer.autoscaling.enabled | bool | `false` | Enable Horizontal Pod Autoscaler ([HPA]) for the repo server | | repoServer.autoscaling.maxReplicas | int | `5` | Maximum number of replicas for the repo server [HPA] | +| repoServer.autoscaling.metrics | list | `[]` | Configures custom HPA metrics for the Argo CD repo server Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ | | repoServer.autoscaling.minReplicas | int | `1` | Minimum number of replicas for the repo server [HPA] | | repoServer.autoscaling.targetCPUUtilizationPercentage | int | `50` | Average CPU utilization percentage for the repo server [HPA] | | repoServer.autoscaling.targetMemoryUtilizationPercentage | int | `50` | Average memory utilization percentage for the repo server [HPA] | @@ -673,6 +674,7 @@ NAME: my-release | server.autoscaling.behavior | object | `{}` | Configures the scaling behavior of the target in both Up and Down directions. This is only available on HPA apiVersion `autoscaling/v2beta2` and newer | | server.autoscaling.enabled | bool | `false` | Enable Horizontal Pod Autoscaler ([HPA]) for the Argo CD server | | server.autoscaling.maxReplicas | int | `5` | Maximum number of replicas for the Argo CD server [HPA] | +| server.autoscaling.metrics | list | `[]` | Configures custom HPA metrics for the Argo CD server Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ | | server.autoscaling.minReplicas | int | `1` | Minimum number of replicas for the Argo CD server [HPA] | | server.autoscaling.targetCPUUtilizationPercentage | int | `50` | Average CPU utilization percentage for the Argo CD server [HPA] | | server.autoscaling.targetMemoryUtilizationPercentage | int | `50` | Average memory utilization percentage for the Argo CD server [HPA] | diff --git a/charts/argo/argo-cd/templates/_common.tpl b/charts/argo/argo-cd/templates/_common.tpl index f8c84c9c2..4173876c6 100644 --- a/charts/argo/argo-cd/templates/_common.tpl +++ b/charts/argo/argo-cd/templates/_common.tpl @@ -38,6 +38,13 @@ Create Argo CD app version {{- default .Chart.AppVersion .Values.global.image.tag }} {{- end -}} +{{/* +Return valid version label +*/}} +{{- define "argo-cd.versionLabelValue" -}} +{{ regexReplaceAll "[^-A-Za-z0-9_.]" (include "argo-cd.defaultTag" .) "-" | trunc 63 | trimAll "-" | trimAll "_" | trimAll "." | quote }} +{{- end -}} + {{/* Common labels */}} @@ -46,7 +53,7 @@ helm.sh/chart: {{ include "argo-cd.chart" .context }} {{ include "argo-cd.selectorLabels" (dict "context" .context "component" .component "name" .name) }} app.kubernetes.io/managed-by: {{ .context.Release.Service }} app.kubernetes.io/part-of: argocd -app.kubernetes.io/version: {{ include "argo-cd.defaultTag" .context }} +app.kubernetes.io/version: {{ include "argo-cd.versionLabelValue" .context }} {{- with .context.Values.global.additionalLabels }} {{ toYaml . }} {{- end }} diff --git a/charts/argo/argo-cd/templates/argocd-repo-server/hpa.yaml b/charts/argo/argo-cd/templates/argocd-repo-server/hpa.yaml index 2cba83248..ef3d5e80b 100644 --- a/charts/argo/argo-cd/templates/argocd-repo-server/hpa.yaml +++ b/charts/argo/argo-cd/templates/argocd-repo-server/hpa.yaml @@ -14,6 +14,9 @@ spec: minReplicas: {{ .Values.repoServer.autoscaling.minReplicas }} maxReplicas: {{ .Values.repoServer.autoscaling.maxReplicas }} metrics: + {{- if .Values.repoServer.autoscaling.metrics }} + {{- toYaml .Values.repoServer.autoscaling.metrics | nindent 4 }} + {{- else }} {{- with .Values.repoServer.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: @@ -38,6 +41,7 @@ spec: type: Utilization {{- end }} {{- end }} + {{- end }} {{- with .Values.repoServer.autoscaling.behavior }} behavior: {{- toYaml . | nindent 4 }} diff --git a/charts/argo/argo-cd/templates/argocd-server/hpa.yaml b/charts/argo/argo-cd/templates/argocd-server/hpa.yaml index cbc17c319..c19b89433 100644 --- a/charts/argo/argo-cd/templates/argocd-server/hpa.yaml +++ b/charts/argo/argo-cd/templates/argocd-server/hpa.yaml @@ -14,6 +14,9 @@ spec: minReplicas: {{ .Values.server.autoscaling.minReplicas }} maxReplicas: {{ .Values.server.autoscaling.maxReplicas }} metrics: + {{- if .Values.server.autoscaling.metrics }} + {{ toYaml .Values.server.autoscaling.metrics | nindent 4 }} + {{- else }} {{- with .Values.server.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: @@ -38,6 +41,7 @@ spec: type: Utilization {{- end }} {{- end }} + {{- end}} {{- with .Values.server.autoscaling.behavior }} behavior: {{- toYaml . | nindent 4 }} diff --git a/charts/argo/argo-cd/values.yaml b/charts/argo/argo-cd/values.yaml index 83ecff3eb..38f9b2d7f 100644 --- a/charts/argo/argo-cd/values.yaml +++ b/charts/argo/argo-cd/values.yaml @@ -1476,6 +1476,9 @@ server: # - type: Pods # value: 2 # periodSeconds: 60 + # -- Configures custom HPA metrics for the Argo CD server + # Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ + metrics: [] ## Argo CD server Pod Disruption Budget ## Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ @@ -2043,6 +2046,9 @@ repoServer: # - type: Pods # value: 2 # periodSeconds: 60 + # -- Configures custom HPA metrics for the Argo CD repo server + # Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ + metrics: [] ## Repo server Pod Disruption Budget ## Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ diff --git a/charts/bitnami/airflow/Chart.yaml b/charts/bitnami/airflow/Chart.yaml index f8ae3540b..bfccdeb34 100644 --- a/charts/bitnami/airflow/Chart.yaml +++ b/charts/bitnami/airflow/Chart.yaml @@ -37,4 +37,4 @@ maintainers: name: airflow sources: - https://github.com/bitnami/charts/tree/main/bitnami/airflow -version: 14.3.3 +version: 14.3.4 diff --git a/charts/bitnami/airflow/README.md b/charts/bitnami/airflow/README.md index 51929b1a8..3595fd340 100644 --- a/charts/bitnami/airflow/README.md +++ b/charts/bitnami/airflow/README.md @@ -318,7 +318,7 @@ The command removes all the Kubernetes components associated with the chart and | ------------------------------ | --------------------------------------------------------------------------------------------------- | ---------------------- | | `git.image.registry` | Git image registry | `docker.io` | | `git.image.repository` | Git image repository | `bitnami/git` | -| `git.image.tag` | Git image tag (immutable tags are recommended) | `2.41.0-debian-11-r14` | +| `git.image.tag` | Git image tag (immutable tags are recommended) | `2.41.0-debian-11-r16` | | `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 | `[]` | diff --git a/charts/bitnami/airflow/values.yaml b/charts/bitnami/airflow/values.yaml index 3fae69cfd..42b3b91bf 100644 --- a/charts/bitnami/airflow/values.yaml +++ b/charts/bitnami/airflow/values.yaml @@ -923,7 +923,7 @@ git: image: registry: docker.io repository: bitnami/git - tag: 2.41.0-debian-11-r14 + tag: 2.41.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/cassandra/Chart.lock b/charts/bitnami/cassandra/Chart.lock index bd0cbbe5b..fc8065eb9 100644 --- a/charts/bitnami/cassandra/Chart.lock +++ b/charts/bitnami/cassandra/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-21T13:55:28.822228359Z" + version: 2.6.0 +digest: sha256:6ce7c85dcb43ad1fc5ff600850f28820ddc2f1a7c8cb25c5ff542fe1f852165a +generated: "2023-07-13T12:34:01.999400148Z" diff --git a/charts/bitnami/cassandra/Chart.yaml b/charts/bitnami/cassandra/Chart.yaml index 31615ad22..78be2ef7f 100644 --- a/charts/bitnami/cassandra/Chart.yaml +++ b/charts/bitnami/cassandra/Chart.yaml @@ -28,4 +28,4 @@ maintainers: name: cassandra sources: - https://github.com/bitnami/charts/tree/main/bitnami/cassandra -version: 10.4.3 +version: 10.4.4 diff --git a/charts/bitnami/cassandra/README.md b/charts/bitnami/cassandra/README.md index fd53fe024..bfbbd530c 100644 --- a/charts/bitnami/cassandra/README.md +++ b/charts/bitnami/cassandra/README.md @@ -81,7 +81,7 @@ The command removes all the Kubernetes components associated with the chart and | ----------------------------- | ---------------------------------------------------------------------------------------------------------------------- | --------------------- | | `image.registry` | Cassandra image registry | `docker.io` | | `image.repository` | Cassandra image repository | `bitnami/cassandra` | -| `image.tag` | Cassandra image tag (immutable tags are recommended) | `4.1.2-debian-11-r10` | +| `image.tag` | Cassandra image tag (immutable tags are recommended) | `4.1.2-debian-11-r15` | | `image.digest` | Cassandra image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | image pull policy | `IfNotPresent` | | `image.pullSecrets` | Cassandra image pull secrets | `[]` | @@ -227,18 +227,18 @@ 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 image registry | `docker.io` | -| `volumePermissions.image.repository` | Init container volume image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume image tag (immutable tags are recommended) | `11-debian-11-r130` | -| `volumePermissions.image.digest` | Init container volume image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | -| `volumePermissions.image.pullPolicy` | Init container volume pull policy | `IfNotPresent` | -| `volumePermissions.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | -| `volumePermissions.resources.limits` | The resources limits for the container | `{}` | -| `volumePermissions.resources.requests` | The requested resources for the container | `{}` | -| `volumePermissions.securityContext.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 image registry | `docker.io` | +| `volumePermissions.image.repository` | Init container volume image repository | `bitnami/os-shell` | +| `volumePermissions.image.tag` | Init container volume image tag (immutable tags are recommended) | `11-debian-11-r2` | +| `volumePermissions.image.digest` | Init container volume image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `volumePermissions.image.pullPolicy` | Init container volume pull policy | `IfNotPresent` | +| `volumePermissions.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | +| `volumePermissions.resources.limits` | The resources limits for the container | `{}` | +| `volumePermissions.resources.requests` | The requested resources for the container | `{}` | +| `volumePermissions.securityContext.runAsUser` | User ID for the init container | `0` | ### Metrics parameters @@ -247,7 +247,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` | Cassandra exporter image registry | `docker.io` | | `metrics.image.repository` | Cassandra exporter image name | `bitnami/cassandra-exporter` | -| `metrics.image.tag` | Cassandra exporter image tag | `2.3.8-debian-11-r133` | +| `metrics.image.tag` | Cassandra exporter image tag | `2.3.8-debian-11-r138` | | `metrics.image.digest` | Cassandra exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.image.pullPolicy` | image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | diff --git a/charts/bitnami/cassandra/charts/common/Chart.yaml b/charts/bitnami/cassandra/charts/common/Chart.yaml index 4fc56bbb7..191699db1 100644 --- a/charts/bitnami/cassandra/charts/common/Chart.yaml +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/README.md b/charts/bitnami/cassandra/charts/common/README.md index 72fca33da..b48bb7a25 100644 --- a/charts/bitnami/cassandra/charts/common/README.md +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_affinities.tpl b/charts/bitnami/cassandra/charts/common/templates/_affinities.tpl index 81902a681..0e571028f 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_affinities.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_capabilities.tpl b/charts/bitnami/cassandra/charts/common/templates/_capabilities.tpl index 697486a31..c6d115fe5 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_capabilities.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_errors.tpl b/charts/bitnami/cassandra/charts/common/templates/_errors.tpl index a79cc2e32..07ded6f64 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_errors.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_images.tpl b/charts/bitnami/cassandra/charts/common/templates/_images.tpl index d60c22e25..2181f3224 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_images.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_ingress.tpl b/charts/bitnami/cassandra/charts/common/templates/_ingress.tpl index 831da9caa..efa5b85c7 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_ingress.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_labels.tpl b/charts/bitnami/cassandra/charts/common/templates/_labels.tpl index 252066c7e..a1d7a95bc 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_labels.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_names.tpl b/charts/bitnami/cassandra/charts/common/templates/_names.tpl index 617a23489..a222924f1 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_names.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_secrets.tpl b/charts/bitnami/cassandra/charts/common/templates/_secrets.tpl index a1708b2e8..a193c46b6 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_secrets.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_storage.tpl b/charts/bitnami/cassandra/charts/common/templates/_storage.tpl index 60e2a844f..16405a0f8 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_storage.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_tplvalues.tpl b/charts/bitnami/cassandra/charts/common/templates/_tplvalues.tpl index 2db166851..dc15f7fdc 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_tplvalues.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_utils.tpl b/charts/bitnami/cassandra/charts/common/templates/_utils.tpl index b1ead50cf..c87040cd9 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_utils.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/_warnings.tpl b/charts/bitnami/cassandra/charts/common/templates/_warnings.tpl index ae10fa41e..66dffc1fe 100644 --- a/charts/bitnami/cassandra/charts/common/templates/_warnings.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/validations/_cassandra.tpl b/charts/bitnami/cassandra/charts/common/templates/validations/_cassandra.tpl index ded1ae3bc..eda9aada5 100644 --- a/charts/bitnami/cassandra/charts/common/templates/validations/_cassandra.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/validations/_mariadb.tpl b/charts/bitnami/cassandra/charts/common/templates/validations/_mariadb.tpl index b6906ff77..17d83a2fd 100644 --- a/charts/bitnami/cassandra/charts/common/templates/validations/_mariadb.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/validations/_mongodb.tpl b/charts/bitnami/cassandra/charts/common/templates/validations/_mongodb.tpl index f820ec107..bbb445b86 100644 --- a/charts/bitnami/cassandra/charts/common/templates/validations/_mongodb.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/validations/_mysql.tpl b/charts/bitnami/cassandra/charts/common/templates/validations/_mysql.tpl index 74472a061..ca3953f86 100644 --- a/charts/bitnami/cassandra/charts/common/templates/validations/_mysql.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/validations/_postgresql.tpl b/charts/bitnami/cassandra/charts/common/templates/validations/_postgresql.tpl index 164ec0d01..8c9aa570e 100644 --- a/charts/bitnami/cassandra/charts/common/templates/validations/_postgresql.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/validations/_redis.tpl b/charts/bitnami/cassandra/charts/common/templates/validations/_redis.tpl index dcccfc1ae..fc0d208dd 100644 --- a/charts/bitnami/cassandra/charts/common/templates/validations/_redis.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/templates/validations/_validations.tpl b/charts/bitnami/cassandra/charts/common/templates/validations/_validations.tpl index 9a814cf40..31ceda871 100644 --- a/charts/bitnami/cassandra/charts/common/templates/validations/_validations.tpl +++ b/charts/bitnami/cassandra/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/cassandra/charts/common/values.yaml b/charts/bitnami/cassandra/charts/common/values.yaml index f2df68e5e..9abe0e154 100644 --- a/charts/bitnami/cassandra/charts/common/values.yaml +++ b/charts/bitnami/cassandra/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/cassandra/values.yaml b/charts/bitnami/cassandra/values.yaml index 1a1cc0f8f..4c51c3746 100644 --- a/charts/bitnami/cassandra/values.yaml +++ b/charts/bitnami/cassandra/values.yaml @@ -76,7 +76,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/cassandra - tag: 4.1.2-debian-11-r10 + tag: 4.1.2-debian-11-r15 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -615,8 +615,8 @@ volumePermissions: ## image: registry: docker.io - repository: bitnami/bitnami-shell - tag: 11-debian-11-r130 + repository: bitnami/os-shell + tag: 11-debian-11-r2 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -685,7 +685,7 @@ metrics: registry: docker.io pullPolicy: IfNotPresent repository: bitnami/cassandra-exporter - tag: 2.3.8-debian-11-r133 + tag: 2.3.8-debian-11-r138 digest: "" ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/charts/bitnami/mysql/Chart.yaml b/charts/bitnami/mysql/Chart.yaml index 85c1b85f1..3b24ebfdb 100644 --- a/charts/bitnami/mysql/Chart.yaml +++ b/charts/bitnami/mysql/Chart.yaml @@ -29,4 +29,4 @@ maintainers: name: mysql sources: - https://github.com/bitnami/charts/tree/main/bitnami/mysql -version: 9.10.5 +version: 9.10.6 diff --git a/charts/bitnami/mysql/README.md b/charts/bitnami/mysql/README.md index de6f1c941..1b2698940 100644 --- a/charts/bitnami/mysql/README.md +++ b/charts/bitnami/mysql/README.md @@ -83,7 +83,7 @@ The command removes all the Kubernetes components associated with the chart and | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------- | | `image.registry` | MySQL image registry | `docker.io` | | `image.repository` | MySQL image repository | `bitnami/mysql` | -| `image.tag` | MySQL image tag (immutable tags are recommended) | `8.0.33-debian-11-r28` | +| `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 | `[]` | @@ -302,16 +302,16 @@ 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(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/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r132` | -| `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 | `[]` | -| `volumePermissions.resources` | Init container volume-permissions resources | `{}` | +| Name | Description | Value | +| ------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | ------------------ | +| `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.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 | `[]` | +| `volumePermissions.resources` | Init container volume-permissions resources | `{}` | ### Metrics parameters @@ -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-r135` | +| `metrics.image.tag` | Exporter image tag (immutable tags are recommended) | `0.14.0-debian-11-r138` | | `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 7ab54e6fa..e1bbb552a 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-r28 + tag: 8.0.33-debian-11-r30 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1008,8 +1008,8 @@ volumePermissions: ## image: registry: docker.io - repository: bitnami/bitnami-shell - tag: 11-debian-11-r132 + repository: bitnami/os-shell + tag: 11-debian-11-r2 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-r135 + tag: 0.14.0-debian-11-r138 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/charts/bitnami/postgresql/Chart.yaml b/charts/bitnami/postgresql/Chart.yaml index f016c8c5b..669091b6c 100644 --- a/charts/bitnami/postgresql/Chart.yaml +++ b/charts/bitnami/postgresql/Chart.yaml @@ -31,4 +31,4 @@ maintainers: name: postgresql sources: - https://github.com/bitnami/charts/tree/main/bitnami/post -version: 12.6.5 +version: 12.6.6 diff --git a/charts/bitnami/postgresql/README.md b/charts/bitnami/postgresql/README.md index a3c0c78d3..6c16402e5 100644 --- a/charts/bitnami/postgresql/README.md +++ b/charts/bitnami/postgresql/README.md @@ -100,7 +100,7 @@ kubectl delete pvc -l release=my-release | ---------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------- | | `image.registry` | PostgreSQL image registry | `docker.io` | | `image.repository` | PostgreSQL image repository | `bitnami/postgresql` | -| `image.tag` | PostgreSQL image tag (immutable tags are recommended) | `15.3.0-debian-11-r17` | +| `image.tag` | PostgreSQL image tag (immutable tags are recommended) | `15.3.0-debian-11-r24` | | `image.digest` | PostgreSQL image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | PostgreSQL image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify image pull secrets | `[]` | @@ -372,18 +372,18 @@ kubectl delete pvc -l release=my-release ### 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-r130` | -| `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.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-r3` | +| `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.runAsUser` | User ID for the init container | `0` | ### Other Parameters @@ -405,7 +405,7 @@ kubectl delete pvc -l release=my-release | `metrics.enabled` | Start a prometheus exporter | `false` | | `metrics.image.registry` | PostgreSQL Prometheus Exporter image registry | `docker.io` | | `metrics.image.repository` | PostgreSQL Prometheus Exporter image repository | `bitnami/postgres-exporter` | -| `metrics.image.tag` | PostgreSQL Prometheus Exporter image tag (immutable tags are recommended) | `0.13.1-debian-11-r0` | +| `metrics.image.tag` | PostgreSQL Prometheus Exporter image tag (immutable tags are recommended) | `0.13.1-debian-11-r5` | | `metrics.image.digest` | PostgreSQL image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.image.pullPolicy` | PostgreSQL Prometheus Exporter image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify image pull secrets | `[]` | @@ -682,4 +682,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. +limitations under the License. \ No newline at end of file diff --git a/charts/bitnami/postgresql/values.yaml b/charts/bitnami/postgresql/values.yaml index 793e22156..c89e3b575 100644 --- a/charts/bitnami/postgresql/values.yaml +++ b/charts/bitnami/postgresql/values.yaml @@ -98,7 +98,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/postgresql - tag: 15.3.0-debian-11-r17 + tag: 15.3.0-debian-11-r24 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1138,8 +1138,8 @@ volumePermissions: ## image: registry: docker.io - repository: bitnami/bitnami-shell - tag: 11-debian-11-r130 + repository: bitnami/os-shell + tag: 11-debian-11-r3 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -1234,7 +1234,7 @@ metrics: image: registry: docker.io repository: bitnami/postgres-exporter - tag: 0.13.1-debian-11-r0 + tag: 0.13.1-debian-11-r5 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/charts/bitnami/redis/Chart.yaml b/charts/bitnami/redis/Chart.yaml index 6839ff6e7..0990e2545 100644 --- a/charts/bitnami/redis/Chart.yaml +++ b/charts/bitnami/redis/Chart.yaml @@ -28,4 +28,4 @@ maintainers: name: redis sources: - https://github.com/bitnami/charts/tree/main/bitnami/redis -version: 17.11.8 +version: 17.13.2 diff --git a/charts/bitnami/redis/README.md b/charts/bitnami/redis/README.md index bdc2533a5..9847278af 100644 --- a/charts/bitnami/redis/README.md +++ b/charts/bitnami/redis/README.md @@ -101,7 +101,7 @@ The command removes all the Kubernetes components associated with the chart and | ------------------- | ---------------------------------------------------------------------------------------------------------- | --------------------- | | `image.registry` | Redis® image registry | `docker.io` | | `image.repository` | Redis® image repository | `bitnami/redis` | -| `image.tag` | Redis® image tag (immutable tags are recommended) | `7.0.12-debian-11-r0` | +| `image.tag` | Redis® image tag (immutable tags are recommended) | `7.0.12-debian-11-r2` | | `image.digest` | Redis® image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | Redis® image pull policy | `IfNotPresent` | | `image.pullSecrets` | Redis® image pull secrets | `[]` | @@ -335,7 +335,7 @@ The command removes all the Kubernetes components associated with the chart and | `sentinel.enabled` | Use Redis® Sentinel on Redis® pods. | `false` | | `sentinel.image.registry` | Redis® Sentinel image registry | `docker.io` | | `sentinel.image.repository` | Redis® Sentinel image repository | `bitnami/redis-sentinel` | -| `sentinel.image.tag` | Redis® Sentinel image tag (immutable tags are recommended) | `7.0.11-debian-11-r27` | +| `sentinel.image.tag` | Redis® Sentinel image tag (immutable tags are recommended) | `7.0.12-debian-11-r1` | | `sentinel.image.digest` | Redis® Sentinel image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `sentinel.image.pullPolicy` | Redis® Sentinel image pull policy | `IfNotPresent` | | `sentinel.image.pullSecrets` | Redis® Sentinel image pull secrets | `[]` | @@ -453,7 +453,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.enabled` | Start a sidecar prometheus exporter to expose Redis® metrics | `false` | | `metrics.image.registry` | Redis® Exporter image registry | `docker.io` | | `metrics.image.repository` | Redis® Exporter image repository | `bitnami/redis-exporter` | -| `metrics.image.tag` | Redis® Exporter image tag (immutable tags are recommended) | `1.51.0-debian-11-r8` | +| `metrics.image.tag` | Redis® Exporter image tag (immutable tags are recommended) | `1.51.0-debian-11-r11` | | `metrics.image.digest` | Redis® Exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `metrics.image.pullPolicy` | Redis® Exporter image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Redis® Exporter image pull secrets | `[]` | @@ -507,6 +507,8 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` | | `metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor resource(s) can be discovered by Prometheus | `{}` | | `metrics.serviceMonitor.podTargetLabels` | Labels from the Kubernetes pod to be transferred to the created metrics | `[]` | +| `metrics.serviceMonitor.sampleLimit` | Limit of how many samples should be scraped from every Pod | `false` | +| `metrics.serviceMonitor.targetLimit` | Limit of how many targets should be scraped | `false` | | `metrics.prometheusRule.enabled` | Create a custom prometheusRule Resource for scraping metrics using PrometheusOperator | `false` | | `metrics.prometheusRule.namespace` | The namespace in which the prometheusRule will be created | `""` | | `metrics.prometheusRule.additionalLabels` | Additional labels for the prometheusRule | `{}` | @@ -514,29 +516,29 @@ The command removes all the Kubernetes components associated with the chart and ### Init Container Parameters -| Name | Description | Value | -| ------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------- | ----------------------- | -| `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` | -| `volumePermissions.image.registry` | Bitnami Shell image registry | `docker.io` | -| `volumePermissions.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r134` | -| `volumePermissions.image.digest` | Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | -| `volumePermissions.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | -| `volumePermissions.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | -| `volumePermissions.resources.limits` | The resources limits for the init container | `{}` | -| `volumePermissions.resources.requests` | The requested resources for the init container | `{}` | -| `volumePermissions.containerSecurityContext.runAsUser` | Set init container's Security Context runAsUser | `0` | -| `sysctl.enabled` | Enable init container to modify Kernel settings | `false` | -| `sysctl.image.registry` | Bitnami Shell image registry | `docker.io` | -| `sysctl.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` | -| `sysctl.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r134` | -| `sysctl.image.digest` | Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | -| `sysctl.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` | -| `sysctl.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` | -| `sysctl.command` | Override default init-sysctl container command (useful when using custom images) | `[]` | -| `sysctl.mountHostSys` | Mount the host `/sys` folder to `/host-sys` | `false` | -| `sysctl.resources.limits` | The resources limits for the init container | `{}` | -| `sysctl.resources.requests` | The requested resources for the init container | `{}` | +| Name | Description | Value | +| ------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------ | ------------------ | +| `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` | +| `volumePermissions.image.registry` | OS Shell + Utility image registry | `docker.io` | +| `volumePermissions.image.repository` | OS Shell + Utility image repository | `bitnami/os-shell` | +| `volumePermissions.image.tag` | OS Shell + Utility image tag (immutable tags are recommended) | `11-debian-11-r3` | +| `volumePermissions.image.digest` | OS Shell + Utility image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `volumePermissions.image.pullPolicy` | OS Shell + Utility image pull policy | `IfNotPresent` | +| `volumePermissions.image.pullSecrets` | OS Shell + Utility image pull secrets | `[]` | +| `volumePermissions.resources.limits` | The resources limits for the init container | `{}` | +| `volumePermissions.resources.requests` | The requested resources for the init container | `{}` | +| `volumePermissions.containerSecurityContext.runAsUser` | Set init container's Security Context runAsUser | `0` | +| `sysctl.enabled` | Enable init container to modify Kernel settings | `false` | +| `sysctl.image.registry` | OS Shell + Utility image registry | `docker.io` | +| `sysctl.image.repository` | OS Shell + Utility image repository | `bitnami/os-shell` | +| `sysctl.image.tag` | OS Shell + Utility image tag (immutable tags are recommended) | `11-debian-11-r3` | +| `sysctl.image.digest` | OS Shell + Utility image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | +| `sysctl.image.pullPolicy` | OS Shell + Utility image pull policy | `IfNotPresent` | +| `sysctl.image.pullSecrets` | OS Shell + Utility image pull secrets | `[]` | +| `sysctl.command` | Override default init-sysctl container command (useful when using custom images) | `[]` | +| `sysctl.mountHostSys` | Mount the host `/sys` folder to `/host-sys` | `false` | +| `sysctl.resources.limits` | The resources limits for the init container | `{}` | +| `sysctl.resources.requests` | The requested resources for the init container | `{}` | ### useExternalDNS Parameters diff --git a/charts/bitnami/redis/templates/secret.yaml b/charts/bitnami/redis/templates/secret.yaml index 9ec4db4cc..7ee2d57d1 100644 --- a/charts/bitnami/redis/templates/secret.yaml +++ b/charts/bitnami/redis/templates/secret.yaml @@ -57,5 +57,9 @@ data: host: {{ print $host | b64enc | quote }} port: {{ print $port | b64enc | quote }} password: {{ print $password | b64enc | quote }} + {{- if $password }} uri: {{ printf "redis://%s@%s:%s" $password $host $port | b64enc | quote }} + {{- else }} + uri: {{ printf "redis://%s:%s" $host $port | b64enc | quote }} + {{- end }} {{- end }} diff --git a/charts/bitnami/redis/templates/servicemonitor.yaml b/charts/bitnami/redis/templates/servicemonitor.yaml index a9a14c4da..732ffbac9 100644 --- a/charts/bitnami/redis/templates/servicemonitor.yaml +++ b/charts/bitnami/redis/templates/servicemonitor.yaml @@ -40,6 +40,12 @@ spec: {{- if .Values.metrics.serviceMonitor.podTargetLabels }} podTargetLabels: {{- toYaml .Values.metrics.serviceMonitor.podTargetLabels | nindent 4 }} {{- end }} + {{ with .Values.metrics.serviceMonitor.sampleLimit }} + sampleLimit: {{ . }} + {{- end }} + {{ with .Values.metrics.serviceMonitor.targetLimit }} + targetLimit: {{ . }} + {{- end }} namespaceSelector: matchNames: - {{ .Release.Namespace }} diff --git a/charts/bitnami/redis/values.yaml b/charts/bitnami/redis/values.yaml index 2b7d02278..ff6d64ec9 100644 --- a/charts/bitnami/redis/values.yaml +++ b/charts/bitnami/redis/values.yaml @@ -91,7 +91,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/redis - tag: 7.0.12-debian-11-r0 + tag: 7.0.12-debian-11-r2 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1004,7 +1004,7 @@ sentinel: image: registry: docker.io repository: bitnami/redis-sentinel - tag: 7.0.11-debian-11-r27 + tag: 7.0.12-debian-11-r1 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1446,7 +1446,7 @@ metrics: image: registry: docker.io repository: bitnami/redis-exporter - tag: 1.51.0-debian-11-r8 + tag: 1.51.0-debian-11-r11 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -1627,6 +1627,13 @@ metrics: ## @param metrics.serviceMonitor.podTargetLabels Labels from the Kubernetes pod to be transferred to the created metrics ## podTargetLabels: [] + ## @param metrics.serviceMonitor.sampleLimit Limit of how many samples should be scraped from every Pod + ## + sampleLimit: false + ## @param metrics.serviceMonitor.targetLimit Limit of how many targets should be scraped + ## + targetLimit: false + ## Custom PrometheusRule to be defined ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions ## @@ -1688,19 +1695,19 @@ volumePermissions: ## @param volumePermissions.enabled Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` ## enabled: false - ## Bitnami Shell image - ## ref: https://hub.docker.com/r/bitnami/bitnami-shell/tags/ - ## @param volumePermissions.image.registry Bitnami Shell image registry - ## @param volumePermissions.image.repository Bitnami Shell image repository - ## @param volumePermissions.image.tag Bitnami Shell image tag (immutable tags are recommended) - ## @param volumePermissions.image.digest Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag - ## @param volumePermissions.image.pullPolicy Bitnami Shell image pull policy - ## @param volumePermissions.image.pullSecrets Bitnami Shell image pull secrets + ## OS Shell + Utility image + ## ref: https://hub.docker.com/r/bitnami/os-shell/tags/ + ## @param volumePermissions.image.registry OS Shell + Utility image registry + ## @param volumePermissions.image.repository OS Shell + Utility image repository + ## @param volumePermissions.image.tag OS Shell + Utility image tag (immutable tags are recommended) + ## @param volumePermissions.image.digest OS Shell + Utility image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param volumePermissions.image.pullPolicy OS Shell + Utility image pull policy + ## @param volumePermissions.image.pullSecrets OS Shell + Utility image pull secrets ## image: registry: docker.io - repository: bitnami/bitnami-shell - tag: 11-debian-11-r134 + repository: bitnami/os-shell + tag: 11-debian-11-r3 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -1736,19 +1743,19 @@ sysctl: ## @param sysctl.enabled Enable init container to modify Kernel settings ## enabled: false - ## Bitnami Shell image - ## ref: https://hub.docker.com/r/bitnami/bitnami-shell/tags/ - ## @param sysctl.image.registry Bitnami Shell image registry - ## @param sysctl.image.repository Bitnami Shell image repository - ## @param sysctl.image.tag Bitnami Shell image tag (immutable tags are recommended) - ## @param sysctl.image.digest Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag - ## @param sysctl.image.pullPolicy Bitnami Shell image pull policy - ## @param sysctl.image.pullSecrets Bitnami Shell image pull secrets + ## OS Shell + Utility image + ## ref: https://hub.docker.com/r/bitnami/os-shell/tags/ + ## @param sysctl.image.registry OS Shell + Utility image registry + ## @param sysctl.image.repository OS Shell + Utility image repository + ## @param sysctl.image.tag OS Shell + Utility image tag (immutable tags are recommended) + ## @param sysctl.image.digest OS Shell + Utility image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag + ## @param sysctl.image.pullPolicy OS Shell + Utility image pull policy + ## @param sysctl.image.pullSecrets OS Shell + Utility image pull secrets ## image: registry: docker.io - repository: bitnami/bitnami-shell - tag: 11-debian-11-r134 + repository: bitnami/os-shell + tag: 11-debian-11-r3 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/charts/bitnami/wordpress/Chart.lock b/charts/bitnami/wordpress/Chart.lock index 59537423a..b16e2f9dd 100644 --- a/charts/bitnami/wordpress/Chart.lock +++ b/charts/bitnami/wordpress/Chart.lock @@ -4,9 +4,9 @@ dependencies: version: 6.5.4 - name: mariadb repository: oci://registry-1.docker.io/bitnamicharts - version: 12.2.7 + version: 12.2.8 - name: common repository: oci://registry-1.docker.io/bitnamicharts version: 2.6.0 -digest: sha256:047d9d4f75d47299e379a72ce3b4c99848075a3db8ad0c1c10aa7b795e178298 -generated: "2023-07-13T12:43:57.995436763Z" +digest: sha256:5f10c5598a3c4ece70bc5eb4b086c21d03aa3121c2b82ec05448ffe09d39edbc +generated: "2023-07-13T19:28:03.474402945Z" diff --git a/charts/bitnami/wordpress/Chart.yaml b/charts/bitnami/wordpress/Chart.yaml index 35a3b6335..688c6d49e 100644 --- a/charts/bitnami/wordpress/Chart.yaml +++ b/charts/bitnami/wordpress/Chart.yaml @@ -40,4 +40,4 @@ maintainers: name: wordpress sources: - https://github.com/bitnami/charts/tree/main/bitnami/wordpress -version: 16.1.26 +version: 16.1.27 diff --git a/charts/bitnami/wordpress/README.md b/charts/bitnami/wordpress/README.md index 97ad68f12..be1a92a69 100644 --- a/charts/bitnami/wordpress/README.md +++ b/charts/bitnami/wordpress/README.md @@ -82,7 +82,7 @@ The command removes all the Kubernetes components associated with the chart and | ------------------- | --------------------------------------------------------------------------------------------------------- | --------------------- | | `image.registry` | WordPress image registry | `docker.io` | | `image.repository` | WordPress image repository | `bitnami/wordpress` | -| `image.tag` | WordPress image tag (immutable tags are recommended) | `6.2.2-debian-11-r29` | +| `image.tag` | WordPress image tag (immutable tags are recommended) | `6.2.2-debian-11-r30` | | `image.digest` | WordPress image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | WordPress image pull policy | `IfNotPresent` | | `image.pullSecrets` | WordPress image pull secrets | `[]` | diff --git a/charts/bitnami/wordpress/charts/mariadb/Chart.yaml b/charts/bitnami/wordpress/charts/mariadb/Chart.yaml index f03b80ac1..00f953992 100644 --- a/charts/bitnami/wordpress/charts/mariadb/Chart.yaml +++ b/charts/bitnami/wordpress/charts/mariadb/Chart.yaml @@ -26,4 +26,4 @@ maintainers: name: mariadb sources: - https://github.com/bitnami/charts/tree/main/bitnami/mariadb -version: 12.2.7 +version: 12.2.8 diff --git a/charts/bitnami/wordpress/charts/mariadb/README.md b/charts/bitnami/wordpress/charts/mariadb/README.md index 697888ddc..f0fe5df4e 100644 --- a/charts/bitnami/wordpress/charts/mariadb/README.md +++ b/charts/bitnami/wordpress/charts/mariadb/README.md @@ -86,7 +86,7 @@ The command removes all the Kubernetes components associated with the chart and | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------- | | `image.registry` | MariaDB image registry | `docker.io` | | `image.repository` | MariaDB image repository | `bitnami/mariadb` | -| `image.tag` | MariaDB image tag (immutable tags are recommended) | `10.11.4-debian-11-r10` | +| `image.tag` | MariaDB image tag (immutable tags are recommended) | `10.11.4-debian-11-r12` | | `image.digest` | MariaDB image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` | | `image.pullPolicy` | MariaDB image pull policy | `IfNotPresent` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | @@ -303,17 +303,17 @@ 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(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/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `11-debian-11-r133` | -| `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 | `[]` | -| `volumePermissions.resources.limits` | Init container volume-permissions resource limits | `{}` | -| `volumePermissions.resources.requests` | Init container volume-permissions resource requests | `{}` | +| Name | Description | Value | +| -------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | ------------------ | +| `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.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 | `[]` | +| `volumePermissions.resources.limits` | Init container volume-permissions resource limits | `{}` | +| `volumePermissions.resources.requests` | Init container volume-permissions resource requests | `{}` | ### Metrics parameters @@ -322,7 +322,7 @@ The command removes all the Kubernetes components associated with the chart and | `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.image.registry` | Exporter image registry | `docker.io` | | `metrics.image.repository` | Exporter image repository | `bitnami/mysqld-exporter` | -| `metrics.image.tag` | Exporter image tag (immutable tags are recommended) | `0.14.0-debian-11-r136` | +| `metrics.image.tag` | Exporter image tag (immutable tags are recommended) | `0.14.0-debian-11-r138` | | `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/wordpress/charts/mariadb/values.yaml b/charts/bitnami/wordpress/charts/mariadb/values.yaml index 27c85bb5c..7d6b7e09c 100644 --- a/charts/bitnami/wordpress/charts/mariadb/values.yaml +++ b/charts/bitnami/wordpress/charts/mariadb/values.yaml @@ -90,7 +90,7 @@ serviceBindings: image: registry: docker.io repository: bitnami/mariadb - tag: 10.11.4-debian-11-r10 + tag: 10.11.4-debian-11-r12 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1003,8 +1003,8 @@ volumePermissions: ## image: registry: docker.io - repository: bitnami/bitnami-shell - tag: 11-debian-11-r133 + repository: bitnami/os-shell + tag: 11-debian-11-r2 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets (secrets must be manually created in the namespace) @@ -1040,7 +1040,7 @@ metrics: image: registry: docker.io repository: bitnami/mysqld-exporter - tag: 0.14.0-debian-11-r136 + tag: 0.14.0-debian-11-r138 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets (secrets must be manually created in the namespace) diff --git a/charts/bitnami/wordpress/values.yaml b/charts/bitnami/wordpress/values.yaml index 3e5591316..a4cb1d8c3 100644 --- a/charts/bitnami/wordpress/values.yaml +++ b/charts/bitnami/wordpress/values.yaml @@ -76,7 +76,7 @@ diagnosticMode: image: registry: docker.io repository: bitnami/wordpress - tag: 6.2.2-debian-11-r29 + tag: 6.2.2-debian-11-r30 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' diff --git a/charts/bitnami/zookeeper/Chart.lock b/charts/bitnami/zookeeper/Chart.lock index 5812ea269..6bc47be4a 100644 --- a/charts/bitnami/zookeeper/Chart.lock +++ b/charts/bitnami/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/zookeeper/Chart.yaml b/charts/bitnami/zookeeper/Chart.yaml index 1ae70b67d..ad4d90847 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.3 +version: 11.4.5 diff --git a/charts/bitnami/zookeeper/README.md b/charts/bitnami/zookeeper/README.md index 79a780990..26c28a430 100644 --- a/charts/bitnami/zookeeper/README.md +++ b/charts/bitnami/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+ @@ -78,9 +80,9 @@ The command removes all the Kubernetes components associated with the chart and | Name | Description | Value | | ----------------------------- | -------------------------------------------------------------------------------------------------------------------------- | ----------------------- | -| `image.registry` | ZooKeeper image registry | `docker.io` | +| `image.registry` | ZooKeeper image registry | `registry-1.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-r145` | | `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 | `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` | ### Metrics parameters diff --git a/charts/bitnami/zookeeper/charts/common/Chart.yaml b/charts/bitnami/zookeeper/charts/common/Chart.yaml index 4fc56bbb7..191699db1 100644 --- a/charts/bitnami/zookeeper/charts/common/Chart.yaml +++ b/charts/bitnami/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/zookeeper/charts/common/README.md b/charts/bitnami/zookeeper/charts/common/README.md index 72fca33da..b48bb7a25 100644 --- a/charts/bitnami/zookeeper/charts/common/README.md +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_affinities.tpl b/charts/bitnami/zookeeper/charts/common/templates/_affinities.tpl index 81902a681..0e571028f 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_affinities.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_capabilities.tpl b/charts/bitnami/zookeeper/charts/common/templates/_capabilities.tpl index 697486a31..c6d115fe5 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_capabilities.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_errors.tpl b/charts/bitnami/zookeeper/charts/common/templates/_errors.tpl index a79cc2e32..07ded6f64 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_errors.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_images.tpl b/charts/bitnami/zookeeper/charts/common/templates/_images.tpl index d60c22e25..2181f3224 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_images.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_ingress.tpl b/charts/bitnami/zookeeper/charts/common/templates/_ingress.tpl index 831da9caa..efa5b85c7 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_ingress.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_labels.tpl b/charts/bitnami/zookeeper/charts/common/templates/_labels.tpl index 252066c7e..a1d7a95bc 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_labels.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_names.tpl b/charts/bitnami/zookeeper/charts/common/templates/_names.tpl index 617a23489..a222924f1 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_names.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_secrets.tpl b/charts/bitnami/zookeeper/charts/common/templates/_secrets.tpl index a1708b2e8..a193c46b6 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_secrets.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_storage.tpl b/charts/bitnami/zookeeper/charts/common/templates/_storage.tpl index 60e2a844f..16405a0f8 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_storage.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_tplvalues.tpl b/charts/bitnami/zookeeper/charts/common/templates/_tplvalues.tpl index 2db166851..dc15f7fdc 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_tplvalues.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_utils.tpl b/charts/bitnami/zookeeper/charts/common/templates/_utils.tpl index b1ead50cf..c87040cd9 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_utils.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/_warnings.tpl b/charts/bitnami/zookeeper/charts/common/templates/_warnings.tpl index ae10fa41e..66dffc1fe 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/_warnings.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/validations/_cassandra.tpl b/charts/bitnami/zookeeper/charts/common/templates/validations/_cassandra.tpl index ded1ae3bc..eda9aada5 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/validations/_cassandra.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/validations/_mariadb.tpl b/charts/bitnami/zookeeper/charts/common/templates/validations/_mariadb.tpl index b6906ff77..17d83a2fd 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/validations/_mariadb.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/validations/_mongodb.tpl b/charts/bitnami/zookeeper/charts/common/templates/validations/_mongodb.tpl index f820ec107..bbb445b86 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/validations/_mongodb.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/validations/_mysql.tpl b/charts/bitnami/zookeeper/charts/common/templates/validations/_mysql.tpl index 74472a061..ca3953f86 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/validations/_mysql.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/validations/_postgresql.tpl b/charts/bitnami/zookeeper/charts/common/templates/validations/_postgresql.tpl index 164ec0d01..8c9aa570e 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/validations/_postgresql.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/validations/_redis.tpl b/charts/bitnami/zookeeper/charts/common/templates/validations/_redis.tpl index dcccfc1ae..fc0d208dd 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/validations/_redis.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/templates/validations/_validations.tpl b/charts/bitnami/zookeeper/charts/common/templates/validations/_validations.tpl index 9a814cf40..31ceda871 100644 --- a/charts/bitnami/zookeeper/charts/common/templates/validations/_validations.tpl +++ b/charts/bitnami/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/zookeeper/charts/common/values.yaml b/charts/bitnami/zookeeper/charts/common/values.yaml index f2df68e5e..9abe0e154 100644 --- a/charts/bitnami/zookeeper/charts/common/values.yaml +++ b/charts/bitnami/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/zookeeper/templates/_helpers.tpl b/charts/bitnami/zookeeper/templates/_helpers.tpl index d855bada0..0e2e8e588 100644 --- a/charts/bitnami/zookeeper/templates/_helpers.tpl +++ b/charts/bitnami/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/zookeeper/templates/configmap.yaml b/charts/bitnami/zookeeper/templates/configmap.yaml index 12b4f489f..75f013767 100644 --- a/charts/bitnami/zookeeper/templates/configmap.yaml +++ b/charts/bitnami/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/zookeeper/templates/extra-list.yaml b/charts/bitnami/zookeeper/templates/extra-list.yaml index 9ac65f9e1..2d35a580e 100644 --- a/charts/bitnami/zookeeper/templates/extra-list.yaml +++ b/charts/bitnami/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/zookeeper/templates/metrics-svc.yaml b/charts/bitnami/zookeeper/templates/metrics-svc.yaml index 5afc4b3e5..ebb73ec02 100644 --- a/charts/bitnami/zookeeper/templates/metrics-svc.yaml +++ b/charts/bitnami/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/zookeeper/templates/networkpolicy.yaml b/charts/bitnami/zookeeper/templates/networkpolicy.yaml index 63532832c..a96b33396 100644 --- a/charts/bitnami/zookeeper/templates/networkpolicy.yaml +++ b/charts/bitnami/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/zookeeper/templates/pdb.yaml b/charts/bitnami/zookeeper/templates/pdb.yaml index f7faf65f9..7a9a67a09 100644 --- a/charts/bitnami/zookeeper/templates/pdb.yaml +++ b/charts/bitnami/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/zookeeper/templates/prometheusrule.yaml b/charts/bitnami/zookeeper/templates/prometheusrule.yaml index 87dcd3565..70818e6c9 100644 --- a/charts/bitnami/zookeeper/templates/prometheusrule.yaml +++ b/charts/bitnami/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/zookeeper/templates/scripts-configmap.yaml b/charts/bitnami/zookeeper/templates/scripts-configmap.yaml index d77ab857b..794ba4fe6 100644 --- a/charts/bitnami/zookeeper/templates/scripts-configmap.yaml +++ b/charts/bitnami/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/zookeeper/templates/secrets.yaml b/charts/bitnami/zookeeper/templates/secrets.yaml index 82ebc2eed..7a9b3e2db 100644 --- a/charts/bitnami/zookeeper/templates/secrets.yaml +++ b/charts/bitnami/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/zookeeper/templates/serviceaccount.yaml b/charts/bitnami/zookeeper/templates/serviceaccount.yaml index 958a57ac2..eda2e4a8b 100644 --- a/charts/bitnami/zookeeper/templates/serviceaccount.yaml +++ b/charts/bitnami/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/zookeeper/templates/servicemonitor.yaml b/charts/bitnami/zookeeper/templates/servicemonitor.yaml index 2c8af3350..936a8c68b 100644 --- a/charts/bitnami/zookeeper/templates/servicemonitor.yaml +++ b/charts/bitnami/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/zookeeper/templates/statefulset.yaml b/charts/bitnami/zookeeper/templates/statefulset.yaml index aa4f1a971..3ed040f8d 100644 --- a/charts/bitnami/zookeeper/templates/statefulset.yaml +++ b/charts/bitnami/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/zookeeper/templates/svc-headless.yaml b/charts/bitnami/zookeeper/templates/svc-headless.yaml index e7ab496cf..0040bca81 100644 --- a/charts/bitnami/zookeeper/templates/svc-headless.yaml +++ b/charts/bitnami/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/zookeeper/templates/svc.yaml b/charts/bitnami/zookeeper/templates/svc.yaml index 6ad0b1096..5077eb925 100644 --- a/charts/bitnami/zookeeper/templates/svc.yaml +++ b/charts/bitnami/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/zookeeper/templates/tls-secrets.yaml b/charts/bitnami/zookeeper/templates/tls-secrets.yaml index 3d7e15926..df8442190 100644 --- a/charts/bitnami/zookeeper/templates/tls-secrets.yaml +++ b/charts/bitnami/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/zookeeper/values.yaml b/charts/bitnami/zookeeper/values.yaml index d1e00b370..6c69b179d 100644 --- a/charts/bitnami/zookeeper/values.yaml +++ b/charts/bitnami/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 @@ -74,9 +77,9 @@ diagnosticMode: ## @param image.debug Specify if debug values should be set ## image: - registry: docker.io + registry: registry-1.docker.io repository: bitnami/zookeeper - tag: 3.8.1-debian-11-r46 + tag: 3.8.1-debian-11-r145 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -658,9 +661,9 @@ volumePermissions: ## @param volumePermissions.image.pullSecrets Init container volume-permissions image pull secrets ## image: - registry: docker.io - repository: bitnami/bitnami-shell - tag: 11-debian-11-r127 + registry: registry-1.docker.io + repository: bitnami/os-shell + tag: 11-debian-11-r11 digest: "" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/charts/clastix/kamaji-console/Chart.yaml b/charts/clastix/kamaji-console/Chart.yaml index 6b58ab834..68b1e689f 100644 --- a/charts/clastix/kamaji-console/Chart.yaml +++ b/charts/clastix/kamaji-console/Chart.yaml @@ -4,11 +4,11 @@ annotations: catalog.cattle.io/kube-version: '>=1.21.0-0' catalog.cattle.io/release-name: kamaji-console apiVersion: v2 -appVersion: v0.0.1 +appVersion: v0.0.2 description: Kamaji deploys and operates Kubernetes at scale with a fraction of the operational burden. This chart install a console for Kamaji. home: https://github.com/clastix/kamaji-console -icon: https://github.com/clastix/kamaji-console/raw/main/.github/images/icon.png +icon: https://github.com/clastix/kamaji/raw/master/assets/logo-colored.png kubeVersion: '>=1.21.0-0' maintainers: - email: dario@tranchitella.eu @@ -19,4 +19,4 @@ name: kamaji-console sources: - https://github.com/clastix/kamaji-console type: application -version: 0.0.4 +version: 0.0.5 diff --git a/charts/clastix/kamaji-console/README.md b/charts/clastix/kamaji-console/README.md index 764c072a1..41adae806 100644 --- a/charts/clastix/kamaji-console/README.md +++ b/charts/clastix/kamaji-console/README.md @@ -1,6 +1,6 @@ # kamaji-console -![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.1](https://img.shields.io/badge/AppVersion-v0.0.1-informational?style=flat-square) +![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.2](https://img.shields.io/badge/AppVersion-v0.0.2-informational?style=flat-square) Kamaji deploys and operates Kubernetes at scale with a fraction of the operational burden. This chart install a console for Kamaji. diff --git a/charts/clastix/kamaji-console/questions.yml b/charts/clastix/kamaji-console/questions.yml index 5b17ae61f..4e4c2e561 100644 --- a/charts/clastix/kamaji-console/questions.yml +++ b/charts/clastix/kamaji-console/questions.yml @@ -1,14 +1,13 @@ questions: - variable: credentialsSecret.generate label: Generate Console Config Secret - description: Generates a Secret that contains a Kamaji Console config and credentials (If the option to generate it is enabled, credentials will be visible in the API to authorized users) + description: Generates a Secret that contains a Kamaji Console config and credentials. type: boolean default: false required: true group: "Console Configuration" show_subquestion_if: true subquestions: - - variable: credentialsSecret.nextAuthUrl label: NextAuthUrl description: URL where the console is accessible, eg. https://kamaji.rancher.localhost @@ -19,11 +18,13 @@ questions: - variable: credentialsSecret.jwtSecret description: Secret used to sign the browser session label: JWT Secret + default: secretme type: string group: "Console Configuration" - variable: credentialsSecret.email label: email + default: admin@kamaji.rancher.localhost description: Credentials (email) to login into console type: string group: "Console Configuration" diff --git a/charts/confluent/confluent-for-kubernetes/Chart.yaml b/charts/confluent/confluent-for-kubernetes/Chart.yaml index 2e065e92b..6230a90aa 100644 --- a/charts/confluent/confluent-for-kubernetes/Chart.yaml +++ b/charts/confluent/confluent-for-kubernetes/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.cattle.io/kube-version: '>=1.15-0' catalog.cattle.io/release-name: confluent-for-kubernetes apiVersion: v1 -appVersion: 2.6.0 +appVersion: 2.6.1 description: A Helm chart to deploy Confluent for Kubernetes home: https://www.confluent.io/ icon: https://cdn.confluent.io/wp-content/uploads/seo-logo-meadow.png @@ -19,4 +19,4 @@ maintainers: name: confluent-for-kubernetes sources: - https://docs.confluent.io/current/index.html -version: 0.771.13 +version: 0.771.29 diff --git a/charts/confluent/confluent-for-kubernetes/values.yaml b/charts/confluent/confluent-for-kubernetes/values.yaml index 8cca1c5d1..f797c8c41 100644 --- a/charts/confluent/confluent-for-kubernetes/values.yaml +++ b/charts/confluent/confluent-for-kubernetes/values.yaml @@ -81,7 +81,7 @@ image: registry: docker.io repository: confluentinc/confluent-operator pullPolicy: IfNotPresent - tag: "0.771.13" + tag: "0.771.29" ### ## Priority class for Confluent Operator pod diff --git a/charts/gopaddle/gopaddle/Chart.yaml b/charts/gopaddle/gopaddle/Chart.yaml index 5f474274f..dcf7572f2 100644 --- a/charts/gopaddle/gopaddle/Chart.yaml +++ b/charts/gopaddle/gopaddle/Chart.yaml @@ -11,10 +11,10 @@ annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: gopaddle catalog.cattle.io/kube-version: '>=1.21-0' - catalog.cattle.io/namespace: gp-lite-4-2 + catalog.cattle.io/namespace: gopaddle catalog.cattle.io/release-name: gopaddle apiVersion: v2 -appVersion: 4.2.8 +appVersion: 4.2.9 dependencies: - condition: global.installer.chart.gp-core name: gp-core @@ -32,4 +32,4 @@ keywords: - Community Edition kubeVersion: '>=1.21-0' name: gopaddle -version: 4.2.8 +version: 4.2.9 diff --git a/charts/gopaddle/gopaddle/charts/gp-core/Chart.yaml b/charts/gopaddle/gopaddle/charts/gp-core/Chart.yaml index 1ec985509..c95ec3a7d 100644 --- a/charts/gopaddle/gopaddle/charts/gp-core/Chart.yaml +++ b/charts/gopaddle/gopaddle/charts/gp-core/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: 4.2.8 +appVersion: 4.2.9 description: A Helm chart for Kubernetes name: gp-core type: application -version: 4.2.8 +version: 4.2.9 diff --git a/charts/gopaddle/gopaddle/charts/gp-core/onprem-values.yaml b/charts/gopaddle/gopaddle/charts/gp-core/onprem-values.yaml index 857246f56..df8b7b32f 100644 --- a/charts/gopaddle/gopaddle/charts/gp-core/onprem-values.yaml +++ b/charts/gopaddle/gopaddle/charts/gp-core/onprem-values.yaml @@ -82,7 +82,7 @@ gateway: HOST: 0.0.0.0 imageTag: multi-arch-4.2.7.onprem.2 imageTagArm: multi-arch-4.2.7.onprem.2 - gpReleaseVersion: 4.2.8 + gpReleaseVersion: 4.2.9 gpcore: core: envMap: diff --git a/charts/gopaddle/gopaddle/charts/gp-core/templates/esearch-statefulset-multi-arch.yaml b/charts/gopaddle/gopaddle/charts/gp-core/templates/esearch-statefulset-multi-arch.yaml index 0f460d550..28bcd724c 100644 --- a/charts/gopaddle/gopaddle/charts/gp-core/templates/esearch-statefulset-multi-arch.yaml +++ b/charts/gopaddle/gopaddle/charts/gp-core/templates/esearch-statefulset-multi-arch.yaml @@ -38,7 +38,7 @@ spec: containers: - name: esearch image: {{ .Values.esearch.esearch.image }} - imagePullPolicy: Always + imagePullPolicy: IfNotPresent env: - name: discovery.type value: single-node diff --git a/charts/gopaddle/gopaddle/charts/gp-core/templates/usermanager-deployment.yaml b/charts/gopaddle/gopaddle/charts/gp-core/templates/usermanager-deployment.yaml index 755917962..7b705fb50 100644 --- a/charts/gopaddle/gopaddle/charts/gp-core/templates/usermanager-deployment.yaml +++ b/charts/gopaddle/gopaddle/charts/gp-core/templates/usermanager-deployment.yaml @@ -75,6 +75,8 @@ spec: value: {{ template "gopaddle.nodeIP" . }} - name: GP_RELEASE value: gp-4.2 + - name: HELM_INSTALLER_SOURCE + value: {{quote .Values.global.cluster.type }} envFrom: - secretRef: name: usermanager-usermanager-envsecret-w8sg1 diff --git a/charts/gopaddle/gopaddle/charts/gp-core/values.yaml b/charts/gopaddle/gopaddle/charts/gp-core/values.yaml index 868434c8a..44ac9896d 100644 --- a/charts/gopaddle/gopaddle/charts/gp-core/values.yaml +++ b/charts/gopaddle/gopaddle/charts/gp-core/values.yaml @@ -82,7 +82,7 @@ gateway: HOST: 0.0.0.0 imageTag: multi-arch-4.2.7.lite.2 imageTagArm: multi-arch-4.2.7.lite.2 - gpReleaseVersion: 4.2.8 + gpReleaseVersion: 4.2.9 gpcore: core: envMap: @@ -136,8 +136,8 @@ usermanager: usermanager: envMap: NODE_NAME: spec.nodeName - imageTag: multi-arch-4.2.7.lite.1 - imageTagArm: multi-arch-4.2.7.lite.1 + imageTag: multi-arch-4.2.9.lite.1 + imageTagArm: multi-arch-4.2.9.lite.1 webhook: webhook: envMap: diff --git a/charts/gopaddle/gopaddle/charts/gp-rabbitmq/Chart.yaml b/charts/gopaddle/gopaddle/charts/gp-rabbitmq/Chart.yaml index 3c0d44fcd..a278bada4 100644 --- a/charts/gopaddle/gopaddle/charts/gp-rabbitmq/Chart.yaml +++ b/charts/gopaddle/gopaddle/charts/gp-rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: 4.2.8 +appVersion: 4.2.9 description: A Helm chart for Kubernetes name: gp-rabbitmq type: application -version: 4.2.8 +version: 4.2.9 diff --git a/charts/jaeger/jaeger-operator/Chart.yaml b/charts/jaeger/jaeger-operator/Chart.yaml index e7929fb3b..52907eff0 100644 --- a/charts/jaeger/jaeger-operator/Chart.yaml +++ b/charts/jaeger/jaeger-operator/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: jaeger-operator sources: - https://github.com/jaegertracing/jaeger-operator -version: 2.46.1 +version: 2.46.2 diff --git a/charts/jaeger/jaeger-operator/crds/crd.yaml b/charts/jaeger/jaeger-operator/crds/crd.yaml index ce9af327d..bb430b2dc 100644 --- a/charts/jaeger/jaeger-operator/crds/crd.yaml +++ b/charts/jaeger/jaeger-operator/crds/crd.yaml @@ -955,6 +955,18 @@ spec: resources: nullable: true properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -1378,13 +1390,26 @@ spec: type: string name: type: string + namespace: + type: string required: - kind - name type: object - x-kubernetes-map-type: atomic resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2395,9 +2420,23 @@ spec: options: type: object x-kubernetes-preserve-unknown-fields: true + priorityClassName: + type: string resources: nullable: true properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2778,13 +2817,26 @@ spec: type: string name: type: string + namespace: + type: string required: - kind - name type: object - x-kubernetes-map-type: atomic resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -3802,6 +3854,11 @@ spec: minReplicas: format: int32 type: integer + nodeSelector: + additionalProperties: + type: string + nullable: true + type: object options: type: object x-kubernetes-preserve-unknown-fields: true @@ -3813,6 +3870,18 @@ spec: resources: nullable: true properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -4193,13 +4262,26 @@ spec: type: string name: type: string + namespace: + type: string required: - kind - name type: object - x-kubernetes-map-type: atomic resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5284,6 +5366,11 @@ spec: minReplicas: format: int32 type: integer + nodeSelector: + additionalProperties: + type: string + nullable: true + type: object options: type: object x-kubernetes-preserve-unknown-fields: true @@ -5293,6 +5380,18 @@ spec: resources: nullable: true properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5671,13 +5770,26 @@ spec: type: string name: type: string + namespace: + type: string required: - kind - name type: object - x-kubernetes-map-type: atomic resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -6703,6 +6815,18 @@ spec: resources: nullable: true properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -7080,13 +7204,26 @@ spec: type: string name: type: string + namespace: + type: string required: - kind - name type: object - x-kubernetes-map-type: atomic resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -8179,6 +8316,11 @@ spec: nodePort: format: int32 type: integer + nodeSelector: + additionalProperties: + type: string + nullable: true + type: object options: type: object x-kubernetes-preserve-unknown-fields: true @@ -8190,6 +8332,18 @@ spec: resources: nullable: true properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -8572,13 +8726,26 @@ spec: type: string name: type: string + namespace: + type: string required: - kind - name type: object - x-kubernetes-map-type: atomic resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -9053,6 +9220,18 @@ spec: resources: nullable: true properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -10073,6 +10252,18 @@ spec: resources: nullable: true properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -10443,13 +10634,26 @@ spec: type: string name: type: string + namespace: + type: string required: - kind - name type: object - x-kubernetes-map-type: atomic resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -10938,6 +11142,18 @@ spec: type: object proxyResources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -10964,6 +11180,18 @@ spec: type: string resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -11552,6 +11780,18 @@ spec: resources: nullable: true properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -11920,13 +12160,26 @@ spec: type: string name: type: string + namespace: + type: string required: - kind - name type: object - x-kubernetes-map-type: atomic resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -12936,6 +13189,18 @@ spec: resources: nullable: true properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -13304,13 +13569,26 @@ spec: type: string name: type: string + namespace: + type: string required: - kind - name type: object - x-kubernetes-map-type: atomic resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -14080,13 +14358,26 @@ spec: type: string name: type: string + namespace: + type: string required: - kind - name type: object - x-kubernetes-map-type: atomic resources: properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: diff --git a/charts/jenkins/jenkins/CHANGELOG.md b/charts/jenkins/jenkins/CHANGELOG.md index 6c7484000..a72739792 100644 --- a/charts/jenkins/jenkins/CHANGELOG.md +++ b/charts/jenkins/jenkins/CHANGELOG.md @@ -12,10 +12,15 @@ 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.4.1 + +Added `.Values.agent.jnlpregistry` to allow agents to be configured with private registry. + ## 4.4.0 Add config keys for liveness probes on agent containers. + ## 4.3.30 Update Jenkins version in controller test matching LTS version diff --git a/charts/jenkins/jenkins/Chart.yaml b/charts/jenkins/jenkins/Chart.yaml index adf1b8ed7..adb60e602 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.4.0 +version: 4.4.1 diff --git a/charts/jenkins/jenkins/VALUES_SUMMARY.md b/charts/jenkins/jenkins/VALUES_SUMMARY.md index acc4c180c..31b900cb3 100644 --- a/charts/jenkins/jenkins/VALUES_SUMMARY.md +++ b/charts/jenkins/jenkins/VALUES_SUMMARY.md @@ -297,18 +297,19 @@ The following tables list the configurable parameters of the Jenkins chart and t ### Jenkins Agent(s) -| Parameter | Description | Default | -| -------------------------- | ----------------------------------------------- | ---------------------- | -| `agent.enabled` | Enable Kubernetes plugin jnlp-agent podTemplate | `true` | -| `agent.namespace` | Namespace in which the Kubernetes agents should be launched | Not set | -| `agent.containerCap` | Maximum number of agent | 10 | -| `agent.defaultsProviderTemplate` | The name of the pod template to use for providing default values | Not set | -| `agent.jenkinsUrl` | Overrides the Kubernetes Jenkins URL | Not set | -| `agent.jenkinsTunnel` | Overrides the Kubernetes Jenkins tunnel | Not set | +| Parameter | Description | Default | +| -------------------------- |------------------------------------------------------------------------------------------| ---------------------- | +| `agent.enabled` | Enable Kubernetes plugin jnlp-agent podTemplate | `true` | +| `agent.namespace` | Namespace in which the Kubernetes agents should be launched | Not set | +| `agent.containerCap` | Maximum number of agent | 10 | +| `agent.defaultsProviderTemplate` | The name of the pod template to use for providing default values | Not set | +| `agent.jenkinsUrl` | Overrides the Kubernetes Jenkins URL | Not set | +| `agent.jenkinsTunnel` | Overrides the Kubernetes Jenkins tunnel | Not set | | `agent.kubernetesConnectTimeout` | The connection timeout in seconds for connections to Kubernetes API. Minimum value is 5. | 5 | -| `agent.kubernetesReadTimeout` | The read timeout in seconds for connections to Kubernetes API. Minimum value is 15. | 15 | -| `agent.maxRequestsPerHostStr` | The maximum concurrent connections to Kubernetes API | 32 | -| `agent.podLabels` | Custom Pod labels (an object with `label-key: label-value` pairs) | Not set | +| `agent.kubernetesReadTimeout` | The read timeout in seconds for connections to Kubernetes API. Minimum value is 15. | 15 | +| `agent.maxRequestsPerHostStr` | The maximum concurrent connections to Kubernetes API | 32 | +| `agent.podLabels` | Custom Pod labels (an object with `label-key: label-value` pairs) | Not set | +| `agent.jnlpregistry` | Custom docker registry used for to get agent jnlp image | Not set | #### Pod Configuration diff --git a/charts/jenkins/jenkins/templates/_helpers.tpl b/charts/jenkins/jenkins/templates/_helpers.tpl index fca1dc7f4..ba663de09 100644 --- a/charts/jenkins/jenkins/templates/_helpers.tpl +++ b/charts/jenkins/jenkins/templates/_helpers.tpl @@ -140,6 +140,9 @@ jenkins: clouds: - kubernetes: containerCapStr: "{{ .Values.agent.containerCap }}" + {{- if .Values.agent.jnlpregistry }} + jnlpregistry: "{{ .Values.agent.jnlpregistry }}" + {{- end }} defaultsProviderTemplate: "{{ .Values.agent.defaultsProviderTemplate }}" connectTimeout: "{{ .Values.agent.kubernetesConnectTimeout }}" readTimeout: "{{ .Values.agent.kubernetesReadTimeout }}" diff --git a/charts/jenkins/jenkins/values.yaml b/charts/jenkins/jenkins/values.yaml index e004165f4..2c3c91d2e 100644 --- a/charts/jenkins/jenkins/values.yaml +++ b/charts/jenkins/jenkins/values.yaml @@ -628,6 +628,8 @@ agent: kubernetesReadTimeout: 15 maxRequestsPerHostStr: "32" namespace: + # private registry for agent image + jnlpregistry: image: "jenkins/inbound-agent" tag: "3107.v665000b_51092-15" workingDir: "/home/jenkins/agent" diff --git a/charts/kasten/k10/Chart.lock b/charts/kasten/k10/Chart.lock index dd259b2dd..5884d3666 100644 --- a/charts/kasten/k10/Chart.lock +++ b/charts/kasten/k10/Chart.lock @@ -6,4 +6,4 @@ dependencies: repository: "" version: 15.8.5 digest: sha256:4399c78f4e445e4fbb26151707c9b481fece2002ac02ae20612d9f26e6b66643 -generated: "2023-06-30T23:35:33.099292242Z" +generated: "2023-07-15T05:48:19.983972564Z" diff --git a/charts/kasten/k10/Chart.yaml b/charts/kasten/k10/Chart.yaml index d6dff0cc8..5784fdc3e 100644 --- a/charts/kasten/k10/Chart.yaml +++ b/charts/kasten/k10/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.cattle.io/kube-version: '>= 1.17.0-0' catalog.cattle.io/release-name: k10 apiVersion: v2 -appVersion: 6.0.2 +appVersion: 6.0.3 dependencies: - name: grafana repository: file://./charts/grafana @@ -19,4 +19,4 @@ maintainers: - email: contact@kasten.io name: kastenIO name: k10 -version: 6.0.201 +version: 6.0.301 diff --git a/charts/kasten/k10/charts/grafana/values.yaml b/charts/kasten/k10/charts/grafana/values.yaml index 00a3692dc..b5fce07d0 100644 --- a/charts/kasten/k10/charts/grafana/values.yaml +++ b/charts/kasten/k10/charts/grafana/values.yaml @@ -770,7 +770,7 @@ dashboards: { "datasource": "Prometheus", "editorMode": "builder", - "expr": "sum(process_virtual_memory_bytes)", + "expr": "sum(process_resident_memory_bytes)", "hide": false, "legendFormat": "Total memory consumption", "range": true, @@ -971,7 +971,7 @@ dashboards: { "datasource": "Prometheus", "editorMode": "builder", - "expr": "process_virtual_memory_bytes{job=\"pushAggregator\"}", + "expr": "process_resident_memory_bytes{job=\"pushAggregator\"}", "hide": false, "legendFormat": "ephemeral pods", "range": true, @@ -980,7 +980,7 @@ dashboards: { "datasource": "Prometheus", "editorMode": "builder", - "expr": "process_virtual_memory_bytes{job=\"httpServiceDiscovery\"}", + "expr": "process_resident_memory_bytes{job=\"httpServiceDiscovery\"}", "hide": false, "legendFormat": "{{service}}", "range": true, @@ -989,7 +989,7 @@ dashboards: { "datasource": "Prometheus", "editorMode": "builder", - "expr": "sum(process_virtual_memory_bytes{job=\"k10-pods\"})", + "expr": "sum(process_resident_memory_bytes{job=\"k10-pods\"})", "hide": false, "legendFormat": "executor", "range": true, @@ -998,9 +998,9 @@ dashboards: { "datasource": "Prometheus", "editorMode": "builder", - "expr": "sum(process_virtual_memory_bytes{job=\"prometheus\"})", + "expr": "sum(process_resident_memory_bytes{job=\"prometheus\"})", "hide": false, - "legendFormat": "executor", + "legendFormat": "prometheus", "range": true, "refId": "D" } diff --git a/charts/kasten/k10/templates/_definitions.tpl b/charts/kasten/k10/templates/_definitions.tpl index 63024505a..6400cc5dc 100644 --- a/charts/kasten/k10/templates/_definitions.tpl +++ b/charts/kasten/k10/templates/_definitions.tpl @@ -31,9 +31,9 @@ vbrintegrationapi: {{- end -}} {{- define "k10.colocatedServiceLookup" -}} crypto: -- bloblifecyclemanager - events - garbagecollector +- bloblifecyclemanager dashboardbff: - vbrintegrationapi state: diff --git a/charts/kasten/k10/templates/_k10_image_tag.tpl b/charts/kasten/k10/templates/_k10_image_tag.tpl index 6d92f4dab..83e029206 100644 --- a/charts/kasten/k10/templates/_k10_image_tag.tpl +++ b/charts/kasten/k10/templates/_k10_image_tag.tpl @@ -1 +1 @@ -{{- define "k10.imageTag" -}}6.0.2{{- end -}} \ No newline at end of file +{{- define "k10.imageTag" -}}6.0.3{{- end -}} \ No newline at end of file diff --git a/charts/kong/kong/CHANGELOG.md b/charts/kong/kong/CHANGELOG.md index 906fdb933..d1396d29b 100644 --- a/charts/kong/kong/CHANGELOG.md +++ b/charts/kong/kong/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.25.0 + +- Generate the `adminApiService.name` value from `.Release.Name` rather than + hardcoding to `kong` + [#839](https://github.com/Kong/charts/pull/839) + ## 2.24.0 ### Improvements diff --git a/charts/kong/kong/Chart.yaml b/charts/kong/kong/Chart.yaml index 7348f456b..2afc4bd94 100644 --- a/charts/kong/kong/Chart.yaml +++ b/charts/kong/kong/Chart.yaml @@ -20,4 +20,4 @@ maintainers: name: kong sources: - https://github.com/Kong/charts/tree/main/charts/kong -version: 2.24.0 +version: 2.25.0 diff --git a/charts/kong/kong/README.md b/charts/kong/kong/README.md index f033a4d2d..009046ba2 100644 --- a/charts/kong/kong/README.md +++ b/charts/kong/kong/README.md @@ -746,6 +746,7 @@ section of `values.yaml` file: | userDefinedVolumeMounts | Create volumeMounts. Please go to Kubernetes doc for the spec of the volumeMounts | | | terminationGracePeriodSeconds | Sets the [termination grace period](https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#hook-handler-execution) for Deployment pod | 30 | | gatewayDiscovery.enabled | Enables Kong instance service discovery (for more details see [gatewayDiscovery section][gd_section]) | false | +| gatewayDiscovery.generateAdminApiService | Generate the admin API service name based on the release name (for more details see [gatewayDiscovery section][gd_section]) | false | | gatewayDiscovery.adminApiService.namespace | The namespace of the Kong admin API service (for more details see [gatewayDiscovery section][gd_section]) | `.Release.Namespace` | | gatewayDiscovery.adminApiService.name | The name of the Kong admin API service (for more details see [gatewayDiscovery section][gd_section]) | "" | | konnect.enabled | Enable synchronisation of data plane configuration with Konnect Runtime Group | false | @@ -798,12 +799,16 @@ You'll be able to configure this feature through configuration section under service. (provided under the hood via `CONTROLLER_KONG_ADMIN_SVC` environment variable). - The following admin API Service flags have to be provided in order for gateway + The following admin API Service flags have to be present in order for gateway discovery to work: - `ingressController.gatewayDiscovery.adminApiService.name` - `ingressController.gatewayDiscovery.adminApiService.namespace` + If you set `ingressController.gatewayDiscovery.generateAdminApiService` to `true`, + the chart will generate values for `name` and `namespace` based on the current release name and + namespace. This is useful when consuming the `kong` chart as a subchart. + Using this feature requires a split release installation of Gateways and Ingress Controller. For exemplar `values.yaml` files which use this feature please see: [examples README.md](./example-values/README.md). diff --git a/charts/kong/kong/templates/_helpers.tpl b/charts/kong/kong/templates/_helpers.tpl index 0de6721f8..d88bddcaa 100644 --- a/charts/kong/kong/templates/_helpers.tpl +++ b/charts/kong/kong/templates/_helpers.tpl @@ -370,7 +370,18 @@ Return the admin API service name for service discovery {{- $gatewayDiscovery := .Values.ingressController.gatewayDiscovery -}} {{- if $gatewayDiscovery.enabled -}} {{- $adminApiService := $gatewayDiscovery.adminApiService -}} - {{- $_ := required ".ingressController.gatewayDiscovery.adminApiService has to be provided when .Values.ingressController.gatewayDiscovery.enabled is set to true" $adminApiService -}} + {{- $adminApiServiceName := $gatewayDiscovery.adminApiService.name -}} + {{- $generateAdminApiService := $gatewayDiscovery.generateAdminApiService -}} + + {{- if and $generateAdminApiService $adminApiService.name -}} + {{- fail (printf ".Values.ingressController.gatewayDiscovery.adminApiService and .Values.ingressController.gatewayDiscovery.generateAdminApiService must not be provided at the same time") -}} + {{- end -}} + + {{- if $generateAdminApiService -}} + {{- $adminApiServiceName = (printf "%s-%s" .Release.Name "gateway-admin") -}} + {{- else }} + {{- $_ := required ".ingressController.gatewayDiscovery.adminApiService.name has to be provided when .Values.ingressController.gatewayDiscovery.enabled is set to true" $adminApiServiceName -}} + {{- end }} {{- if (semverCompare "< 2.9.0" (include "kong.effectiveVersion" .Values.ingressController.image)) }} {{- fail (printf "Gateway discovery is available in controller versions 2.9 and up. Detected %s" (include "kong.effectiveVersion" .Values.ingressController.image)) }} @@ -381,9 +392,7 @@ Return the admin API service name for service discovery {{- end }} {{- $namespace := $adminApiService.namespace | default ( include "kong.namespace" . ) -}} - {{- $name := $adminApiService.name -}} - {{- $_ := required ".ingressController.gatewayDiscovery.adminApiService.name has to be provided when .Values.ingressController.gatewayDiscovery.enabled is set to true" $name -}} - {{- printf "%s/%s" $namespace $name -}} + {{- printf "%s/%s" $namespace $adminApiServiceName -}} {{- else -}} {{- fail "Can't use gateway discovery when .Values.ingressController.gatewayDiscovery.enabled is set to false." -}} {{- end -}} diff --git a/charts/kong/kong/values.yaml b/charts/kong/kong/values.yaml index 52eee0c03..b419a4395 100644 --- a/charts/kong/kong/values.yaml +++ b/charts/kong/kong/values.yaml @@ -525,6 +525,7 @@ ingressController: gatewayDiscovery: enabled: false + generateAdminApiService: false adminApiService: namespace: "" name: "" diff --git a/charts/kubecost/cost-analyzer/Chart.yaml b/charts/kubecost/cost-analyzer/Chart.yaml index 627d2f29c..3d59bffd7 100644 --- a/charts/kubecost/cost-analyzer/Chart.yaml +++ b/charts/kubecost/cost-analyzer/Chart.yaml @@ -7,7 +7,7 @@ annotations: catalog.cattle.io/featured: "1" catalog.cattle.io/release-name: cost-analyzer apiVersion: v2 -appVersion: 1.104.4 +appVersion: 1.105.0 dependencies: - condition: global.grafana.enabled name: grafana @@ -25,4 +25,4 @@ description: A Helm chart that sets up Kubecost, Prometheus, and Grafana to moni cloud costs. icon: https://partner-charts.rancher.io/assets/logos/kubecost.png name: cost-analyzer -version: 1.104.4 +version: 1.105.0 diff --git a/charts/kubecost/cost-analyzer/charts/prometheus/templates/server-deployment.yaml b/charts/kubecost/cost-analyzer/charts/prometheus/templates/server-deployment.yaml index 1dc792f3a..6e0f9513d 100644 --- a/charts/kubecost/cost-analyzer/charts/prometheus/templates/server-deployment.yaml +++ b/charts/kubecost/cost-analyzer/charts/prometheus/templates/server-deployment.yaml @@ -92,6 +92,9 @@ spec: args: {{- if .Values.server.retention }} - --storage.tsdb.retention.time={{ .Values.server.retention }} + {{- end }} + {{- if .Values.server.retentionSize }} + - --storage.tsdb.retention.size={{ .Values.server.retentionSize }} {{- end }} - --config.file={{ .Values.server.configPath }} - --storage.tsdb.path={{ .Values.server.persistentVolume.mountPath }} diff --git a/charts/kubecost/cost-analyzer/grafana-templates/README.md b/charts/kubecost/cost-analyzer/grafana-templates/README.md index c0837b4c1..c6f344209 100644 --- a/charts/kubecost/cost-analyzer/grafana-templates/README.md +++ b/charts/kubecost/cost-analyzer/grafana-templates/README.md @@ -2,7 +2,7 @@ ## Overview -Kubecost, by default, ships with a Grafana instance that already contains the dashboards in this repo. +Kubecost, by default, is bundled with a Grafana instance that already contains the dashboards in this repo. The dashboards in this repo are templated for those wanting to load the dashboards into an existing Grafana instance. @@ -14,6 +14,31 @@ The primary purpose of the dashboards provided is to allow visibility into the m The networkCosts-metrics dashboard requires the optional networkCosts daemonset to be [enabled](https://docs.kubecost.com/install-and-configure/advanced-configuration/network-costs-configuration). +## Metrics Required + +`kubecost-container-stats` metrics: + +``` +container_cpu_usage_seconds_total +kube_pod_container_resource_requests +container_memory_working_set_bytes +container_cpu_cfs_throttled_periods_total +container_cpu_cfs_periods_total +``` + +`network-transfer-data` metrics: + +``` +kubecost_pod_network_ingress_bytes_total +kubecost_pod_network_egress_bytes_total +``` + +`disk-usage` metrics: +``` +container_fs_limit_bytes +container_fs_usage_bytes +``` + ## Additional Information Kubecost Grafana [Configuration Guide](https://docs.kubecost.com/install-and-configure/install/custom-grafana) \ No newline at end of file diff --git a/charts/kubecost/cost-analyzer/grafana-templates/multi-cluster-container-stats.json b/charts/kubecost/cost-analyzer/grafana-templates/multi-cluster-container-stats.json new file mode 100644 index 000000000..7467e2ede --- /dev/null +++ b/charts/kubecost/cost-analyzer/grafana-templates/multi-cluster-container-stats.json @@ -0,0 +1,852 @@ +{ + "__inputs": [ + { + "name": "DS_PROMETHEUS", + "label": "Prometheus", + "description": "", + "type": "datasource", + "pluginId": "prometheus", + "pluginName": "Prometheus" + } + ], + "__elements": {}, + "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "9.5.2" + }, + { + "type": "datasource", + "id": "prometheus", + "name": "Prometheus", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "table", + "name": "Table", + "version": "" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" + } + ], + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "datasource", + "uid": "grafana" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "description": "Visualize your kubernetes costs at the pod level.", + "editable": true, + "fiscalYearStartMonth": 0, + "gnetId": 9063, + "graphTooltip": 0, + "id": null, + "links": [], + "liveNow": false, + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "container" + }, + "properties": [ + { + "id": "displayName", + "value": "Container" + }, + { + "id": "unit", + "value": "currencyUSD" + }, + { + "id": "decimals", + "value": 2 + }, + { + "id": "custom.align" + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(245, 54, 54, 0.9)", + "value": null + }, + { + "color": "rgba(50, 172, 45, 0.97)", + "value": 30 + }, + { + "color": "#c15c17", + "value": 80 + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Value #memory_requests" + }, + "properties": [ + { + "id": "displayName", + "value": "Memory Request" + }, + { + "id": "unit", + "value": "bytes" + }, + { + "id": "decimals", + "value": 2 + }, + { + "id": "custom.align" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Value #cpu_requests" + }, + "properties": [ + { + "id": "displayName", + "value": "CPU Request" + }, + { + "id": "unit", + "value": "none" + }, + { + "id": "decimals", + "value": 2 + }, + { + "id": "custom.align" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Time" + }, + "properties": [ + { + "id": "unit", + "value": "short" + }, + { + "id": "decimals", + "value": 2 + }, + { + "id": "custom.align" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Value #C" + }, + "properties": [ + { + "id": "displayName", + "value": "Memory ($/hour)" + }, + { + "id": "unit", + "value": "currencyUSD" + }, + { + "id": "decimals", + "value": 2 + }, + { + "id": "custom.align" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Value #D" + }, + "properties": [ + { + "id": "displayName", + "value": "Spot/PE RAM" + }, + { + "id": "unit", + "value": "currencyUSD" + }, + { + "id": "decimals", + "value": 2 + }, + { + "id": "custom.align" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Value #E" + }, + "properties": [ + { + "id": "displayName", + "value": "Total" + }, + { + "id": "unit", + "value": "currencyUSD" + }, + { + "id": "decimals", + "value": 2 + }, + { + "id": "custom.align" + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "#bf1b00", + "value": null + }, + { + "color": "rgba(50, 172, 45, 0.97)" + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "cluster_id" + }, + "properties": [ + { + "id": "custom.width", + "value": 226 + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 0 + }, + "hideTimeOverride": true, + "id": 98, + "links": [], + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true, + "sortBy": [ + { + "desc": true, + "displayName": "Memory Request" + } + ] + }, + "pluginVersion": "9.5.2", + "repeatDirection": "v", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "expr": "sum(\n avg_over_time(kube_pod_container_resource_requests{resource=\"memory\",cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\"}[$__range])\n) by (cluster_id, namespace, container)", + "format": "table", + "instant": true, + "intervalFactor": 1, + "refId": "memory_requests" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "expr": "sum(\n avg_over_time(kube_pod_container_resource_requests{resource=\"cpu\",cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\"}[$__range])\n or up * 0 \n) by (cluster_id, namespace, container)", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "intervalFactor": 1, + "legendFormat": "", + "refId": "cpu_requests" + } + ], + "timeFrom": "1M", + "title": "Container allocation analysis", + "transformations": [ + { + "id": "merge", + "options": { + "reducers": [] + } + } + ], + "type": "table" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "description": "CPU usage vs requests", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "stepAfter", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 8 + }, + "id": 94, + "links": [], + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "pluginVersion": "9.1.0-beta1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "avg(rate(container_cpu_usage_seconds_total{cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\",container!=\"\"}[10m])) by (cluster_id, namespace, container)", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "{{cluster_id}}/{{namespace}}/{{container}} (usage)", + "metric": "container_cpu", + "refId": "usage", + "step": 10 + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "exemplar": true, + "expr": "avg(kube_pod_container_resource_requests{resource=\"cpu\", unit=\"core\", cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\"}) by (cluster_id, namespace, container)", + "legendFormat": "{{cluster_id}}/{{namespace}}/{{ container }} (request)", + "range": true, + "refId": "requests" + } + ], + "timeFrom": "", + "title": "CPU Usage vs Requested", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "description": "Memory usage vs. requests", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "stepAfter", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "bytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 15 + }, + "id": 96, + "links": [], + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "pluginVersion": "9.1.0-beta1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "avg(avg_over_time(container_memory_working_set_bytes{cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\",container!=\"\"}[5m])) by (cluster_id, namespace, container)", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "{{cluster_id}}/{{namespace}}/{{ container }} (usage)", + "metric": "container_cpu", + "refId": "A", + "step": 10 + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "avg(kube_pod_container_resource_requests{resource=\"memory\", unit=\"byte\", cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\"}) by (cluster_id, namespace, container)", + "format": "time_series", + "hide": false, + "instant": false, + "intervalFactor": 1, + "legendFormat": "{{cluster_id}}/{{namespace}}/{{ container }} (requested)", + "refId": "B" + } + ], + "timeFrom": "", + "title": "RAM Usage vs Requested", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "description": "Percentage of time a pod is being throttled. Values range from 0-100", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "stepAfter", + "lineWidth": 2, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 24, + "x": 0, + "y": 22 + }, + "id": 99, + "links": [], + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "desc" + } + }, + "pluginVersion": "9.1.0-beta1", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "100\n * sum by(cluster_id, namespace, container) (increase(container_cpu_cfs_throttled_periods_total{container!=\"\",cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\"}[5m]))\n / sum by(cluster_id, namespace, container) (increase(container_cpu_cfs_periods_total{container!=\"\",cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\"}[5m]))", + "format": "time_series", + "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "{{cluster_id}}/{{namespace}}/{{ container }}", + "refId": "B" + } + ], + "timeFrom": "", + "title": "CPU throttle percent", + "type": "timeseries" + } + ], + "refresh": "", + "revision": 1, + "schemaVersion": 38, + "style": "dark", + "tags": [ + "utilization", + "metrics", + "kubecost" + ], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": "Prometheus", + "value": "Prometheus" + }, + "hide": 0, + "includeAll": false, + "multi": false, + "name": "datasource", + "options": [], + "query": "prometheus", + "queryValue": "", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "definition": "label_values(kube_namespace_labels, cluster_id)", + "hide": 0, + "includeAll": true, + "label": "", + "multi": false, + "name": "cluster", + "options": [], + "query": { + "query": "label_values(kube_namespace_labels, cluster_id)", + "refId": "StandardVariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "tagValuesQuery": "", + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "definition": "label_values(kube_namespace_labels{cluster_id=~\"$cluster\"}, namespace) ", + "hide": 0, + "includeAll": true, + "label": "", + "multi": false, + "name": "namespace", + "options": [], + "query": { + "query": "label_values(kube_namespace_labels{cluster_id=~\"$cluster\"}, namespace) ", + "refId": "StandardVariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "tagValuesQuery": "", + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "current": {}, + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "definition": "label_values(container_memory_working_set_bytes{cluster_id=~\"$cluster\",namespace=~\"$namespace\", container!=\"POD\"}, container) ", + "hide": 0, + "includeAll": true, + "multi": false, + "name": "container", + "options": [], + "query": { + "query": "label_values(container_memory_working_set_bytes{cluster_id=~\"$cluster\",namespace=~\"$namespace\", container!=\"POD\"}, container) ", + "refId": "StandardVariableQuery" + }, + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "type": "query" + } + ] + }, + "time": { + "from": "now-7d", + "to": "now" + }, + "timepicker": { + "hidden": false, + "refresh_intervals": [ + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ] + }, + "timezone": "browser", + "title": "Kubecost - container CPU & Memory usage(multi-cluster)", + "uid": "kubecost-container-stats", + "version": 1, + "weekStart": "" +} \ No newline at end of file diff --git a/charts/kubecost/cost-analyzer/grafana-templates/multi-cluster-kubernetes-resource-efficiency.json b/charts/kubecost/cost-analyzer/grafana-templates/multi-cluster-kubernetes-resource-efficiency.json deleted file mode 100644 index e1f67a28f..000000000 --- a/charts/kubecost/cost-analyzer/grafana-templates/multi-cluster-kubernetes-resource-efficiency.json +++ /dev/null @@ -1,423 +0,0 @@ -{ - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__elements": {}, - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "9.3.1" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - }, - { - "type": "panel", - "id": "timeseries", - "name": "Time series", - "version": "" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": { - "type": "grafana", - "uid": "-- Grafana --" - }, - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "target": { - "limit": 100, - "matchAny": false, - "tags": [], - "type": "dashboard" - }, - "type": "dashboard" - } - ] - }, - "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": null, - "links": [], - "liveNow": false, - "panels": [ - { - "collapsed": false, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 2, - "panels": [], - "title": "Requests - Usage (negative values are unused reservations)", - "type": "row" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": 3600000, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "bytes" - }, - "overrides": [] - }, - "gridPos": { - "h": 16, - "w": 24, - "x": 0, - "y": 1 - }, - "id": 4, - "options": { - "legend": { - "calcs": [ - "lastNotNull" - ], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "sum by ($aggregation) (\n (sum by (cluster_id,namespace,pod,container) (container_memory_usage_bytes{cluster_id=~\"$cluster\",namespace=~\"$namespace\",container=~\"$container\",container!=\"POD\",container!=\"\"}))\n -(sum by (cluster_id,namespace,pod,container) (kube_pod_container_resource_requests{resource=\"memory\",unit=\"byte\",cluster_id=~\"$cluster\",namespace=~\"$namespace\",container=~\"$container\",container!=\"POD\",container!=\"\"}))\n)", - "legendFormat": "__auto", - "range": true, - "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "sum by ($aggregation) (\n -(sum by (cluster_id,namespace,pod,container) (kube_pod_container_resource_requests{resource=\"memory\",unit=\"byte\",cluster_id=~\"$cluster\",namespace=~\"$namespace\",container=~\"$container\",container!=\"POD\",container!=\"\"}))\n)", - "hide": true, - "legendFormat": "{{$aggregation}} Request", - "range": true, - "refId": "B" - } - ], - "title": "Memory Request-Usage", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": 3600000, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 14, - "w": 24, - "x": 0, - "y": 17 - }, - "id": 6, - "options": { - "legend": { - "calcs": [ - "lastNotNull" - ], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "sum by ($aggregation)(\n (sum by (cluster_id,namespace,pod,container) (rate(container_cpu_usage_seconds_total{cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\",container!=\"\"}[1h])))\n - \n (sum by (cluster_id,namespace,pod,container) (kube_pod_container_resource_requests{resource=\"cpu\",cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\",container!=\"\"}))\n)\n \n", - "legendFormat": "__auto", - "range": true, - "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "editorMode": "code", - "expr": "-sum by ($aggregation)(\n (sum by (cluster_id,namespace,pod,container) (kube_pod_container_resource_requests{resource=\"cpu\",cluster_id=~\"$cluster\", namespace=~\"$namespace\", container=~\"$container\", container!=\"POD\",container!=\"\"}))\n)", - "hide": true, - "legendFormat": "{{$aggregation}} Request", - "range": true, - "refId": "B" - } - ], - "title": "CPU Request-Usage", - "type": "timeseries" - } - ], - "schemaVersion": 37, - "style": "dark", - "tags": [], - "templating": { - "list": [ - { - "current": { - "selected": false, - "text": "default", - "value": "default" - }, - "hide": 0, - "includeAll": false, - "multi": false, - "name": "datasource", - "options": [], - "query": "prometheus", - "queryValue": "", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "type": "datasource" - }, - { - "current": { - "selected": true, - "text": "namespace", - "value": "namespace" - }, - "hide": 0, - "includeAll": false, - "multi": false, - "name": "aggregation", - "options": [ - { - "selected": false, - "text": "cluster_id", - "value": "cluster_id" - }, - { - "selected": true, - "text": "namespace", - "value": "namespace" - }, - { - "selected": false, - "text": "container", - "value": "container" - } - ], - "query": "cluster_id,namespace,container", - "queryValue": "", - "skipUrlSync": false, - "type": "custom" - }, - { - "current": {}, - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "definition": "label_values(kube_namespace_labels, cluster_id)", - "hide": 0, - "includeAll": true, - "multi": false, - "name": "cluster", - "options": [], - "query": { - "query": "label_values(kube_namespace_labels, cluster_id)", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": "", - "skipUrlSync": false, - "sort": 5, - "type": "query" - }, - { - "current": {}, - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "definition": "label_values(kube_namespace_labels{cluster_id=~\"$cluster\"}, namespace) ", - "hide": 0, - "includeAll": true, - "multi": false, - "name": "namespace", - "options": [], - "query": { - "query": "label_values(kube_namespace_labels{cluster_id=~\"$cluster\"}, namespace) ", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": "", - "skipUrlSync": false, - "sort": 5, - "type": "query" - }, - { - "current": {}, - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, - "definition": "label_values(container_memory_working_set_bytes{cluster_id=~\"$cluster\",namespace=~\"$namespace\", container!=\"POD\"}, container) ", - "hide": 0, - "includeAll": true, - "multi": false, - "name": "container", - "options": [], - "query": { - "query": "label_values(container_memory_working_set_bytes{cluster_id=~\"$cluster\",namespace=~\"$namespace\", container!=\"POD\"}, container) ", - "refId": "StandardVariableQuery" - }, - "refresh": 2, - "regex": "", - "skipUrlSync": false, - "sort": 5, - "type": "query" - } - ] - }, - "time": { - "from": "now-6h", - "to": "now" - }, - "timepicker": {}, - "timezone": "", - "title": "Pod cost & utilization metrics(multi-cluster)", - "uid": "at-cost-analysis-pod2", - "version": 2, - "weekStart": "" -} \ No newline at end of file diff --git a/charts/kubecost/cost-analyzer/grafana-templates/multi-cluster-network-transfer-data.json b/charts/kubecost/cost-analyzer/grafana-templates/multi-cluster-network-transfer-data.json index 946969f5e..a153b053e 100644 --- a/charts/kubecost/cost-analyzer/grafana-templates/multi-cluster-network-transfer-data.json +++ b/charts/kubecost/cost-analyzer/grafana-templates/multi-cluster-network-transfer-data.json @@ -76,7 +76,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "fieldConfig": { "defaults": { @@ -155,7 +155,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "editorMode": "code", "expr": "sum by($aggregation) (increase(kubecost_pod_network_ingress_bytes_total{namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}[60m])) / 1024 / 1024", @@ -167,7 +167,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "editorMode": "code", "expr": "- sum by($aggregation) (increase(kubecost_pod_network_egress_bytes_total{namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}[60m])) / 1024 / 1024", @@ -183,7 +183,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "fieldConfig": { "defaults": { @@ -261,7 +261,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "editorMode": "code", "expr": "sum by($aggregation) (increase(kubecost_pod_network_ingress_bytes_total{internet=\"true\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}[60m])) / 1024 / 1024", @@ -274,7 +274,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "editorMode": "code", "expr": "- sum by($aggregation) (increase(kubecost_pod_network_egress_bytes_total{internet=\"true\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\"}[60m])) / 1024 / 1024", @@ -290,7 +290,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "description": "Cross region and cross zone subnets must be defined via the configMap. \nSee: \n", "fieldConfig": { @@ -370,7 +370,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "editorMode": "code", "expr": "sum by($aggregation) (increase(kubecost_pod_network_ingress_bytes_total{internet=\"false\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\", sameRegion=\"false\", sameZone=\"false\"}[60m])) / 1024 / 1024", @@ -382,7 +382,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "editorMode": "code", "expr": "- sum by($aggregation) (increase(kubecost_pod_network_egress_bytes_total{internet=\"false\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\", sameRegion=\"false\", sameZone=\"false\"}[60m])) / 1024 / 1024", @@ -398,7 +398,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "description": "Cross region and cross zone subnets must be defined via the configMap. \nSee: \n", "fieldConfig": { @@ -478,7 +478,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "editorMode": "code", "expr": "sum by($aggregation) (increase(kubecost_pod_network_ingress_bytes_total{internet=\"false\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\", sameRegion=\"true\", sameZone=\"false\"}[60m])) / 1024 / 1024", @@ -490,7 +490,7 @@ { "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "editorMode": "code", "expr": "- sum by($aggregation) (increase(kubecost_pod_network_egress_bytes_total{internet=\"false\", namespace=~\"$namespace\", cluster_id=~\"$cluster\", pod_name=~\"$pod\", sameRegion=\"true\", sameZone=\"false\"}[60m])) / 1024 / 1024", @@ -513,11 +513,7 @@ "templating": { "list": [ { - "current": { - "selected": false, - "text": "Prometheus", - "value": "Prometheus" - }, + "current": {}, "hide": 0, "includeAll": false, "multi": false, @@ -553,11 +549,11 @@ }, { "selected": false, - "text": "pod_name", - "value": "pod_name" + "text": "pod", + "value": "pod" } ], - "query": "cluster_id, namespace, pod_name", + "query": "cluster_id, namespace, pod", "queryValue": "", "skipUrlSync": false, "type": "custom" @@ -566,7 +562,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "definition": "label_values(cluster_id)", "hide": 0, @@ -585,10 +581,14 @@ "type": "query" }, { - "current": {}, + "current": { + "selected": true, + "text": "kubecost", + "value": "kubecost" + }, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "definition": "label_values(kube_namespace_labels{cluster_id=~\"$cluster\"}, namespace) ", "hide": 0, @@ -610,7 +610,7 @@ "current": {}, "datasource": { "type": "prometheus", - "uid": "${DS_PROMETHEUS}" + "uid": "${datasource}" }, "definition": "label_values(kube_pod_labels{cluster_id=~\"$cluster\",namespace=~\"$namespace\"}, pod) ", "hide": 0, @@ -647,7 +647,7 @@ }, "timepicker": {}, "timezone": "", - "title": "Kubecost networkCosts Metrics", + "title": "Kubecost - networkCosts Metrics", "uid": "kubecost-networkCosts-metrics", "version": 7, "weekStart": "" diff --git a/charts/kubecost/cost-analyzer/templates/_helpers.tpl b/charts/kubecost/cost-analyzer/templates/_helpers.tpl index 0c916da42..d0cadba84 100644 --- a/charts/kubecost/cost-analyzer/templates/_helpers.tpl +++ b/charts/kubecost/cost-analyzer/templates/_helpers.tpl @@ -8,6 +8,9 @@ Expand the name of the chart. {{- define "query-service.name" -}} {{- default "query-service" | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- define "federator.name" -}} +{{- default "federator" | trunc 63 | trimSuffix "-" -}} +{{- end -}} {{/* Create a default fully qualified app name. @@ -31,6 +34,10 @@ If release name contains chart name it will be used as a full name. {{- printf "%s-%s" .Release.Name "query-service" | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- define "federator.fullname" -}} +{{- printf "%s-%s" .Release.Name "federator" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + {{/* Create the fully qualified name for Prometheus server service. */}} @@ -73,6 +80,10 @@ Create the fully qualified name for Prometheus alertmanager service. {{- printf "%s-%s" .Release.Name "cost-analyzer" | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- define "query-service.serviceName" -}} +{{- printf "%s-%s" .Release.Name "query-service-load-balancer" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + {{/* Network Costs name used to tie autodiscovery of metrics to daemon set pods */}} @@ -109,6 +120,12 @@ helm.sh/chart: {{ include "cost-analyzer.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end -}} +{{- define "kubecost.federator.chartLabels" -}} +app.kubernetes.io/name: {{ include "federator.name" . }} +helm.sh/chart: {{ include "cost-analyzer.chart" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end -}} {{/* @@ -150,6 +167,10 @@ app: cost-analyzer {{ include "kubecost.queryService.chartLabels" . }} app: query-service {{- end -}} +{{- define "federator.commonLabels" -}} +{{ include "kubecost.federator.chartLabels" . }} +app: federator +{{- end -}} {{/* Create the selector labels. @@ -164,6 +185,11 @@ app.kubernetes.io/name: {{ include "query-service.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app: query-service {{- end -}} +{{- define "federator.selectorLabels" -}} +app.kubernetes.io/name: {{ include "federator.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +app: federator +{{- end -}} {{/* Return the appropriate apiVersion for daemonset. diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-deployment-template.yaml index cce353827..7276592e8 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-deployment-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-deployment-template.yaml @@ -252,13 +252,6 @@ spec: {{- end }} {{- end }} {{- end }} - {{- if .Values.federatedETL.federator }} - {{- if .Values.federatedETL.federator.enabled }} - - name: federator-config - configMap: - name: {{ template "cost-analyzer.fullname" . }}-federator - {{- end }} - {{- end }} {{- if .Values.extraVolumes }} # Extra volume(s) {{- toYaml .Values.extraVolumes | nindent 8 }} @@ -486,12 +479,6 @@ spec: {{- end }} {{- end }} {{- end }} - {{- if .Values.federatedETL }} - {{- if .Values.federatedETL.federator.enabled }} - - name: federator-config - mountPath: /var/configs/federator - {{- end }} - {{- end }} {{- if .Values.kubecostProductConfigs }} {{- if .Values.kubecostProductConfigs.productKey }} {{- if .Values.kubecostProductConfigs.productKey.secretname }} @@ -797,18 +784,6 @@ spec: - name: FEDERATED_REDIRECT_BACKUP value: "true" {{- end}} - {{- if .Values.federatedETL.useExistingS3Config }} - - name: FEDERATED_USE_EXISTING_CONFIG - value: "true" - {{- end}} - {{- if .Values.federatedETL.federator.enabled }} - - name: FEDERATED_FEDERATOR_ENABLED - value: "true" - {{- end}} - {{- if .Values.federatedETL.federator.useMultiClusterDB }} - - name: CURRENT_CLUSTER_ID_FILTER_ENABLED - value: "true" - {{- end}} - name: ETL_STORE_READ_ONLY value: {{ (quote .Values.kubecostModel.etlStoreReadOnly) | default (quote false) }} - name : ETL_CLOUD_USAGE_ENABLED diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-federator-config-map-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-federator-config-map-template.yaml index 819962edf..72a326af4 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-federator-config-map-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-federator-config-map-template.yaml @@ -6,7 +6,7 @@ metadata: name: {{ template "cost-analyzer.fullname" . }}-federator namespace: {{ .Release.Namespace }} labels: - {{ include "cost-analyzer.commonLabels" . | nindent 4 }} + {{- include "cost-analyzer.commonLabels" . | nindent 4 }} data: {{- $root := . }} federator.json: '{{ toJson .Values.federatedETL.federator }}' diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-network-costs-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-network-costs-template.yaml index 71edca007..b4b1ea6e9 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-network-costs-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-network-costs-template.yaml @@ -80,6 +80,9 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if .Values.networkCosts.healthCheckProbes }} + {{- toYaml .Values.networkCosts.healthCheckProbes | nindent 8 }} + {{- end }} volumeMounts: {{- if .Values.networkCosts.hostProc }} - mountPath: {{ .Values.networkCosts.hostProc.mountPath }} @@ -96,6 +99,9 @@ spec: {{- end }} securityContext: privileged: true + {{- if .Values.networkCosts.additionalSecurityContext }} + {{- toYaml .Values.networkCosts.additionalSecurityContext | nindent 10 }} + {{- end }} ports: - name: http-server containerPort: {{ .Values.networkCosts.port | default 3001 }} diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-oidc-config-map-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-oidc-config-map-template.yaml index 3ac3e2401..ee447680c 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-oidc-config-map-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-oidc-config-map-template.yaml @@ -12,6 +12,7 @@ data: oidc.json: |- { "enabled" : {{ .Values.oidc.enabled }}, + "useIDToken" : {{ .Values.oidc.useIDToken | default "false" }}, "clientID" : "{{ .Values.oidc.clientID }}", "secretName" : "{{ .Values.oidc.secretName }}", "authURL" : "{{ .Values.oidc.authURL }}", diff --git a/charts/kubecost/cost-analyzer/templates/cost-analyzer-service-template.yaml b/charts/kubecost/cost-analyzer/templates/cost-analyzer-service-template.yaml index 4776b8b31..ab7e469b0 100644 --- a/charts/kubecost/cost-analyzer/templates/cost-analyzer-service-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/cost-analyzer-service-template.yaml @@ -66,4 +66,11 @@ spec: targetPort: 9004 {{- end }} {{- end }} -{{- end }} \ No newline at end of file + {{- if .Values.oidc }} + {{- if .Values.oidc.enabled }} + - name: apiserver + port: 9004 + targetPort: 9004 + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/kubecost/cost-analyzer/templates/extra-manifests.yaml b/charts/kubecost/cost-analyzer/templates/extra-manifests.yaml new file mode 100644 index 000000000..edad397d9 --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/extra-manifests.yaml @@ -0,0 +1,8 @@ +{{ range .Values.extraObjects }} +--- +{{- if typeIs "string" . }} + {{- tpl . $ }} +{{- else }} + {{- tpl (toYaml .) $ }} +{{- end }} +{{ end }} \ No newline at end of file diff --git a/charts/kubecost/cost-analyzer/templates/federator-deployment-template.yaml b/charts/kubecost/cost-analyzer/templates/federator-deployment-template.yaml new file mode 100644 index 000000000..d7ef4d3d5 --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/federator-deployment-template.yaml @@ -0,0 +1,76 @@ +{{- if .Values.federatedETL.useExistingS3Config -}} +{{- fail "ERROR: You are using a deprecated configuration `.Values.federatedETL.useExistingS3Config`. Please use `.Values.kubecostModel.federatedStorageConfigSecret` instead." -}} +{{- end -}} + +{{- if and (.Values.federatedETL.federator) (.Values.federatedETL.federator.enabled) }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ template "federator.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + {{- include "federator.commonLabels" . | nindent 4 }} +spec: + replicas: 1 + selector: + matchLabels: + {{- include "federator.selectorLabels" . | nindent 6 }} + template: + metadata: + labels: + {{- include "federator.selectorLabels" . | nindent 8 }} + spec: + containers: + - name: federator + {{- if .Values.kubecostModel }} + {{- if .Values.kubecostModel.fullImageName }} + image: {{ .Values.kubecostModel.fullImageName }} + {{- else if .Values.imageVersion }} + image: {{ .Values.kubecostModel.image }}:{{ .Values.imageVersion }} + {{- else }} + image: {{ .Values.kubecostModel.image }}:prod-{{ $.Chart.AppVersion }} + {{- end }} + {{- else }} + image: gcr.io/kubecost1/cost-model:prod-{{ $.Chart.AppVersion }} + {{- end }} + imagePullPolicy: Always + args: ["federator"] + ports: + - name: tcp-model + containerPort: 9001 + protocol: TCP + volumeMounts: + - name: federator-config + mountPath: /var/configs/federator + - name: federated-storage-config + mountPath: /var/configs/etl/federated + readOnly: true + readinessProbe: + httpGet: + path: /healthz + port: 9001 + initialDelaySeconds: 30 + periodSeconds: 10 + failureThreshold: 200 + env: + - name: CONFIG_PATH + value: /var/configs/ + - name: DB_PATH + value: /var/db/ + {{- if .Values.kubecostModel.federatedStorageConfigSecret }} + - name: FEDERATED_STORE_CONFIG + value: "/var/configs/etl/federated/federated-store.yaml" + {{- end }} + restartPolicy: Always + serviceAccountName: {{ template "cost-analyzer.serviceAccountName" . }} + volumes: + - name: federator-config + configMap: + name: {{ template "cost-analyzer.fullname" . }}-federator + {{- if .Values.kubecostModel.federatedStorageConfigSecret }} + - name: federated-storage-config + secret: + defaultMode: 420 + secretName: {{ .Values.kubecostModel.federatedStorageConfigSecret }} + {{- end }} +{{- end }} diff --git a/charts/kubecost/cost-analyzer/templates/kubecost-cluster-controller-template.yaml b/charts/kubecost/cost-analyzer/templates/kubecost-cluster-controller-template.yaml index 18652d7f9..beabc38d7 100644 --- a/charts/kubecost/cost-analyzer/templates/kubecost-cluster-controller-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/kubecost-cluster-controller-template.yaml @@ -71,6 +71,7 @@ rules: - watch - update - patch + - delete - apiGroups: - '' resources: @@ -169,6 +170,17 @@ rules: - get - list - watch + # Used for namespace turndown + # When cleaning a namespace, we need the ability to remove + # arbitrary resources (since we helm uninstall all releases in that NS first) + {{- if .Values.clusterController.namespaceTurndown.rbac.enabled }} + - apiGroups: ["*"] + resources: ["*"] + verbs: + - list + - get + - delete + {{- end }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding diff --git a/charts/kubecost/cost-analyzer/templates/mimir-proxy-configmap-template.yaml b/charts/kubecost/cost-analyzer/templates/mimir-proxy-configmap-template.yaml new file mode 100644 index 000000000..ded965a8f --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/mimir-proxy-configmap-template.yaml @@ -0,0 +1,18 @@ +{{- if .Values.global.mimirProxy }} +{{- if .Values.global.mimirProxy.enabled }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "cost-analyzer.fullname" . }}-mimir-proxy + namespace: {{ .Release.Namespace }} +data: + default.conf: | + server { + listen {{ .Values.global.mimirProxy.port }}; + location / { + proxy_pass {{ .Values.global.mimirProxy.mimirEndpoint }}; + proxy_set_header X-Scope-OrgID "{{ .Values.global.mimirProxy.orgIdentifier }}"; + } + } +{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/kubecost/cost-analyzer/templates/mimir-proxy-deployment-template.yaml b/charts/kubecost/cost-analyzer/templates/mimir-proxy-deployment-template.yaml new file mode 100644 index 000000000..5319dc9df --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/mimir-proxy-deployment-template.yaml @@ -0,0 +1,40 @@ +{{- if .Values.global.mimirProxy }} +{{- if .Values.global.mimirProxy.enabled }} +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ template "cost-analyzer.fullname" . }}-mimir-proxy + namespace: {{ .Release.Namespace }} + labels: + app: mimir-proxy +spec: + replicas: 1 + selector: + matchLabels: + app: mimir-proxy + template: + metadata: + labels: + app: mimir-proxy + spec: + containers: + - name: {{ .Values.global.mimirProxy.name }} + image: {{ .Values.global.mimirProxy.image }} + ports: + - containerPort: {{ .Values.global.mimirProxy.port }} + protocol: TCP + resources: {} + imagePullPolicy: IfNotPresent + volumeMounts: + - mountPath: /etc/nginx/conf.d + name: default-conf + readOnly: true + volumes: + - name: default-conf + configMap: + name: {{ template "cost-analyzer.fullname" . }}-mimir-proxy + items: + - key: default.conf + path: default.conf +{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/kubecost/cost-analyzer/templates/mimir-proxy-service-template.yaml b/charts/kubecost/cost-analyzer/templates/mimir-proxy-service-template.yaml new file mode 100644 index 000000000..5e46b62f9 --- /dev/null +++ b/charts/kubecost/cost-analyzer/templates/mimir-proxy-service-template.yaml @@ -0,0 +1,18 @@ +{{- if .Values.global.mimirProxy }} +{{- if .Values.global.mimirProxy.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ template "cost-analyzer.fullname" . }}-mimir-proxy + namespace: {{ .Release.Namespace }} +spec: + ports: + - name: mimir-proxy + protocol: TCP + port: {{ .Values.global.mimirProxy.port }} + targetPort: {{ .Values.global.mimirProxy.port }} + selector: + app: mimir-proxy + type: ClusterIP +{{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/kubecost/cost-analyzer/templates/query-service-deployment-template.yaml b/charts/kubecost/cost-analyzer/templates/query-service-deployment-template.yaml index f8d76dfc0..3f480717b 100644 --- a/charts/kubecost/cost-analyzer/templates/query-service-deployment-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/query-service-deployment-template.yaml @@ -98,6 +98,8 @@ spec: - name: tcp-model containerPort: 9003 protocol: TCP + resources: +{{ toYaml .Values.kubecostDeployment.queryService.resources | indent 12 }} volumeMounts: - name: persistent-configs mountPath: /var/configs @@ -136,5 +138,31 @@ spec: value: "/var/db" - name: CLOUD_PROVIDER_API_KEY value: "AIzaSyDXQPG_MHUEy9neR7stolq6l0ujXmjJlvk" # The GCP Pricing API key.This GCP api key is expected to be here and is limited to accessing google's billing API.' + {{- if .Values.imagePullSecrets }} + imagePullSecrets: + {{ toYaml .Values.imagePullSecrets | indent 2 }} + {{- end }} + {{- if .Values.kubecostDeployment.queryService.priority }} + {{- if .Values.kubecostDeployment.queryService.priority.enabled }} + {{- if .Values.kubecostDeployment.queryService.priority.name }} + priorityClassName: {{ .Values.kubecostDeployment.queryService.priority.name }} + {{- else }} + priorityClassName: {{ template "cost-analyzer.fullname" . }}-qsr-priority + {{- end }} + {{- end }} + {{- end }} + {{- with .Values.kubecostDeployment.queryService.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.kubecostDeployment.queryService.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.kubecostDeployment.queryService.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} {{- end }} \ No newline at end of file diff --git a/charts/kubecost/cost-analyzer/templates/query-service-service-template.yaml b/charts/kubecost/cost-analyzer/templates/query-service-service-template.yaml index 423c06738..8df515707 100644 --- a/charts/kubecost/cost-analyzer/templates/query-service-service-template.yaml +++ b/charts/kubecost/cost-analyzer/templates/query-service-service-template.yaml @@ -3,7 +3,7 @@ kind: Service apiVersion: v1 metadata: - name: {{ .Release.Name }}-query-service-load-balancer + name: {{ template "query-service.serviceName" . }} namespace: {{ .Release.Namespace }} labels: {{ include "query-service.commonLabels" . | nindent 4 }} diff --git a/charts/kubecost/cost-analyzer/values.yaml b/charts/kubecost/cost-analyzer/values.yaml index bad08c49c..ec032f34a 100644 --- a/charts/kubecost/cost-analyzer/values.yaml +++ b/charts/kubecost/cost-analyzer/values.yaml @@ -1,7 +1,7 @@ global: # zone: cluster.local (use only if your DNS server doesn't live in the same zone as kubecost) prometheus: - enabled: true # If false, Prometheus will not be installed -- please read this before disabling: https://github.com/kubecost/docs/blob/main/custom-prom.md + enabled: true # If false, Prometheus will not be installed -- Warning: Before changing this setting, please read to understand this setting https://docs.kubecost.com/install-and-configure/install/custom-prom fqdn: http://cost-analyzer-prometheus-server.default.svc #example address of a prometheus to connect to. Include protocol (http:// or https://) Ignored if enabled: true # insecureSkipVerify : false # If true, kubecost will not check the TLS cert of prometheus # queryServiceBasicAuthSecretName: dbsecret # kubectl create secret generic dbsecret -n kubecost --from-file=USERNAME --from-file=PASSWORD @@ -22,10 +22,10 @@ global: proxy: true # If true, the kubecost frontend will route to your grafana through its service endpoint # fqdn: cost-analyzer-grafana.default.svc - # Enable only when you are using GCP Marketplace ENT listing. Learn more at https://console.cloud.google.com/marketplace/product/kubecost-public/kubecost-ent + # Enable only when you are using GCP Marketplace ENT listing. Learn more at https://console.cloud.google.com/marketplace/product/kubecost-public/kubecost-ent gcpstore: enabled: false - + # Google Cloud Managed Service for Prometheus gmp: # Remember to set up these parameters when install the Kubecost Helm chart with `global.gmp.enabled=true` if you want to use GMP self-deployed collection (Recommended) to ultilize Kubecost scrape configs. @@ -55,6 +55,20 @@ global: # role_arn: ROLE_ARN # AWS role arn # profile: PROFILE # AWS profile + # Mimir Proxy to help Kubecost to query metrics from multi-tenant Grafana Mimir. + # Set `global.mimirProxy.enabled=true` and `global.prometheus.enabled=false` to enable Mimir Proxy. + # You also need to set `global.prometheus.fqdn=http://kubecost-cost-analyzer-mimir-proxy.kubecost.svc:8085/prometheus` + # or `global.prometheus.fqdn=http://{{ template "cost-analyzer.fullname" . }}-mimir-proxy.{{ .Release.Namespace }}.svc:8085/prometheus' + # Learn more at https://grafana.com/docs/mimir/latest/operators-guide/secure/authentication-and-authorization/#without-an-authenticating-reverse-proxy + mimirProxy: + enabled: false + name: mimir-proxy + image: nginxinc/nginx-unprivileged + port: 8085 + mimirEndpoint: $mimir_endpoint #Your Mimir query endpoint. If your Mimir query endpoint is http://example.com/prometheus, replace $mimir_endpoint with http://example.com/ + orgIdentifier: $your_tenant_ID #Your Grafana Mimir tenant ID + + notifications: # Kubecost alerting configuration # Ref: http://docs.kubecost.com/alerts @@ -193,11 +207,11 @@ global: reports: - title: "Cloud Cost Report 0" window: "today" - aggregateBy: "type" - accumulate: false # daily resolution - filters: - - property: "cluster" - value: "cluster-one" + aggregateBy: "service" + accumulate: false # daily resolution + # filters: + # - property: "service" + # value: "service1" # corresponds to a value to filter cloud cost aggregate by service data on. podAnnotations: {} # iam.amazonaws.com/role: role-arn @@ -263,24 +277,24 @@ oidc: discoveryURL: "https://my.auth.server/.well-known/openid-configuration" # url for OIDC endpoint discovery # hostedDomain: "example.com" # optional, blocks access to the auth domain specified in the hd claim of the provider ID token rbac: - enabled: false - groups: - - name: admin - enabled: false # if admin is disabled, all SAML users will be able to make configuration changes to the kubecost frontend - assertionName: "preferred_username" # field used for role matching in the OIDC access token - assertionValues: - - "admin" - - "superusers" - - name: readonly - enabled: false # if readonly is disabled, all users authorized on SAML will default to readonly - assertionName: "preferred_username" - assertionValues: - - "readonly" - - name: editor - enabled: false # if editor is enabled, editors will be allowed to edit reports/alerts scoped to them, and act as readers otherwise. Users will never default to editor. - assertionName: "preferred_username" - assertionValues: - - "editor" + enabled: false + groups: + - name: admin + enabled: false # if admin is disabled, all authenticated users will be able to make configuration changes to the kubecost frontend + claimName: "roles" # Kubecost matches this string against the JWT's payload key containing RBAC info (this value is unique across identity providers) + claimValues: # Kubecost matches these strings with the roles created in your identity provider + - "admin" + - "superusers" + - name: readonly + enabled: false # if readonly is disabled, all authenticated users will default to readonly + claimName: "roles" + claimValues: + - "readonly" + - name: editor + enabled: false # if editor is enabled, editors will be allowed to edit reports/alerts scoped to them, and act as readers otherwise. Users will never default to editor. + claimName: "roles" + claimValues: + - "editor" # Adds an httpProxy as an environment variable. systemProxy.enabled must be `true`to have any effect. # Ref: https://www.oreilly.com/library/view/security-with-go/9781788627917/5ea6a02b-3d96-44b1-ad3c-6ab60fcbbe4f.xhtml @@ -695,7 +709,7 @@ networkCosts: enabled: false podSecurityPolicy: enabled: false - image: gcr.io/kubecost1/kubecost-network-costs:v0.16.6 + image: gcr.io/kubecost1/kubecost-network-costs:v0.16.7 imagePullPolicy: Always updateStrategy: type: RollingUpdate @@ -717,8 +731,8 @@ networkCosts: cpu: 500m # can be less, will depend on cluster size # memory: it is not recommended to set a memory limit requests: - cpu: 50m - memory: 20Mi + cpu: 50m + memory: 20Mi extraArgs: [] config: # Configuration for traffic destinations, including specific classification @@ -810,6 +824,21 @@ networkCosts: additionalLabels: {} nodeSelector: {} annotations: {} + healthCheckProbes: {} + # readinessProbe: + # tcpSocket: + # port: 3001 + # initialDelaySeconds: 5 + # periodSeconds: 10 + # failureThreshold: 5 + # livenessProbe: + # tcpSocket: + # port: 3001 + # initialDelaySeconds: 5 + # periodSeconds: 10 + # failureThreshold: 5 + additionalSecurityContext: {} + # readOnlyRootFilesystem: true # Kubecost Deployment Configuration # Used for HA mode in Business & Enterprise tier @@ -822,8 +851,16 @@ kubecostDeployment: # maxSurge: 1 # maxUnavailable: 1 # type: RollingUpdate + + # QueryServiceReplicas + # Ref: https://docs.kubecost.com/install-and-configure/advanced-configuration/query-service-replicas queryServiceReplicas: 0 queryService: + resources: + requests: + # You can use the Kubecost savings report for 'Right-size your container requests' to determine the recommended resource requests once the pod has run for 24 hours. + cpu: 1000m + memory: 500Mi # default storage class storageClass: "" databaseVolumeSize: 100Gi @@ -842,6 +879,9 @@ clusterController: # automatically right-sized on a regular basis. defaultResizeAll: false # fqdn: kubecost-cluster-controller.kubecost.svc.cluster.local:9731 + namespaceTurndown: + rbac: + enabled: true reporting: # Kubecost bug report feature: Logs access/collection limited to .Release.Namespace @@ -927,28 +967,16 @@ awsstore: priorityClassName: "" federatedETL: - # federatedCluster indicates whether this cluster should push data to the Federated store - federatedCluster: false - # primaryCluster indicates whether this cluster should load data from the combined section of the Federated store - primaryCluster: false - # redirectS3Backup changes the dir of S3 backup to the Federated combined store, for using Thanos-federated data in the Federated ETL - # Note S3 backup should be enabled separately for this. - redirectS3Backup: false - # useExistingS3Config will attempt to use existing object-store.yaml configs for S3 backup/Thanos as config for the Federated store - useExistingS3Config: false - # useMultiClusterDB should be set to true if you have a single federated PromQL DB with metrics from all monitored clusters but want to use federation for performance - useMultiClusterDB: false + federatedCluster: false # whether this cluster should push data to the Federated store + primaryCluster: false # whether this cluster should load data from the combined section of the Federated store + useExistingS3Config: false # will attempt to use existing object-store.yaml configs for S3 backup/Thanos as config for the Federated store + redirectS3Backup: false # changes the dir of S3 backup to the Federated combined store, for using Thanos-federated data in the Federated ETL. Note S3 backup should be enabled separately for this. + useMultiClusterDB: false # set to true if you have a single federated PromQL DB with metrics from all monitored clusters but want to use federation for performance federator: - # federationCutoffDate is an RFC 3339-formatted string. All ETL files with windows that fall before this time are not processed by the Federator. - # If this is not set, the Federator will process all files regardless of date. - # federationCutoffDate: "2022-10-18T00:00:00.000Z" - # federator.enabled enables the federator to run inside the costmodel container, federating the data in the Federated store - enabled: false - # federator.clusters is an optional whitelist of clusters by cluster id. - # If not set, the federator will attempt to federated all clusters pushing to the federated storage. - clusters: [] - # federator.primaryClusterID is an optional parameter that should be used when reconciliation is expected to occur on the Primary. - # primaryClusterID: "cluster_id" + enabled: false # enables the federator to run inside the costmodel container, federating the data in the Federated store + clusters: [] # optional. Whitelist of clusters by cluster id. If not set, the federator will attempt to federated all clusters pushing to the federated storage. + # primaryClusterID: "cluster_id" # optional. Used when reconciliation is expected to occur on the Primary. + # federationCutoffDate: "2022-10-18T00:00:00.000Z" # an RFC 3339-formatted string. All ETL files with windows that fall before this time are not processed by the Federator. If this is not set, the Federator will process all files regardless of date. kubecostAdmissionController: enabled: false @@ -961,12 +989,12 @@ costEventsAudit: enabled: false -# readonly: false # disable updates to kubecost from the frontend UI and via POST request +#readonly: false # disable updates to kubecost from the frontend UI and via POST request # These configs can also be set from the Settings page in the Kubecost product UI # Values in this block override config changes in the Settings UI on pod restart # -# kubecostProductConfigs: +#kubecostProductConfigs: # An optional list of cluster definitions that can be added for frontend access. The local # cluster is *always* included by default, so this list is for non-local clusters. # Ref: https://github.com/kubecost/docs/blob/main/multi-cluster.md @@ -1073,3 +1101,34 @@ costEventsAudit: # enabled: true # secretName: webhook-server-tls # caBundle: ${CA_BUNDLE} + +# -- Array of extra K8s manifests to deploy +## Note: Supports use of custom Helm templates +extraObjects: [] +# Cloud Billing Integration: +# - apiVersion: v1 +# kind: Secret +# metadata: +# name: cloud-integration +# namespace: kubecost +# type: Opaque +# data: +# cloud-integration.json: BASE64_SECRET +# Istio: +# - apiVersion: networking.istio.io/v1alpha3 +# kind: VirtualService +# metadata: +# name: my-virtualservice +# spec: +# hosts: +# - kubecost.myorg.com +# gateways: +# - my-gateway +# http: +# - route: +# - destination: +# host: kubecost.kubecost.svc.cluster.local +# port: +# number: 80 + + diff --git a/charts/nats/nats/Chart.yaml b/charts/nats/nats/Chart.yaml index a44985a04..a3486b2c9 100644 --- a/charts/nats/nats/Chart.yaml +++ b/charts/nats/nats/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.cattle.io/kube-version: '>=1.16-0' catalog.cattle.io/release-name: nats apiVersion: v2 -appVersion: 2.9.19 +appVersion: 2.9.20 description: A Helm chart for the NATS.io High Speed Cloud Native Distributed Communications Technology. home: http://github.com/nats-io/k8s @@ -18,4 +18,4 @@ maintainers: name: The NATS Authors url: https://github.com/nats-io name: nats -version: 0.19.16 +version: 0.19.17 diff --git a/charts/nats/nats/templates/configmap.yaml b/charts/nats/nats/templates/configmap.yaml index d2f4cc365..da4959d94 100644 --- a/charts/nats/nats/templates/configmap.yaml +++ b/charts/nats/nats/templates/configmap.yaml @@ -31,7 +31,7 @@ data: # # ############### http: 8222 - server_name: {{- if .Values.nats.serverNamePrefix }}$SERVER_NAME{{- else }}$POD_NAME{{- end }} + server_name: {{ if .Values.nats.serverNamePrefix }}$SERVER_NAME{{ else }}$POD_NAME{{ end }} {{- if .Values.nats.serverTags }} server_tags: [ diff --git a/charts/nats/nats/values.yaml b/charts/nats/nats/values.yaml index 2d7e643f1..6f5bdf260 100644 --- a/charts/nats/nats/values.yaml +++ b/charts/nats/nats/values.yaml @@ -6,7 +6,7 @@ nats: image: repository: nats - tag: 2.9.19-alpine + tag: 2.9.20-alpine pullPolicy: IfNotPresent # registry: docker.io @@ -517,7 +517,7 @@ gateway: bootconfig: image: repository: natsio/nats-boot-config - tag: 0.10.1 + tag: 0.11.0 pullPolicy: IfNotPresent # registry: docker.io @@ -606,7 +606,7 @@ reloader: enabled: true image: repository: natsio/nats-server-config-reloader - tag: 0.10.1 + tag: 0.11.0 pullPolicy: IfNotPresent # registry: docker.io @@ -623,7 +623,7 @@ exporter: enabled: true image: repository: natsio/prometheus-nats-exporter - tag: 0.11.0 + tag: 0.12.0 pullPolicy: IfNotPresent # registry: docker.io diff --git a/index.yaml b/index.yaml index 295df80f8..f1bb5fd38 100644 --- a/index.yaml +++ b/index.yaml @@ -80,6 +80,50 @@ 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 + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 2.6.3 + created: "2023-07-17T16:51:30.741795594Z" + dependencies: + - condition: redis.enabled + name: redis + repository: file://./charts/redis + version: 17.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: 45dad27f4aa5a09b030c6445a9b415867bf8dc4e055df401a1490545b2ddf788 + 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-14.3.4.tgz + version: 14.3.4 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Apache Airflow @@ -1316,8 +1360,8 @@ entries: argo-cd: - annotations: artifacthub.io/changes: | - - kind: added - description: Allow configuring Dex's init image resources separately + - 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 @@ -1328,7 +1372,7 @@ entries: catalog.cattle.io/release-name: argo-cd apiVersion: v2 appVersion: v2.7.7 - created: "2023-07-14T17:08:31.475350439Z" + created: "2023-07-17T16:51:29.638745593Z" dependencies: - condition: redis-ha.enabled name: redis-ha @@ -1336,7 +1380,46 @@ entries: version: 4.23.0 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. - digest: 909d8e8e7a7c7ccfd6a0b26a6529239cbe79e81fa7bfbac10f2c2bc177a8b8de + digest: 8026a237f5c415017da313f2b769ca2689cd9deaf8db5f4b6a4cc14cc5cc8a0e + 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.40.0.tgz + version: 5.40.0 + - annotations: + artifacthub.io/changes: | + - kind: added + description: Allow configuring Dex's init image resources separately + 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-17T16:51:11.908927867Z" + 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: db0280e315fbc6b57f32e099249af31999b0a1fd8dbc709d759c5f906851efcd home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -7563,6 +7646,41 @@ entries: - assets/aws-event-sources/aws-event-sources-0.1.901.tgz version: 0.1.901 cassandra: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Apache Cassandra + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: cassandra + category: Database + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 4.1.2 + created: "2023-07-17T16:51:30.787536063Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: Apache Cassandra is an open source distributed database management + system designed to handle large amounts of data across many servers, providing + high availability with no single point of failure. + digest: 65c9eefad80d5e10cf5b49b84d7de56db81d3d9d9978762e12a6d17c4d792641 + home: https://bitnami.com + icon: https://svn.apache.org/repos/asf/comdev/project-logos/originals/cassandra-4.svg + keywords: + - cassandra + - database + - nosql + maintainers: + - name: VMware, Inc. + url: https://github.com/bitnami/charts + name: cassandra + sources: + - https://github.com/bitnami/charts/tree/main/bitnami/cassandra + urls: + - assets/bitnami/cassandra-10.4.4.tgz + version: 10.4.4 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Apache Cassandra @@ -10301,6 +10419,32 @@ entries: - assets/mongodb/community-operator-0.7.6.tgz version: 0.7.6 confluent-for-kubernetes: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Confluent For Kubernetes + catalog.cattle.io/kube-version: '>=1.15-0' + catalog.cattle.io/release-name: confluent-for-kubernetes + apiVersion: v1 + appVersion: 2.6.1 + created: "2023-07-17T16:51:32.923314698Z" + description: A Helm chart to deploy Confluent for Kubernetes + digest: a18365317fcb96337599b25a2b4d071cddf442d613222a786f5d43f47e77f78b + home: https://www.confluent.io/ + icon: https://cdn.confluent.io/wp-content/uploads/seo-logo-meadow.png + keywords: + - Confluent + - Confluent Operator + - Confluent Platform + - CFK + maintainers: + - email: operator@confluent.io + name: Confluent Operator + name: confluent-for-kubernetes + sources: + - https://docs.confluent.io/current/index.html + urls: + - assets/confluent/confluent-for-kubernetes-0.771.29.tgz + version: 0.771.29 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Confluent For Kubernetes @@ -10939,8 +11083,8 @@ entries: catalog.cattle.io/featured: "1" catalog.cattle.io/release-name: cost-analyzer apiVersion: v2 - appVersion: 1.104.4 - created: "2023-07-06T06:52:04.774228613-06:00" + appVersion: 1.105.0 + created: "2023-07-17T16:51:45.749541822Z" dependencies: - condition: global.grafana.enabled name: grafana @@ -10956,7 +11100,38 @@ entries: version: ~0.29.0 description: A Helm chart that sets up Kubecost, Prometheus, and Grafana to monitor cloud costs. - digest: ba1f9a97cd557bb9658239d3a987742655dce3b15565b418309d6bb5e46e14fd + digest: a10f39de0079eb6f7ad02a056ce8d9b22a0a815a83fb9c40b0ce046ab2006cc4 + icon: https://partner-charts.rancher.io/assets/logos/kubecost.png + name: cost-analyzer + urls: + - assets/kubecost/cost-analyzer-1.105.0.tgz + version: 1.105.0 + - annotations: + artifacthub.io/links: | + - name: Homepage + url: https://www.kubecost.com + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Kubecost + catalog.cattle.io/release-name: cost-analyzer + apiVersion: v2 + appVersion: 1.104.4 + created: "2023-07-17T16:51:35.73522629Z" + dependencies: + - condition: global.grafana.enabled + name: grafana + repository: file://./charts/grafana + version: ~1.17.2 + - condition: global.prometheus.enabled + name: prometheus + repository: file://./charts/prometheus + version: ~11.0.2 + - condition: global.thanos.enabled + name: thanos + repository: file://./charts/thanos + version: ~0.29.0 + description: A Helm chart that sets up Kubecost, Prometheus, and Grafana to monitor + cloud costs. + digest: 0e2a51b02bf3cbf89eadc85799ad73fdc95b2d0796256220ec62b3f45a051c16 icon: https://partner-charts.rancher.io/assets/logos/kubecost.png name: cost-analyzer urls: @@ -17806,6 +17981,45 @@ entries: - assets/gluu/gluu-5.0.10.tgz version: 5.0.10 gopaddle: + - annotations: + artifacthub.io/changes: |- + - kind: added + description: Docker Compose based installer for Docker Desktop extension + - kind: changed + description: Docker Image size optimization for faster installation + - kind: added + description: Gitlab person access token support added + - kind: changed + description: EKS cluster create - UX improvements for Master role ARN, Node role ARN & ALB role + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: gopaddle + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/namespace: gopaddle + catalog.cattle.io/release-name: gopaddle + apiVersion: v2 + appVersion: 4.2.9 + created: "2023-07-17T16:51:33.781106621Z" + dependencies: + - condition: global.installer.chart.gp-core + name: gp-core + repository: file://./charts/gp-core + - condition: global.installer.chart.rabbitmq + name: gp-rabbitmq + repository: file://./charts/gp-rabbitmq + description: Simple low-code platform for Kubernetes developers and operators + digest: 4831a1a72efca6e8164c53ee0de3447be32b774f0e0f9be39b03434fb3ff23ac + home: https://gopaddle.io + icon: https://gopaddle-marketing.s3.ap-southeast-2.amazonaws.com/gopaddle.png + keywords: + - low-code + - Internal Developer Platform + - PaaS + - Community Edition + kubeVersion: '>=1.21-0' + name: gopaddle + urls: + - assets/gopaddle/gopaddle-4.2.9.tgz + version: 4.2.9 - annotations: artifacthub.io/changes: |- - kind: added @@ -19913,6 +20127,28 @@ entries: - assets/tetrate-istio/istiod-tid-1.12.600.tgz version: 1.12.600 jaeger-operator: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Jaeger Operator + catalog.cattle.io/release-name: jaeger-operator + apiVersion: v1 + appVersion: 1.46.0 + created: "2023-07-17T16:51:34.088223999Z" + description: jaeger-operator Helm chart for Kubernetes + digest: d72dfaed2400d53dab1347c85eb8596c13e377dc74768acb8e2e1534969bf593 + home: https://www.jaegertracing.io/ + icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg + maintainers: + - email: ctadeu@gmail.com + name: cpanato + - email: batazor111@gmail.com + name: batazor + name: jaeger-operator + sources: + - https://github.com/jaegertracing/jaeger-operator + urls: + - assets/jaeger/jaeger-operator-2.46.2.tgz + version: 2.46.2 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Jaeger Operator @@ -20156,6 +20392,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.401.2-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.401.2 + created: "2023-07-17T16:51:34.215033022Z" + description: Jenkins - Build great things at any scale! The leading open source + automation server, Jenkins provides hundreds of plugins to support building, + deploying and automating any project. + digest: e38bc5a5797bbee7379b9af20a7f3de1c8d52e58b738f3493b89940876e41dd8 + 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.4.1.tgz + version: 4.4.1 - annotations: artifacthub.io/category: integration-delivery artifacthub.io/images: | @@ -22353,6 +22645,32 @@ entries: - assets/komodor/k8s-watcher-0.10.1101.tgz version: 0.10.1101 k10: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: K10 + catalog.cattle.io/kube-version: '>= 1.17.0-0' + catalog.cattle.io/release-name: k10 + apiVersion: v2 + appVersion: 6.0.3 + created: "2023-07-17T16:51:35.29656365Z" + dependencies: + - name: grafana + repository: file://./charts/grafana + version: 6.32.9 + - name: prometheus + repository: file://./charts/prometheus + version: 15.8.5 + description: Kasten’s K10 Data Management Platform + digest: fa46a833ba91243b12e21dd8cf3f32df498dff37d845aa858b9c4d1e8ffdb468 + home: https://kasten.io/ + icon: https://docs.kasten.io/_static/logo-kasten-k10-blue-white.png + maintainers: + - email: contact@kasten.io + name: kastenIO + name: k10 + urls: + - assets/kasten/k10-6.0.301.tgz + version: 6.0.301 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: K10 @@ -24815,6 +25133,32 @@ entries: - assets/clastix/kamaji-0.10.1.tgz version: 0.10.1 kamaji-console: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Kamaji Console + catalog.cattle.io/kube-version: '>=1.21.0-0' + catalog.cattle.io/release-name: kamaji-console + apiVersion: v2 + appVersion: v0.0.2 + created: "2023-07-17T16:51:32.782914065Z" + description: Kamaji deploys and operates Kubernetes at scale with a fraction of + the operational burden. This chart install a console for Kamaji. + digest: 81ed659956d83a8a69de7a82a585ee3fb025dd1a937d67c92c113c26f7085b0b + home: https://github.com/clastix/kamaji-console + icon: https://github.com/clastix/kamaji/raw/master/assets/logo-colored.png + kubeVersion: '>=1.21.0-0' + maintainers: + - email: dario@tranchitella.eu + name: Dario Tranchitella + - email: me@bsctl.io + name: Adriano Pezzuto + name: kamaji-console + sources: + - https://github.com/clastix/kamaji-console + type: application + urls: + - assets/clastix/kamaji-console-0.0.5.tgz + version: 0.0.5 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Kamaji Console @@ -24911,6 +25255,33 @@ entries: - assets/elastic/kibana-7.17.3.tgz version: 7.17.3 kong: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Kong Gateway + catalog.cattle.io/release-name: kong + apiVersion: v2 + appVersion: "3.3" + created: "2023-07-17T16:51:35.488547399Z" + dependencies: + - condition: postgresql.enabled + name: postgresql + repository: file://./charts/postgresql + version: 11.9.13 + description: The Cloud-Native Ingress and API-management + digest: 1c9c79deebc8ff32372379d94ce3a74aa0ec59dac8f750f3c9ebcc97c76171c5 + home: https://konghq.com/ + icon: https://s3.amazonaws.com/downloads.kong/universe/assets/icon-kong-inc-large.png + maintainers: + - email: harry@konghq.com + name: hbagdi + - email: traines@konghq.com + name: rainest + name: kong + sources: + - https://github.com/Kong/charts/tree/main/charts/kong + urls: + - assets/kong/kong-2.25.0.tgz + version: 2.25.0 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Kong Gateway @@ -28194,6 +28565,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.33 + created: "2023-07-17T16:51:31.252833018Z" + 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: 72ffc62e1e5f426eb70c457bba6bee0871985a44fb4b301407d06024713f1765 + 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.6.tgz + version: 9.10.6 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: MySQL @@ -28908,6 +29316,31 @@ entries: - assets/bitnami/mysql-9.4.1.tgz version: 9.4.1 nats: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: NATS Server + catalog.cattle.io/kube-version: '>=1.16-0' + catalog.cattle.io/release-name: nats + apiVersion: v2 + appVersion: 2.9.20 + created: "2023-07-17T16:51:45.929180439Z" + description: A Helm chart for the NATS.io High Speed Cloud Native Distributed + Communications Technology. + digest: 89924a2c56bb0f82d9ba68cf0be3c7d217487271e04bd64e01ac5bbf9440a25d + home: http://github.com/nats-io/k8s + icon: https://nats.io/img/nats-icon-color.png + keywords: + - nats + - messaging + - cncf + maintainers: + - email: info@nats.io + name: The NATS Authors + url: https://github.com/nats-io + name: nats + urls: + - assets/nats/nats-0.19.17.tgz + version: 0.19.17 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: NATS Server @@ -33323,6 +33756,44 @@ 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 + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 15.3.0 + created: "2023-07-17T16:51:31.498133098Z" + 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: 4ca371a2f1f6f81cb734952543f7a5321fc6afed18381ccc27da4dd44a8716fb + 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/post + urls: + - assets/bitnami/postgresql-12.6.6.tgz + version: 12.6.6 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: PostgreSQL @@ -35320,6 +35791,41 @@ entries: - assets/quobyte/quobyte-cluster-0.1.5.tgz version: 0.1.5 redis: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Redis + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: redis + category: Database + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 7.0.12 + created: "2023-07-17T16:51:31.565022337Z" + dependencies: + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: Redis(R) is an open source, advanced key-value store. It is often + referred to as a data structure server since keys can contain strings, hashes, + lists, sets and sorted sets. + digest: 87a1c20406b513c57e0a4d4abd5afa7ef5090d582c9fdc10357bce581cc87548 + home: https://bitnami.com + icon: https://redis.com/wp-content/uploads/2021/08/redis-logo.png + keywords: + - redis + - keyvalue + - database + maintainers: + - name: VMware, Inc. + url: https://github.com/bitnami/charts + name: redis + sources: + - https://github.com/bitnami/charts/tree/main/bitnami/redis + urls: + - assets/bitnami/redis-17.13.2.tgz + version: 17.13.2 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Redis @@ -46006,6 +46512,53 @@ entries: - assets/hashicorp/vault-0.22.0.tgz version: 0.22.0 wordpress: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: WordPress + catalog.cattle.io/kube-version: '>=1.19-0' + catalog.cattle.io/release-name: wordpress + category: CMS + licenses: Apache-2.0 + apiVersion: v2 + appVersion: 6.2.2 + created: "2023-07-17T16:51:32.540331208Z" + dependencies: + - condition: memcached.enabled + name: memcached + repository: file://./charts/memcached + version: 6.x.x + - condition: mariadb.enabled + name: mariadb + repository: file://./charts/mariadb + version: 12.x.x + - name: common + repository: file://./charts/common + tags: + - bitnami-common + version: 2.x.x + description: WordPress is the world's most popular blogging and content management + platform. Powerful yet simple, everyone from students to global corporations + use it to build beautiful, functional websites. + digest: b751ec7a8dc145c7b51763393e4d8fe801b9baa592363a08da58bcb783fb57c1 + home: https://bitnami.com + icon: https://s.w.org/style/images/about/WordPress-logotype-simplified.png + keywords: + - application + - blog + - cms + - http + - php + - web + - wordpress + maintainers: + - name: VMware, Inc. + url: https://github.com/bitnami/charts + name: wordpress + sources: + - https://github.com/bitnami/charts/tree/main/bitnami/wordpress + urls: + - assets/bitnami/wordpress-16.1.27.tgz + version: 16.1.27 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: WordPress @@ -49679,6 +50232,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-17T16:51:32.650537297Z" + 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: 8f86fda02b6eaeba91563b1b226eed466c10116942c2179683c1d14c89f99696 + 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.5.tgz + version: 11.4.5 - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/display-name: Apache Zookeeper