Skip to content

kola/kubeadm: fix CNI selection#205

Merged
tormath1 merged 1 commit intoflatcar-masterfrom
tormath1/fix-cni
Aug 12, 2021
Merged

kola/kubeadm: fix CNI selection#205
tormath1 merged 1 commit intoflatcar-masterfrom
tormath1/fix-cni

Conversation

@tormath1
Copy link
Copy Markdown
Contributor

register action was keeping the latest occurence of CNI so it was
basically always testing the cilium CNI.

... it happens.

The issue was already being fixed into #196 but it's better to be merged now to confirm that flatcar-archive/coreos-overlay#1181 is solving the actual flannel issue raised in #196 (comment)

@tormath1 tormath1 self-assigned this Aug 11, 2021
@tormath1 tormath1 requested a review from a team August 11, 2021 16:15

func init() {
for _, CNI := range CNIs {
cni := CNI
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I see now that this is variable capturing in the Run function that bit us here. Nasty. Would a comment about the fact be helpful here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes for sure. Actually, this section will be replaced by a new one from this PR (#196) - and a comment is already there to explain while we need such a thing (see https://github.com/kinvolk/mantle/pull/196/files#diff-833c725698d5fe10161a1c491a560567f1473d7541658c722022bc45db2d4c3fR88-R95)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah, cool. Thanks.

Copy link
Copy Markdown
Member

@krnowak krnowak left a comment

Choose a reason for hiding this comment

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

Looks good. You probably want to squash the fixup commit though. Unless github does it for you when merging.

register action was keeping the latest occurence of `CNI` so it was
basically always testing the `cilium` CNI.

... it happens.

Signed-off-by: Mathieu Tortuyaux <mathieu@kinvolk.io>
@tormath1
Copy link
Copy Markdown
Contributor Author

@krnowak yes.. Github does not handle yet the --autosquash when it detects --fixup commits. :/

@tormath1 tormath1 merged commit 2764ae0 into flatcar-master Aug 12, 2021
@tormath1 tormath1 deleted the tormath1/fix-cni branch August 12, 2021 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants