Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion pkg/configurer/windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ func (c WindowsConfigurer) InstallMCRLicense(h os.Host, lic string) error {

// InstallMCR install MCR on Windows.
func (c WindowsConfigurer) InstallMCR(h os.Host, engineConfig commonconfig.MCRConfig) error {

installerPath, getInstallerErr := GetInstaller(engineConfig.InstallURLWindows)
if getInstallerErr != nil {
return fmt.Errorf("could not install MCR; %w", getInstallerErr)
Expand Down
6 changes: 3 additions & 3 deletions pkg/docker/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ func (i *Image) Exist(h *mkeconfig.Host) bool {

// PullImages pulls multiple images parallelly by using a worker pool.
func PullImages(h *mkeconfig.Host, images []*Image) error {
wp := workerpool.New(5)
pool := workerpool.New(5)

var mutex sync.Mutex
var lastError error

for _, image := range images {
i := image // So we can safely pass i forward to pool without it getting mutated
wp.Submit(func() {
pool.Submit(func() {
if err := i.Pull(h); err != nil {
mutex.Lock()
if lastError == nil {
Expand All @@ -115,7 +115,7 @@ func PullImages(h *mkeconfig.Host, images []*Image) error {
// Wait for all workers to complete before reading lastError.
// A deferred StopWait() would let the return expression evaluate
// before workers finish, potentially returning nil on a real error.
wp.StopWait()
pool.StopWait()
return lastError
}

Expand Down
1 change: 0 additions & 1 deletion pkg/product/mke/config/cluster_spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ func (c *ClusterSpec) UnmarshalYAML(unmarshal func(interface{}) error) error {
return fmt.Errorf("%w: missing spec.mcr.channel — the mcr block is required; set a channel (e.g. channel: stable-29.4)", errInvalidConfig)
}


if c.Hosts.Count(func(h *Host) bool { return h.Role == "msr" }) > 0 {
if specAlias.MSR == nil {
return fmt.Errorf("%w: hosts with msr role present, but no spec.msr defined", errInvalidConfig)
Expand Down
1 change: 0 additions & 1 deletion pkg/product/mke/config/host.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ type Host struct {
// private NIC IP is not routable across DCs but the SSH/floating address is.
SwarmAddressOverride string `yaml:"swarmAddress,omitempty"`


Metadata *HostMetadata `yaml:"-"`
MSRMetadata *MSRMetadata `yaml:"-"`
Configurer HostConfigurer `yaml:"-"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/product/mke/phase/validate_facts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func TestValidateFactsPopulateSan(t *testing.T) {
Channel: "stable-25.0",
},
MKE: mkeconfig.MKEConfig{
Version: "3.6.0",
Version: "3.6.0",
Metadata: &mkeconfig.MKEMetadata{},
InstallFlags: commonconfig.Flags{
"--foo",
Expand Down
1 change: 0 additions & 1 deletion test/platforms.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,3 @@ var Platforms = map[string]Platform{
UserData: "sudo ufw allow 2377,7946,10250/tcp; sudo ufw allow 7946,4789/udp",
},
}

4 changes: 2 additions & 2 deletions test/smoke/smoke_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func runSmokeTest(t *testing.T, cfg smokeConfig) {
"nodegroups": cfg.Nodegroups,
"ssh_key_algorithm": cfg.SSHKeyAlgorithm,
"extra_tags": map[string]string{
"launchpad-smoke-test": "true",
"launchpad-smoke-test": "true",
"launchpad-smoke-test-name": cfg.Name,
},
}
Expand Down Expand Up @@ -245,7 +245,7 @@ func TestFIPSCluster(t *testing.T) {
SSHKeyAlgorithm: "rsa",
Nodegroups: map[string]interface{}{
"MngrUbuntu22FIPS": test.Platforms["Ubuntu22FIPS"].GetManager(),
"WrkWin2025": test.Platforms["Windows2025"].GetWorker(),
"WrkWin2025": test.Platforms["Windows2025"].GetWorker(),
},
})
}