[bitnami/*] Make use of new "common.ingress.certManagerRequest" helper (#8862)

2026-02-19 11:37:23 +08:00 · 2022-02-02 09:19:24 +01:00
parent 5b659dea76
commit 12e4c3733e
74 changed files with 125 additions and 296 deletions
--- a/bitnami/argo-workflows/Chart.lock
+++ b/bitnami/argo-workflows/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
  version: 8.8.23
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.4
-digest: sha256:db6191b7644160c0ac424b386840e875b162466f883678e8a7bd622dee56ea9e
-generated: "2022-01-28T03:53:41.80369135Z"
+  version: 1.11.0
+digest: sha256:08c8e06a935969ef0d55ce7e31fa2853f8daabd384b926ba9a34c3b58b25c187
+generated: "2022-02-01T17:57:12.919266+01:00"
--- a/bitnami/argo-workflows/Chart.yaml
+++ b/bitnami/argo-workflows/Chart.yaml
@@ -35,4 +35,4 @@ sources:
  - https://github.com/bitnami/bitnami-docker-argo-workflow-controller
  - https://github.com/bitnami/bitnami-docker-argo-workflow-exec
  - https://argoproj.github.io/workflows/
-version: 0.2.3
+version: 0.2.4
--- a/bitnami/argo-workflows/templates/_helpers.tpl
+++ b/bitnami/argo-workflows/templates/_helpers.tpl
@@ -228,16 +228,6 @@ Validate database configuration
 {{- end -}}
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "argo-workflows.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Compile all warnings into a single message.
 */}}
