From 588e54cabc3de513e2385424d0b5e022ad3a36e7 Mon Sep 17 00:00:00 2001 From: mtojek Date: Thu, 7 Oct 2021 14:16:08 +0200 Subject: [PATCH 1/2] WIP --- internal/install/application_configuration.go | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/internal/install/application_configuration.go b/internal/install/application_configuration.go index be0d7dd8bc..7e050607db 100644 --- a/internal/install/application_configuration.go +++ b/internal/install/application_configuration.go @@ -34,35 +34,29 @@ type stack struct { ImageRefOverrides map[string]ImageRefs `yaml:"image_ref_overrides"` } -func checkImageRefOverride(envVar string, fallback string) string { +func checkImageRefOverride(envVar, fallback string) string { refOverride := os.Getenv(envVar) if refOverride == "" { return fallback } - return refOverride } func (s stack) ImageRefOverridesForVersion(version string) ImageRefs { - refs, ok := s.ImageRefOverrides[version] - - elasticAgentRefOverride := checkImageRefOverride("ELASTIC_AGENT_IMAGE_REF_OVERRIDE", fmt.Sprintf("%s:%s", elasticAgentImageName, DefaultStackVersion)) - elasticsearchRefOverride := checkImageRefOverride("ELASTICSEARCH_IMAGE_REF_OVERRIDE", fmt.Sprintf("%s:%s", elasticsearchImageName, DefaultStackVersion)) - kibanaRefOverride := checkImageRefOverride("KIBANA_IMAGE_REF_OVERRIDE", fmt.Sprintf("%s:%s", kibanaImageName, DefaultStackVersion)) - - if !ok { + appConfigImageRefs, ok := s.ImageRefOverrides[version] + if ok { return ImageRefs{ - ElasticAgent: elasticAgentRefOverride, - Elasticsearch: elasticsearchRefOverride, - Kibana: kibanaRefOverride, + ElasticAgent: checkImageRefOverride("ELASTIC_AGENT_IMAGE_REF_OVERRIDE", appConfigImageRefs.ElasticAgent), + Elasticsearch: checkImageRefOverride("ELASTICSEARCH_IMAGE_REF_OVERRIDE", appConfigImageRefs.Elasticsearch), + Kibana: checkImageRefOverride("KIBANA_IMAGE_REF_OVERRIDE", appConfigImageRefs.Kibana), } } - refs.ElasticAgent = elasticAgentRefOverride - refs.Elasticsearch = elasticsearchRefOverride - refs.Kibana = kibanaRefOverride - - return refs + return ImageRefs{ + ElasticAgent: checkImageRefOverride("ELASTIC_AGENT_IMAGE_REF_OVERRIDE", ""), + Elasticsearch: checkImageRefOverride("ELASTICSEARCH_IMAGE_REF_OVERRIDE", ""), + Kibana: checkImageRefOverride("KIBANA_IMAGE_REF_OVERRIDE", ""), + } } // ImageRefs stores Docker image references used to create the Elastic stack containers. From 228cb931c20c728ad07a5143fe6fce1ef14d227f Mon Sep 17 00:00:00 2001 From: mtojek Date: Thu, 7 Oct 2021 14:19:39 +0200 Subject: [PATCH 2/2] Fix: don't fallback to default stack version --- internal/install/application_configuration.go | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/internal/install/application_configuration.go b/internal/install/application_configuration.go index 7e050607db..eee9483f85 100644 --- a/internal/install/application_configuration.go +++ b/internal/install/application_configuration.go @@ -36,26 +36,15 @@ type stack struct { func checkImageRefOverride(envVar, fallback string) string { refOverride := os.Getenv(envVar) - if refOverride == "" { - return fallback - } - return refOverride + return stringOrDefault(refOverride, fallback) } func (s stack) ImageRefOverridesForVersion(version string) ImageRefs { - appConfigImageRefs, ok := s.ImageRefOverrides[version] - if ok { - return ImageRefs{ - ElasticAgent: checkImageRefOverride("ELASTIC_AGENT_IMAGE_REF_OVERRIDE", appConfigImageRefs.ElasticAgent), - Elasticsearch: checkImageRefOverride("ELASTICSEARCH_IMAGE_REF_OVERRIDE", appConfigImageRefs.Elasticsearch), - Kibana: checkImageRefOverride("KIBANA_IMAGE_REF_OVERRIDE", appConfigImageRefs.Kibana), - } - } - + appConfigImageRefs := s.ImageRefOverrides[version] return ImageRefs{ - ElasticAgent: checkImageRefOverride("ELASTIC_AGENT_IMAGE_REF_OVERRIDE", ""), - Elasticsearch: checkImageRefOverride("ELASTICSEARCH_IMAGE_REF_OVERRIDE", ""), - Kibana: checkImageRefOverride("KIBANA_IMAGE_REF_OVERRIDE", ""), + ElasticAgent: checkImageRefOverride("ELASTIC_AGENT_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.ElasticAgent, "")), + Elasticsearch: checkImageRefOverride("ELASTICSEARCH_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Elasticsearch, "")), + Kibana: checkImageRefOverride("KIBANA_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Kibana, "")), } }