conflicts

.buildkite/hooks/pre-exit

@@ -14,7 +14,7 @@ if [ -n "$TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE" ]; then
   fi
 fi
 
-unset GOOGLE_APPLICATION_GCP_SECRET API_KEY_TOKEN
+source .buildkite/scripts/unset-secrets.sh
 
 if command -v docker &>/dev/null; then
   DOCKER_REGISTRY="docker.elastic.co"

.buildkite/misc/gce-cleanup.yml

@@ -0,0 +1,36 @@
+---
+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: "${CREATION_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"

.buildkite/pipeline.elastic-agent-gce-cleanup.yml

@@ -0,0 +1,13 @@
+# 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"
+  DOCKER_REGISTRY: "docker.elastic.co"
+steps:
+  - label: "GCE Cleanup"
+    key: "gce-cleanup"
+    command: ".buildkite/scripts/steps/gce-cleanup.sh"
+    agents:
+      provider: "gcp"

.buildkite/pipeline.yml

@@ -12,3 +12,4 @@ steps:
       - "build/diagnostics/*"
     agents:
       provider: "gcp"
+      machineType: "n1-standard-8"

.buildkite/scripts/steps/gce-cleanup.sh

@@ -0,0 +1,15 @@
+#!/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 CREATION_DATE=$(date -Is -d "24 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 CREATION_DATE=$CREATION_DATE \
+  ${DOCKER_REGISTRY}/observability-ci/cloud-reaper:0.3.0 cloud-reaper --config /etc/cloud-reaper/config.yml destroy --confirm

.buildkite/scripts/steps/integration_tests.sh

@@ -13,7 +13,13 @@ TESTS_EXIT_STATUS=$?
 set -e
 
 # HTML report
-go install github.com/alexec/junit2html@latest
-junit2html < build/TEST-go-integration.xml > build/TEST-report.html
+outputXML="build/TEST-go-integration.xml"
+
+if [ -f "$outputXML" ]; then
+  go install github.com/alexec/junit2html@latest
+  junit2html < "$outputXML" > build/TEST-report.html
+else
+    echo "Cannot generate HTML test report: $outputXML not found"
+fi
 
 exit $TESTS_EXIT_STATUS

.buildkite/scripts/unset-secrets.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -euo pipefail
+# Unset all variables ending with _SECRET or _TOKEN
+for var in $(printenv | sed 's;=.*;;' | sort); do
+  if [[ "$var" == *_SECRET || "$var" == *_TOKEN ]]; then
+      unset "$var"
+  fi
+done

.github/CODEOWNERS

@@ -3,3 +3,4 @@
 
 /deploy/kubernetes @elastic/obs-cloudnative-monitoring
 /dev-tools/kubernetes @elastic/obs-cloudnative-monitoring
+/internal/pkg/composable/providers/kubernetes @elastic/obs-cloudnative-monitoring

.mergify.yml

@@ -254,3 +254,16 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
+  - name: backport patches to 8.10 branch
+    conditions:
+      - merged
+      - label=backport-v8.10.0
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.10"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"