--- a/bitnami/argo-workflows/templates/server/ingress.yaml
+++ b/bitnami/argo-workflows/templates/server/ingress.yaml
@@ -56,9 +56,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "argo-workflows.server.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "argo-workflows.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-   {{- if and .Values.ingress.tls (or (include "argo-workflows.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+   {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/consul/Chart.lock
+++ b/bitnami/consul/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.3
-digest: sha256:710e8247ae70ea63a2fb2fde4320511ff28c7b5c7a738861427f104a7718bdf4
-generated: "2021-12-14T04:45:40.913654993Z"
+  version: 1.11.0
+digest: sha256:302ab7d6834685503ff1250e55d67e85ae40a4c53cf02a94e7026f6a8b7550e3
+generated: "2022-02-01T17:57:22.012733+01:00"
--- a/bitnami/consul/Chart.yaml
+++ b/bitnami/consul/Chart.yaml
@@ -23,4 +23,4 @@ name: consul
 sources:
  - https://github.com/bitnami/bitnami-docker-consul
  - https://www.consul.io/
-version: 10.2.3
+version: 10.2.4
--- a/bitnami/consul/templates/_helpers.tpl
+++ b/bitnami/consul/templates/_helpers.tpl
@@ -60,13 +60,3 @@ Return true if a configmap object should be created for Consul
 {{- else -}}
 {{- end -}}
 {{- end -}}
-
-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "consul.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
--- a/bitnami/consul/templates/ingress.yaml
+++ b/bitnami/consul/templates/ingress.yaml
@@ -43,9 +43,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-ui" (include "common.names.fullname" $)) "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "consul.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or .Values.ingress.existingSecret (include "consul.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or .Values.ingress.existingSecret (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      {{- if .Values.ingress.existingSecret }}
--- a/bitnami/geode/Chart.lock
+++ b/bitnami/geode/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.4
-digest: sha256:e177cdcd71e67a1e64e95260c4b780374e1d66e85be405d5dc58459654e49ffa
-generated: "2022-01-21T13:16:12.664620637Z"
+  version: 1.11.0
+digest: sha256:302ab7d6834685503ff1250e55d67e85ae40a4c53cf02a94e7026f6a8b7550e3
+generated: "2022-02-01T17:57:28.724417+01:00"
--- a/bitnami/geode/Chart.yaml
+++ b/bitnami/geode/Chart.yaml
@@ -22,4 +22,4 @@ name: geode
 sources:
  - https://github.com/bitnami/bitnami-docker-geode
  - https://github.com/apache/geode
-version: 0.4.4
+version: 0.4.5
--- a/bitnami/geode/templates/_helpers.tpl
+++ b/bitnami/geode/templates/_helpers.tpl
@@ -137,16 +137,6 @@ Return true if a ConfigMap object should be created for Cache server Log4J confi
 {{- end -}}
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "geode.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Compile all warnings into a single message.
 */}}
--- a/bitnami/geode/templates/ingress.yaml
+++ b/bitnami/geode/templates/ingress.yaml
@@ -40,9 +40,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-locator" (include "common.names.fullname" .)) "servicePort" "http" "context" $)  | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "geode.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "geode.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/ghost/Chart.yaml
+++ b/bitnami/ghost/Chart.yaml
@@ -33,4 +33,4 @@ name: ghost
 sources:
  - https://github.com/bitnami/bitnami-docker-ghost
  - https://www.ghost.org/
-version: 16.0.6
+version: 16.0.7
--- a/bitnami/ghost/templates/_helpers.tpl
+++ b/bitnami/ghost/templates/_helpers.tpl
@@ -146,13 +146,3 @@ ghost: database
       externalDatabase.port=DB_SERVER_PORT
 {{- end -}}
 {{- end -}}
-
-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "ghost.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
--- a/bitnami/ghost/templates/ingress.yaml
+++ b/bitnami/ghost/templates/ingress.yaml
@@ -49,9 +49,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" (ternary "https" "http" $.Values.ghostEnableHttps) "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "ghost.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "ghost.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/grafana/Chart.lock
+++ b/bitnami/grafana/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.3
-digest: sha256:710e8247ae70ea63a2fb2fde4320511ff28c7b5c7a738861427f104a7718bdf4
-generated: "2021-12-01T18:56:42.216754964Z"
+  version: 1.11.0
+digest: sha256:302ab7d6834685503ff1250e55d67e85ae40a4c53cf02a94e7026f6a8b7550e3
+generated: "2022-02-01T17:57:44.141679+01:00"
--- a/bitnami/grafana/Chart.yaml
+++ b/bitnami/grafana/Chart.yaml
@@ -24,4 +24,4 @@ name: grafana
 sources:
  - https://github.com/bitnami/bitnami-docker-grafana
  - https://grafana.com/
-version: 7.6.4
+version: 7.6.5
--- a/bitnami/grafana/templates/_helpers.tpl
+++ b/bitnami/grafana/templates/_helpers.tpl
@@ -123,16 +123,6 @@ is true or default otherwise.
    {{- end -}}
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "grafana.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Validate values for Grafana.
 */}}
--- a/bitnami/grafana/templates/ingress.yaml
+++ b/bitnami/grafana/templates/ingress.yaml
@@ -49,9 +49,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "grafana.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "grafana.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/jupyterhub/Chart.lock
+++ b/bitnami/jupyterhub/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.3
+  version: 1.11.0
 - name: postgresql
  repository: https://charts.bitnami.com/bitnami
-  version: 10.15.1
-digest: sha256:6c5e4784ff524976d576bb0014668886f724a77d18643f1cbee11ae85c6adcdb
-generated: "2022-01-12T05:11:43.220177855Z"
+  version: 10.16.2
+digest: sha256:4a595ba85359abfef7c618d5b69e3bbcfe95c4747cf37ce0839bfcae0f2c1dd6
+generated: "2022-02-01T17:57:51.644295+01:00"
--- a/bitnami/jupyterhub/Chart.yaml
+++ b/bitnami/jupyterhub/Chart.yaml
@@ -26,4 +26,4 @@ name: jupyterhub
 sources:
  - https://github.com/bitnami/bitnami-docker-jupyterhub
  - https://github.com/jupyterhub/jupyterhub
-version: 0.4.3
+version: 0.4.4
--- a/bitnami/jupyterhub/templates/_helpers.tpl
+++ b/bitnami/jupyterhub/templates/_helpers.tpl
@@ -214,13 +214,3 @@ Compile all warnings into a single message.
 {{-   printf "\nVALUES VALIDATION:\n%s" $message -}}
 {{- end -}}
 {{- end -}}
-
-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "jupyterhub.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
--- a/bitnami/jupyterhub/templates/proxy/ingress.yaml
+++ b/bitnami/jupyterhub/templates/proxy/ingress.yaml
@@ -47,9 +47,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or .Values.proxy.ingress.tls .Values.proxy.ingress.extraTls }}
+  {{- if or (and .Values.proxy.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.proxy.ingress.annotations )) .Values.proxy.ingress.selfSigned)) .Values.proxy.ingress.extraTls }}
  tls:
