From b39a0fd04033c2b71c5b4fe4766ffd35818461bb Mon Sep 17 00:00:00 2001 From: Alen Komljen Date: Tue, 21 May 2019 14:36:42 +0200 Subject: [PATCH] SC-4770 Remove region info from Helm chart (#14024) Signed-off-by: Alen Komljen --- stable/sematext-agent/Chart.yaml | 2 +- stable/sematext-agent/templates/configmap-agent.yaml | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/stable/sematext-agent/Chart.yaml b/stable/sematext-agent/Chart.yaml index a20fbf557a..c7a2ced9b0 100644 --- a/stable/sematext-agent/Chart.yaml +++ b/stable/sematext-agent/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 appVersion: "1.0" -version: 1.0.6 +version: 1.0.7 description: Helm chart for deploying Sematext Agent to Kubernetes keywords: - sematext diff --git a/stable/sematext-agent/templates/configmap-agent.yaml b/stable/sematext-agent/templates/configmap-agent.yaml index f2a1623288..36e2ef667c 100644 --- a/stable/sematext-agent/templates/configmap-agent.yaml +++ b/stable/sematext-agent/templates/configmap-agent.yaml @@ -8,7 +8,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - API_SERVER_PORT: "{{ .Values.agent.service.port }}" + REGION: {{ .Values.region | quote }} {{- range $key, $val := .Values.agent.config }} {{ $key }}: {{ $val | quote }} {{- end }} @@ -16,12 +16,5 @@ data: SERVER_BASE_URL: {{ default "" .Values.customUrl.serverBaseUrl | quote }} EVENTS_RECEIVER_URL: {{ default "" .Values.customUrl.eventsRecieverUrl | quote }} LOGS_RECEIVER_URL: {{ default "" .Values.customUrl.logsReceiverUrl | quote }} - {{- else if eq .Values.region "EU" }} - SERVER_BASE_URL: "https://spm-receiver.eu.sematext.com" - EVENTS_RECEIVER_URL: "https://event-receiver.eu.sematext.com" - LOGS_RECEIVER_URL: "https://logsene-receiver.eu.sematext.com" - {{- else if eq .Values.region "US" }} - SERVER_BASE_URL: "https://spm-receiver.sematext.com" - EVENTS_RECEIVER_URL: "https://event-receiver.sematext.com" - LOGS_RECEIVER_URL: "https://logsene-receiver.sematext.com" {{- end }} + API_SERVER_PORT: "{{ .Values.agent.service.port }}"