From 59a3f323e2a51493dad61dfabd6778a9a50688e4 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Wed, 2 Nov 2022 01:33:59 -0400 Subject: [PATCH] [Automation] Update elastic stack version to 8.6.0-4765d2b0 for testing (#9494) Co-authored-by: apmmachine --- docker-compose.yml | 8 ++++---- testing/infra/k8s/base/stack/apm-server.yaml | 2 +- testing/infra/k8s/base/stack/elasticsearch.yaml | 2 +- testing/infra/k8s/base/stack/fleet-server.yaml | 2 +- testing/infra/k8s/base/stack/kibana.yaml | 2 +- testing/infra/k8s/overlays/local/kustomization.yaml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3e8bea2a9ce..bf24cdb90c5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.9' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.6.0-26dc1164-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.6.0-4765d2b0-SNAPSHOT ports: - 9200:9200 healthcheck: @@ -31,7 +31,7 @@ services: - "./testing/docker/elasticsearch/ingest-geoip:/usr/share/elasticsearch/config/ingest-geoip" kibana: - image: docker.elastic.co/kibana/kibana:8.6.0-26dc1164-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.6.0-4765d2b0-SNAPSHOT ports: - 5601:5601 healthcheck: @@ -50,7 +50,7 @@ services: - "./testing/docker/kibana/kibana.yml:/usr/share/kibana/config/kibana.yml" fleet-server: - image: docker.elastic.co/beats/elastic-agent:8.6.0-26dc1164-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:8.6.0-4765d2b0-SNAPSHOT ports: - 8220:8220 healthcheck: @@ -78,7 +78,7 @@ services: - "./testing/docker/fleet-server/key.pem:/etc/pki/tls/private/fleet-server-key.pem" metricbeat: - image: docker.elastic.co/beats/metricbeat:8.6.0-26dc1164-SNAPSHOT + image: docker.elastic.co/beats/metricbeat:8.6.0-4765d2b0-SNAPSHOT environment: ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}" diff --git a/testing/infra/k8s/base/stack/apm-server.yaml b/testing/infra/k8s/base/stack/apm-server.yaml index 135d0f999a5..1eb6cdd1a60 100644 --- a/testing/infra/k8s/base/stack/apm-server.yaml +++ b/testing/infra/k8s/base/stack/apm-server.yaml @@ -4,7 +4,7 @@ metadata: name: apm-server namespace: default spec: - version: 8.6.0-26dc1164-SNAPSHOT + version: 8.6.0-4765d2b0-SNAPSHOT mode: fleet policyID: eck-apm-server kibanaRef: diff --git a/testing/infra/k8s/base/stack/elasticsearch.yaml b/testing/infra/k8s/base/stack/elasticsearch.yaml index 63abe07d3ee..a6f7c8b9cc2 100644 --- a/testing/infra/k8s/base/stack/elasticsearch.yaml +++ b/testing/infra/k8s/base/stack/elasticsearch.yaml @@ -3,7 +3,7 @@ kind: Elasticsearch metadata: name: elasticsearch spec: - version: 8.6.0-26dc1164-SNAPSHOT + version: 8.6.0-4765d2b0-SNAPSHOT auth: fileRealm: - secretName: elasticsearch-admin diff --git a/testing/infra/k8s/base/stack/fleet-server.yaml b/testing/infra/k8s/base/stack/fleet-server.yaml index 465749b291b..5cae8949a86 100644 --- a/testing/infra/k8s/base/stack/fleet-server.yaml +++ b/testing/infra/k8s/base/stack/fleet-server.yaml @@ -3,7 +3,7 @@ kind: Agent metadata: name: fleet-server spec: - version: 8.6.0-26dc1164-SNAPSHOT + version: 8.6.0-4765d2b0-SNAPSHOT mode: fleet fleetServerEnabled: true elasticsearchRefs: diff --git a/testing/infra/k8s/base/stack/kibana.yaml b/testing/infra/k8s/base/stack/kibana.yaml index d9ab4ddbbc1..0415b8fa8b1 100644 --- a/testing/infra/k8s/base/stack/kibana.yaml +++ b/testing/infra/k8s/base/stack/kibana.yaml @@ -3,7 +3,7 @@ kind: Kibana metadata: name: kibana spec: - version: 8.6.0-26dc1164-SNAPSHOT + version: 8.6.0-4765d2b0-SNAPSHOT count: 1 elasticsearchRef: name: elasticsearch diff --git a/testing/infra/k8s/overlays/local/kustomization.yaml b/testing/infra/k8s/overlays/local/kustomization.yaml index f2dfc5d663e..b89e5c7aa21 100644 --- a/testing/infra/k8s/overlays/local/kustomization.yaml +++ b/testing/infra/k8s/overlays/local/kustomization.yaml @@ -21,4 +21,4 @@ patches: # image_json_path for overriding the apm-server image (see above), # and we use the same CRD kind for both apm-server and fleet-server. # As soon as you specify image_json_path, it *must* match an image. - image: docker.elastic.co/beats/elastic-agent:8.6.0-26dc1164-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:8.6.0-4765d2b0-SNAPSHOT