-    {{- if and .Values.proxy.ingress.tls (or (include "jupyterhub.ingress.certManagerRequest" .Values.proxy.ingress.annotations) .Values.proxy.ingress.selfSigned) }}
+    {{- if and .Values.proxy.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.proxy.ingress.annotations )) .Values.proxy.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.proxy.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.proxy.ingress.hostname }}
--- a/bitnami/keycloak/Chart.lock
+++ b/bitnami/keycloak/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.4
+  version: 1.11.0
 - name: postgresql
  repository: https://charts.bitnami.com/bitnami
  version: 10.16.2
-digest: sha256:95f289054240185bb38f87e5359b4cc4ae49fbb0b12d28b069bbf94ac71e464d
-generated: "2022-01-25T18:27:04.747528155Z"
+digest: sha256:4a595ba85359abfef7c618d5b69e3bbcfe95c4747cf37ce0839bfcae0f2c1dd6
+generated: "2022-02-01T17:58:00.511651+01:00"
--- a/bitnami/keycloak/Chart.yaml
+++ b/bitnami/keycloak/Chart.yaml
@@ -26,4 +26,4 @@ name: keycloak
 sources:
  - https://github.com/bitnami/bitnami-docker-keycloak
  - https://github.com/keycloak/keycloak
-version: 6.1.2
+version: 6.1.3
--- a/bitnami/keycloak/templates/_helpers.tpl
+++ b/bitnami/keycloak/templates/_helpers.tpl
@@ -201,16 +201,6 @@ Return true if a TLS secret object should be created
 {{- end -}}
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "keycloak.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Compile all warnings into a single message.
 */}}
--- a/bitnami/keycloak/templates/ingress.yaml
+++ b/bitnami/keycloak/templates/ingress.yaml
@@ -44,9 +44,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "keycloak.fullname" $) "servicePort" $.Values.ingress.servicePort "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "keycloak.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "keycloak.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/kubeapps/Chart.lock
+++ b/bitnami/kubeapps/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.3
+  version: 1.11.0
 - name: postgresql
  repository: https://charts.bitnami.com/bitnami
-  version: 10.15.1
+  version: 10.16.2
 - name: redis
  repository: https://charts.bitnami.com/bitnami
-  version: 15.7.2
-digest: sha256:d6e0627ab556444b5658c8e49bdc27f73dc3cc14c76c60b2997c22ade92d598d
-generated: "2022-01-11T08:18:34.643908773Z"
+  version: 15.7.6
+digest: sha256:4102035f8d115bb5ea6d4bc51767abbee940de90425077245ecc8117567561bf
+generated: "2022-02-01T17:58:10.326513+01:00"
--- a/bitnami/kubeapps/Chart.yaml
+++ b/bitnami/kubeapps/Chart.yaml
@@ -33,4 +33,4 @@ maintainers:
 name: kubeapps
 sources:
  - https://github.com/kubeapps/kubeapps
-version: 7.7.2
+version: 7.7.3
--- a/bitnami/kubeapps/templates/_helpers.tpl
+++ b/bitnami/kubeapps/templates/_helpers.tpl
@@ -186,17 +186,6 @@ Return the Redis secret name
  {{- end -}}
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "kubeapps.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
-
 {{/*
 Compile all warnings into a single message, and call fail.
 */}}
@@ -215,7 +204,7 @@ Compile all warnings into a single message, and call fail.
 Validate values of Kubeapps - TLS configuration for Ingress
 */}}
 {{- define "kubeapps.validateValues.ingress.tls" -}}
-{{- if and .Values.ingress.enabled .Values.ingress.tls (not (include "kubeapps.ingress.certManagerRequest" .Values.ingress.annotations)) (not .Values.ingress.selfSigned) (empty .Values.ingress.extraTls) }}
+{{- if and .Values.ingress.enabled .Values.ingress.tls (not (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations ))) (not .Values.ingress.selfSigned) (empty .Values.ingress.extraTls) }}
 kubeapps: ingress.tls
    You enabled the TLS configuration for the default ingress hostname but
    you did not enable any of the available mechanisms to create the TLS secret
