Skip to content

Commit

Permalink
Merge pull request #2276 from ciaranRoche/OCM-9833
Browse files Browse the repository at this point in the history
OCM-9833 | fix: remove dot import from machine pools
  • Loading branch information
openshift-merge-bot[bot] authored Jul 23, 2024
2 parents 4d2071b + 994ab3c commit c13f865
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
1 change: 1 addition & 0 deletions pkg/aws/client_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions pkg/machinepool/machinepool.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/openshift/rosa/pkg/interactive"
"github.com/openshift/rosa/pkg/interactive/confirm"
"github.com/openshift/rosa/pkg/interactive/securitygroups"
. "github.com/openshift/rosa/pkg/kubeletconfig"
"github.com/openshift/rosa/pkg/kubeletconfig"
"github.com/openshift/rosa/pkg/ocm"
ocmOutput "github.com/openshift/rosa/pkg/ocm/output"
"github.com/openshift/rosa/pkg/output"
Expand Down Expand Up @@ -1854,7 +1854,8 @@ func editNodePool(cmd *cobra.Command, nodePoolID string,
return fmt.Errorf("Failed to create machine pool for hosted cluster '%s': %v", clusterKey, err)
}

if isKubeletConfigSet && !promptForNodePoolNodeRecreate(nodePool, update, PromptToAcceptNodePoolNodeRecreate, r) {
if isKubeletConfigSet && !promptForNodePoolNodeRecreate(
nodePool, update, kubeletconfig.PromptToAcceptNodePoolNodeRecreate, r) {
return nil
}

Expand Down
15 changes: 15 additions & 0 deletions pkg/machinepool/machinepool_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c13f865

Please sign in to comment.