Merge pull request #169 from elastic/friday_the_thirteenth

Add GKE 1.13 to automated testing suite
elastic · Jun 21, 2019 · 6f97893 · 6f97893
2 parents e6771f4 + b0a769e
commit 6f97893
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 141 deletions.
diff --git a/elasticsearch/README.md b/elasticsearch/README.md
@@ -41,9 +41,9 @@ If you currently have a cluster deployed with the [helm/charts stable](https://g
 
 This chart is tested with the latest supported versions. The currently tested versions are:
 
-| 5.x    | 6.x   | 7.x   |
-| ------ | ----- | ----- |
-| 5.6.16 | 6.8.0 | 7.1.1 |
+| 6.x   | 7.x   |
+| ----- | ----- |
+| 6.8.0 | 7.1.1 |
 
 Examples of installing older major versions can be found in the [examples](./examples) directory.
 

diff --git a/elasticsearch/examples/5.x/Makefile b/elasticsearch/examples/5.x/Makefile
diff --git a/elasticsearch/examples/5.x/test/goss.yaml b/elasticsearch/examples/5.x/test/goss.yaml
diff --git a/elasticsearch/examples/5.x/values.yaml b/elasticsearch/examples/5.x/values.yaml
diff --git a/elasticsearch/examples/default/test/goss.yaml b/elasticsearch/examples/default/test/goss.yaml
@@ -1,23 +1,17 @@
-port:
-  tcp6:9200:
-    listening: true
-    ip:
-    - '::'
-
 kernel-param:
   vm.max_map_count:
     value: '262144'
 
 http:
-  http://localhost:9200/_cluster/health:
+  http://elasticsearch-master:9200/_cluster/health:
     status: 200
     timeout: 2000
     body:
       - 'green'
       - '"number_of_nodes":3'
       - '"number_of_data_nodes":3'
 
-  http://localhost:9200:
+  http://0.0.0.0:9200:
     status: 200
     timeout: 2000
     body:

diff --git a/elasticsearch/examples/security/test/goss.yaml b/elasticsearch/examples/security/test/goss.yaml
@@ -1,5 +1,5 @@
 http:
-  https://localhost:9200/_cluster/health:
+  https://security-master:9200/_cluster/health:
     status: 200
     timeout: 2000
     allow-insecure: true
@@ -10,7 +10,7 @@ http:
       - '"number_of_nodes":3'
       - '"number_of_data_nodes":3'
 
-  https://localhost:9200/:
+  https://0.0.0.0:9200/:
     status: 200
     timeout: 2000
     allow-insecure: true
@@ -21,7 +21,7 @@ http:
       - '"name" : "security-master-0"'
       - 'You Know, for Search'
 
-  https://localhost:9200/_xpack/license:
+  https://0.0.0.0:9200/_xpack/license:
     status: 200
     timeout: 2000
     allow-insecure: true

diff --git a/filebeat/README.md b/filebeat/README.md
@@ -28,9 +28,9 @@ This helm chart is a lightweight way to configure and run our official [Filebeat
 
 This chart is tested with the latest supported versions. The currently tested versions are:
 
-| 5.x    | 6.x   | 7.x   |
-| ------ | ----- | ----- |
-| 5.6.16 | 6.8.0 | 7.1.1 |
+| 6.x   | 7.x   |
+| ----- | ----- |
+| 6.8.0 | 7.1.1 |
 
 Examples of installing older major versions can be found in the [examples](./examples) directory.
 

diff --git a/helpers/bumper.py b/helpers/bumper.py
@@ -8,7 +8,6 @@
 os.chdir(os.path.join(os.path.dirname(__file__), '..'))
 
 versions = {
-    5: '5.6.16',
     6: '6.8.0',
     7: '7.1.1',
 }

diff --git a/helpers/matrix.yml b/helpers/matrix.yml
@@ -8,13 +8,11 @@ ES_SUITE:
   - oss
   - security
   - upgrade
-  - 5.x
   - 6.x
 KIBANA_SUITE:
   - default
   - oss
   - security
-  - 5.x
   - 6.x
 FILEBEAT_SUITE:
   - default
@@ -24,3 +22,4 @@ FILEBEAT_SUITE:
 KUBERNETES_VERSION:
   - '1.11'
   - '1.12'
+  - '1.13'
diff --git a/helpers/terraform/main.tf b/helpers/terraform/main.tf
@@ -25,8 +25,8 @@ resource "google_container_cluster" "cluster" {
   }
 
   timeouts {
-    create = "30m"
-    delete = "30m"
-    update = "30m"
+    create = "180m"
+    delete = "180m"
+    update = "180m"
   }
 }
diff --git a/kibana/README.md b/kibana/README.md
@@ -24,9 +24,9 @@ This helm chart is a lightweight way to configure and run our official [Kibana d
 
 This chart is tested with the latest supported versions. The currently tested versions are:
 
-| 5.x    | 6.x   | 7.x   |
-| ------ | ----- | ----- |
-| 5.6.16 | 6.8.0 | 7.1.1 |
+| 6.x   | 7.x   |
+| ----- | ----- |
+| 6.8.0 | 7.1.1 |
 
 Examples of installing older major versions can be found in the [examples](./examples) directory.
 

diff --git a/kibana/examples/5.x/Makefile b/kibana/examples/5.x/Makefile
diff --git a/kibana/examples/5.x/test/goss.yaml b/kibana/examples/5.x/test/goss.yaml
diff --git a/kibana/examples/5.x/values.yml b/kibana/examples/5.x/values.yml
diff --git a/kibana/examples/default/test/goss.yaml b/kibana/examples/default/test/goss.yaml
@@ -1,20 +1,14 @@
 http:
-  http://localhost:5601/api/status:
+  http://0.0.0.0:5601/api/status:
     status: 200
     timeout: 2000
     body:
       - '"number":"7.1.1"'
 
-  http://localhost:5601/app/kibana:
+  http://0.0.0.0:5601/app/kibana:
     status: 200
     timeout: 2000
 
   http://helm-kibana-default-kibana:5601/app/kibana:
     status: 200
     timeout: 2000
-
-port:
-  tcp:5601:
-    listening: true
-    ip:
-    - '0.0.0.0'
diff --git a/kibana/examples/security/security.yml b/kibana/examples/security/security.yml
@@ -34,9 +34,3 @@ secretMounts:
   - name: kibana-certificates
     secretName: kibana-certificates
     path: /usr/share/kibana/config/certs/kibana
-
-port:
-  tcp:5601:
-    listening: true
-    ip:
-    - '0.0.0.0'
diff --git a/kibana/examples/security/test/goss.yaml b/kibana/examples/security/test/goss.yaml
@@ -1,5 +1,5 @@
 http:
-  https://localhost:5601/app/kibana:
+  https://0.0.0.0:5601/app/kibana:
     status: 200
     timeout: 2000
     allow-insecure: true