Skip to content

Commit

Permalink
Merge pull request #247 from stakater/revert-previous-change-remove-s…
Browse files Browse the repository at this point in the history
…ervice-port-override

Revert "Defining default path spec in ingress if hosts.*.paths is null"
  • Loading branch information
hussnain612 committed Jul 7, 2023
2 parents b036ebb + 2a6b322 commit d637d8e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 13 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

All notable changes to this project will be documented here.

### v2.1.19
- 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)

Expand All @@ -24,7 +27,7 @@ All notable changes to this project will be documented here.
- Fix: make deployment.image.tag and job.image.tag optional [PR-234](https://github.com/stakater/application/pull/234)

### v2.1.12
- Caused by Change Log update
- Update: Changelog updates. This release shouldnt have been made as the head commit had [`[skip ci]`](https://docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs). [PR-248](https://github.com/stakater/application/pull/248)

### v2.1.11
- Feature: Add topologySpreadConstraints [PR-239](https://github.com/stakater/application/pull/239)
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions application/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,7 @@ spec:
name: {{ default "http" (.servicePort) }}
{{- end }}
{{- else }}
- path: "/"
pathType: "ImplementationSpecific"
backend:
service:
name: {{ $applicationNameTpl }}
port:
name: {{ default "http" (.servicePort) }}
{{ fail "Specify paths for ingress host, check values.yaml" }}
{{- end }}
{{- end -}}
{{- if .Values.ingress.tls }}
Expand Down
3 changes: 1 addition & 2 deletions application/values-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ''
Expand Down
4 changes: 2 additions & 2 deletions application/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,8 @@ ingress:
# List of host addresses to be exposed by this Ingress
hosts:
- host: chart-example.local
# paths:
# - path: /
paths:
- path: /
# pathType: ''
# serviceName: ''
# servicePort: ''
Expand Down

0 comments on commit d637d8e

Please sign in to comment.