From f58a813a36de7b356d72ba1e6f2f991da5491285 Mon Sep 17 00:00:00 2001
From: Patrick Jahns <kontakt@patrickjahns.de>
Date: Wed, 16 Nov 2022 12:18:11 +0100
Subject: [PATCH 1/3] refactor(helm): disable the ingress per default

The default values forces people to create an ingress resources,
where per default an ingress is not necessary to start garage.

If someone wants to utilize an ingress, he would need to define
the values for the ingress either way, so enabling the ingress
explicitly makes more sense, then requiring it to be disabled per default
---
 script/helm/garage/values.yaml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/script/helm/garage/values.yaml b/script/helm/garage/values.yaml
index 08d0c09b..9c1c54c0 100644
--- a/script/helm/garage/values.yaml
+++ b/script/helm/garage/values.yaml
@@ -85,12 +85,12 @@ service:
 ingress:
   s3:
     api:
-      enabled: true
+      enabled: false
       # Rely either on the className or the annotation below but not both
       # replace "nginx" by an Ingress controller
       # you can find examples here https://kubernetes.io/docs/concepts/services-networking/ingress-controllers
-      className: "nginx"
-      annotations:
+      # className: "nginx"
+      annotations: {}
         # kubernetes.io/ingress.class: "nginx"
         # kubernetes.io/tls-acme: "true"
       hosts:
@@ -107,8 +107,11 @@ ingress:
       #    hosts:
       #      - kubernetes.docker.internal
     web:
-      enabled: true
-      className: "nginx"
+      enabled: false
+      # Rely either on the className or the annotation below but not both
+      # replace "nginx" by an Ingress controller
+      # you can find examples here https://kubernetes.io/docs/concepts/services-networking/ingress-controllers
+      # className: "nginx"
       annotations: {}
         # kubernetes.io/ingress.class: nginx
         # kubernetes.io/tls-acme: "true"

From edb0b9c1ee30a595833fd0bf46b42b3bb165b299 Mon Sep 17 00:00:00 2001
From: Patrick Jahns <kontakt@patrickjahns.de>
Date: Wed, 16 Nov 2022 12:21:18 +0100
Subject: [PATCH 2/3] feat(helm): allow to add custom labels to created ingress
 resources

---
 script/helm/garage/templates/ingress.yaml | 6 ++++++
 script/helm/garage/values.yaml            | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/script/helm/garage/templates/ingress.yaml b/script/helm/garage/templates/ingress.yaml
index c4ee5a3f..35225daa 100644
--- a/script/helm/garage/templates/ingress.yaml
+++ b/script/helm/garage/templates/ingress.yaml
@@ -18,6 +18,9 @@ metadata:
   name: {{ $fullName }}-s3-api
   labels:
     {{- include "garage.labels" . | nindent 4 }}
+    {{- with .Values.ingress.s3.api.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.ingress.s3.api.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -80,6 +83,9 @@ metadata:
   name: {{ $fullName }}-s3-web
   labels:
     {{- include "garage.labels" . | nindent 4 }}
+    {{- with .Values.ingress.s3.web.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.ingress.s3.web.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/script/helm/garage/values.yaml b/script/helm/garage/values.yaml
index 9c1c54c0..608ee53c 100644
--- a/script/helm/garage/values.yaml
+++ b/script/helm/garage/values.yaml
@@ -93,6 +93,7 @@ ingress:
       annotations: {}
         # kubernetes.io/ingress.class: "nginx"
         # kubernetes.io/tls-acme: "true"
+      labels: {}
       hosts:
         - host: "s3.garage.tld" # garage S3 API endpoint
           paths:
@@ -115,6 +116,7 @@ ingress:
       annotations: {}
         # kubernetes.io/ingress.class: nginx
         # kubernetes.io/tls-acme: "true"
+      labels: {}
       hosts:
        - host: "*.web.garage.tld" # wildcard website access with bucket name prefix
          paths:

From 7a0014b6f71f9d4a445b378deb215b088e02e036 Mon Sep 17 00:00:00 2001
From: Patrick Jahns <kontakt@patrickjahns.de>
Date: Wed, 16 Nov 2022 12:21:33 +0100
Subject: [PATCH 3/3] chore(helm): bump chart number

---
 script/helm/garage/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/helm/garage/Chart.yaml b/script/helm/garage/Chart.yaml
index 56598ea4..7fb4c531 100644
--- a/script/helm/garage/Chart.yaml
+++ b/script/helm/garage/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to