Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor updates to the ziti-router service template #281

Open
wants to merge 3 commits into
base: kevinlmadison-router-proxy-services
Choose a base branch
from
Open

Minor updates to the ziti-router service template #281

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d9603f
minor updates to the ziti-router service template
kevinlmadison Nov 21, 2024
d2052bd
Update charts/ziti-router/templates/service.yaml
kevinlmadison Nov 25, 2024
95cb4f0
Update charts/ziti-router/templates/service.yaml
kevinlmadison Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions charts/ziti-router/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ spec:
{{- if and .Values.tunnel.mode (eq .Values.tunnel.mode "proxy" ) (gt (len .Values.tunnel.proxyAdditionalK8sServices) 0) }}
{{- $root := . }}
{{- range .Values.tunnel.proxyAdditionalK8sServices }}
---
qrkourier marked this conversation as resolved.
Show resolved Hide resolved
apiVersion: v1
kind: Service
metadata:
Expand Down Expand Up @@ -235,11 +236,11 @@ spec:
publishNotReadyAddresses: {{ . }}
{{- end }}
ports:
{{- $service_name := .name }}
{{- $ziti_service := .zitiService }}
{{- range $root.Values.tunnel.proxyServices }}
{{- if and .k8sService (eq .k8sService $service_name) }}
- port: {{ .advertisedrPort }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow. I'm surprised I missed those typos! I definitely tested this, so now I'm wondering how it ever worked. I could only have tested the default service. 🤔

targetPort: {{ .containerPortPort }}
{{- if and .zitiService (eq .zitiService $ziti_service) }}
- port: {{ .advertisedPort }}
targetPort: {{ .containerPort }}
protocol: {{ .serviceProtocol | default "TCP" }}
name: {{ regexReplaceAll "\\W+" .zitiService "-" }}
{{- if eq $type "NodePort" }}
Expand Down
Loading