Merge remote-tracking branch 'upstream/main' into 1276-test-for-ignored-fields

Author: flash1293

.buildkite/pipeline.trigger.integration.tests.sh

@@ -20,7 +20,8 @@ STACK_COMMAND_TESTS=(
 )
 
 for test in "${STACK_COMMAND_TESTS[@]}"; do
- echo " - label: \":go: Integration test: ${test}\""
+ test_name=${test#"test-"}
+ echo " - label: \":go: Integration test: ${test_name}\""
  echo " command: ./.buildkite/scripts/integration_tests.sh -t ${test}"
  echo " agents:"
  echo " provider: \"gcp\""
@@ -39,7 +40,12 @@ CHECK_PACKAGES_TESTS=(
 )
 for independent_agent in false true ; do
 for test in "${CHECK_PACKAGES_TESTS[@]}"; do
- echo " - label: \":go: Integration test: ${test} - independent_agent ${independent_agent}\""
+ label_suffix=""
+ if [[ "$independent_agent" == "true" ]]; then
+ label_suffix=" (independent agent)"
+ fi
+ test_name=${test#"test-check-packages-"}
+ echo " - label: \":go: Integration test: ${test_name}${label_suffix}\""
  echo " command: ./.buildkite/scripts/integration_tests.sh -t ${test}"
  echo " agents:"
  echo " provider: \"gcp\""
@@ -76,8 +82,12 @@ done
 pushd test/packages/parallel > /dev/null
 for independent_agent in false true; do
 for package in $(find . -maxdepth 1 -mindepth 1 -type d) ; do
+ label_suffix=""
+ if [[ "$independent_agent" == "true" ]]; then
+ label_suffix=" (independent agent)"
+ fi
  package_name=$(basename "${package}")
- echo " - label: \":go: Integration test: ${package_name} - independent_agent ${independent_agent}\""
+ echo " - label: \":go: Integration test: ${package_name}${label_suffix}\""
  echo " key: \"integration-parallel-${package_name}-agent-${independent_agent}\""
  echo " command: ./.buildkite/scripts/integration_tests.sh -t test-check-packages-parallel -p ${package_name}"
  echo " env:"
@@ -93,38 +103,42 @@ done
 
 popd > /dev/null
 
-echo " - label: \":go: Integration test: test-build-zip\""
+echo " - label: \":go: Integration test: build-zip\""
 echo " command: ./.buildkite/scripts/integration_tests.sh -t test-build-zip"
 echo " agents:"
 echo " provider: \"gcp\""
 echo " artifact_paths:"
 echo " - build/elastic-stack-dump/build-zip/logs/*.log"
 echo " - build/packages/*.sig"
 
-echo " - label: \":go: Integration test: test-install-zip\""
+echo " - label: \":go: Integration test: install-zip\""
 echo " command: ./.buildkite/scripts/integration_tests.sh -t test-install-zip"
 echo " agents:"
 echo " provider: \"gcp\""
 echo " artifact_paths:"
 echo " - build/elastic-stack-dump/install-zip/logs/*.log"
 
-echo " - label: \":go: Integration test: test-install-zip-shellinit\""
+echo " - label: \":go: Integration test: install-zip-shellinit\""
 echo " command: ./.buildkite/scripts/integration_tests.sh -t test-install-zip-shellinit"
 echo " agents:"
 echo " provider: \"gcp\""
 echo " artifact_paths:"
 echo " - build/elastic-stack-dump/install-zip-shellinit/logs/*.log"
 
 for independent_agent in false true; do
-echo " - label: \":go: Integration test: test-system-test-flags - independent_agent ${independent_agent}\""
-echo " command: ./.buildkite/scripts/integration_tests.sh -t test-system-test-flags"
-echo " agents:"
-echo " provider: \"gcp\""
-echo " env:"
-echo " ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT: ${independent_agent}"
+ label_suffix=""
+ if [[ "$independent_agent" == "true" ]]; then
+ label_suffix=" (independent agent)"
+ fi
+ echo " - label: \":go: Integration test: system-flags${label_suffix}\""
+ echo " command: ./.buildkite/scripts/integration_tests.sh -t test-system-test-flags"
+ echo " agents:"
+ echo " provider: \"gcp\""
+ echo " env:"
+ echo " ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT: ${independent_agent}"
 done
 
-echo " - label: \":go: Integration test: test-profiles-command\""
+echo " - label: \":go: Integration test: profiles-command\""
 echo " command: ./.buildkite/scripts/integration_tests.sh -t test-profiles-command"
 echo " env:"
 echo " DOCKER_COMPOSE_VERSION: \"false\""
@@ -134,7 +148,7 @@ echo " image: \"${LINUX_AGENT_IMAGE}\""
 echo " cpu: \"8\""
 echo " memory: \"4G\""
 
-echo " - label: \":go: Integration test: test-check-update-version\""
+echo " - label: \":go: Integration test: check-update-version\""
 echo " command: ./.buildkite/scripts/integration_tests.sh -t test-check-update-version"
 echo " env:"
 echo " DEFAULT_VERSION_TAG: v0.80.0"

.github/dependabot.yml

@@ -10,3 +10,7 @@ updates:
  reviewers:
  - "elastic/ecosystem"
  open-pull-requests-limit: 10
+ groups:
+ k8s:
+ patterns:
+ - "k8s.io/*"

Makefile

@@ -59,14 +59,14 @@ test-stack-command-oldest:
 ./scripts/test-stack-command.sh 7.14.2
 
 test-stack-command-7x:
-./scripts/test-stack-command.sh 7.17.18
+./scripts/test-stack-command.sh 7.17.19
 
 # Keeping a test for 8.6 because it has an specific configuration file.
 test-stack-command-86:
 ./scripts/test-stack-command.sh 8.6.2
 
 test-stack-command-8x:
-./scripts/test-stack-command.sh 8.13.0-SNAPSHOT
+./scripts/test-stack-command.sh 8.14.0-SNAPSHOT
 
 test-stack-command-with-apm-server:
 APM_SERVER_ENABLED=true ./scripts/test-stack-command.sh

cmd/testrunner.go

@@ -366,11 +366,14 @@ func testTypeCommandActionFactory(runner testrunner.TestRunner) cobraext.Command
 RunIndependentElasticAgent: runIndependentElasticAgent,
 })
 
