diff --git a/CHANGELOG.md b/CHANGELOG.md index d511abf..db6a119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# 6.8.2 + +- Added additional configuration for HTTPRoute objects: +```yaml +httproute: + streamingParentRef: +``` + # 6.8.1 - Options to keep PVCs around in the event of helm deletion: diff --git a/Chart.yaml b/Chart.yaml index 90befe7..d0d63ab 100644 --- a/Chart.yaml +++ b/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: 6.8.1 +version: 6.8.2 # 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/templates/httproute-streaming.yaml b/templates/httproute-streaming.yaml index 4c6381a..591afa6 100644 --- a/templates/httproute-streaming.yaml +++ b/templates/httproute-streaming.yaml @@ -1,4 +1,4 @@ -{{- if .Values.httproute.streamingHostnames -}} +{{- if or .Values.httproute.streamingHostnames .Values.httproute.streamingParentRefs -}} {{- $fullName := include "mastodon.fullname" . -}} {{- $streamingPort := .Values.mastodon.streaming.port -}} apiVersion: gateway.networking.k8s.io/v1 @@ -16,9 +16,9 @@ metadata: {{- end }} spec: parentRefs: - {{- toYaml .Values.httproute.parentRefs | nindent 4 }} + {{- coalesce .Values.httproute.streamingParentRefs .Values.httproute.parentRefs | toYaml | nindent 4 }} hostnames: - {{- toYaml .Values.httproute.streamingHostnames | nindent 4 }} + {{- coalesce .Values.httproute.streamingHostnames .Values.httproute.hostnames | toYaml | nindent 4 }} rules: {{- range .Values.httproute.streamingRules }} {{- with .matches }} diff --git a/values.yaml b/values.yaml index 148a1f7..1be9655 100644 --- a/values.yaml +++ b/values.yaml @@ -628,6 +628,12 @@ httproute: hostnames: - mastodon.local + # Streaming gateway parent ref, if streaming should be routed differently. + streamingParentRefs: + # - name: example-streaming-gateway + # namespace: example-streaming-gateway-namespace + # sectionName: websecure + # Streaming hostnames, if different than the primary domain. streamingHostnames: # - streaming.mastodon.local