--- a/bitnami/kubeapps/templates/ingress.yaml
+++ b/bitnami/kubeapps/templates/ingress.yaml
@@ -51,9 +51,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $)  | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "kubeapps.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "kubeapps.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/minio/Chart.lock
+++ b/bitnami/minio/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.4
-digest: sha256:e177cdcd71e67a1e64e95260c4b780374e1d66e85be405d5dc58459654e49ffa
-generated: "2022-01-28T17:47:28.170475794Z"
+  version: 1.11.0
+digest: sha256:302ab7d6834685503ff1250e55d67e85ae40a4c53cf02a94e7026f6a8b7550e3
+generated: "2022-02-01T17:58:19.34878+01:00"
--- a/bitnami/minio/Chart.yaml
+++ b/bitnami/minio/Chart.yaml
@@ -25,4 +25,4 @@ name: minio
 sources:
  - https://github.com/bitnami/bitnami-docker-minio
  - https://min.io
-version: 10.1.1
+version: 10.1.2
--- a/bitnami/minio/templates/_helpers.tpl
+++ b/bitnami/minio/templates/_helpers.tpl
@@ -171,16 +171,6 @@ is true or default otherwise.
    {{- end -}}
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "minio.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Compile all warnings into a single message, and call fail.
 */}}
--- a/bitnami/minio/templates/ingress.yaml
+++ b/bitnami/minio/templates/ingress.yaml
@@ -43,9 +43,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "minio-console" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "minio.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "minio.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/nats/Chart.lock
+++ b/bitnami/nats/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.3
-digest: sha256:710e8247ae70ea63a2fb2fde4320511ff28c7b5c7a738861427f104a7718bdf4
-generated: "2021-12-02T22:16:14.767087168Z"
+  version: 1.11.0
+digest: sha256:302ab7d6834685503ff1250e55d67e85ae40a4c53cf02a94e7026f6a8b7550e3
+generated: "2022-02-01T17:58:25.897081+01:00"
--- a/bitnami/nats/Chart.yaml
+++ b/bitnami/nats/Chart.yaml
@@ -24,4 +24,4 @@ name: nats
 sources:
  - https://github.com/bitnami/bitnami-docker-nats
  - https://nats.io/
-version: 7.1.3
+version: 7.1.4
--- a/bitnami/nats/templates/_helpers.tpl
+++ b/bitnami/nats/templates/_helpers.tpl
@@ -49,16 +49,6 @@ Return the NATS configuration secret name
 {{- end -}}
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "nats.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Compile all warnings into a single message, and call fail.
 */}}
--- a/bitnami/nats/templates/ingress.yaml
+++ b/bitnami/nats/templates/ingress.yaml
@@ -44,9 +44,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "tcp-monitoring" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "nats.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "nats.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/odoo/Chart.lock
+++ b/bitnami/odoo/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: postgresql
  repository: https://charts.bitnami.com/bitnami
-  version: 10.15.1
+  version: 10.16.2
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.3
-digest: sha256:64fcc1ffbb0c358eb75b33b690ede740465ef2eb5c26467ba522e3f959d00618
-generated: "2022-01-09T05:19:40.009797605Z"
+  version: 1.11.0
+digest: sha256:f7f0ae3f2661b089399e2cd49458bba2b0b88dd03242d95a7b5d718c6fca5292
+generated: "2022-02-01T17:58:33.421087+01:00"
--- a/bitnami/odoo/Chart.yaml
+++ b/bitnami/odoo/Chart.yaml
@@ -27,4 +27,4 @@ name: odoo
 sources:
  - https://github.com/bitnami/bitnami-docker-odoo
  - https://www.odoo.com/
-version: 20.2.4
+version: 20.2.5
--- a/bitnami/odoo/templates/_helpers.tpl
+++ b/bitnami/odoo/templates/_helpers.tpl
@@ -135,13 +135,3 @@ Return the SMTP Secret Name
    {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
-
-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "odoo.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
--- a/bitnami/odoo/templates/ingress.yaml
+++ b/bitnami/odoo/templates/ingress.yaml
@@ -45,9 +45,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "odoo.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "odoo.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "odoo.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/rabbitmq/Chart.lock
+++ b/bitnami/rabbitmq/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.4
-digest: sha256:e177cdcd71e67a1e64e95260c4b780374e1d66e85be405d5dc58459654e49ffa
-generated: "2022-02-01T15:29:23.039004591Z"
+  version: 1.11.0
+digest: sha256:302ab7d6834685503ff1250e55d67e85ae40a4c53cf02a94e7026f6a8b7550e3
+generated: "2022-02-01T17:58:41.12945+01:00"
--- a/bitnami/rabbitmq/Chart.yaml
+++ b/bitnami/rabbitmq/Chart.yaml
@@ -23,4 +23,4 @@ name: rabbitmq
 sources:
  - https://github.com/bitnami/bitnami-docker-rabbitmq
  - https://www.rabbitmq.com
-version: 8.28.0
+version: 8.28.1
--- a/bitnami/rabbitmq/templates/_helpers.tpl
+++ b/bitnami/rabbitmq/templates/_helpers.tpl
@@ -151,16 +151,6 @@ Usage:
 {{- end }}
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "rabbitmq.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Compile all warnings into a single message, and call fail.
 */}}
