Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
[meta] increase helm timeout
Browse files Browse the repository at this point in the history 
This commit increase the timeout for helm upgrade commands examples to
avoid timeout error when deploying all example releases in // in helm
test gke cluster.
  • Loading branch information
@jmlrt
jmlrt committed Nov 10, 2020
1 parent ce44645 commit 42d60e6
Show file tree
Hide file tree
Showing 28 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion apm-server/examples/default/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-apm-server-default

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion apm-server/examples/oss/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-apm-server-oss

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) --values values.yaml ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion apm-server/examples/security/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-apm-server-security

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) --values values.yaml ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/config/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-es-config

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../

secrets:
kubectl delete secret elastic-config-credentials elastic-config-secret elastic-config-slack elastic-config-custom-path || true
Expand Down
4 changes: 2 additions & 2 deletions elasticsearch/examples/default/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
RELEASE := helm-es-default

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) ../../

restart:
helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../
helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/docker-for-mac/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default: test
RELEASE := helm-es-docker-for-mac

install:
helm upgrade --wait --timeout=900 --install --values values.yaml $(RELEASE) ../../
helm upgrade --wait --timeout=1200 --install --values values.yaml $(RELEASE) ../../

test: install
helm test $(RELEASE)
Expand Down
4 changes: 2 additions & 2 deletions elasticsearch/examples/kubernetes-kind/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ default: test
RELEASE := helm-es-kind

install:
helm upgrade --wait --timeout=900 --install --values values.yaml $(RELEASE) ../../
helm upgrade --wait --timeout=1200 --install --values values.yaml $(RELEASE) ../../

install-local-path:
kubectl apply -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/deploy/local-path-storage.yaml
helm upgrade --wait --timeout=900 --install --values values-local-path.yaml $(RELEASE) ../../
helm upgrade --wait --timeout=1200 --install --values values-local-path.yaml $(RELEASE) ../../

test: install
helm test $(RELEASE)
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/microk8s/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default: test
RELEASE := helm-es-microk8s

install:
helm upgrade --wait --timeout=900 --install --values values.yaml $(RELEASE) ../../
helm upgrade --wait --timeout=1200 --install --values values.yaml $(RELEASE) ../../

test: install
helm test $(RELEASE)
Expand Down
6 changes: 3 additions & 3 deletions elasticsearch/examples/migration/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PREFIX := helm-es-migration

data:
helm upgrade --wait --timeout=600 --install --values ./data.yml $(PREFIX)-data ../../
helm upgrade --wait --timeout=900 --install --values ./data.yml $(PREFIX)-data ../../

master:
helm upgrade --wait --timeout=600 --install --values ./master.yml $(PREFIX)-master ../../
helm upgrade --wait --timeout=900 --install --values ./master.yml $(PREFIX)-master ../../

client:
helm upgrade --wait --timeout=600 --install --values ./client.yml $(PREFIX)-client ../../
helm upgrade --wait --timeout=900 --install --values ./client.yml $(PREFIX)-client ../../
2 changes: 1 addition & 1 deletion elasticsearch/examples/minikube/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default: test
RELEASE := helm-es-minikube

install:
helm upgrade --wait --timeout=900 --install --values values.yaml $(RELEASE) ../../
helm upgrade --wait --timeout=1200 --install --values values.yaml $(RELEASE) ../../

test: install
helm test $(RELEASE)
Expand Down
6 changes: 3 additions & 3 deletions elasticsearch/examples/multi/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ PREFIX := helm-es-multi
RELEASE := helm-es-multi-master

install:
helm upgrade --wait --timeout=600 --install --values ./master.yml $(PREFIX)-master ../../
helm upgrade --wait --timeout=600 --install --values ./data.yml $(PREFIX)-data ../../
helm upgrade --wait --timeout=600 --install --values ./client.yml $(PREFIX)-client ../../
helm upgrade --wait --timeout=900 --install --values ./master.yml $(PREFIX)-master ../../
helm upgrade --wait --timeout=900 --install --values ./data.yml $(PREFIX)-data ../../
helm upgrade --wait --timeout=900 --install --values ./client.yml $(PREFIX)-client ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/openshift/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ template:
helm template --values ./values.yaml ../../

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/oss/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-es-oss

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/security/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RELEASE := helm-es-security
ELASTICSEARCH_IMAGE := docker.elastic.co/elasticsearch/elasticsearch:$(STACK_VERSION)

