Skip to content

Commit cbabe42

Browse files
authoredSep 22, 2023
[bitnami/minio]: Fix ingress TLS configuration (#19451)
1 parent 338a3d5 commit cbabe42

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed
 

‎bitnami/minio/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ maintainers:
3434
name: minio
3535
sources:
3636
- https://github.com/bitnami/charts/tree/main/bitnami/minio
37-
version: 12.8.7
37+
version: 12.8.8

‎bitnami/minio/templates/api-ingress.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ spec:
4545
{{- if .Values.apiIngress.extraRules }}
4646
{{- include "common.tplvalues.render" (dict "value" .Values.apiIngress.extraRules "context" $) | nindent 4 }}
4747
{{- end }}
48-
{{- if or (and .Values.apiIngress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" $annotations )) .Values.apiIngress.selfSigned)) .Values.apiIngress.extraTls }}
48+
{{- $annotationsMap := include "common.tplvalues.render" (dict "value" $annotations "context" $) | fromYaml }}
49+
{{- if or (and .Values.apiIngress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" $annotationsMap )) .Values.apiIngress.selfSigned)) .Values.apiIngress.extraTls }}
4950
tls:
50-
{{- if and .Values.apiIngress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" $annotations )) .Values.apiIngress.selfSigned) }}
51+
{{- if and .Values.apiIngress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" $annotationsMap )) .Values.apiIngress.selfSigned) }}
5152
- hosts:
5253
- {{ include "minio.apiIngress.hostname" . }}
5354
secretName: {{ printf "%s-tls" (include "minio.apiIngress.hostname" .) }}

‎bitnami/minio/templates/ingress.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ spec:
4545
{{- if .Values.ingress.extraRules }}
4646
{{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraRules "context" $) | nindent 4 }}
4747
{{- end }}
48-
{{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" $annotations )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
48+
{{- $annotationsMap := include "common.tplvalues.render" (dict "value" $annotations "context" $) | fromYaml }}
49+
{{- if or (and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" $annotationsMap )) .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
4950
tls:
50-
{{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" $annotations )) .Values.ingress.selfSigned) }}
51+
{{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" $annotationsMap )) .Values.ingress.selfSigned) }}
5152
- hosts:
5253
- {{ include "minio.ingress.hostname" . }}
5354
secretName: {{ printf "%s-tls" (include "minio.ingress.hostname" .) }}

0 commit comments

Comments
 (0)
Please sign in to comment.