Fix Helm chart: rename minio.ingress to minioIngress to avoid subchart conflict

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