Skip to content

Commit 2252fdd

Browse files
ci: revert deployment_csp_configuration.yaml to create_deployment_csp_configuration.yaml (elastic#8746)
1 parent 7eff1a9 commit 2252fdd

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ sources:
2626
key: .build
2727
targets:
2828
updateStackImages:
29-
name: "Update deployment_csp_configuration.yaml"
29+
name: "Update create_deployment_csp_configuration.yaml"
3030
sourceid: lastStableStackSnapshot
3131
scmid: githubConfig
3232
kind: file
3333
spec:
34-
file: "pkg/testing/ess/deployment_csp_configuration.yaml"
34+
file: "pkg/testing/ess/create_deployment_csp_configuration.yaml"
3535
matchpattern: '(\S*_image: ".*docker.*):(.+)"'
3636
replacepattern: '$1:{{ source "lastStableStackSnapshot" }}-SNAPSHOT"'
3737
actions:
@@ -48,4 +48,4 @@ actions:
4848
- "Team:Elastic-Agent-Control-Plane"
4949
title: '[{{ requiredEnv "BRANCH_NAME" }}][Automation] Bump stack images versions to {{ source "lastStableStackSnapshot" }}'
5050
description: |
51-
Updates `deployment_csp_configuration.yml`. It is used to pin stable images versions for integration tests.
51+
Updates `create_deployment_csp_configuration.yml`. It is used to pin stable images versions for integration tests.

.mergify.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ defaults:
1919
labels:
2020
- "backport"
2121
pull_request_rules:
22-
- name: automatic approval for updatecli pull requests with changes in .buildkite or deployment_csp_configuration.yaml
22+
- name: automatic approval for updatecli pull requests with changes in .buildkite or create_deployment_csp_configuration.yaml
2323
conditions:
2424
- author=github-actions[bot]
2525
- check-success=buildkite/elastic-agent
2626
- or:
27-
- files~=^pkg/testing/ess/deployment_csp_configuration.yaml$
27+
- files~=^pkg/testing/ess/create_deployment_csp_configuration.yaml$
2828
- files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml)$
2929
- head~=^updatecli_.*
3030
actions:
3131
review:
3232
type: APPROVE
3333
message: Automatically approving mergify
34-
- name: automatic squash and merge with success checks and the files matching the regex .buildkite or deployment_csp_configuration.yaml is modified.
34+
- name: automatic squash and merge with success checks and the files matching the regex .buildkite or create_deployment_csp_configuration.yaml is modified.
3535
conditions:
3636
- author=github-actions[bot]
3737
- check-success=buildkite/elastic-agent
3838
- or:
39-
- files~=^pkg/testing/ess/deployment_csp_configuration.yaml$
39+
- files~=^pkg/testing/ess/create_deployment_csp_configuration.yaml$
4040
- files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml)$
4141
- head~=^updatecli_.*
4242
- "#approved-reviews-by>=1"
@@ -47,7 +47,7 @@ pull_request_rules:
4747
conditions:
4848
- author=github-actions[bot]
4949
- or:
50-
- files~=^pkg/testing/ess/deployment_csp_configuration.yaml$
50+
- files~=^pkg/testing/ess/create_deployment_csp_configuration.yaml$
5151
- files~=^.buildkite/(pipeline.yml|bk.integration.pipeline.yml)$
5252
- head~=^updatecli_.*
5353
- "#check-failure>0"

pkg/testing/ess/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ func overallStatus(statuses ...string) string {
399399
//go:embed create_deployment_request.tmpl.json
400400
var createDeploymentRequestTemplate string
401401

402-
//go:embed deployment_csp_configuration.yaml
402+
//go:embed create_deployment_csp_configuration.yaml
403403
var cloudProviderSpecificValues []byte
404404

405405
func generateCreateDeploymentRequestBody(req CreateDeploymentRequest) ([]byte, error) {

test_infra/ess/deployment.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ locals {
7070
}
7171

7272
},
73-
yamldecode(file("${path.module}/../../pkg/testing/ess/deployment_csp_configuration.yaml")))
73+
yamldecode(file("${path.module}/../../pkg/testing/ess/create_deployment_csp_configuration.yaml")))
7474

7575
integration_server_docker_image = coalesce(
7676
var.integration_server_docker_image,

test_infra/ess/readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
### Stable snapshots and images override
77
This deployment uses the latest tested snapshots of the Elastic Stack components by default. However, you can override the Docker images used for the integration server, Elasticsearch, and Kibana.
88

9-
`deployment_csp_configuration.yaml` contains the default configuration for the deployment, including the Docker images for the integration server, Elasticsearch, and Kibana. These images are automatically updated to the latest tested snapshots of the Elastic Stack components.
9+
`create_deployment_csp_configuration.yaml` contains the default configuration for the deployment, including the Docker images for the integration server, Elasticsearch, and Kibana. These images are automatically updated to the latest tested snapshots of the Elastic Stack components.
1010
* `integration_server_image` - The Docker image for the integration server
1111
* `elasticsearch_docker_image` - The Docker image for Elasticsearch
1212
* `kibana_docker_image` - The Docker image for Kibana
@@ -25,4 +25,4 @@ export TF_VAR_elasticsearch_docker_image="docker.elastic.co/cloud-release/elasti
2525
export TF_VAR_kibana_docker_image="docker.elastic.co/cloud-release/kibana-cloud:9.1.0-48398db3-SNAPSHOT"
2626
```
2727

28-
Note: terraform variables take precedence over `deployment_csp_configuration.yaml` docker images configuration. Use `terraform.tfvars` and `TF_VAR_` environment variables to override the images if you don't want to modify the `deployment_csp_configuration.yaml` file.
28+
Note: terraform variables take precedence over `create_deployment_csp_configuration.yaml` docker images configuration. Use `terraform.tfvars` and `TF_VAR_` environment variables to override the images if you don't want to modify the `create_deployment_csp_configuration.yaml` file.

0 commit comments

Comments
 (0)