From 8e8d00a7052d2c27d73380b7ae2acf8201b83e4a Mon Sep 17 00:00:00 2001 From: Mustafa Date: Mon, 3 Apr 2023 12:10:57 +0500 Subject: [PATCH 1/8] Revert "Make servicePort overrides possible with ingress hosts" This reverts commit 1d19633e9df23a80afda39a8a3efafdf4686c38d. --- application/templates/ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/templates/ingress.yaml b/application/templates/ingress.yaml index 728af3c1..f64c6193 100644 --- a/application/templates/ingress.yaml +++ b/application/templates/ingress.yaml @@ -42,7 +42,7 @@ spec: service: name: {{ $applicationNameTpl }} port: - name: {{ default "http" (.servicePort) }} + name: "http" {{- end }} {{- end -}} {{- if .Values.ingress.tls }} From 452b3d5f340fe4ede967c4295ed23c99a186b2e7 Mon Sep 17 00:00:00 2001 From: Mustafa Date: Mon, 3 Apr 2023 12:49:35 +0500 Subject: [PATCH 2/8] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf2c191b..11ec75c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All notable changes to this project will be documented here. +### v2.2.1 +- Fix: Reverts, This can already be configured via `paths` [PR-243](https://github.com/stakater/application/pull/243) [PR-247](https://github.com/stakater/application/pull/247) + ### v2.2.0 - Feature: Add topologySpreadConstraints [PR-239](https://github.com/stakater/application/pull/239) From 3f8c385e580a0f4c091bdc08b0054ca06f242dfb Mon Sep 17 00:00:00 2001 From: Mustafa Date: Mon, 3 Apr 2023 12:51:32 +0500 Subject: [PATCH 3/8] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11ec75c1..1c62e1be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented here. ### v2.2.1 -- Fix: Reverts, This can already be configured via `paths` [PR-243](https://github.com/stakater/application/pull/243) [PR-247](https://github.com/stakater/application/pull/247) +- Fix: Reverts [PR-243](https://github.com/stakater/application/pull/243), This can already be configured via `paths` [PR-247](https://github.com/stakater/application/pull/247) ### v2.2.0 - Feature: Add topologySpreadConstraints [PR-239](https://github.com/stakater/application/pull/239) From 87b95b76fd648b52b3aab3603b95cb5eba3dcaf4 Mon Sep 17 00:00:00 2001 From: Mustafa Date: Thu, 13 Apr 2023 15:39:28 +0500 Subject: [PATCH 4/8] [application/templates/ingress] remove default paths block, fail on missing paths along with host --- application/templates/ingress.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/application/templates/ingress.yaml b/application/templates/ingress.yaml index f64c6193..760439f1 100644 --- a/application/templates/ingress.yaml +++ b/application/templates/ingress.yaml @@ -36,13 +36,7 @@ spec: name: {{ default "http" (.servicePort) }} {{- end }} {{- else }} - - path: "/" - pathType: "ImplementationSpecific" - backend: - service: - name: {{ $applicationNameTpl }} - port: - name: "http" + {{ fail "Specify paths for ingress host, check values.yaml" }} {{- end }} {{- end -}} {{- if .Values.ingress.tls }} From 196b3d40290fe88280680cce1999963ed6e9c0d6 Mon Sep 17 00:00:00 2001 From: Mustafa Date: Thu, 13 Apr 2023 15:43:26 +0500 Subject: [PATCH 5/8] [application] update values.yaml and values-test.yaml --- application/values-test.yaml | 3 +-- application/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/application/values-test.yaml b/application/values-test.yaml index 401a523d..f38827df 100644 --- a/application/values-test.yaml +++ b/application/values-test.yaml @@ -280,8 +280,7 @@ ingress: # List of host addresses to be exposed by this Ingress hosts: - - host: chart-example-1.local - - host: chart-example-2.local + - host: chart-example.local paths: - path: / # pathType: '' diff --git a/application/values.yaml b/application/values.yaml index 9c559e38..12c25edc 100644 --- a/application/values.yaml +++ b/application/values.yaml @@ -352,8 +352,8 @@ ingress: # List of host addresses to be exposed by this Ingress hosts: - host: chart-example.local - # paths: - # - path: / + paths: + - path: / # pathType: '' # serviceName: '' # servicePort: '' From 6f6b0c912eaac34a9c93f1ab09af8a14fdbc3f9b Mon Sep 17 00:00:00 2001 From: Zadkiel Aharonian Date: Wed, 5 Jul 2023 12:22:23 +0200 Subject: [PATCH 6/8] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b1a0b05..ca99daf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented here. ### v2.1.14 -- Fix: Reverts [PR-243](https://github.com/stakater/application/pull/243), This can already be configured via `paths` [PR-247](https://github.com/stakater/application/pull/247) +- Fix: Reverts [PR-240](https://github.com/stakater/application/pull/240), This can already be configured via `paths` [PR-247](https://github.com/stakater/application/pull/247) ### v2.1.13 - Fix: make deployment.image.tag and job.image.tag optional [PR-234](https://github.com/stakater/application/pull/234) From bee7958272149d74eb389c45ddd256c66bfc3da3 Mon Sep 17 00:00:00 2001 From: Mustafa Date: Fri, 7 Jul 2023 17:40:43 +0500 Subject: [PATCH 7/8] fix chlog #minor --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71d4ce32..c9abb85d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented here. ### v2.1.19 -- Fix: Reverts [PR-240](https://github.com/stakater/application/pull/240), This can already be configured via `paths` [PR-247](https://github.com/stakater/application/pull/247) +- Fix: Reverts [PR-240](https://github.com/stakater/application/pull/240), It can already be configured via `paths` [PR-247](https://github.com/stakater/application/pull/247) ### v2.1.18 - feat: Add vertical pod autoscaler template [PR-249](https://github.com/stakater/application/pull/249) From 2a6b3222cc015b69b0e68cb4776533cc75e38a82 Mon Sep 17 00:00:00 2001 From: Mustafa Date: Fri, 7 Jul 2023 18:47:14 +0500 Subject: [PATCH 8/8] specify vpa version --- Tiltfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tiltfile b/Tiltfile index b85ffcd1..330dfc28 100644 --- a/Tiltfile +++ b/Tiltfile @@ -51,7 +51,7 @@ vpa_namespace = "openshift-vertical-pod-autoscaler" namespace_create(vpa_namespace) local_resource( 'openshift-vertical-pod-autoscaler', - cmd='helm install openshift-vertical-pod-autoscaler -n openshift-vertical-pod-autoscaler oci://ghcr.io/stakater/charts/openshift-vertical-pod-autoscaler' + cmd='helm install openshift-vertical-pod-autoscaler -n openshift-vertical-pod-autoscaler oci://ghcr.io/stakater/charts/openshift-vertical-pod-autoscaler --version=0.0.3' ) # Wait until VPA CRD becomes available