Merge pull request #347 from jmlrt/fix-goss-port-bug

[logstash] remove goss port test
elastic · Oct 30, 2019 · 9bb0b89 · 9bb0b89
2 parents 74a32a6 + ffb0266
commit 9bb0b89
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 32 deletions.
diff --git a/logstash/examples/6.x/Makefile b/logstash/examples/6.x/Makefile
@@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
 RELEASE := helm-logstash-six
 
 install:
-	helm upgrade --wait --timeout=600 --install $(RELEASE)  --values ./values.yaml ../../
+	helm upgrade --wait --timeout=900 --install $(RELEASE)  --values ./values.yaml ../../
 
 restart:
-	helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../
+	helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../
 
 test: install goss
 

diff --git a/logstash/examples/6.x/test/goss.yaml b/logstash/examples/6.x/test/goss.yaml
@@ -1,9 +1,3 @@
-port:
-  tcp:9600:
-    listening: true
-    ip:
-    - '0.0.0.0'
-
 user:
   logstash:
     exists: true

diff --git a/logstash/examples/default/Makefile b/logstash/examples/default/Makefile
@@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
 RELEASE := helm-logstash-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
 

diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml
@@ -1,9 +1,3 @@
-port:
-  tcp:9600:
-    listening: true
-    ip:
-    - '0.0.0.0'
-
 user:
   logstash:
     exists: true

diff --git a/logstash/examples/elasticsearch/Makefile b/logstash/examples/elasticsearch/Makefile
@@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
 RELEASE := helm-logstash-elasticsearch
 
 install:
-	helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../
+	helm upgrade --wait --timeout=900 --install $(RELEASE) --values ./values.yaml ../../
 
 restart:
-	helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../
+	helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) ../../
 
 test: install goss
 

diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml
@@ -1,9 +1,3 @@
-port:
-  tcp:9600:
-    listening: true
-    ip:
-    - '0.0.0.0'
-
 mount:
   /usr/share/logstash/data:
     exists: true

diff --git a/logstash/examples/oss/Makefile b/logstash/examples/oss/Makefile
@@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
 RELEASE := helm-logstash-oss
 
 install:
-	helm upgrade --wait --timeout=600 --install $(RELEASE)  --values ./values.yaml ../../
+	helm upgrade --wait --timeout=900 --install $(RELEASE)  --values ./values.yaml ../../
 
 restart:
-	helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../
+	helm upgrade --set terminationGracePeriod=121 --wait --timeout=900 --install $(RELEASE) ../../
 
 test: install goss
 

diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml
@@ -1,9 +1,3 @@
-port:
-  tcp:9600:
-    listening: true
-    ip:
-    - '0.0.0.0'
-
 user:
   logstash:
     exists: true