Skip to content

[9.0] (backport #8575) [ci] fix k8s integration tests flakiness #8624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 23, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2025

What does this PR do?

This PR introduces the following changes:

  1. Vendor external Kubernetes artifacts for testing:

    • Kube-state-metrics (KSM) Helm subchart is now vendored to eliminate remote fetches during k8s integration tests.
    • Rendered manifests from the kustomize configuration are vendored to remove the runtime dependency on kustomize.
    • The kube-stack Helm chart is also vendored to avoid network pulls.

    To support this, a new mage target called integration:buildKubernetesTestData was added. This target is now invoked as a prerequisite by:

    • integration:testKubernetes
    • integration:testKubernetesMatrix
    • integration:testKubernetesSingle

    This aims to prevent CI failures from GitHub/network issues and addresses #8319.

  2. Fix decoding of Beats-style API Keys in K8s tests:

    • PR #7754 introduced a regression that broke Beats-style API key generation required by the Helm and Kustomize k8s integration tests.
    • This PR patches the decoding logic, and highlights the need to validate event ingestion in all integration tests.
  3. Fix %CA_TRUSTED% environment variable injection in Kustomize tests:

    • Recent failures revealed malformed ca_trusted_fingerprint values caused by %CA_TRUSTED% placeholders not being overridden.
    • This PR sets CA_TRUSTED to an empty value in the relevant test environments to ensure expected TLS behavior.
    {"log.level":"info","@timestamp":"2025-06-18T02:40:53.068Z","message":"'ca_trusted_fingerprint' set, looking for matching fingerprints","component":{"binary":"filebeat","dataset":"elastic_agent.filebeat","id":"filestream-default","type":"filestream"},"log":{"source":"filestream-default"},"log.logger":"tls","log.origin":{"file.line":180,"file.name":"tlscommon/tls_config.go","function":"github.com/elastic/elastic-agent-libs/transport/tlscommon.trustRootCA"},"service.name":"filebeat","ecs.version":"1.6.0","ecs.version":"1.6.0"}
    {"log.level":"error","@timestamp":"2025-06-18T02:40:53.068Z","message":"Error dialing decode 'ca_trusted_fingerprint': encoding/hex: invalid byte: U+0025 '%'","component":{"binary":"filebeat","dataset":"elastic_agent.filebeat","id":"filestream-default","type":"filestream"},"log":{"source":"filestream-default"},"ecs.version":"1.6.0","log.logger":"esclientleg","log.origin":{"file.line":39,"file.name":"transport/logging.go","function":"github.com/elastic/elastic-agent-libs/transport/httpcommon.(*HTTPTransportSettings).RoundTripper.LoggingDialer.func2"},"service.name":"filebeat","network.transport":"tcp","server.address":"767b2b9229dd4bd098dab11b95e74c64.us-west2.gcp.elastic-cloud.com:443","ecs.version":"1.6.0"}
    
  4. Increase memory limits for Elastic Agent in Kustomize-based tests:

    • Multiple OOMKilled errors were observed (example 1, example 2).
    • A bump in memory limits is applied specifically for the Kustomize scenario, where all inputs run on a single DaemonSet pod, potentially spawning more Beat subprocesses.

Why is it important?

  • Ensures Kubernetes integration tests are resilient to GitHub outages and network instability by removing external dependencies.
  • Fixes broken functionality introduced in previous PRs related to API key handling.
  • Prevents TLS misconfiguration caused by unintended environment variable injections.
  • Addresses out-of-memory crashes that reduce test reliability and increase CI flakiness.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

None expected. All changes are isolated to the Kubernetes integration test setup and do not affect runtime or user configurations.

How to test this PR locally

mage integration:buildKubernetesTestData

EXTERNAL=true SNAPSHOT=true PACKAGES=docker DOCKER_VARIANTS=basic PLATFORMS=linux/arm64 mage package

INSTANCE_PROVISIONER="kind" TEST_PLATFORMS="kubernetes/arm64/1.33.0/basic" mage integration:TestKubernetes

Related issues


This is an automatic backport of pull request #8575 done by [Mergify](https://mergify.com).

* feat: vendor all necessary test artifacts for kubernetes integration to minimise flakiness due to transient errors

* fix: correct decode api key

* fix: clear CA_TRUSTED env var for kustomize

* fix: bump memory limits for kustomize

* fix: fabricate paths leveraging filepath

* fix: remove redundant file moving when downloading kube stack helm chart

* feat: vendor expanded archives

* fix: use filepath.Join

* doc: update BuildDependencies godoc

(cherry picked from commit 7259e54)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	testing/integration/k8s/journald_test.go
@mergify mergify bot requested a review from a team as a code owner June 23, 2025 05:29
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 23, 2025
@mergify mergify bot requested review from michalpristas and swiatekm and removed request for a team June 23, 2025 05:29
Copy link
Contributor Author

mergify bot commented Jun 23, 2025

Cherry-pick of 7259e54 has failed:

On branch mergify/bp/9.0/pr-8575
Your branch is up to date with 'origin/9.0'.

You are currently cherry-picking commit 7259e54d9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Makefile
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/.helmignore
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/Chart.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/README.md
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/NOTES.txt
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/_helpers.tpl
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/ciliumnetworkpolicy.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/clusterrolebinding.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/crs-configmap.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/deployment.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/extra-manifests.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/kubeconfig-secret.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/networkpolicy.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/pdb.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/podsecuritypolicy.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/psp-clusterrole.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/rbac-configmap.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/role.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/rolebinding.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/service.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/serviceaccount.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/servicemonitor.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/stsdiscovery-role.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/stsdiscovery-rolebinding.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/templates/verticalpodautoscaler.yaml
	new file:   deploy/helm/elastic-agent/charts/kube-state-metrics/values.yaml
	modified:   deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
	modified:   deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
	modified:   deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/base/elastic-agent-managed-daemonset.yaml
	modified:   deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-managed/extra/elastic-agent-managed-statefulset.yaml
	modified:   deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/base/elastic-agent-standalone-daemonset.yaml
	modified:   deploy/kubernetes/elastic-agent-kustomize/ksm-autosharding/elastic-agent-standalone/extra/elastic-agent-standalone-statefulset.yaml
	modified:   deploy/kubernetes/elastic-agent-managed-kubernetes.yaml
	modified:   deploy/kubernetes/elastic-agent-managed/elastic-agent-managed-daemonset.yaml
	modified:   deploy/kubernetes/elastic-agent-standalone-kubernetes.yaml
	modified:   deploy/kubernetes/elastic-agent-standalone/elastic-agent-standalone-daemonset.yaml
	modified:   dev-tools/mage/common.go
	modified:   magefile.go
	deleted:    pkg/testing/helm/helm.go
	new file:   pkg/testing/kubernetes/kustomize.go
	modified:   testing/integration/k8s/common.go
	new file:   testing/integration/k8s/k8s.go
	modified:   testing/integration/k8s/kubernetes_agent_service_test.go
	modified:   testing/integration/k8s/kubernetes_agent_standalone_test.go
	modified:   testing/integration/k8s/otel_helm_test.go
	new file:   testing/integration/k8s/testdata/elastic-agent-kustomize.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/.helmignore
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/Chart.lock
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/Chart.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/README.md
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/crds/Chart.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/crds/README.md
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/crds/crds/monitoring.coreos.com_podmonitors.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/crds/crds/monitoring.coreos.com_servicemonitors.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/crds/crds/opentelemetry.io_instrumentations.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/crds/crds/opentelemetry.io_opampbridges.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/crds/crds/opentelemetry.io_opentelemetrycollectors.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/.helmignore
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/Chart.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/README.md
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/NOTES.txt
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/_helpers.tpl
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/ciliumnetworkpolicy.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/clusterrolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/crs-configmap.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/deployment.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/extra-manifests.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/kubeconfig-secret.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/networkpolicy.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/pdb.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/podsecuritypolicy.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/psp-clusterrole.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/psp-clusterrolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/rbac-configmap.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/role.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/rolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/serviceaccount.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/stsdiscovery-role.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/stsdiscovery-rolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/templates/verticalpodautoscaler.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/kube-state-metrics/values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/.helmignore
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/CONTRIBUTING.md
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/Chart.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/README.md
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/UPGRADING.md
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/ci/cert-manager-disable-nameoverride-values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/ci/cert-manager-disable-values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/ci/nameoverride-values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/ci/secret-name-nameoverride-values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/ci/secret-name-values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/conf/crds/crd-opentelemetry.io_opampbridges.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/conf/crds/crd-opentelemetryinstrumentation.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/README.md
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/deployment.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/role.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/examples/default/values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/NOTES.txt
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/_helpers.tpl
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook-with-cert-manager.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/admission-webhooks/operator-webhook.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/certmanager.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/clusterrole.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/clusterrolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/deployment.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/pdb.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/prometheusrule.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/role.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/rolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/serviceaccount.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/tests/test-certmanager-connection.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/tests/test-service-connection.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/templates/verticalpodautoscaler.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/values.schema.json
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/.helmignore
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/Chart.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/README.md
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/ci/port-values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/NOTES.txt
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/_helpers.tpl
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/clusterrole.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/clusterrolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/daemonset.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/endpoints.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/extra-manifests.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/networkpolicy.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/podmonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/psp-clusterrolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/psp.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/rbac-configmap.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/serviceaccount.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/templates/verticalpodautoscaler.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/prometheus-node-exporter/values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/daemon_scrape_configs.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/clusterrole.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/admission-webhooks/operator-webhook-with-cert-manager.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/admission-webhooks/operator-webhook.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/certmanager.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/clusterrole.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/clusterrolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/deployment.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/role.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/rolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/serviceaccount.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/tests/test-certmanager-connection.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/rendered/opentelemetry-operator/tests/test-service-connection.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/cloud-demo/values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/README.md
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/kubelet_scrape_configs.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/clusterrole.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/kube-state-metrics/clusterrolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/kube-state-metrics/deployment.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/kube-state-metrics/role.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/kube-state-metrics/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/kube-state-metrics/serviceaccount.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/kube-state-metrics/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/admission-webhooks/operator-webhook-with-cert-manager.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/admission-webhooks/operator-webhook.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/certmanager.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/clusterrole.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/clusterrolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/deployment.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/role.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/rolebinding.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/serviceaccount.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/tests/test-certmanager-connection.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/opentelemetry-operator/tests/test-service-connection.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/prometheus-node-exporter/daemonset.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/prometheus-node-exporter/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/prometheus-node-exporter/serviceaccount.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/rendered/prometheus-node-exporter/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/examples/prometheus-otel/values.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/_config.tpl
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/_helpers.tpl
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/bridge.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/clusterrole.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/collector.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/core-dns/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/core-dns/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-api-server/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-controller-manager/endpoints.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-controller-manager/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-dns/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-dns/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-etcd/endpoints.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-etcd/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-etcd/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-proxy/endpoints.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-proxy/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-proxy/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-scheduler/endpoints.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-scheduler/service.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/exporters/kube-scheduler/servicemonitor.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/hooks.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/instrumentation.yaml
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/values.schema.json
	new file:   testing/integration/k8s/testdata/opentelemetry-kube-stack/values.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	deleted by us:   testing/integration/k8s/journald_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jun 23, 2025
8 tasks
@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Jun 23, 2025
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

Copy link
Contributor Author

mergify bot commented Jun 23, 2025

This pull request has not been merged yet. Could you please review and merge it @pkoutsovasilis? 🙏

Copy link

@elasticmachine
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @pkoutsovasilis

@pkoutsovasilis pkoutsovasilis merged commit 0a34bd9 into 9.0 Jun 23, 2025
16 of 19 checks passed
@pkoutsovasilis pkoutsovasilis deleted the mergify/bp/9.0/pr-8575 branch June 23, 2025 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants