From e5186b0f45138c75fa9edd6378354e2a72e4b55e Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Thu, 14 Jan 2021 13:25:05 +0100 Subject: [PATCH 1/2] [meta] fix transient errors with stable repository This commit move stable chart repo setup and dependency update steps to metricbeat specific examples. We have lot of transient issues when running configuring stable repo: ``` helm repo add stable https://charts.helm.sh/stable && \ helm dependency update && \ cd ./examples/oss && \ make Error: looks like "https://charts.helm.sh/stable" is not a valid chart repository or cannot be reached: read tcp 172.17.0.2:37660->185.199.108.153:443: read: connection reset by peer make: *** [integration] Error 1 ``` As stable repo is only used by Metricbeat chart, by not configuring it for other charts tests, we should limit the risk of transient issues. --- helpers/terraform/Makefile | 2 -- metricbeat/examples/default/Makefile | 2 ++ metricbeat/examples/oss/Makefile | 2 ++ metricbeat/examples/security/Makefile | 2 ++ metricbeat/examples/upgrade/Makefile | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/helpers/terraform/Makefile b/helpers/terraform/Makefile index 8d448c3e3..25e516db0 100644 --- a/helpers/terraform/Makefile +++ b/helpers/terraform/Makefile @@ -80,8 +80,6 @@ k8s-staging-registry: creds ## Create the staging registry auth secret in k8s .PHONY: integration integration: creds ## Deploy helm chart and run integration tests cd ../../$(CHART)/ && \ - helm repo add stable https://charts.helm.sh/stable && \ - helm dependency update && \ cd ./examples/$(SUITE) && \ make diff --git a/metricbeat/examples/default/Makefile b/metricbeat/examples/default/Makefile index bcd4fb77b..73cebdeaa 100644 --- a/metricbeat/examples/default/Makefile +++ b/metricbeat/examples/default/Makefile @@ -6,6 +6,8 @@ RELEASE = helm-metricbeat-default GOSS_SELECTOR = release=$(RELEASE),app=helm-metricbeat-default-metricbeat install: + helm repo add stable https://charts.helm.sh/stable + helm dependency update helm upgrade --wait --timeout=$(TIMEOUT) --install $(RELEASE) ../../ test-metrics: diff --git a/metricbeat/examples/oss/Makefile b/metricbeat/examples/oss/Makefile index 534201044..4c2fe8efa 100644 --- a/metricbeat/examples/oss/Makefile +++ b/metricbeat/examples/oss/Makefile @@ -6,6 +6,8 @@ RELEASE := helm-metricbeat-oss GOSS_SELECTOR = release=$(RELEASE),app=helm-metricbeat-oss-metricbeat install: + helm repo add stable https://charts.helm.sh/stable + helm dependency update helm upgrade --wait --timeout=$(TIMEOUT) --install --values values.yaml $(RELEASE) ../../ test-metrics: diff --git a/metricbeat/examples/security/Makefile b/metricbeat/examples/security/Makefile index 2433d8e95..314f2a354 100644 --- a/metricbeat/examples/security/Makefile +++ b/metricbeat/examples/security/Makefile @@ -6,6 +6,8 @@ RELEASE := helm-metricbeat-security GOSS_SELECTOR = release=$(RELEASE),app=helm-metricbeat-security-metricbeat install: + helm repo add stable https://charts.helm.sh/stable + helm dependency update helm upgrade --wait --timeout=$(TIMEOUT) --install --values values.yaml $(RELEASE) ../../ test-metrics: diff --git a/metricbeat/examples/upgrade/Makefile b/metricbeat/examples/upgrade/Makefile index 5cd564fcc..129cfab2f 100644 --- a/metricbeat/examples/upgrade/Makefile +++ b/metricbeat/examples/upgrade/Makefile @@ -8,6 +8,8 @@ FROM := 7.10.0 # upgrade from version < 7.10.0 is failing due to selector # breaking change in https://github.com/elastic/helm-charts/pull/516 install: + helm repo add stable https://charts.helm.sh/stable + helm dependency update ../../../helpers/upgrade.sh --chart $(CHART) --release $(RELEASE) --from $(FROM) kubectl rollout status daemonset $(RELEASE)-metricbeat kubectl rollout status deployment $(RELEASE)-metricbeat-metrics From 66097d08045238878cb02b0d68a2b2ede2786390 Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Fri, 15 Jan 2021 12:45:42 +0100 Subject: [PATCH 2/2] fix command --- metricbeat/examples/default/Makefile | 2 +- metricbeat/examples/oss/Makefile | 2 +- metricbeat/examples/security/Makefile | 2 +- metricbeat/examples/upgrade/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/metricbeat/examples/default/Makefile b/metricbeat/examples/default/Makefile index 73cebdeaa..ab8e6aacf 100644 --- a/metricbeat/examples/default/Makefile +++ b/metricbeat/examples/default/Makefile @@ -7,7 +7,7 @@ GOSS_SELECTOR = release=$(RELEASE),app=helm-metricbeat-default-metricbeat install: helm repo add stable https://charts.helm.sh/stable - helm dependency update + helm dependency update ../../ helm upgrade --wait --timeout=$(TIMEOUT) --install $(RELEASE) ../../ test-metrics: diff --git a/metricbeat/examples/oss/Makefile b/metricbeat/examples/oss/Makefile index 4c2fe8efa..81334c998 100644 --- a/metricbeat/examples/oss/Makefile +++ b/metricbeat/examples/oss/Makefile @@ -7,7 +7,7 @@ GOSS_SELECTOR = release=$(RELEASE),app=helm-metricbeat-oss-metricbeat install: helm repo add stable https://charts.helm.sh/stable - helm dependency update + helm dependency update ../../ helm upgrade --wait --timeout=$(TIMEOUT) --install --values values.yaml $(RELEASE) ../../ test-metrics: diff --git a/metricbeat/examples/security/Makefile b/metricbeat/examples/security/Makefile index 314f2a354..81049b709 100644 --- a/metricbeat/examples/security/Makefile +++ b/metricbeat/examples/security/Makefile @@ -7,7 +7,7 @@ GOSS_SELECTOR = release=$(RELEASE),app=helm-metricbeat-security-metricbeat install: helm repo add stable https://charts.helm.sh/stable - helm dependency update + helm dependency update ../../ helm upgrade --wait --timeout=$(TIMEOUT) --install --values values.yaml $(RELEASE) ../../ test-metrics: diff --git a/metricbeat/examples/upgrade/Makefile b/metricbeat/examples/upgrade/Makefile index 129cfab2f..e18cb8435 100644 --- a/metricbeat/examples/upgrade/Makefile +++ b/metricbeat/examples/upgrade/Makefile @@ -9,7 +9,7 @@ FROM := 7.10.0 # upgrade from version < 7.10.0 is failing due to selector install: helm repo add stable https://charts.helm.sh/stable - helm dependency update + helm dependency update ../../ ../../../helpers/upgrade.sh --chart $(CHART) --release $(RELEASE) --from $(FROM) kubectl rollout status daemonset $(RELEASE)-metricbeat kubectl rollout status deployment $(RELEASE)-metricbeat-metrics