+// Results must be appended even if there is an error, since there could be
+// tests (e.g. system tests) that return both error and results.
 results = append(results, r...)
 
 if err != nil {
 return fmt.Errorf("error running package %s tests: %w", testType, err)
 }
+
 }
 
 format := testrunner.TestReportFormat(reportFormat)

docs/howto/system_benchmarking.md

@@ -156,7 +156,6 @@ To use environment variables within the Terraform service deployer a `env.yml` f
 The file should be structured like this:
 
 ```yaml
-version: '2.3'
 services:
  terraform:
  environment:

docs/howto/system_testing.md

@@ -76,7 +76,6 @@ the log files from your package's integration service must be written to a volum
 the following definition in it's integration service's `docker-compose.yml` file.
 
 ```yaml
-version: '2.3'
 services:
  apache:
  # Other properties such as build, ports, etc.
@@ -95,7 +94,6 @@ For example docker images for MySQL include a volume for the data directory
 tests are executed, a volume can be added to the `docker-compose.yml`:
 
 ```yaml
-version: '2.3'
 services:
  mysql:
  # Other properties such as build, ports, etc.
@@ -118,7 +116,6 @@ This is useful if you need different capabilities than the provided by the
 
 `custom-agent.yml`
 ```yaml
-version: '2.3'
 services:
  docker-custom-agent:
  pid: host
@@ -131,7 +128,6 @@ services:
 This will result in an agent configuration such as:
 
 ```yaml
-version: '2.3'
 services:
  docker-custom-agent:
  hostname: docker-custom-agent
@@ -196,7 +192,6 @@ RUN apt-get update && apt-get -y install \
 ```
 An example for `custom-agent.yml` in multi-service setup is as below
 ```yaml
-version: '2.3'
 services:
  docker-custom-agent:
  build:
@@ -328,7 +323,6 @@ To use environment variables within the Terraform service deployer a `env.yml` f
 The file should be structured like this:
 
 ```yaml
-version: '2.3'
 services:
  terraform:
  environment:

go.mod

