Skip to content

Fix: don't fallback to default stack version #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2021
Merged

Fix: don't fallback to default stack version #535

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
588e54c
WIP
Oct 7, 2021
228cb93
Fix: don't fallback to default stack version
Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 7 additions & 24 deletions internal/install/application_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,35 +34,18 @@ 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
return stringOrDefault(refOverride, fallback)
}

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 {
return ImageRefs{
ElasticAgent: elasticAgentRefOverride,
Elasticsearch: elasticsearchRefOverride,
Kibana: kibanaRefOverride,
}
appConfigImageRefs := s.ImageRefOverrides[version]
return ImageRefs{
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, "")),
}

refs.ElasticAgent = elasticAgentRefOverride
refs.Elasticsearch = elasticsearchRefOverride
refs.Kibana = kibanaRefOverride

return refs
}

// ImageRefs stores Docker image references used to create the Elastic stack containers.
Expand Down