-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
🌱 Add back flavor to Waiter interface #9166
Merged
k8s-ci-robot
merged 1 commit into
kubernetes-sigs:main
from
CecileRobertMichon:flavor-e2e
Aug 14, 2023
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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)
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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 ofControlPlaneWaiters
. I don't understand if you're saying there's another way around this?There was a problem hiding this comment.
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
There was a problem hiding this comment.
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 callsInstallCalicoAndCloudProviderAzureHelmChart
where the flavor is neededThere was a problem hiding this comment.
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