From 07b6e3a9dc230bc7c8a0dd04408d0283573837b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ewelina=20Grudzie=C5=84?= Date: Mon, 9 Sep 2024 14:08:38 +0200 Subject: [PATCH 1/3] Bump VERSION to 2.0.2. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 38f77a65b..e9307ca57 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.1 +2.0.2 From b0ad91808e80d4615159ce219346ac6f02bcd725 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 5 Nov 2024 01:48:24 -0800 Subject: [PATCH 2/3] Update fairspace-ingress.yaml to allow pathType override ImplementationSpecific will break the intended functionality or ingress providers which do not default to prefix matching, such as the AWS ALB. --- charts/fairspace/templates/ingress/fairspace-ingress.yaml | 2 +- charts/fairspace/values.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/fairspace/templates/ingress/fairspace-ingress.yaml b/charts/fairspace/templates/ingress/fairspace-ingress.yaml index 2ce9380e7..9da2196d1 100644 --- a/charts/fairspace/templates/ingress/fairspace-ingress.yaml +++ b/charts/fairspace/templates/ingress/fairspace-ingress.yaml @@ -23,7 +23,7 @@ spec: http: paths: - path: / - pathType: ImplementationSpecific + pathType: {{ $ingress.pathType | default "ImplementationSpecific" }} backend: service: name: {{ .Release.Name }} diff --git a/charts/fairspace/values.yaml b/charts/fairspace/values.yaml index 7979ed5dc..cfb8a36e8 100644 --- a/charts/fairspace/values.yaml +++ b/charts/fairspace/values.yaml @@ -13,12 +13,15 @@ external: clientSecret: # Setup ingress for fairspace components +# Change pathType to "Prefix" for ingress providers which do not default to prefix or wildcard +# matching for the "/" path, eg: AWS ALB fairspace: name: "fairspace" description: "Fairspace" ingress: enabled: true domain: + pathType: ImplementationSpecific annotations: pluto: kubernetes.io/ingress.class: nginx @@ -185,4 +188,4 @@ postgres: # Pod annotations should remain empty. They are filled within the build process podAnnotations: { } -svgicons: { } \ No newline at end of file +svgicons: { } From e6b5f57dd2b6efd3628de305a41142027d53dad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ewelina=20Grudzie=C5=84?= Date: Wed, 13 Nov 2024 15:06:11 +0100 Subject: [PATCH 3/3] Prepare release 2.0.2. --- README.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index 1db8fa093..68805bb52 100644 --- a/README.adoc +++ b/README.adoc @@ -2656,7 +2656,7 @@ Create DNS records for the ``keycloak.example.com``, ``fairspace.example.com`` a # Fetch the fairspace-keycloak chart ~/bin/helm/helm pull oci://ghcr.io/thehyve/fairspace/helm-charts/fairspace-keycloak --version 0.7.0 # Fetch the fairspace chart -~/bin/helm/helm pull oci://ghcr.io/thehyve/fairspace/helm-charts/fairspace --version 2.0.1 +~/bin/helm/helm pull oci://ghcr.io/thehyve/fairspace/helm-charts/fairspace --version 2.0.2 ---- ===== Deploy Keycloak @@ -2744,7 +2744,7 @@ Create a new deployment (called _release_ in helm terminology) and install the Fairspace chart: [source, shell] ---- -~/bin/helm/helm install fairspace-new fairspace-2.0.1.tgz --namespace=fairspace-new \ +~/bin/helm/helm install fairspace-new fairspace-2.0.2.tgz --namespace=fairspace-new \ -f /path/to/values.yaml --set-file saturn.vocabulary=/path/to/vocabulary.ttl --set-file saturn.views=/path/to/views.yaml ---- You can pass values files with ``-f`` and provide a file for a specified @@ -2841,7 +2841,7 @@ Additionally, to include custom icons for `fairspace.icons` option, you need to [source, shell] ---- -~/bin/helm/helm install fairspace-new fairspace-2.0.1.tgz --namespace=fairspace-new \ +~/bin/helm/helm install fairspace-new fairspace-2.0.2.tgz --namespace=fairspace-new \ -f /path/to/values.yaml --set-file saturn.vocabulary=/path/to/vocabulary.ttl --set-file saturn.views=/path/to/views.yaml --set-file svgicons.extra-icon=/path/to/extra-icon.svg ---- @@ -2898,7 +2898,7 @@ jupyterhub: To update a deployment using a new chart: [source, shell] ---- -~/bin/helm/helm upgrade fairspace-new fairspace-2.0.1.tgz +~/bin/helm/helm upgrade fairspace-new fairspace-2.0.2.tgz ---- With ``helm upgrade`` you can also pass new values files with ``-f`` and pass files with ``--set-file`` as for ``helm install``.