diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-01-04 11:34:43 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-01-04 11:34:43 +0100 |
| commit | 570e5e5bbb7a3eac41350db9433e28ed289b97f4 (patch) | |
| tree | a7fc299ba180098be5a3bef28a39256870ce697b /script | |
| parent | 6e44369cbc810b8912ca0f7f5fd293e87f10c851 (diff) | |
| parent | 4eb8ca3a528dae2848141f5cc3eb607eb7d40114 (diff) | |
| download | garage-570e5e5bbb7a3eac41350db9433e28ed289b97f4.tar.gz garage-570e5e5bbb7a3eac41350db9433e28ed289b97f4.zip | |
Merge branch 'main' into next
Diffstat (limited to 'script')
| -rw-r--r-- | script/helm/garage/Chart.yaml | 2 | ||||
| -rw-r--r-- | script/helm/garage/templates/ingress.yaml | 6 | ||||
| -rw-r--r-- | script/helm/garage/values.yaml | 15 |
3 files changed, 17 insertions, 6 deletions
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 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 08d0c09b..608ee53c 100644 --- a/script/helm/garage/values.yaml +++ b/script/helm/garage/values.yaml @@ -85,14 +85,15 @@ 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" + labels: {} hosts: - host: "s3.garage.tld" # garage S3 API endpoint paths: @@ -107,11 +108,15 @@ 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" + labels: {} hosts: - host: "*.web.garage.tld" # wildcard website access with bucket name prefix paths: |