Skip to content

Commit 16ea133

Browse files
committed
revert pin elastic stack elastic#8352
1 parent 7e2d84c commit 16ea133

File tree

5 files changed

+5
-158
lines changed

5 files changed

+5
-158
lines changed

.ci/updatecli/updatecli-bump-stack-version.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/workflows/bump-stable-snapshot.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

pkg/testing/ess/create_deployment_csp_configuration.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,3 @@ aws:
1313
elasticsearch_conf_id: "aws.es.datahot.i3"
1414
elasticsearch_deployment_template_id: "aws-storage-optimized"
1515
kibana_instance_configuration_id: "aws.kibana.c5d"
16-
# Automatically updated by updatecli-bump-stack-version.yml. Don't change the structure and key names
17-
docker:
18-
integration_server_image: "docker.elastic.co/cloud-release/elastic-agent-cloud:9.2.0-cd34cd9b-SNAPSHOT"
19-
elasticsearch_image: "docker.elastic.co/cloud-release/elasticsearch-cloud-ess:9.2.0-cd34cd9b-SNAPSHOT"
20-
kibana_image: "docker.elastic.co/cloud-release/kibana-cloud:9.2.0-cd34cd9b-SNAPSHOT"

test_infra/ess/deployment.tf

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ locals {
6161

6262
ess_region = coalesce(var.ess_region, "gcp-us-east1")
6363
deployment_template_id = coalesce(var.deployment_template_id, "gcp-storage-optimized")
64+
6465
ess_properties = merge(
6566
{
6667
docker = {
@@ -72,23 +73,10 @@ locals {
7273
},
7374
yamldecode(file("${path.module}/../../pkg/testing/ess/create_deployment_csp_configuration.yaml")))
7475

75-
integration_server_docker_image = coalesce(
76-
var.integration_server_docker_image,
77-
local.ess_properties.docker.integration_server_image,
78-
"docker.elastic.co/cloud-release/elastic-agent-cloud:${var.stack_version}"
79-
)
80-
81-
elasticsearch_docker_image = coalesce(
82-
var.elasticsearch_docker_image,
83-
local.ess_properties.docker.elasticsearch_image,
84-
"docker.elastic.co/cloud-release/elasticsearch-cloud-ess:${var.stack_version}"
85-
)
86-
87-
kibana_docker_image = coalesce(
88-
var.kibana_docker_image,
89-
local.ess_properties.docker.kibana_image,
90-
"docker.elastic.co/cloud-release/kibana-cloud:${var.stack_version}"
91-
)
76+
77+
integration_server_docker_image = coalesce(var.integration_server_docker_image, local.ess_properties.docker.integration_server_image, "docker.elastic.co/cloud-release/elastic-agent-cloud:${var.stack_version}")
78+
elasticsearch_docker_image = coalesce(var.elasticsearch_docker_image, local.ess_properties.docker.elasticsearch_image, "docker.elastic.co/cloud-release/elasticsearch-cloud-ess:${var.stack_version}")
79+
kibana_docker_image = coalesce(var.kibana_docker_image, local.ess_properties.docker.kibana_image, "docker.elastic.co/cloud-release/kibana-cloud:${var.stack_version}")
9280
}
9381

9482
# If we have defined a stack version, validate that this version exists on that region and return it.

test_infra/ess/readme.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)