Skip to content
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

Jump to bottom

🌱 Add back flavor to Waiter interface #9166

Merged
merged 1 commit into from
Aug 14, 2023
Merged

🌱 Add back flavor to Waiter interface #9166

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions test/framework/clusterctl/clusterctl_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ func ApplyClusterTemplateAndWait(ctx context.Context, input ApplyClusterTemplate
ClusterName: input.ConfigCluster.ClusterName,
Namespace: input.ConfigCluster.Namespace,
CNIManifestPath: input.CNIManifestPath,
Flavor: input.ConfigCluster.Flavor,
WaitForClusterIntervals: input.WaitForClusterIntervals,
WaitForControlPlaneIntervals: input.WaitForControlPlaneIntervals,
WaitForMachineDeployments: input.WaitForMachineDeployments,
Expand All @@ -333,6 +334,7 @@ type ApplyCustomClusterTemplateAndWaitInput struct {
ClusterName string
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CecileRobertMichon I could be mixing up some thing. But why are you moving from ApplyClusterTemplateAndWaitInput to ApplyCustomClusterTemplateAndWaitInput in CAPZ?

/hold

Copy link
Member

@sbueringer sbueringer Aug 11, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xref: kubernetes-sigs/cluster-api-provider-azure#3707 (comment)
(Not sure if you're referring to this)

Copy link
Member

@sbueringer sbueringer Aug 11, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, now understood that you had to align because you use the interface. Should have seen it the first time

Copy link
Member

@sbueringer sbueringer Aug 11, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll answer in CAPZ. The link to the CAPZ conversation didn't work the first time for me

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbueringer we're not moving from one to the other, we're implementing the Waiter interface https://github.com/kubernetes-sigs/cluster-api/blob/main/test/framework/clusterctl/clusterctl_helpers.go#L227 as part of ControlPlaneWaiters. I don't understand if you're saying there's another way around this?

Copy link
Member

@sbueringer sbueringer Aug 14, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm basically wondering if you have to move to the ApplyCustomClusterTemplateAndWaitInput struct in all cases where you did (because not all of them are for the Waiters interface). And then if in the cases you had to move you require the flavor

I'm not very familiar with the CAPZ code, I'm just seeing that this input struct is passed around in a lot of places

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay took a closer look and saw that all starts with EnsureControlPlaneInitialized which takes the input struct and then calls InstallCalicoAndCloudProviderAzureHelmChart where the flavor is needed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there are ways around it basically with closure, but looking at how you use the flavor it seems reasonable to require the flavor in this struct. So I would say let's add it

Namespace string
CNIManifestPath string
Flavor string
WaitForClusterIntervals []interface{}
WaitForControlPlaneIntervals []interface{}
WaitForMachineDeployments []interface{}
Expand Down