From ae7e0dd6a687b283e9d57939143511f938bfe654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Cabrera=20Mi=C3=B1agorri?= Date: Thu, 23 Sep 2021 10:37:00 +0200 Subject: [PATCH] [bitnami/wordpress] Use the dependency fullname template (#7472) * [bitnami/wordpress] Use the dependency fullname template * Delete unnedeed line * Update airflow dependencies fullnames * Update argo-cd dependencies fullnames * Update Chart.lock * Fix redis service name * Bump wordpress version --- bitnami/airflow/Chart.lock | 2 +- bitnami/airflow/Chart.yaml | 2 +- bitnami/airflow/templates/_helpers.tpl | 6 ++---- bitnami/argo-cd/Chart.lock | 2 +- bitnami/argo-cd/Chart.yaml | 2 +- bitnami/argo-cd/templates/_helpers.tpl | 3 +-- bitnami/wordpress/Chart.lock | 2 +- bitnami/wordpress/Chart.yaml | 2 +- bitnami/wordpress/templates/_helpers.tpl | 4 ++-- 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/bitnami/airflow/Chart.lock b/bitnami/airflow/Chart.lock index 7ac9ed6dc9..ff1f79c30f 100644 --- a/bitnami/airflow/Chart.lock +++ b/bitnami/airflow/Chart.lock @@ -9,4 +9,4 @@ dependencies: repository: https://charts.bitnami.com/bitnami version: 15.3.2 digest: sha256:9f5ba58c8d1906903cac12a48a93a1febf1c4bb3d399171c67606fe80d3e24ae -generated: "2021-09-19T02:08:26.420844145Z" +generated: "2021-09-21T08:09:32.50609853Z" diff --git a/bitnami/airflow/Chart.yaml b/bitnami/airflow/Chart.yaml index 97446f28e5..89f6473edd 100644 --- a/bitnami/airflow/Chart.yaml +++ b/bitnami/airflow/Chart.yaml @@ -32,4 +32,4 @@ name: airflow sources: - https://github.com/bitnami/bitnami-docker-airflow - https://airflow.apache.org/ -version: 11.0.2 +version: 11.0.3 diff --git a/bitnami/airflow/templates/_helpers.tpl b/bitnami/airflow/templates/_helpers.tpl index ae6c64829b..6048a7d86d 100644 --- a/bitnami/airflow/templates/_helpers.tpl +++ b/bitnami/airflow/templates/_helpers.tpl @@ -106,8 +106,7 @@ Create a default fully qualified postgresql name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "airflow.postgresql.fullname" -}} -{{- $name := default "postgresql" .Values.postgresql.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- include "common.names.dependency.fullname" (dict "chartName" "postgresql" "chartValues" .Values.postgresql "context" $) -}} {{- end -}} {{/* @@ -115,8 +114,7 @@ Create a default fully qualified redis name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "airflow.redis.fullname" -}} -{{- $name := default "redis" .Values.redis.nameOverride -}} -{{- printf "%s-%s-master" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- include "common.names.dependency.fullname" (dict "chartName" "redis-master" "chartValues" .Values.redis "context" $) -}} {{- end -}} {{/* diff --git a/bitnami/argo-cd/Chart.lock b/bitnami/argo-cd/Chart.lock index e65b0fff76..1eba5af2c3 100644 --- a/bitnami/argo-cd/Chart.lock +++ b/bitnami/argo-cd/Chart.lock @@ -6,4 +6,4 @@ dependencies: repository: https://charts.bitnami.com/bitnami version: 1.9.0 digest: sha256:92515e65ce24a2e89e7459be66746a4c826c45efa46b4932084aea6cf52bffcf -generated: "2021-09-14T16:28:16.722155798+02:00" +generated: "2021-09-21T08:08:58.821321755Z" diff --git a/bitnami/argo-cd/Chart.yaml b/bitnami/argo-cd/Chart.yaml index 87ee3834cd..a97474f729 100644 --- a/bitnami/argo-cd/Chart.yaml +++ b/bitnami/argo-cd/Chart.yaml @@ -30,4 +30,4 @@ sources: - https://github.com/argoproj/argo-cd/ - https://github.com/bitnami/bitnami-docker-dex - https://github.com/dexidp/dex -version: 2.0.0 +version: 2.0.1 diff --git a/bitnami/argo-cd/templates/_helpers.tpl b/bitnami/argo-cd/templates/_helpers.tpl index 8f799a0e21..7103d86af6 100644 --- a/bitnami/argo-cd/templates/_helpers.tpl +++ b/bitnami/argo-cd/templates/_helpers.tpl @@ -59,8 +59,7 @@ Create a default fully qualified redis name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "argocd.redis.fullname" -}} -{{- $name := default "redis" .Values.redis.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- include "common.names.dependency.fullname" (dict "chartName" "redis" "chartValues" .Values.redis "context" $) -}} {{- end -}} {{/* diff --git a/bitnami/wordpress/Chart.lock b/bitnami/wordpress/Chart.lock index 3e14129dbc..65fcb97a40 100644 --- a/bitnami/wordpress/Chart.lock +++ b/bitnami/wordpress/Chart.lock @@ -9,4 +9,4 @@ dependencies: repository: https://charts.bitnami.com/bitnami version: 1.9.1 digest: sha256:e4610a10040e335781fe14c9aa5f2955515da01856bc746ea2e9e0a3045a923f -generated: "2021-09-22T21:05:13.081935963Z" +generated: "2021-09-23T08:22:02.655023638Z" diff --git a/bitnami/wordpress/Chart.yaml b/bitnami/wordpress/Chart.yaml index 088e92a8b9..8ffb127575 100644 --- a/bitnami/wordpress/Chart.yaml +++ b/bitnami/wordpress/Chart.yaml @@ -35,4 +35,4 @@ name: wordpress sources: - https://github.com/bitnami/bitnami-docker-wordpress - https://wordpress.org/ -version: 12.1.15 +version: 12.1.16 diff --git a/bitnami/wordpress/templates/_helpers.tpl b/bitnami/wordpress/templates/_helpers.tpl index 663cb8d4b5..7a58a9efb5 100755 --- a/bitnami/wordpress/templates/_helpers.tpl +++ b/bitnami/wordpress/templates/_helpers.tpl @@ -5,7 +5,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "wordpress.mariadb.fullname" -}} -{{- printf "%s-mariadb" .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- include "common.names.dependency.fullname" (dict "chartName" "mariadb" "chartValues" .Values.mariadb "context" $) -}} {{- end -}} {{/* @@ -13,7 +13,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "wordpress.memcached.fullname" -}} -{{- printf "%s-memcached" .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- include "common.names.dependency.fullname" (dict "chartName" "memcached" "chartValues" .Values.memcached "context" $) -}} {{- end -}} {{/*