From f3dc754f7133c994e45fedf858b2b212baf0b72c Mon Sep 17 00:00:00 2001 From: apmmachine Date: Tue, 25 Jan 2022 05:12:45 +0000 Subject: [PATCH] bump stack version 8.1.0-aa69d697 --- .ci/Jenkinsfile | 4 ++-- .stack-version | 2 +- cli/config/compose/profiles/fleet/docker-compose.yml | 6 +++--- cli/config/compose/profiles/metricbeat/docker-compose.yml | 2 +- cli/config/kubernetes/base/elasticsearch/deployment.yaml | 2 +- cli/config/kubernetes/base/fleet-server/deployment.yaml | 2 +- cli/config/kubernetes/base/kibana/deployment.yaml | 2 +- internal/common/defaults.go | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index c55ff404cc..a0282917bf 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -48,12 +48,12 @@ pipeline { booleanParam(name: "notifyOnGreenBuilds", defaultValue: false, description: "If it's needed to notify to Slack with green builds.") string(name: 'SLACK_CHANNEL', defaultValue: 'observablt-bots', description: 'The Slack channel(s) where errors will be posted. For multiple channels, use a comma-separated list of channels') string(name: 'ELASTIC_AGENT_DOWNLOAD_URL', defaultValue: '', description: 'If present, it will override the download URL for the Elastic agent artifact. (I.e. https://snapshots.elastic.co/8.0.0-59098054/downloads/beats/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-linux-x86_64.tar.gz') - string(name: 'BEAT_VERSION', defaultValue: '8.1.0-dbc834fd-SNAPSHOT', description: 'SemVer version of the Beat to be used for the tests. You can use here the tag of your PR to test your changes') + string(name: 'BEAT_VERSION', defaultValue: '8.1.0-aa69d697-SNAPSHOT', description: 'SemVer version of the Beat to be used for the tests. You can use here the tag of your PR to test your changes') string(name: 'ELASTIC_AGENT_STALE_VERSION', defaultValue: '7.17-SNAPSHOT', description: 'SemVer version of the stale stand-alone elastic-agent to be used for Fleet upgrade tests.') choice(name: 'LOG_LEVEL', choices: ['DEBUG', 'TRACE', 'INFO'], description: 'Log level to be used') choice(name: 'TIMEOUT_FACTOR', choices: ['5', '3', '7', '11'], description: 'Max number of minutes for timeout backoff strategies') string(name: 'KIBANA_VERSION', defaultValue: '', description: 'Docker tag of the kibana to be used for the tests. It will refer to an image related to a Kibana PR, under the Observability-CI namespace') - string(name: 'STACK_VERSION', defaultValue: '8.1.0-dbc834fd-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') + string(name: 'STACK_VERSION', defaultValue: '8.1.0-aa69d697-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.') string(name: 'HELM_CHART_VERSION', defaultValue: '7.11.2', description: 'SemVer version of Helm chart to be used.') string(name: 'HELM_VERSION', defaultValue: '3.5.2', description: 'SemVer version of Helm to be used.') string(name: 'KIND_VERSION', defaultValue: '0.10.0', description: 'SemVer version of Kind to be used.') diff --git a/.stack-version b/.stack-version index 7a6844f9c2..40040e875d 100644 --- a/.stack-version +++ b/.stack-version @@ -1 +1 @@ -8.1.0-dbc834fd-SNAPSHOT +8.1.0-aa69d697-SNAPSHOT diff --git a/cli/config/compose/profiles/fleet/docker-compose.yml b/cli/config/compose/profiles/fleet/docker-compose.yml index cf284cbab6..8f21f77f88 100644 --- a/cli/config/compose/profiles/fleet/docker-compose.yml +++ b/cli/config/compose/profiles/fleet/docker-compose.yml @@ -16,7 +16,7 @@ services: - xpack.security.authc.api_key.enabled=true - ELASTIC_USERNAME=elastic - ELASTIC_PASSWORD=changeme - image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.1.0-dbc834fd-SNAPSHOT}" + image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.1.0-aa69d697-SNAPSHOT}" platform: ${stackPlatform:-linux/amd64} ports: - "9200:9200" @@ -28,14 +28,14 @@ services: test: "curl -f http://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null" retries: 600 interval: 1s - image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-8.1.0-dbc834fd-SNAPSHOT}" + image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-8.1.0-aa69d697-SNAPSHOT}" platform: ${stackPlatform:-linux/amd64} ports: - "5601:5601" volumes: - ./${kibanaProfile:-default}/kibana.config.yml:/usr/share/kibana/config/kibana.yml fleet-server: - image: "docker.elastic.co/beats/elastic-agent-complete:${stackVersion:-8.1.0-dbc834fd-SNAPSHOT}" + image: "docker.elastic.co/beats/elastic-agent-complete:${stackVersion:-8.1.0-aa69d697-SNAPSHOT}" depends_on: elasticsearch: condition: service_healthy diff --git a/cli/config/compose/profiles/metricbeat/docker-compose.yml b/cli/config/compose/profiles/metricbeat/docker-compose.yml index 85ae9b115d..6e8f3255c4 100644 --- a/cli/config/compose/profiles/metricbeat/docker-compose.yml +++ b/cli/config/compose/profiles/metricbeat/docker-compose.yml @@ -9,7 +9,7 @@ services: - xpack.monitoring.collection.enabled=true - ELASTIC_USERNAME=elastic - ELASTIC_PASSWORD=changeme - image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.1.0-dbc834fd-SNAPSHOT}" + image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.1.0-aa69d697-SNAPSHOT}" platform: ${stackPlatform:-linux/amd64} ports: - "9200:9200" diff --git a/cli/config/kubernetes/base/elasticsearch/deployment.yaml b/cli/config/kubernetes/base/elasticsearch/deployment.yaml index dd7d1e7d5c..7ce491d244 100644 --- a/cli/config/kubernetes/base/elasticsearch/deployment.yaml +++ b/cli/config/kubernetes/base/elasticsearch/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: elasticsearch - image: docker.elastic.co/elasticsearch/elasticsearch:8.1.0-dbc834fd-SNAPSHOT + image: docker.elastic.co/elasticsearch/elasticsearch:8.1.0-aa69d697-SNAPSHOT envFrom: - configMapRef: name: elasticsearch-config diff --git a/cli/config/kubernetes/base/fleet-server/deployment.yaml b/cli/config/kubernetes/base/fleet-server/deployment.yaml index 9ecbf7664e..b4e30e6ed5 100644 --- a/cli/config/kubernetes/base/fleet-server/deployment.yaml +++ b/cli/config/kubernetes/base/fleet-server/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: fleet-server - image: docker.elastic.co/beats/elastic-agent:8.1.0-dbc834fd-SNAPSHOT + image: docker.elastic.co/beats/elastic-agent:8.1.0-aa69d697-SNAPSHOT env: - name: FLEET_SERVER_ENABLE value: "1" diff --git a/cli/config/kubernetes/base/kibana/deployment.yaml b/cli/config/kubernetes/base/kibana/deployment.yaml index c52cd9b70b..018d340eca 100644 --- a/cli/config/kubernetes/base/kibana/deployment.yaml +++ b/cli/config/kubernetes/base/kibana/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: kibana - image: docker.elastic.co/kibana/kibana:8.1.0-dbc834fd-SNAPSHOT + image: docker.elastic.co/kibana/kibana:8.1.0-aa69d697-SNAPSHOT env: - name: ELASTICSEARCH_URL value: http://elasticsearch:9200 diff --git a/internal/common/defaults.go b/internal/common/defaults.go index 29a11ca426..2472dc1d04 100644 --- a/internal/common/defaults.go +++ b/internal/common/defaults.go @@ -36,7 +36,7 @@ const FleetServerAgentServiceName = "fleet-server" var AgentStaleVersion = "7.17-SNAPSHOT" // BeatVersionBase is the base version of the Beat to use -var BeatVersionBase = "8.1.0-dbc834fd-SNAPSHOT" +var BeatVersionBase = "8.1.0-aa69d697-SNAPSHOT" // BeatVersion is the version of the Beat to use // It can be overriden by BEAT_VERSION env var