Skip to content

test deployer: fix a bug when deploying cluster with various ent images #19381

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
huikang merged 1 commit into from
Oct 26, 2023
Merged

test deployer: fix a bug when deploying cluster with various ent images #19381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion testing/deployer/topology/compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func compile(logger hclog.Logger, raw *Config, prev *Topology) (*Topology, error
n.Index = nextIndex
nextIndex++

n.Images = c.Images.OverrideWith(n.Images).ChooseNode(n.Kind)
n.Images = c.Images.OverrideWith(n.Images.ChooseConsul(c.Enterprise)).ChooseNode(n.Kind)

n.Cluster = c.Name
n.Datacenter = c.Datacenter
Expand Down
9 changes: 7 additions & 2 deletions testing/deployer/topology/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ import (
)

type Images struct {
Consul string `json:",omitempty"`
ConsulCE string `json:",omitempty"`
// Consul is the image used for creating the container,
// Use ChooseConsul() to control which image (ConsulCE or ConsulEnterprise) assign to Consul
Consul string `json:",omitempty"`
// ConsulCE sets the CE image
ConsulCE string `json:",omitempty"`
// ConsulEnterprise sets the ent image
ConsulEnterprise string `json:",omitempty"`
Envoy string
Dataplane string
Expand Down Expand Up @@ -82,6 +86,7 @@ func (i Images) ChooseNode(kind NodeKind) Images {
return i
}

// ChooseConsul controls which image assigns to Consul
func (i Images) ChooseConsul(enterprise bool) Images {
if enterprise {
i.Consul = i.ConsulEnterprise
Expand Down