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

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fixed Helm chart `minio.ingress` conflicting with Bitnami MinIO subchart by renaming to `minioIngress` (#48)
+
+## [0.3.0] - 2025-12-15
+### Changed
+- Changed default download mode from `proxy` to `presigned` for better performance (#48)
 ### Added
 - Added presigned URL support for direct S3 downloads (#48)
 - Added `ORCHARD_DOWNLOAD_MODE` config option (`presigned`, `redirect`, `proxy`) (#48)
@@ -22,12 +28,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Compute and store MD5, SHA1, and S3 ETag alongside SHA256 during upload (#25)
 - Added `Dockerfile.local` and `docker-compose.local.yml` for local development (#25)
 - Added migration script `003_checksum_fields.sql` for existing databases (#25)
-### Changed
-- Changed default download mode from `proxy` to `presigned` for better performance (#48)
 
 ## [0.2.0] - 2025-12-15
-### Changed
-- Updated images to use internal container BSF proxy (#46)
 ### Added
 - Added `format` and `platform` fields to packages table (#16)
 - Added `checksum_md5` and `metadata` JSONB fields to artifacts table (#16)
@@ -41,9 +43,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added database triggers for maintaining artifact `ref_count` accuracy (#16)
 - Added CHECK constraints for data integrity (`size > 0`, `ref_count >= 0`) (#16)
 - Added migration script `002_schema_enhancements.sql` for existing databases (#16)
+### Changed
+- Updated images to use internal container BSF proxy (#46)
 
 ## [0.1.0] - 2025-12-12
-### Changed
-- Changed the Dockerfile npm build arg to use the deps.global.bsf.tools URL as the default registry (#45)
 ### Added
 - Added Prosper docker template config (#45)
+### Changed
+- Changed the Dockerfile npm build arg to use the deps.global.bsf.tools URL as the default registry (#45)

README.md

@@ -553,19 +553,18 @@ orchard:
     presignedUrlExpiry: 3600
 
 # MinIO ingress (required for presigned URL downloads)
-minio:
-  ingress:
+minioIngress:
+  enabled: true
+  className: "nginx"
+  annotations:
+    cert-manager.io/cluster-issuer: "letsencrypt"
+  host: "minio.your-domain.com"
+  tls:
     enabled: true
-    className: "nginx"
-    annotations:
-      cert-manager.io/cluster-issuer: "letsencrypt"
-    host: "minio.your-domain.com"
-    tls:
-      enabled: true
-      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.
 

helm/orchard/templates/NOTES.txt

@@ -62,5 +62,3 @@ Orchard has been installed!
    Endpoint: {{ include "orchard.minio.host" . }}
    Bucket: {{ .Values.orchard.s3.bucket }}
 {{- end }}
-
-For more information, visit: https://git.bitstorm.ca/bitforge/orchard

helm/orchard/templates/_helpers.tpl

@@ -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 }}

helm/orchard/templates/minio-ingress.yaml

@@ -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: /

helm/orchard/values.yaml

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