Skip to content

Commit bd6312f

Browse files
authored
Update default value for env. var used for Wolfi images (#2083)
Update default value for environment variable used to enable or disable the usage of Elastic Agent images based on Wolfi. From now on, wolfi images will be used by default starting with Elastic stack versions 8.16.0.
1 parent 386f4d2 commit bd6312f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

internal/install/application_configuration.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ func selectElasticAgentImageName(version, agentBaseImage string) string {
162162
return elasticAgentLegacyImageName
163163
}
164164

165-
disableWolfiImages := true
165+
disableWolfiImages := false
166166
valueEnv, ok := os.LookupEnv(disableElasticAgentWolfiEnvVar)
167-
if ok && strings.ToLower(valueEnv) != "true" {
168-
disableWolfiImages = false
167+
if ok && strings.ToLower(valueEnv) != "false" {
168+
disableWolfiImages = true
169169
}
170170
switch {
171171
case agentBaseImage == "complete":

internal/install/application_configuration_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ func TestSelectElasticAgentImageName_NextStackInOwnNamespace(t *testing.T) {
5353
assert.Equal(t, selected, elasticAgentCompleteImageName)
5454
}
5555

56-
func TestSelectElasticAgentImageName_DefaultImage816_WihtoutEnvVar(t *testing.T) {
56+
func TestSelectElasticAgentImageName_DefaultImage816_WithoutEnvVar(t *testing.T) {
5757
version := stackVersion8160
5858
// Try to keep the test agnostic from the environment variables defined in CI
5959
t.Setenv(disableElasticAgentWolfiEnvVar, "")
6060
os.Unsetenv(disableElasticAgentWolfiEnvVar)
6161

6262
selected := selectElasticAgentImageName(version, "")
63-
assert.Equal(t, selected, elasticAgentCompleteImageName)
63+
assert.Equal(t, selected, elasticAgentWolfiImageName)
6464
}
6565

6666
func TestSelectElasticAgentImageName_DisableWolfiImageEnvVar(t *testing.T) {

0 commit comments

Comments
 (0)