Skip to content

Commit 49a7301

Browse files
committed
Allow overriding of pathType in ingress rules to support ImplementationSpecific
Signed-off-by: David Zhou <[email protected]>
1 parent 3b1915e commit 49a7301

File tree

8 files changed

+9
-4
lines changed

8 files changed

+9
-4
lines changed

charts/opensearch-dashboards/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
---
99
## [Unreleased]
1010
### Added
11+
- Support `pathType` for ingress rules
1112
### Changed
1213
### Deprecated
1314
### Removed

charts/opensearch-dashboards/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 3.3.0
18+
version: 3.3.1
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/opensearch-dashboards/templates/ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
paths:
4545
{{- range .paths }}
4646
- path: {{ .path }}
47-
pathType: Prefix
47+
pathType: {{ .pathType | default "Prefix" }}
4848
backend:
4949
service:
5050
name: {{ .backend.serviceName | default $fullName }}

charts/opensearch-dashboards/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ ingress:
181181
- host: chart-example.local
182182
paths:
183183
- path: /
184+
pathType: Prefix
184185
backend:
185186
serviceName: ""
186187
servicePort: ""

charts/opensearch/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
---
99
## [Unreleased]
1010
### Added
11+
- Support `pathType` for ingress rules
1112
### Changed
1213
### Deprecated
1314
### Removed

charts/opensearch/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 3.3.1
18+
version: 3.3.2
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/opensearch/templates/ingress.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{{- $fullName := include "opensearch.serviceName" . -}}
33
{{- $servicePort := .Values.httpPort -}}
44
{{- $ingressPath := .Values.ingress.path -}}
5+
{{- $ingressPathType := .Values.ingress.pathType -}}
56
{{- $ingressApiIsStable := eq (include "opensearch.ingress.isStable" .) "true" -}}
67
{{- $ingressSupportsIngressClassName := eq (include "opensearch.ingress.supportsIngressClassName" .) "true" -}}
78
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
@@ -44,7 +45,7 @@ spec:
4445
http:
4546
paths:
4647
- path: {{ $ingressPath }}
47-
pathType: Prefix
48+
pathType: {{ $ingressPathType }}
4849
backend:
4950
service:
5051
name: {{ $fullName }}

charts/opensearch/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ ingress:
411411
# kubernetes.io/tls-acme: "true"
412412
ingressLabels: {}
413413
path: /
414+
pathType: Prefix
414415
hosts:
415416
- chart-example.local
416417
tls: []

0 commit comments

Comments
 (0)