@@ -230,7 +220,7 @@ rabbitmq: memoryHighWatermark
 Validate values of rabbitmq - TLS configuration for Ingress
 */}}
 {{- define "rabbitmq.validateValues.ingress.tls" -}}
-{{- if and .Values.ingress.enabled .Values.ingress.tls (not (include "rabbitmq.ingress.certManagerRequest" .Values.ingress.annotations)) (not .Values.ingress.selfSigned) (empty .Values.ingress.extraTls) }}
+{{- if and .Values.ingress.enabled .Values.ingress.tls (not (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations ))) (not .Values.ingress.selfSigned) (empty .Values.ingress.extraTls) }}
 rabbitmq: ingress.tls
    You enabled the TLS configuration for the default ingress hostname but
    you did not enable any of the available mechanisms to create the TLS secret
@@ -242,8 +232,8 @@ rabbitmq: ingress.tls
 {{- end -}}
 {{- end -}}

-{{/* 
-Validate values of RabbitMQ - Auth TLS enabled 
+{{/*
+Validate values of RabbitMQ - Auth TLS enabled
 */}}
 {{- define "rabbitmq.validateValues.auth.tls" -}}
 {{- if and .Values.auth.tls.enabled (not .Values.auth.tls.autoGenerated) (not .Values.auth.tls.existingSecret) (not .Values.auth.tls.caCertificate) (not .Values.auth.tls.serverCertificate) (not .Values.auth.tls.serverKey) }}
--- a/bitnami/rabbitmq/templates/ingress.yaml
+++ b/bitnami/rabbitmq/templates/ingress.yaml
@@ -43,9 +43,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http-stats" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "rabbitmq.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "rabbitmq.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/redmine/Chart.lock
+++ b/bitnami/redmine/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.3
+  version: 1.11.0
 - name: mariadb
  repository: https://charts.bitnami.com/bitnami
  version: 9.8.1
 - name: postgresql
  repository: https://charts.bitnami.com/bitnami
-  version: 10.16.1
-digest: sha256:3bc53dd1435fc298495f03bd667bb596f45607887c06458c8a2868024eb02f1b
-generated: "2022-01-15T17:51:04.387367964Z"
+  version: 10.16.2
+digest: sha256:9850c11539f2c818b1586acec2426534ba916a4375be53710d1455e78eccbc6f
+generated: "2022-02-01T17:58:49.573266+01:00"
--- a/bitnami/redmine/Chart.yaml
+++ b/bitnami/redmine/Chart.yaml
@@ -36,4 +36,4 @@ name: redmine
 sources:
  - https://github.com/bitnami/bitnami-docker-redmine
  - https://www.redmine.org/
-version: 17.2.3
+version: 17.2.4
--- a/bitnami/redmine/templates/_helpers.tpl
+++ b/bitnami/redmine/templates/_helpers.tpl
@@ -168,13 +168,3 @@ Return the name of the database secret with its credentials
    {{- end -}}
 {{- end -}}
 {{- end -}}
-
-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "redmine.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
--- a/bitnami/redmine/templates/ingress.yaml
+++ b/bitnami/redmine/templates/ingress.yaml
@@ -48,9 +48,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "redmine.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "redmine.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/solr/Chart.lock
+++ b/bitnami/solr/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: zookeeper
  repository: https://charts.bitnami.com/bitnami
-  version: 8.0.0
+  version: 8.0.1
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.3
-digest: sha256:dc574a63a961c8d4c95e3675c9f3bc7adf8bf2d467d1eb76425928cce03d5389
-generated: "2022-01-18T13:10:34.390931+01:00"
+  version: 1.11.0
+digest: sha256:8fcef9a7aaab7452cc153ba172038b68888b8d8bcd1615d8b911eaca956b5471
+generated: "2022-02-01T17:58:59.755144+01:00"
--- a/bitnami/solr/Chart.yaml
+++ b/bitnami/solr/Chart.yaml
@@ -27,4 +27,4 @@ name: solr
 sources:
  - https://github.com/bitnami/bitnami-docker-solr
  - https://lucene.apache.org/solr/
