From 388c1be4193d20da5ab831a2435757dc22c6e67f Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Thu, 17 Sep 2020 17:24:36 +0200 Subject: [PATCH] Do not proxy kubernetes internal traffic (#920) * Do not proxy kubernetes internal traffic * Update terraform tests * Generate new 'setup-sumologic.yaml.tmpl' Co-authored-by: Travis CI --- deploy/helm/sumologic/conf/setup/setup.sh | 1 + deploy/helm/sumologic/templates/setup/setup-job.yaml | 2 ++ deploy/helm/sumologic/values.yaml | 2 ++ deploy/kubernetes/setup-sumologic.yaml.tmpl | 3 +++ tests/terraform/static/all_fields.output.yaml | 1 + tests/terraform/static/collector_fields.output.yaml | 1 + tests/terraform/static/conditional_sources.output.yaml | 1 + tests/terraform/static/default.output.yaml | 1 + tests/terraform/static/strip_extrapolation.output.yaml | 1 + tests/terraform/static/traces.output.yaml | 1 + 10 files changed, 14 insertions(+) diff --git a/deploy/helm/sumologic/conf/setup/setup.sh b/deploy/helm/sumologic/conf/setup/setup.sh index 431b894d26..ad1af4e3f2 100644 --- a/deploy/helm/sumologic/conf/setup/setup.sh +++ b/deploy/helm/sumologic/conf/setup/setup.sh @@ -8,6 +8,7 @@ export SUMOLOGIC_BASE_URL=${SUMOLOGIC_BASE_URL%v1*} # Support proxy for terraform export HTTP_PROXY=${HTTP_PROXY:=""} export HTTPS_PROXY=${HTTPS_PROXY:=""} +export NO_PROXY=${NO_PROXY:=""} COLLECTOR_NAME="{{- if .Values.sumologic.collectorName }}{{ .Values.sumologic.collectorName }}{{- else}}{{ .Values.sumologic.clusterName }}{{- end}}" diff --git a/deploy/helm/sumologic/templates/setup/setup-job.yaml b/deploy/helm/sumologic/templates/setup/setup-job.yaml index aadf1e98c1..56dfd96e94 100644 --- a/deploy/helm/sumologic/templates/setup/setup-job.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-job.yaml @@ -62,5 +62,7 @@ spec: value: {{ .Values.sumologic.httpProxy }} - name: HTTPS_PROXY value: {{ .Values.sumologic.httpsProxy }} + - name: NO_PROXY + value: {{ .Values.sumologic.noProxy }} {{ end }} {{- end }} diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 6b53256dff..f6e587b72e 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -32,6 +32,8 @@ sumologic: ## proxy urls httpProxy: "" httpsProxy: "" + ## Exclude kubernetes internal traffic from proxy + noProxy: kubernetes.default.svc ## Collector name #collectorName: "" diff --git a/deploy/kubernetes/setup-sumologic.yaml.tmpl b/deploy/kubernetes/setup-sumologic.yaml.tmpl index 0b0a7d97b6..a61f4b185b 100644 --- a/deploy/kubernetes/setup-sumologic.yaml.tmpl +++ b/deploy/kubernetes/setup-sumologic.yaml.tmpl @@ -135,6 +135,7 @@ data: # Support proxy for terraform export HTTP_PROXY=${HTTP_PROXY:=""} export HTTPS_PROXY=${HTTPS_PROXY:=""} + export NO_PROXY=${NO_PROXY:=""} COLLECTOR_NAME="$COLLECTOR_NAME" @@ -282,5 +283,7 @@ spec: value: - name: HTTPS_PROXY value: + - name: NO_PROXY + value: kubernetes.default.svc diff --git a/tests/terraform/static/all_fields.output.yaml b/tests/terraform/static/all_fields.output.yaml index b96e7f5f90..c3dc30206d 100644 --- a/tests/terraform/static/all_fields.output.yaml +++ b/tests/terraform/static/all_fields.output.yaml @@ -182,6 +182,7 @@ data: # Support proxy for terraform export HTTP_PROXY=${HTTP_PROXY:=""} export HTTPS_PROXY=${HTTPS_PROXY:=""} + export NO_PROXY=${NO_PROXY:=""} COLLECTOR_NAME="kubernetes" diff --git a/tests/terraform/static/collector_fields.output.yaml b/tests/terraform/static/collector_fields.output.yaml index 3c56e08f98..25c33398d3 100644 --- a/tests/terraform/static/collector_fields.output.yaml +++ b/tests/terraform/static/collector_fields.output.yaml @@ -137,6 +137,7 @@ data: # Support proxy for terraform export HTTP_PROXY=${HTTP_PROXY:=""} export HTTPS_PROXY=${HTTPS_PROXY:=""} + export NO_PROXY=${NO_PROXY:=""} COLLECTOR_NAME="kubernetes" diff --git a/tests/terraform/static/conditional_sources.output.yaml b/tests/terraform/static/conditional_sources.output.yaml index bee20b8c13..a73e3438c7 100644 --- a/tests/terraform/static/conditional_sources.output.yaml +++ b/tests/terraform/static/conditional_sources.output.yaml @@ -64,6 +64,7 @@ data: # Support proxy for terraform export HTTP_PROXY=${HTTP_PROXY:=""} export HTTPS_PROXY=${HTTPS_PROXY:=""} + export NO_PROXY=${NO_PROXY:=""} COLLECTOR_NAME="kubernetes" diff --git a/tests/terraform/static/default.output.yaml b/tests/terraform/static/default.output.yaml index c7d42a67f3..0f28b6c653 100644 --- a/tests/terraform/static/default.output.yaml +++ b/tests/terraform/static/default.output.yaml @@ -135,6 +135,7 @@ data: # Support proxy for terraform export HTTP_PROXY=${HTTP_PROXY:=""} export HTTPS_PROXY=${HTTPS_PROXY:=""} + export NO_PROXY=${NO_PROXY:=""} COLLECTOR_NAME="kubernetes" diff --git a/tests/terraform/static/strip_extrapolation.output.yaml b/tests/terraform/static/strip_extrapolation.output.yaml index 7845f7747c..1be2e9bc29 100644 --- a/tests/terraform/static/strip_extrapolation.output.yaml +++ b/tests/terraform/static/strip_extrapolation.output.yaml @@ -136,6 +136,7 @@ data: # Support proxy for terraform export HTTP_PROXY=${HTTP_PROXY:=""} export HTTPS_PROXY=${HTTPS_PROXY:=""} + export NO_PROXY=${NO_PROXY:=""} COLLECTOR_NAME="kubernetes" diff --git a/tests/terraform/static/traces.output.yaml b/tests/terraform/static/traces.output.yaml index bc9c672ee3..cbb9029559 100644 --- a/tests/terraform/static/traces.output.yaml +++ b/tests/terraform/static/traces.output.yaml @@ -72,6 +72,7 @@ data: # Support proxy for terraform export HTTP_PROXY=${HTTP_PROXY:=""} export HTTPS_PROXY=${HTTPS_PROXY:=""} + export NO_PROXY=${NO_PROXY:=""} COLLECTOR_NAME="kubernetes"