@@ -39,9 +39,9 @@ require (
 gotest.tools/gotestsum v1.11.0
 helm.sh/helm/v3 v3.14.4
 honnef.co/go/tools v0.4.7
-k8s.io/apimachinery v0.29.3
-k8s.io/cli-runtime v0.29.3
-k8s.io/client-go v0.29.3
+k8s.io/apimachinery v0.30.0
+k8s.io/cli-runtime v0.30.0
+k8s.io/client-go v0.30.0
 )
 
 require (
@@ -77,7 +77,7 @@ require (
 github.com/fsnotify/fsnotify v1.7.0 // indirect
 github.com/go-errors/errors v1.4.2 // indirect
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-github.com/go-logr/logr v1.3.0 // indirect
+github.com/go-logr/logr v1.4.1 // indirect
 github.com/go-ole/go-ole v1.2.6 // indirect
 github.com/go-openapi/errors v0.20.3 // indirect
 github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -171,11 +171,11 @@ require (
 gopkg.in/inf.v0 v0.9.1 // indirect
 gopkg.in/warnings.v0 v0.1.2 // indirect
 gopkg.in/yaml.v2 v2.4.0 // indirect
-k8s.io/api v0.29.3 // indirect
+k8s.io/api v0.30.0 // indirect
 k8s.io/apiextensions-apiserver v0.29.0 // indirect
 k8s.io/component-base v0.29.0 // indirect
-k8s.io/klog/v2 v2.110.1 // indirect
-k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+k8s.io/klog/v2 v2.120.1 // indirect
+k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 k8s.io/kubectl v0.29.0 // indirect
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

go.sum

@@ -139,8 +139,8 @@ github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMj
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
 github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys=
 github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY=
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
-github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
@@ -334,10 +334,10 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
-github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
-github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
-github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
-github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
+github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
+github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
+github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
 github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
 github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
@@ -636,22 +636,22 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.4.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs=
 honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0=
-k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=
-k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80=
+k8s.io/api v0.30.0 h1:siWhRq7cNjy2iHssOB9SCGNCl2spiF1dO3dABqZ8niA=
+k8s.io/api v0.30.0/go.mod h1:OPlaYhoHs8EQ1ql0R/TsUgaRPhpKNxIMrKQfWUp8QSE=
 k8s.io/apiextensions-apiserver v0.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0=
 k8s.io/apiextensions-apiserver v0.29.0/go.mod h1:TKmpy3bTS0mr9pylH0nOt/QzQRrW7/h7yLdRForMZwc=
-k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
-k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
-k8s.io/cli-runtime v0.29.3 h1:r68rephmmytoywkw2MyJ+CxjpasJDQY7AGc3XY2iv1k=
-k8s.io/cli-runtime v0.29.3/go.mod h1:aqVUsk86/RhaGJwDhHXH0jcdqBrgdF3bZWk4Z9D4mkM=
-k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg=
-k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0=
+k8s.io/apimachinery v0.30.0 h1:qxVPsyDM5XS96NIh9Oj6LavoVFYff/Pon9cZeDIkHHA=
+k8s.io/apimachinery v0.30.0/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
+k8s.io/cli-runtime v0.30.0 h1:0vn6/XhOvn1RJ2KJOC6IRR2CGqrpT6QQF4+8pYpWQ48=
+k8s.io/cli-runtime v0.30.0/go.mod h1:vATpDMATVTMA79sZ0YUCzlMelf6rUjoBzlp+RnoM+cg=
+k8s.io/client-go v0.30.0 h1:sB1AGGlhY/o7KCyCEQ0bPWzYDL0pwOZO4vAtTSh/gJQ=
+k8s.io/client-go v0.30.0/go.mod h1:g7li5O5256qe6TYdAMyX/otJqMhIiGgTapdLchhmOaY=
 k8s.io/component-base v0.29.0 h1:T7rjd5wvLnPBV1vC4zWd/iWRbV8Mdxs+nGaoaFzGw3s=
 k8s.io/component-base v0.29.0/go.mod h1:sADonFTQ9Zc9yFLghpDpmNXEdHyQmFIGbiuZbqAXQ1M=
-k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
-k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
-k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
-k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
+k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
+k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
+k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
 k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI=
 k8s.io/kubectl v0.29.0/go.mod h1:0jMjGWIcMIQzmUaMgAzhSELv5WtHo2a8pq67DtviAJs=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=

internal/agentdeployer/_static/docker-agent-base.yml renamed to internal/agentdeployer/_static/docker-agent-base.yml.tmpl

@@ -1,4 +1,3 @@
-version: "2.3"
 services:
  elastic-agent:
  hostname: ${AGENT_HOSTNAME}
@@ -7,6 +6,18 @@ services:
  test: "elastic-agent status"
  retries: 180
  interval: 1s
+ {{ if ne .pidMode "" }}
+ pid: {{ .pidMode }}
+ {{ end }}
+ {{ if ne .user "" }}
+ user: {{ .user }}
+ {{ end }}
+ {{ if .capabilities }}
+ cap_add:
+ {{- range .capabilities }}
+ - {{ . }}
+ {{- end }}
+ {{ end }}
  environment:
  - FLEET_ENROLL=1
  - FLEET_URL=https://fleet-server:8220
@@ -15,4 +26,3 @@ services:
  volumes:
  - ${SERVICE_LOGS_DIR}:/tmp/service_logs/
  - ${LOCAL_CA_CERT}:/etc/ssl/certs/elastic-package.pem
-

internal/agentdeployer/agent.go

@@ -10,6 +10,7 @@ import (
 "fmt"
 "os"
 "path/filepath"
+"text/template"
 "time"
 
 "github.com/elastic/elastic-package/internal/compose"
@@ -24,13 +25,12 @@ import (
 
 const (
 dockerTestAgentNamePrefix = "elastic-agent"
-dockerTestgentDir = "docker_test_agent"
 dockerTestAgentDockerCompose = "docker-agent-base.yml"
 defaultAgentPolicyName = "Elastic-Agent (elastic-package)"
 )
 
-//go:embed _static/docker-agent-base.yml
-var dockerAgentDockerComposeContent []byte
+//go:embed _static/docker-agent-base.yml.tmpl
+var dockerTestAgentDockerComposeTemplate string
 
 // CustomAgentDeployer knows how to deploy a custom elastic-agent defined via
 // a Docker Compose file.
@@ -112,7 +112,7 @@ func (d *DockerComposeAgentDeployer) SetUp(ctx context.Context, agentInfo AgentI
 fmt.Sprintf("%s=%s", agentHostnameEnv, d.agentHostname()),
 )
 
-configDir, err := d.installDockerfile()
+configDir, err := d.installDockerfile(agentInfo)
 if err != nil {
 return nil, fmt.Errorf("could not create resources for custom agent: %w", err)
 }
@@ -236,17 +236,29 @@ func (d *DockerComposeAgentDeployer) agentName() string {
 
 // installDockerfile creates the files needed to run the custom elastic agent and returns
 // the directory with these files.
-func (d *DockerComposeAgentDeployer) installDockerfile() (string, error) {
+func (d *DockerComposeAgentDeployer) installDockerfile(agentInfo AgentInfo) (string, error) {
 customAgentDir := filepath.Join(d.profile.ProfilePath, fmt.Sprintf("agent-%s", d.agentName()))
 err := os.MkdirAll(customAgentDir, 0755)
 if err != nil {
 return "", fmt.Errorf("failed to create directory for custom agent files: %w", err)
 }
 
 customAgentDockerfile := filepath.Join(customAgentDir, dockerTestAgentDockerCompose)
-err = os.WriteFile(customAgentDockerfile, dockerAgentDockerComposeContent, 0644)
+file, err := os.Create(customAgentDockerfile)
 if err != nil {
-return "", fmt.Errorf("failed to create docker compose file for custom agent: %w", err)
+return "", fmt.Errorf("failed to create file (name %s): %w", customAgentDockerfile, err)
+}
+defer file.Close()
+
+tmpl := template.Must(template.New(dockerTestAgentDockerCompose).Parse(dockerTestAgentDockerComposeTemplate))
+err = tmpl.Execute(file, map[string]any{
+"user": agentInfo.Agent.User,
+"capabilities": agentInfo.Agent.LinuxCapabilities,
+"runtime": agentInfo.Agent.Runtime,
+"pidMode": agentInfo.Agent.PidMode,
+})
+if err != nil {
+return "", fmt.Errorf("failed to create contents of the docker-compose file %q: %w", customAgentDockerfile, err)
 }
 
 return customAgentDir, nil