diff --git a/.buildkite/bk.integration.pipeline.yml b/.buildkite/bk.integration.pipeline.yml index 8291961a76c..477be05f545 100644 --- a/.buildkite/bk.integration.pipeline.yml +++ b/.buildkite/bk.integration.pipeline.yml @@ -1,7 +1,6 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json env: - VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp" ASDF_MAGE_VERSION: 1.14.0 # The following images are defined here and their values will be updated by updatecli diff --git a/.buildkite/integration.pipeline.yml b/.buildkite/integration.pipeline.yml index b889c66307a..751d3fa34a3 100644 --- a/.buildkite/integration.pipeline.yml +++ b/.buildkite/integration.pipeline.yml @@ -1,7 +1,6 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json env: - VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp" ASDF_MAGE_VERSION: 1.14.0 # The following images are defined here and their values will be updated by updatecli diff --git a/.buildkite/misc/gce-cleanup.yml b/.buildkite/misc/gce-cleanup.yml deleted file mode 100644 index 6606f4a6c11..00000000000 --- a/.buildkite/misc/gce-cleanup.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -version: "1.0" - -accounts: - - name: "${ACCOUNT_PROJECT}" - driver: "gce" - options: - key: "${ACCOUNT_KEY}" - secret: "${ACCOUNT_SECRET}" - project: "${ACCOUNT_PROJECT}" - -scanners: - - account_name: "${ACCOUNT_PROJECT}" - resources: - - type: "node" - regions: - - "us-central1" - filters: - - type: "<" - pointer: "/extra/creationTimestamp" - param: "${DELETE_CREATED_AFTER_DATE}" - converters: - param: "date" - value: "date" - - type: "=" - pointer: "/extra/labels/project" - param: "elastic-agent" - - type: "regex" - pointer: "/name" - param: "^ogc(.*)" - - type: "!=" - pointer: "/state" - param: "unknown" - - type: "!=" - pointer: "/state" - param: "terminated" diff --git a/.buildkite/pipeline.elastic-agent-gce-cleanup.yml b/.buildkite/pipeline.elastic-agent-gce-cleanup.yml deleted file mode 100644 index 45f47ff308c..00000000000 --- a/.buildkite/pipeline.elastic-agent-gce-cleanup.yml +++ /dev/null @@ -1,12 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json - -# Removes stale GCE instances having matching labels, name prefixes and older than 24 hours -# See gce-cleanup.sh and .buildkite/misc/gce-cleanup.yml -env: - VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp" -steps: - - label: "GCE Cleanup" - key: "gce-cleanup" - command: ".buildkite/scripts/steps/gce-cleanup.sh" - agents: - provider: "gcp" diff --git a/.buildkite/pipeline.integration-test-matrix.yml b/.buildkite/pipeline.integration-test-matrix.yml index 488e3843b62..55527542bf1 100644 --- a/.buildkite/pipeline.integration-test-matrix.yml +++ b/.buildkite/pipeline.integration-test-matrix.yml @@ -1,8 +1,5 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json -env: - VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp" - steps: - label: "Integration tests: packaging" key: "package-it" diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 1dafcfd851d..81cc67a1ccd 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,8 +1,6 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json env: - VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp" - # The following images are defined here and their values will be updated by updatecli # Please do not change them manually. IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1760144464" diff --git a/.buildkite/scripts/steps/gce-cleanup.sh b/.buildkite/scripts/steps/gce-cleanup.sh deleted file mode 100755 index cd0a2306d4f..00000000000 --- a/.buildkite/scripts/steps/gce-cleanup.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -export ACCOUNT_KEY_SECRET=$(vault kv get -field=client_email $VAULT_PATH) -export ACCOUNT_SECRET=$(vault kv get -field=private_key $VAULT_PATH) -export ACCOUNT_PROJECT_SECRET=$(vault kv get -field=project_id $VAULT_PATH) -export DELETE_CREATED_AFTER_DATE=$(date -Is -d "5 hours ago") - -docker run -v $(pwd)/.buildkite/misc/gce-cleanup.yml:/etc/cloud-reaper/config.yml \ - -e ACCOUNT_SECRET="$ACCOUNT_SECRET" \ - -e ACCOUNT_KEY="$ACCOUNT_KEY_SECRET" \ - -e ACCOUNT_PROJECT=$ACCOUNT_PROJECT_SECRET \ - -e DELETE_CREATED_AFTER_DATE=$DELETE_CREATED_AFTER_DATE \ - docker.elastic.co/observability-ci/cloud-reaper:0.3.0 cloud-reaper --config /etc/cloud-reaper/config.yml destroy --confirm diff --git a/.buildkite/serverless.beats.tests.yml b/.buildkite/serverless.beats.tests.yml index a2e66b6431e..93e0630b09a 100644 --- a/.buildkite/serverless.beats.tests.yml +++ b/.buildkite/serverless.beats.tests.yml @@ -1,8 +1,5 @@ # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json -env: - VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp" - steps: - label: "Serverless Beats Tests" key: "serverless-beats-integration-tests" diff --git a/catalog-info.yaml b/catalog-info.yaml index 2c6d2b0608f..998e9c1309f 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -390,53 +390,6 @@ spec: everyone: access_level: BUILD_AND_READ ---- -# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/e57ee3bed7a6f73077a3f55a38e76e40ec87a7cf/rre.schema.json -apiVersion: backstage.io/v1alpha1 -kind: Resource -metadata: - name: buildkite-elastic-agent-gce-cleanup - description: Clean up stale GCE instances - links: - - title: Pipeline - url: https://buildkite.com/elastic/elastic-agent - -spec: - type: buildkite-pipeline - owner: group:ingest-fp - system: platform-ingest - implementation: - apiVersion: buildkite.elastic.dev/v1 - kind: Pipeline - metadata: - name: elastic-agent-gce-cleanup - description: Pipeline file for cleaning up lingering GCE instances - spec: - pipeline_file: ".buildkite/pipeline.elastic-agent-gce-cleanup.yml" - provider_settings: - build_pull_request_forks: false - build_pull_requests: false # requires filter_enabled and filter_condition settings as below when used with buildkite-pr-bot - publish_commit_status: false # do not update status of commits for this pipeline - build_tags: false - build_branches: false - filter_enabled: true - # required by "build_pull_requests: true" when used with buildkite-pr-bot - filter_condition: >- - build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null) - repository: elastic/elastic-agent - schedules: - Every 4 hours: - branch: main - cronline: "0 0/4 * * *" # every 4th hour - message: GCE cleanup - teams: - ingest-fp: - access_level: MANAGE_BUILD_AND_READ - observablt-robots: - access_level: MANAGE_BUILD_AND_READ - everyone: - access_level: BUILD_AND_READ - --- # yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json apiVersion: backstage.io/v1alpha1