Просмотр исходного кода

[bitnami/minio] Missing references to common.ingress.certManagerRequest (#8895)

Juan Ariza Toledano 3 лет назад
Родитель
Сommit
dcec32e41d

+ 1 - 1
bitnami/minio/Chart.yaml

@@ -25,4 +25,4 @@ name: minio
 sources:
   - https://github.com/bitnami/bitnami-docker-minio
   - https://min.io
-version: 10.1.2
+version: 10.1.3

+ 2 - 2
bitnami/minio/templates/api-ingress.yaml

@@ -43,9 +43,9 @@ spec:
             {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "minio-api" "context" $) | nindent 14 }}
     {{- end }}
-  {{- if or (and .Values.apiIngress.tls (or (include "minio.ingress.certManagerRequest" .Values.apiIngress.annotations) .Values.apiIngress.selfSigned)) .Values.apiIngress.extraTls }}
+  {{- if or (and .Values.apiIngress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.apiIngress.annotations )) .Values.apiIngress.selfSigned)) .Values.apiIngress.extraTls }}
   tls:
-    {{- if and .Values.apiIngress.tls (or (include "minio.ingress.certManagerRequest" .Values.apiIngress.annotations) .Values.apiIngress.selfSigned) }}
+    {{- if and .Values.apiIngress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.apiIngress.annotations )) .Values.apiIngress.selfSigned) }}
     - hosts:
         - {{ .Values.apiIngress.hostname }}
       secretName: {{ printf "%s-tls" .Values.apiIngress.hostname }}

+ 2 - 2
template/CHART_NAME/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 "%%TEMPLATE_NAME%%.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 "%%TEMPLATE_NAME%%.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 }}