Add support to use wolfi Elastic Agent image starting in 8.16.0-SNAPSHOT (#2038)

Add support to use wolfi Elastic Agent image starting with Elastic
stack 8.16.0-SNAPSHOT. This feature can be disabled using a new environment
variable: ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI. Currently,
the default value of this environment variable is "false", so it is enabled
(it is taken into account just from 8.16.0-SNAPSHOT onward).

Author: mrodm

Makefile

@@ -73,7 +73,7 @@ test-stack-command-86:
 	./scripts/test-stack-command.sh 8.6.2
 
 test-stack-command-8x:
-	./scripts/test-stack-command.sh 8.16.0-32bc94b7-SNAPSHOT
+	./scripts/test-stack-command.sh 8.16.0-54ba7abd-SNAPSHOT
 
 test-stack-command-with-apm-server:
 	APM_SERVER_ENABLED=true ./scripts/test-stack-command.sh

README.md

@@ -692,6 +692,9 @@ There are available some environment variables that could be used to change some
 
 - Related to tests:
     - `ELASTIC_PACKAGE_SERVERLESS_PIPELINE_TEST_DISABLE_COMPARE_RESULTS`: If set to `true`, the results from pipeline tests are not compared to avoid errors from GeoIP.
+    - `ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI`: If set to `true`, the Elastic Agent image used for running agents will be using the Ubuntu docker images
+      (e.g. `docker.elastic.co/elastic-agent/elastic-agent-complete`). If set to `false`, the Elastic Agent image used for the running agents will be based on the wolfi
+      images (e.g. `docker.elastic.co/elastic-agent/elastic-agent-wolfi`). Default: `false`.
 
 - To configure the Elastic stack to be used by `elastic-package`:
     - `ELASTIC_PACKAGE_ELASTICSEARCH_HOST`: Host of the elasticsearch (e.g. https://127.0.0.1:9200)

internal/install/application_configuration.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/Masterminds/semver/v3"
 
@@ -23,10 +24,14 @@ import (
 const (
 	stackVersion715 = "7.15.0-SNAPSHOT"
 	stackVersion820 = "8.2.0-SNAPSHOT"
+	// Not setting here 8.16.0-SNAPSHOT to take also into account prerelease versions
+	// like 8.16.0-21bba6f5-SNAPSHOT
+	stackVersion8160 = "8.16.0-00000000-SNAPSHOT"
 
 	elasticAgentImageName               = "docker.elastic.co/beats/elastic-agent"
 	elasticAgentCompleteLegacyImageName = "docker.elastic.co/beats/elastic-agent-complete"
 	elasticAgentCompleteImageName       = "docker.elastic.co/elastic-agent/elastic-agent-complete"
+	elasticAgentWolfiImageName          = "docker.elastic.co/elastic-agent/elastic-agent-wolfi"
 	elasticsearchImageName              = "docker.elastic.co/elasticsearch/elasticsearch"
 	kibanaImageName                     = "docker.elastic.co/kibana/kibana"
 	logstashImageName                   = "docker.elastic.co/logstash/logstash"
@@ -37,9 +42,12 @@ const (
 var (
 	elasticAgentCompleteFirstSupportedVersion = semver.MustParse(stackVersion715)
 	elasticAgentCompleteOwnNamespaceVersion   = semver.MustParse(stackVersion820)
+	elasticAgentWolfiVersion                  = semver.MustParse(stackVersion8160)
 
 	// ProfileNameEnvVar is the name of the environment variable to set the default profile
 	ProfileNameEnvVar = environment.WithElasticPackagePrefix("PROFILE")
+
+	disableElasticAgentWolfiEnvVar = environment.WithElasticPackagePrefix("DISABLE_ELASTIC_AGENT_WOLFI")
 )
 
 func DefaultConfiguration() *ApplicationConfiguration {
@@ -150,6 +158,15 @@ func selectElasticAgentImageName(version string) string {
 		logger.Errorf("stack version not in semver format (value: %s): %v", v, err)
 		return elasticAgentImageName
 	}
+
+	disableWolfiImages := false
+	valueEnv, ok := os.LookupEnv(disableElasticAgentWolfiEnvVar)
+	if ok && strings.ToLower(valueEnv) != "false" {
+		disableWolfiImages = true
+	}
+	if !disableWolfiImages && !v.LessThan(elasticAgentWolfiVersion) {
+		return elasticAgentWolfiImageName
+	}
 	if !v.LessThan(elasticAgentCompleteOwnNamespaceVersion) {
 		return elasticAgentCompleteImageName
 	}

internal/install/application_configuration_test.go

@@ -51,3 +51,22 @@ func TestSelectElasticAgentImageName_NextStackInOwnNamespace(t *testing.T) {
 	selected := selectElasticAgentImageName(version)
 	assert.Equal(t, selected, elasticAgentCompleteImageName)
 }
+
+func TestSelectElasticAgentImageName_WolfiImage(t *testing.T) {
+	version := "8.16.0-SNAPSHOT"
+	selected := selectElasticAgentImageName(version)
+	assert.Equal(t, selected, elasticAgentWolfiImageName)
+}
+
+func TestSelectElasticAgentImageName_DisableWolfiImageEnvVar(t *testing.T) {
+	version := "8.16.0-SNAPSHOT"
+	t.Setenv(disableElasticAgentWolfiEnvVar, "true")
+	selected := selectElasticAgentImageName(version)
+	assert.Equal(t, selected, elasticAgentCompleteImageName)
+}
+func TestSelectElasticAgentImageName_EnableWolfiImageEnvVar(t *testing.T) {
+	version := "8.16.0-SNAPSHOT"
+	t.Setenv(disableElasticAgentWolfiEnvVar, "false")
+	selected := selectElasticAgentImageName(version)
+	assert.Equal(t, selected, elasticAgentWolfiImageName)
+}

tools/readme/readme.md.tmpl

@@ -234,6 +234,9 @@ There are available some environment variables that could be used to change some
 
 - Related to tests:
     - `ELASTIC_PACKAGE_SERVERLESS_PIPELINE_TEST_DISABLE_COMPARE_RESULTS`: If set to `true`, the results from pipeline tests are not compared to avoid errors from GeoIP.
+    - `ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI`: If set to `true`, the Elastic Agent image used for running agents will be using the Ubuntu docker images
+      (e.g. `docker.elastic.co/elastic-agent/elastic-agent-complete`). If set to `false`, the Elastic Agent image used for the running agents will be based on the wolfi
+      images (e.g. `docker.elastic.co/elastic-agent/elastic-agent-wolfi`). Default: `false`.
 
 - To configure the Elastic stack to be used by `elastic-package`:
     - `ELASTIC_PACKAGE_ELASTICSEARCH_HOST`: Host of the elasticsearch (e.g. https://127.0.0.1:9200)