install:
helm upgrade --wait --timeout=600 --install --values ./security.yml $(RELEASE) ../../
helm upgrade --wait --timeout=900 --install --values ./security.yml $(RELEASE) ../../

purge:
kubectl delete secrets elastic-credentials elastic-certificates elastic-certificate-pem elastic-certificate-crt|| true
Expand Down
2 changes: 1 addition & 1 deletion filebeat/examples/default/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-filebeat-default

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion filebeat/examples/oss/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-filebeat-oss

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) --values values.yaml ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion filebeat/examples/security/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-filebeat-security

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) --values values.yaml ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion kibana/examples/default/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RELEASE := helm-kibana-default

install:
echo "Goss container: $(GOSS_CONTAINER)"
helm upgrade --wait --timeout=600 --install $(RELEASE) ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) ../../

test: install goss

Expand Down
6 changes: 3 additions & 3 deletions kibana/examples/openshift/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ RELEASE := kibana
template:
helm template --values ./values.yml ../../

install:
helm upgrade --wait --timeout=600 --install --values ./values.yml $(RELEASE) ../../
install:
helm upgrade --wait --timeout=900 --install --values ./values.yml $(RELEASE) ../../

test: install goss

purge:
helm del --purge $(RELEASE)
2 changes: 1 addition & 1 deletion kibana/examples/oss/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-kibana-oss

install:
helm upgrade --wait --timeout=600 --install --values ./values.yml $(RELEASE) ../../
helm upgrade --wait --timeout=900 --install --values ./values.yml $(RELEASE) ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion kibana/examples/security/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-kibana-security

install:
helm upgrade --wait --timeout=600 --install --values ./security.yml $(RELEASE) ../../
helm upgrade --wait --timeout=900 --install --values ./security.yml $(RELEASE) ../../

test: secrets install goss

Expand Down
4 changes: 2 additions & 2 deletions logstash/examples/default/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
RELEASE := helm-logstash-default

install:
helm upgrade --wait --timeout=900 --install $(RELEASE) ../../
helm upgrade --wait --timeout=1200 --install $(RELEASE) ../../

restart:
helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) ../../
helm upgrade --set terminationGracePeriod=121 --wait --timeout=1200 --install $(RELEASE) ../../

test: install goss

Expand Down
4 changes: 2 additions & 2 deletions logstash/examples/elasticsearch/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
RELEASE := helm-logstash-elasticsearch

install:
helm upgrade --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../
helm upgrade --wait --timeout=1200 --install $(RELEASE) --values ./values.yaml ../../

restart:
helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) ../../
helm upgrade --set terminationGracePeriod=121 --wait --timeout=1200 --install $(RELEASE) ../../

test: install goss

Expand Down
4 changes: 2 additions & 2 deletions logstash/examples/oss/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
RELEASE := helm-logstash-oss

install:
helm upgrade --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../
helm upgrade --wait --timeout=1200 --install $(RELEASE) --values ./values.yaml ../../

restart:
helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) ../../
helm upgrade --set terminationGracePeriod=121 --wait --timeout=1200 --install $(RELEASE) ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion logstash/examples/security/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-logstash-security

install:
helm upgrade --wait --timeout=900 --install $(RELEASE) --values values.yaml ../../
helm upgrade --wait --timeout=1200 --install $(RELEASE) --values values.yaml ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/examples/default/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RELEASE = helm-metricbeat-default
GOSS_SELECTOR = release=$(RELEASE),app=helm-metricbeat-default-metricbeat

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) ../../

test-metrics:
GOSS_FILE=goss-metrics.yaml make goss GOSS_SELECTOR=release=$(RELEASE),app=helm-metricbeat-default-metricbeat-metrics
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/examples/oss/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RELEASE := helm-metricbeat-oss
GOSS_SELECTOR = release=$(RELEASE),app=helm-metricbeat-oss-metricbeat

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) --values values.yaml ../../

purge:
helm del --purge $(RELEASE)
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/examples/security/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RELEASE := helm-metricbeat-security
GOSS_SELECTOR = release=$(RELEASE),app=helm-metricbeat-security-metricbeat

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values values.yaml ../../
helm upgrade --wait --timeout=900 --install $(RELEASE) --values values.yaml ../../

purge:
helm del --purge $(RELEASE)
Expand Down

0 comments on commit 42d60e6

Please sign in to comment.