Skip to content

CORS-2472: Expose Azure useImageGallery parameter in the MachineSets() call #6737

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
openshift-merge-robot merged 1 commit into from
Jan 9, 2023
Merged

CORS-2472: Expose Azure useImageGallery parameter in the MachineSets() call #6737

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
3 changes: 1 addition & 2 deletions pkg/asset/machines/azure/machinesets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
)

// MachineSets returns a list of machinesets for a machinepool.
func MachineSets(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage, role, userDataSecret string, capabilities map[string]string, rhcosVersion string) ([]*clusterapi.MachineSet, error) {
func MachineSets(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage, role, userDataSecret string, capabilities map[string]string, useImageGallery bool) ([]*clusterapi.MachineSet, error) {
if configPlatform := config.Platform.Name(); configPlatform != azure.Name {
return nil, fmt.Errorf("non-azure configuration: %q", configPlatform)
}
Expand Down Expand Up @@ -41,7 +41,6 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
if int64(idx) < total%numOfAZs {
replicas++
}
useImageGallery := platform.CloudName != azure.StackCloud
provider, err := provider(platform, mpool, osImage, userDataSecret, clusterID, role, &idx, capabilities, useImageGallery)
if err != nil {
return nil, errors.Wrap(err, "failed to create provider")
Expand Down
4 changes: 3 additions & 1 deletion pkg/asset/machines/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
var err error
ic := installConfig.Config
for _, pool := range ic.Compute {
pool := pool // this makes golint happy... G601: Implicit memory aliasing in for loop. (gosec)
if pool.Hyperthreading == types.HyperthreadingDisabled {
ignHT, err := machineconfig.ForHyperthreadingDisabled("worker")
if err != nil {
Expand Down Expand Up @@ -411,7 +412,8 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
return err
}

sets, err := azure.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", workerUserDataSecretName, capabilities, rhcosRelease.GetAzureReleaseVersion())
useImageGallery := ic.Platform.Azure.CloudName != azuretypes.StackCloud
sets, err := azure.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", workerUserDataSecretName, capabilities, useImageGallery)
if err != nil {
return errors.Wrap(err, "failed to create worker machine objects")
}
Expand Down