Skip to content

Commit

Permalink
fix: agent plane name was fixed in chart helpers.
Browse files Browse the repository at this point in the history
  • Loading branch information
drcgjung committed May 15, 2024
1 parent 94abcf5 commit d157a90
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions charts/agent-plane-azure-vault/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,14 @@ Validation URL
Data Control URL (Expects the Chart Root to be accessible via .root, the current dataplane via .dataplane)
*/}}
{{- define "txap.dataplane.url.signaling" -}}
{{- printf "http://%s-dataplane:%v%s" (include "txap.fullname" . ) .Values.endpoints.signaling.port .Values.endpoints.signaling.path -}}
{{- printf "http://%s-%s:%v%s" (include "txap.fullname" . ) .Values.name .Values.endpoints.signaling.port .Values.endpoints.signaling.path -}}
{{- end }}

{{/*
Data Control URL (Expects the Chart Root to be accessible via .root, the current dataplane via .dataplane)
*/}}
{{- define "txap.dataplane.url.callback" -}}
{{- printf "http://%s-dataplane:%v%s" (include "txap.fullname" . ) .Values.endpoints.callback.port .Values.endpoints.callback.path -}}
{{- printf "http://%s-%s:%v%s" (include "txap.fullname" . ) .Values.name .Values.endpoints.callback.port .Values.endpoints.callback.path -}}
{{- end }}

{{/*
Expand All @@ -173,7 +173,7 @@ Data Public URL
{{- printf "http://%s%s" .hostname $.Values.endpoints.public.path -}}
{{- end }}{{/* end if tls */}}
{{- else }}{{/* else when ingress not enabled */}}
{{- printf "http://%s-dataplane:%v%s" (include "txap.fullname" $ ) $.Values.endpoints.public.port $.Values.endpoints.public.path -}}
{{- printf "http://%s-%s:%v%s" (include "txap.fullname" $ ) $.Values.name $.Values.endpoints.public.port $.Values.endpoints.public.path -}}
{{- end }}{{/* end if ingress */}}
{{- end }}{{/* end with ingress */}}
{{- end }}{{/* end if .Values.url.public */}}
Expand Down
8 changes: 4 additions & 4 deletions charts/agent-plane/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -141,21 +141,21 @@ Validation URL
Validation URL
*/}}
{{- define "txap.controlplane.url.management" -}}
{{- printf "http://%s-controlplane:%v%" ( include "txap.connector.fullname" $ ) .Values.controlplane.endpoints.management.port .Values.controlplane.endpoints.management.path -}}
{{- printf "http://%s-controlplane:%v%s" ( include "txap.connector.fullname" $ ) .Values.controlplane.endpoints.management.port .Values.controlplane.endpoints.management.path -}}
{{- end }}

{{/*
Data Control URL (Expects the Chart Root to be accessible via .root, the current dataplane via .dataplane)
*/}}
{{- define "txap.dataplane.url.signaling" -}}
{{- printf "http://%s-dataplane:%v%s" (include "txap.fullname" . ) .Values.endpoints.signaling.port .Values.endpoints.signaling.path -}}
{{- printf "http://%s-%s:%v%s" (include "txap.fullname" . ) .Values.name .Values.endpoints.signaling.port .Values.endpoints.signaling.path -}}
{{- end }}

{{/*
Data Control URL (Expects the Chart Root to be accessible via .root, the current dataplane via .dataplane)
*/}}
{{- define "txap.dataplane.url.callback" -}}
{{- printf "http://%s-dataplane:%v%s" (include "txap.fullname" . ) .Values.endpoints.callback.port .Values.endpoints.callback.path -}}
{{- printf "http://%s-%s:%v%s" (include "txap.fullname" . ) .Values.name .Values.endpoints.callback.port .Values.endpoints.callback.path -}}
{{- end }}

{{/*
Expand All @@ -173,7 +173,7 @@ Data Public URL
{{- printf "http://%s%s" .hostname $.Values.endpoints.public.path -}}
{{- end }}{{/* end if tls */}}
{{- else }}{{/* else when ingress not enabled */}}
{{- printf "http://%s-dataplane:%v%s" (include "txap.fullname" $ ) $.Values.endpoints.public.port $.Values.endpoints.public.path -}}
{{- printf "http://%s-%s:%v%s" (include "txap.fullname" $ ) $.Values.name $.Values.endpoints.public.port $.Values.endpoints.public.path -}}
{{- end }}{{/* end if ingress */}}
{{- end }}{{/* end with ingress */}}
{{- end }}{{/* end if .Values.url.public */}}
Expand Down

0 comments on commit d157a90

Please sign in to comment.