Fix Helm chart: rename minio.ingress to minioIngress to avoid subchart conflict
The minio.ingress config was conflicting with the Bitnami MinIO subchart's own ingress configuration, causing coalesce.go warnings. Renamed to minioIngress as a top-level config to avoid the collision.
This commit is contained in:
@@ -553,8 +553,7 @@ orchard:
|
||||
presignedUrlExpiry: 3600
|
||||
|
||||
# MinIO ingress (required for presigned URL downloads)
|
||||
minio:
|
||||
ingress:
|
||||
minioIngress:
|
||||
enabled: true
|
||||
className: "nginx"
|
||||
annotations:
|
||||
@@ -565,7 +564,7 @@ minio:
|
||||
secretName: minio-tls
|
||||
```
|
||||
|
||||
When `minio.ingress.enabled` is `true`, the S3 endpoint automatically uses the external URL (`https://minio.your-domain.com`), making presigned URLs accessible to external clients.
|
||||
When `minioIngress.enabled` is `true`, the S3 endpoint automatically uses the external URL (`https://minio.your-domain.com`), making presigned URLs accessible to external clients.
|
||||
|
||||
See `helm/orchard/values.yaml` for all configuration options.
|
||||
|
||||
|
||||
@@ -111,11 +111,11 @@ MinIO internal host (for server-side operations)
|
||||
MinIO host (uses external URL if ingress enabled, for presigned URLs)
|
||||
*/}}
|
||||
{{- define "orchard.minio.host" -}}
|
||||
{{- if and .Values.minio.enabled .Values.minio.ingress.enabled .Values.minio.ingress.host }}
|
||||
{{- if .Values.minio.ingress.tls.enabled }}
|
||||
{{- printf "https://%s" .Values.minio.ingress.host }}
|
||||
{{- if and .Values.minio.enabled .Values.minioIngress.enabled .Values.minioIngress.host }}
|
||||
{{- if .Values.minioIngress.tls.enabled }}
|
||||
{{- printf "https://%s" .Values.minioIngress.host }}
|
||||
{{- else }}
|
||||
{{- printf "http://%s" .Values.minio.ingress.host }}
|
||||
{{- printf "http://%s" .Values.minioIngress.host }}
|
||||
{{- end }}
|
||||
{{- else if .Values.minio.enabled }}
|
||||
{{- printf "http://%s-minio:9000" .Release.Name }}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{{- if and .Values.minio.enabled .Values.minio.ingress.enabled -}}
|
||||
{{- if and .Values.minio.enabled .Values.minioIngress.enabled -}}
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
@@ -6,22 +6,22 @@ metadata:
|
||||
labels:
|
||||
{{- include "orchard.labels" . | nindent 4 }}
|
||||
app.kubernetes.io/component: minio
|
||||
{{- with .Values.minio.ingress.annotations }}
|
||||
{{- with .Values.minioIngress.annotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
{{- if .Values.minio.ingress.className }}
|
||||
ingressClassName: {{ .Values.minio.ingress.className }}
|
||||
{{- if .Values.minioIngress.className }}
|
||||
ingressClassName: {{ .Values.minioIngress.className }}
|
||||
{{- end }}
|
||||
{{- if .Values.minio.ingress.tls.enabled }}
|
||||
{{- if .Values.minioIngress.tls.enabled }}
|
||||
tls:
|
||||
- hosts:
|
||||
- {{ .Values.minio.ingress.host | quote }}
|
||||
secretName: {{ .Values.minio.ingress.tls.secretName }}
|
||||
- {{ .Values.minioIngress.host | quote }}
|
||||
secretName: {{ .Values.minioIngress.tls.secretName }}
|
||||
{{- end }}
|
||||
rules:
|
||||
- host: {{ .Values.minio.ingress.host | quote }}
|
||||
- host: {{ .Values.minioIngress.host | quote }}
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
|
||||
@@ -152,8 +152,9 @@ minio:
|
||||
persistence:
|
||||
enabled: false
|
||||
size: 50Gi
|
||||
# MinIO ingress for presigned URL access
|
||||
ingress:
|
||||
|
||||
# MinIO external ingress for presigned URL access (separate from subchart ingress)
|
||||
minioIngress:
|
||||
enabled: false
|
||||
className: "nginx"
|
||||
annotations:
|
||||
|
||||
Reference in New Issue
Block a user