-version: 3.0.2
+version: 3.0.3
--- a/bitnami/solr/templates/_helpers.tpl
+++ b/bitnami/solr/templates/_helpers.tpl
@@ -142,16 +142,6 @@ Return true if a TLS credentials secret object should be created
 {{- end -}}
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "solr.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Compile all warnings into a single message.
 */}}
--- a/bitnami/solr/templates/ingress.yaml
+++ b/bitnami/solr/templates/ingress.yaml
@@ -43,9 +43,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "tcp-client" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "solr.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "solr.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/sonarqube/Chart.lock
+++ b/bitnami/sonarqube/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
  version: 10.16.2
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.4
-digest: sha256:e119f0198a30be0e69ff6db0769a553802bdab0c77ca42f9e22b29fa4895b497
-generated: "2022-01-31T18:00:27.587633789Z"
+  version: 1.11.0
+digest: sha256:debf437290ff095a6a5a0aa094ed4fa36c14782d9be68ba577eacf906f3501a8
+generated: "2022-02-01T17:59:08.828686+01:00"
--- a/bitnami/sonarqube/Chart.yaml
+++ b/bitnami/sonarqube/Chart.yaml
@@ -28,4 +28,4 @@ name: sonarqube
 sources:
  - https://github.com/bitnami/bitnami-docker-sonarqube
  - https://github.com/SonarSource/sonarqube
-version: 0.2.5
+version: 0.2.6
--- a/bitnami/sonarqube/templates/_helpers.tpl
+++ b/bitnami/sonarqube/templates/_helpers.tpl
@@ -155,16 +155,6 @@ if [[ "$DESIRED" -gt "$CURRENT" ]]; then
 fi
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "sonarqube.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Compile all warnings into a single message.
 */}}
--- a/bitnami/sonarqube/templates/ingress.yaml
+++ b/bitnami/sonarqube/templates/ingress.yaml
@@ -45,9 +45,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "sonarqube.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "sonarqube.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
--- a/bitnami/thanos/Chart.lock
+++ b/bitnami/thanos/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.3
+  version: 1.11.0
 - name: minio
  repository: https://charts.bitnami.com/bitnami
-  version: 10.0.1
-digest: sha256:22248fd2a94a2025139b3ea484217773b7e8d4f14c450442bc96a77d544692bf
-generated: "2022-01-17T08:41:26.513006742Z"
+  version: 10.1.1
+digest: sha256:8c901cd78c7f1e03b539231a4711251420876255f5e346ccf991796177feda26
+generated: "2022-02-01T17:59:18.078356+01:00"
--- a/bitnami/thanos/Chart.yaml
+++ b/bitnami/thanos/Chart.yaml
@@ -28,4 +28,4 @@ name: thanos
 sources:
  - https://github.com/bitnami/bitnami-docker-thanos
  - https://thanos.io
-version: 9.0.2
+version: 9.0.3
--- a/bitnami/thanos/templates/_helpers.tpl
+++ b/bitnami/thanos/templates/_helpers.tpl
@@ -371,13 +371,3 @@ Usage:
 {{- end -}}
 {{- end -}}
 {{- end -}}
-
-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "thanos.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
--- a/bitnami/thanos/templates/bucketweb/ingress.yaml
+++ b/bitnami/thanos/templates/bucketweb/ingress.yaml
@@ -41,9 +41,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-%s"  (include "common.names.fullname" $) "bucketweb") "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.bucketweb.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.bucketweb.ingress.annotations) .Values.bucketweb.ingress.selfSigned)) .Values.bucketweb.ingress.extraTls }}
+  {{- if or (and .Values.bucketweb.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.bucketweb.ingress.annotations )) .Values.bucketweb.ingress.selfSigned)) .Values.bucketweb.ingress.extraTls }}
  tls:
-    {{- if and .Values.bucketweb.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.bucketweb.ingress.annotations) .Values.bucketweb.ingress.selfSigned) }}
+    {{- if and .Values.bucketweb.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.bucketweb.ingress.annotations )) .Values.bucketweb.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.bucketweb.ingress.hostname }}
      secretName: {{ printf "%s-tls" .Values.bucketweb.ingress.hostname }}
