Make is_ready container-image configurable

docs/howto/custom_images.md

@@ -21,7 +21,7 @@ The current images that could be overwritten are:
 | Kibana | KIBANA_IMAGE_REF_OVERRIDE | kibana |
 | Elastic Agent | ELASTIC_AGENT_IMAGE_REF_OVERRIDE | elastic-agent |
 | Logstash | LOGSTASH_IMAGE_REF_OVERRIDE | logstash |
-| is_ready | IS_READY_IMAGE_REF_OVERRIDE | is_ready |
+| IsReady | ISREADY_IMAGE_REF_OVERRIDE | is_ready |
 
 
 For the following two examples, it will be used as example overwriting elastic-agent image.

internal/install/application_configuration.go

@@ -37,7 +37,7 @@ const (
 	elasticsearchImageName              = "docker.elastic.co/elasticsearch/elasticsearch"
 	kibanaImageName                     = "docker.elastic.co/kibana/kibana"
 	logstashImageName                   = "docker.elastic.co/logstash/logstash"
-	isreadyImageName                    = "tianon/true:multiarch"
+	isReadyImageName                    = "tianon/true:multiarch"
 
 	applicationConfigurationYmlFile = "config.yml"
 )
@@ -102,7 +102,7 @@ func (s stack) ImageRefOverridesForVersion(version string) ImageRefs {
 		Elasticsearch: checkImageRefOverride("ELASTICSEARCH_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Elasticsearch, "")),
 		Kibana:        checkImageRefOverride("KIBANA_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Kibana, "")),
 		Logstash:      checkImageRefOverride("LOGSTASH_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Logstash, "")),
-		is_ready:      checkImageRefOverride("IS_READY_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.is_ready, "")),
+		IsReady:       checkImageRefOverride("ISREADY_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.IsReady, "")),
 	}
 }
 
@@ -112,7 +112,7 @@ type ImageRefs struct {
 	Elasticsearch string `yaml:"elasticsearch"`
 	Kibana        string `yaml:"kibana"`
 	Logstash      string `yaml:"logstash"`
-	is_ready      string `yaml:"is_ready"`
+	IsReady       string `yaml:"is_ready"`
 }
 
 // AsEnv method returns key=value representation of image refs.
@@ -122,7 +122,7 @@ func (ir ImageRefs) AsEnv() []string {
 	vars = append(vars, "ELASTICSEARCH_IMAGE_REF="+ir.Elasticsearch)
 	vars = append(vars, "KIBANA_IMAGE_REF="+ir.Kibana)
 	vars = append(vars, "LOGSTASH_IMAGE_REF="+ir.Logstash)
-	vars = append(vars, "IS_READY_IMAGE_REF="+ir.is_ready)
+	vars = append(vars, "ISREADY_IMAGE_REF="+ir.IsReady)
 	return vars
 }
 
@@ -133,7 +133,7 @@ func (ac *ApplicationConfiguration) StackImageRefs() ImageRefs {
 	refs.Elasticsearch = stringOrDefault(refs.Elasticsearch, fmt.Sprintf("%s:%s", elasticsearchImageName, ac.stackVersion))
 	refs.Kibana = stringOrDefault(refs.Kibana, fmt.Sprintf("%s:%s", kibanaImageName, ac.stackVersion))
 	refs.Logstash = stringOrDefault(refs.Logstash, fmt.Sprintf("%s:%s", logstashImageName, ac.stackVersion))
-	refs.is_ready = stringOrDefault(refs.is_ready, isreadyImageName)
+	refs.IsReady = stringOrDefault(refs.IsReady, isReadyImageName)
 	return refs
 }
 

internal/profile/testdata/migration-home-legacy/profiles/default/stack/snapshot.yml

@@ -20,7 +20,7 @@ services:
       - "127.0.0.1:9200:9200"
 
   elasticsearch_is_ready:
-    image: tianon/true:multiarch
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       elasticsearch:
         condition: service_healthy
@@ -49,7 +49,7 @@ services:
       - "127.0.0.1:5601:5601"
 
   kibana_is_ready:
-    image: tianon/true:multiarch
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       kibana:
         condition: service_healthy
@@ -78,7 +78,7 @@ services:
       - "127.0.0.1:9000:9000"
 
   package-registry_is_ready:
-    image: tianon/true:multiarch
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       package-registry:
         condition: service_healthy
@@ -116,7 +116,7 @@ services:
 
 
   fleet-server_is_ready:
-    image: tianon/true:multiarch
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       fleet-server:
         condition: service_healthy
@@ -148,7 +148,7 @@ services:
       target: /run/service_logs/
 
   elastic-agent_is_ready:
-    image: tianon/true:multiarch
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       elastic-agent:
         condition: service_healthy

internal/stack/_static/docker-compose-stack.yml.tmpl

@@ -28,7 +28,7 @@ services:
       - "127.0.0.1:9200:9200"
 
   elasticsearch_is_ready:
-    image: "${IS_READY_IMAGE_REF}"
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       elasticsearch:
         condition: service_healthy
@@ -57,7 +57,7 @@ services:
       - "127.0.0.1:5601:5601"
 
   kibana_is_ready:
-    image: "${IS_READY_IMAGE_REF}"
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       kibana:
         condition: service_healthy
@@ -89,7 +89,7 @@ services:
       - "127.0.0.1:9000:9000"
 
   package-registry_is_ready:
-    image: "${IS_READY_IMAGE_REF}"
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       package-registry:
         condition: service_healthy
@@ -130,7 +130,7 @@ services:
       {{ end }}
 
   fleet-server_is_ready:
-    image: "${IS_READY_IMAGE_REF}"
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       fleet-server:
         condition: service_healthy
@@ -162,7 +162,7 @@ services:
       target: /run/service_logs/
 
   elastic-agent_is_ready:
-    image: "${IS_READY_IMAGE_REF}"
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       elastic-agent:
         condition: service_healthy
@@ -195,7 +195,7 @@ services:
       - ELASTIC_HOSTS=https://127.0.0.1:9200
 
   logstash_is_ready:
-    image: "${IS_READY_IMAGE_REF}"
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       logstash:
         condition: service_healthy

internal/stack/_static/local-services-docker-compose.yml.tmpl

@@ -40,7 +40,7 @@ services:
     - "host.docker.internal:host-gateway"
 
   fleet-server_is_ready:
-    image: tianon/true:multiarch
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       fleet-server:
         condition: service_healthy
@@ -76,7 +76,7 @@ services:
     - "host.docker.internal:host-gateway"
 
   elastic-agent_is_ready:
-    image: tianon/true:multiarch
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       elastic-agent:
         condition: service_healthy
@@ -109,7 +109,7 @@ services:
       - "host.docker.internal:host-gateway"
 
   logstash_is_ready:
-    image: tianon/true:multiarch
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       logstash:
         condition: service_healthy

internal/stack/localresources.go

@@ -53,6 +53,7 @@ func applyLocalResources(profile *profile.Profile, stackVersion string, config C
 		"agent_version":        stackVersion,
 		"agent_image":          imageRefs.ElasticAgent,
 		"logstash_image":       imageRefs.Logstash,
+		"isready_image":        imageRefs.IsReady,
 		"elasticsearch_host":   DockerInternalHost(esHostWithPort(config.ElasticsearchHost)),
 		"api_key":              config.ElasticsearchAPIKey,
 		"username":             config.ElasticsearchUsername,

test/packages/parallel/sql_input/_dev/deploy/docker/docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - ${SERVICE_LOGS_DIR}/sql_input:/var/log/mysql
       - mysqldata:/var/lib/mysql
   sql_input_is_ready:
-    image: tianon/true:multiarch
+    image: "${ISREADY_IMAGE_REF}"
     depends_on:
       sql_input:
         condition: service_healthy