fix svc name

Author: zarbis

charts/internal-gateway/files/conf.d/s3-gateway.conf

@@ -1,3 +1,4 @@
+{{- $vals := include "internal-gateway.default-values" . | fromYaml }}
 server {
     listen {{ index . "codefresh" "workflow-logs-s3-proxy-domain" }}:80;
 
@@ -8,10 +9,10 @@ server {
 
         js_set $account_name auth.account_name;
 
-        proxy_pass http://{{ index . "codefresh" "workflow-logs-s3-proxy-svc" }}:{{ index . "codefresh" "workflow-logs-s3-proxy-port" }}/logs/$account_name/$1;
+        proxy_pass http://{{ index $vals "codefresh" "serviceEndpoints" "workflow-logs-s3-proxy" "svc" }}:{{ index $vals "codefresh" "serviceEndpoints" "workflow-logs-s3-proxy" "svc" }}/logs/$account_name/$1;
     }
 
     location = /api/auth/authenticate {
-        proxy_pass http://{{ index . "codefresh" "cfapi-auth-svc" }}:{{ index . "codefresh" "cfapi-auth-port" }};
+        proxy_pass http://{{ index $vals "codefresh" "serviceEndpoints" "cfapi-auth" "svc" }}:{{ index $vals "codefresh" "serviceEndpoints" "cfapi-auth" "svc" }};
     }
 }

charts/internal-gateway/templates/_default_values.tpl

@@ -58,4 +58,7 @@ codefresh:
     jira-addon:
       svc: '{{ .Release.Name }}-{{ index .Values.codefresh "jira-addon-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}'
       port: {{ index .Values.codefresh "jira-addon-port" }}
+    workflow-logs-s3-proxy:
+      svc: '{{ .Release.Name }}-{{ index .Values.codefresh "workflow-logs-s3-proxy-svc" }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}'
+      port: {{ index .Values.codefresh "workflow-logs-s3-proxy-port" }}
 {{- end }}

charts/internal-gateway/templates/_location_map.tpl

@@ -26,78 +26,8 @@ locationDirectives:
   proxy_read_timeout: "60s"
 {{- end }}
 
-{{- define "internal-gateway.platform-endpoints-defaults" }}
-serviceEndpoints:
-  cfapi-auth:
-    svc: cfapi-auth
-    port: 80
-  cfapi-endpoints:
-    svc: cfapi-endpoints
-    port: 80
-  cfapi-environments:
-    svc: cfapi-environments
-    port: 80
-  cfapi-downloadlogmanager:
-    svc: cfapi-downloadlogmanager
-    port: 80
-  cfapi-gitops-resource-receiver:
-    svc: cfapi-gitops-resource-receiver
-    port: 80
-  cfapi-test-reporting:
-    svc: cfapi-test-reporting
-    port: 80
-  cfapi-kubernetesresourcemonitor:
-    svc: cfapi-kubernetesresourcemonitor
-    port: 80
-  cfapi-kubernetes-endpoints:
-    svc: cfapi-kubernetes-endpoints
-    port: 80
-  cfapi-admin:
-    svc: cfapi-admin
-    port: 80
-  cfapi-teams:
-    svc: cfapi-teams
-    port: 80
-  cfapi-ws:
-    svc: cfapi-ws
-    port: 80
-  cfui:
-    svc: cfui
-    port: 80
-  argo-platform-api-graphql:
-    svc: argo-platform-api-graphql
-    port: 80
-  argo-platform-api-events:
-    svc: argo-platform-api-events
-    port: 80
-  argo-platform-broadcaster:
-    svc: argo-platform-broadcaster
-    port: 80
-  argo-platform-ui:
-    svc: argo-platform-ui
-    port: 4200
-  argo-hub:
-    svc: argo-hub-platform
-    port: 80
-  nomios:
-    svc: nomios
-    port: 80
-  jira-addon:
-    svc: cf-jira-addon
-    port: 9000
-{{- end }}
-
-{{- define "internal-gateway.platform-endpoints" }}
-{{- $endpointDefaults := include "internal-gateway.platform-endpoints-defaults" . | fromYaml }}
-{{- $mergedEndpoints := deepCopy $endpointDefaults }}
-  {{- if .Values.codefresh.serviceEndpoints }}
-    {{- $mergedEndpoints = mergeOverwrite $endpointDefaults .Values.codefresh }}
-  {{- end }}
-{{ $mergedEndpoints | toYaml }}
-{{- end }}
-
 {{- define "internal-gateway.nginx-config-defaults" }}
-  {{- $endpoints := include "internal-gateway.platform-endpoints" . | fromYaml }}
+  {{- $endpoints := .Values.codefresh }}
   {{- $presets := include "internal-gateway.location-presets" . | fromYaml }}
   {{- $_  := set $presets "locationDirectives" (mergeOverwrite $presets.locationDirectives .Values.nginx.config.locationDirectives) }}
 nginx: