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

Add GKE 1.13 to automated testing suite #169

Merged
merged 5 commits into from
Jun 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions elasticsearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
20 changes: 0 additions & 20 deletions elasticsearch/examples/5.x/Makefile

This file was deleted.

21 changes: 0 additions & 21 deletions elasticsearch/examples/5.x/test/goss.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions elasticsearch/examples/5.x/values.yaml

This file was deleted.

10 changes: 2 additions & 8 deletions elasticsearch/examples/default/test/goss.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 3 additions & 3 deletions elasticsearch/examples/security/test/goss.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
http:
https://localhost:9200/_cluster/health:
https://security-master:9200/_cluster/health:
status: 200
timeout: 2000
allow-insecure: true
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions filebeat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 0 additions & 1 deletion helpers/bumper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}
Expand Down
3 changes: 1 addition & 2 deletions helpers/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,3 +22,4 @@ FILEBEAT_SUITE:
KUBERNETES_VERSION:
- '1.11'
- '1.12'
- '1.13'
6 changes: 3 additions & 3 deletions helpers/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ resource "google_container_cluster" "cluster" {
}

timeouts {
create = "30m"
delete = "30m"
update = "30m"
create = "180m"
delete = "180m"
update = "180m"
}
}
6 changes: 3 additions & 3 deletions kibana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
12 changes: 0 additions & 12 deletions kibana/examples/5.x/Makefile

This file was deleted.

14 changes: 0 additions & 14 deletions kibana/examples/5.x/test/goss.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions kibana/examples/5.x/values.yml

This file was deleted.

10 changes: 2 additions & 8 deletions kibana/examples/default/test/goss.yaml
Original file line number Diff line number Diff line change
@@ -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'
6 changes: 0 additions & 6 deletions kibana/examples/security/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion kibana/examples/security/test/goss.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down