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.

Also enabled minioIngress by default with host minio-orch-dev.common.global.bsf.tools
This commit is contained in:
Mondo Diaz
2025-12-16 12:28:49 -06:00
parent 8999552949
commit 9a0468e9d8
5 changed files with 35 additions and 33 deletions

View File

@@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added migration script `003_checksum_fields.sql` for existing databases (#25) - Added migration script `003_checksum_fields.sql` for existing databases (#25)
### Changed ### Changed
- Changed default download mode from `proxy` to `presigned` for better performance (#48) - Changed default download mode from `proxy` to `presigned` for better performance (#48)
### Fixed
- Fixed Helm chart `minio.ingress` conflicting with Bitnami MinIO subchart by renaming to `minioIngress` (#48)
## [0.2.0] - 2025-12-15 ## [0.2.0] - 2025-12-15
### Changed ### Changed

View File

@@ -553,8 +553,7 @@ orchard:
presignedUrlExpiry: 3600 presignedUrlExpiry: 3600
# MinIO ingress (required for presigned URL downloads) # MinIO ingress (required for presigned URL downloads)
minio: minioIngress:
ingress:
enabled: true enabled: true
className: "nginx" className: "nginx"
annotations: annotations:
@@ -565,7 +564,7 @@ minio:
secretName: minio-tls 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. See `helm/orchard/values.yaml` for all configuration options.

View File

@@ -111,11 +111,11 @@ MinIO internal host (for server-side operations)
MinIO host (uses external URL if ingress enabled, for presigned URLs) MinIO host (uses external URL if ingress enabled, for presigned URLs)
*/}} */}}
{{- define "orchard.minio.host" -}} {{- define "orchard.minio.host" -}}
{{- if and .Values.minio.enabled .Values.minio.ingress.enabled .Values.minio.ingress.host }} {{- if and .Values.minio.enabled .Values.minioIngress.enabled .Values.minioIngress.host }}
{{- if .Values.minio.ingress.tls.enabled }} {{- if .Values.minioIngress.tls.enabled }}
{{- printf "https://%s" .Values.minio.ingress.host }} {{- printf "https://%s" .Values.minioIngress.host }}
{{- else }} {{- else }}
{{- printf "http://%s" .Values.minio.ingress.host }} {{- printf "http://%s" .Values.minioIngress.host }}
{{- end }} {{- end }}
{{- else if .Values.minio.enabled }} {{- else if .Values.minio.enabled }}
{{- printf "http://%s-minio:9000" .Release.Name }} {{- printf "http://%s-minio:9000" .Release.Name }}

View File

@@ -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 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
@@ -6,22 +6,22 @@ metadata:
labels: labels:
{{- include "orchard.labels" . | nindent 4 }} {{- include "orchard.labels" . | nindent 4 }}
app.kubernetes.io/component: minio app.kubernetes.io/component: minio
{{- with .Values.minio.ingress.annotations }} {{- with .Values.minioIngress.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.minio.ingress.className }} {{- if .Values.minioIngress.className }}
ingressClassName: {{ .Values.minio.ingress.className }} ingressClassName: {{ .Values.minioIngress.className }}
{{- end }} {{- end }}
{{- if .Values.minio.ingress.tls.enabled }} {{- if .Values.minioIngress.tls.enabled }}
tls: tls:
- hosts: - hosts:
- {{ .Values.minio.ingress.host | quote }} - {{ .Values.minioIngress.host | quote }}
secretName: {{ .Values.minio.ingress.tls.secretName }} secretName: {{ .Values.minioIngress.tls.secretName }}
{{- end }} {{- end }}
rules: rules:
- host: {{ .Values.minio.ingress.host | quote }} - host: {{ .Values.minioIngress.host | quote }}
http: http:
paths: paths:
- path: / - path: /

View File

@@ -152,14 +152,15 @@ minio:
persistence: persistence:
enabled: false enabled: false
size: 50Gi size: 50Gi
# MinIO ingress for presigned URL access
ingress: # MinIO external ingress for presigned URL access (separate from subchart ingress)
enabled: false minioIngress:
enabled: true
className: "nginx" className: "nginx"
annotations: annotations:
cert-manager.io/cluster-issuer: "letsencrypt" cert-manager.io/cluster-issuer: "letsencrypt"
nginx.ingress.kubernetes.io/proxy-body-size: "0" # Disable body size limit for uploads nginx.ingress.kubernetes.io/proxy-body-size: "0" # Disable body size limit for uploads
host: "" # e.g., minio.your-domain.com host: "minio-orch-dev.common.global.bsf.tools"
tls: tls:
enabled: true enabled: true
secretName: minio-tls secretName: minio-tls