--- a/bitnami/thanos/templates/compactor/ingress.yaml
+++ b/bitnami/thanos/templates/compactor/ingress.yaml
@@ -41,9 +41,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-%s"  (include "common.names.fullname" .) "compactor") "servicePort" "http" "context" $)  | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.compactor.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.compactor.ingress.annotations) .Values.compactor.ingress.selfSigned)) .Values.compactor.ingress.extraTls }}
+  {{- if or (and .Values.compactor.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.compactor.ingress.annotations )) .Values.compactor.ingress.selfSigned)) .Values.compactor.ingress.extraTls }}
  tls:
-    {{- if and .Values.compactor.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.compactor.ingress.annotations) .Values.compactor.ingress.selfSigned) }}
+    {{- if and .Values.compactor.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.compactor.ingress.annotations )) .Values.compactor.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.compactor.ingress.hostname }}
      secretName: {{ printf "%s-tls" .Values.compactor.ingress.hostname }}
--- a/bitnami/thanos/templates/query-frontend/ingress.yaml
+++ b/bitnami/thanos/templates/query-frontend/ingress.yaml
@@ -41,9 +41,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-%s"  (include "common.names.fullname" $) "query-frontend") "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.queryFrontend.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.queryFrontend.ingress.annotations) .Values.queryFrontend.ingress.selfSigned)) .Values.queryFrontend.ingress.extraTls }}
+  {{- if or (and .Values.queryFrontend.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.queryFrontend.ingress.annotations )) .Values.queryFrontend.ingress.selfSigned)) .Values.queryFrontend.ingress.extraTls }}
  tls:
-    {{- if and .Values.queryFrontend.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.queryFrontend.ingress.annotations) .Values.queryFrontend.ingress.selfSigned) }}
+    {{- if and .Values.queryFrontend.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.queryFrontend.ingress.annotations )) .Values.queryFrontend.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.queryFrontend.ingress.hostname }}
      secretName: {{ printf "%s-query-frontend" (include "common.names.fullname" .) }}
--- a/bitnami/thanos/templates/query/ingress-grpc.yaml
+++ b/bitnami/thanos/templates/query/ingress-grpc.yaml
@@ -41,9 +41,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-%s"  (include "common.names.fullname" $) "query") "servicePort" "grpc" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.query.ingress.grpc.tls (or (include "thanos.ingress.certManagerRequest" .Values.query.ingress.grpc.annotations) .Values.query.ingress.grpc.selfSigned)) .Values.query.ingress.grpc.extraTls }}
+  {{- if or (and .Values.query.ingress.grpc.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.query.ingress.grpc.annotations )) .Values.query.ingress.grpc.selfSigned)) .Values.query.ingress.grpc.extraTls }}
  tls:
-    {{- if and .Values.query.ingress.grpc.tls (or (include "thanos.ingress.certManagerRequest" .Values.query.ingress.grpc.annotations) .Values.query.ingress.grpc.selfSigned) }}
+    {{- if and .Values.query.ingress.grpc.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.query.ingress.grpc.annotations )) .Values.query.ingress.grpc.selfSigned) }}
    - hosts:
        - {{ .Values.query.ingress.grpc.hostname }}
      secretName: {{ printf "%s-tls" .Values.query.ingress.grpc.hostname }}
--- a/bitnami/thanos/templates/query/ingress.yaml
+++ b/bitnami/thanos/templates/query/ingress.yaml
@@ -41,9 +41,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-%s"  (include "common.names.fullname" $) "query") "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.query.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.query.ingress.annotations) .Values.query.ingress.selfSigned)) .Values.query.ingress.extraTls }}
+  {{- if or (and .Values.query.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.query.ingress.annotations )) .Values.query.ingress.selfSigned)) .Values.query.ingress.extraTls }}
  tls:
-    {{- if and .Values.query.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.query.ingress.annotations) .Values.query.ingress.selfSigned) }}
+    {{- if and .Values.query.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.query.ingress.annotations )) .Values.query.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.query.ingress.hostname }}
      secretName: {{ printf "%s-tls" .Values.query.ingress.hostname }}
--- a/bitnami/thanos/templates/receive/ingress.yaml
+++ b/bitnami/thanos/templates/receive/ingress.yaml
@@ -47,9 +47,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-%s"  (include "common.names.fullname" $) "receive") "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.receive.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.receive.ingress.annotations) .Values.receive.ingress.selfSigned)) .Values.receive.ingress.extraTls }}
+  {{- if or (and .Values.receive.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.receive.ingress.annotations )) .Values.receive.ingress.selfSigned)) .Values.receive.ingress.extraTls }}
  tls:
-    {{- if and .Values.receive.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.receive.ingress.annotations) .Values.receive.ingress.selfSigned) }}
+    {{- if and .Values.receive.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.receive.ingress.annotations )) .Values.receive.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.receive.ingress.hostname }}
        {{- range .Values.receive.ingress.extraHosts }}
--- a/bitnami/thanos/templates/ruler/ingress.yaml
+++ b/bitnami/thanos/templates/ruler/ingress.yaml
@@ -41,9 +41,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-%s"  (include "common.names.fullname" $) "ruler") "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ruler.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.ruler.ingress.annotations) .Values.ruler.ingress.selfSigned)) .Values.ruler.ingress.extraTls }}
+  {{- if or (and .Values.ruler.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ruler.ingress.annotations )) .Values.ruler.ingress.selfSigned)) .Values.ruler.ingress.extraTls }}
  tls:
-    {{- if and .Values.ruler.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.ruler.ingress.annotations) .Values.ruler.ingress.selfSigned) }}
+    {{- if and .Values.ruler.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ruler.ingress.annotations )) .Values.ruler.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ruler.ingress.hostname }}
      secretName: {{ printf "%s-tls" .Values.ruler.ingress.hostname }}
--- a/bitnami/thanos/templates/storegateway/ingress.yaml
+++ b/bitnami/thanos/templates/storegateway/ingress.yaml
@@ -41,9 +41,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-%s"  (include "common.names.fullname" .) "storegateway") "servicePort" "http" "context" $)  | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.storegateway.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.storegateway.ingress.annotations) .Values.storegateway.ingress.selfSigned)) .Values.storegateway.ingress.extraTls }}
+  {{- if or (and .Values.storegateway.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.storegateway.ingress.annotations )) .Values.storegateway.ingress.selfSigned)) .Values.storegateway.ingress.extraTls }}
  tls:
-    {{- if and .Values.storegateway.ingress.tls (or (include "thanos.ingress.certManagerRequest" .Values.storegateway.ingress.annotations) .Values.storegateway.ingress.selfSigned) }}
+    {{- if and .Values.storegateway.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.storegateway.ingress.annotations )) .Values.storegateway.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.storegateway.ingress.hostname }}
      secretName: {{ printf "%s-tls" .Values.storegateway.ingress.hostname }}
--- a/bitnami/wordpress/Chart.lock
+++ b/bitnami/wordpress/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
  version: 10.3.2
 - name: memcached
  repository: https://charts.bitnami.com/bitnami
-  version: 6.0.1
+  version: 6.0.2
 - name: common
  repository: https://charts.bitnami.com/bitnami
-  version: 1.10.4
-digest: sha256:9a699a03bf56580dfa87a05e3193bc9d3305d631bc9779a25f061f013f7f25bf
-generated: "2022-01-21T12:45:34.090026092Z"
+  version: 1.11.0
+digest: sha256:00b89afe2cad73e35eef76a7d461a0d95b8d7fa8cd041ef3b43454a7e1cc650c
+generated: "2022-02-01T17:59:27.927632+01:00"
--- 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: 13.0.6
+version: 13.0.7
--- a/bitnami/wordpress/templates/_helpers.tpl
+++ b/bitnami/wordpress/templates/_helpers.tpl
@@ -213,16 +213,6 @@ Return the SMTP Secret Name
 {{- end -}}
 {{- end -}}

-{{/*
-Return true if cert-manager required annotations for TLS signed certificates are set in the Ingress annotations
-Ref: https://cert-manager.io/docs/usage/ingress/#supported-annotations
-*/}}
-{{- define "wordpress.ingress.certManagerRequest" -}}
-{{ if or (hasKey . "cert-manager.io/cluster-issuer") (hasKey . "cert-manager.io/issuer") }}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Compile all warnings into a single message.
 */}}
--- a/bitnami/wordpress/templates/ingress.yaml
+++ b/bitnami/wordpress/templates/ingress.yaml
@@ -43,9 +43,9 @@ spec:
            {{- end }}
            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
    {{- end }}
-  {{- if or (and .Values.ingress.tls (or (include "wordpress.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
+  {{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
  tls:
-    {{- if and .Values.ingress.tls (or (include "wordpress.ingress.certManagerRequest" .Values.ingress.annotations) .Values.ingress.selfSigned) }}
+    {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
    - hosts:
        - {{ .Values.ingress.hostname | quote }}
      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}