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.

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

fix: Deploy User defined addons before external CCM initialization #3065

Merged
merged 1 commit into from
Mar 5, 2024

Conversation

kron4eg
Copy link
Member

@kron4eg kron4eg commented Mar 4, 2024

What this PR does / why we need it:
This is fix for situation when we have both cloud provider and CNI set to external.

apiVersion: kubeone.k8c.io/v1beta2
kind: KubeOneCluster

versions:
  kubernetes: v1.28.7

cloudProvider:
  external: true

clusterNetwork:
  cni:
    external: {}

addons:
  enable: true
  addons:
  - name: calico-vxlan

This results to endless waiting for control-plane nodes to be initialized. It happens because Nodes are not ready (for the lack of CNI).

Which issue(s) this PR fixes:

What type of PR is this?
/kind bug

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

Deploy user defined addons before the external CCM initialization. This fixes an issue with cluster provisioning for users that use both external CCM and external CNI

Documentation:

NONE

@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. docs/none Denotes a PR that doesn't need documentation (changes). labels Mar 4, 2024
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubermatic-bot kubermatic-bot added dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 4, 2024
@kron4eg
Copy link
Member Author

kron4eg commented Mar 4, 2024

/test pull-kubeone-e2e-aws-default-calico-containerd-external-v1.27.7

@kron4eg kron4eg marked this pull request as ready for review March 4, 2024 12:43
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 4, 2024
@kron4eg
Copy link
Member Author

kron4eg commented Mar 4, 2024

/cherrypick release/v1.6

@kron4eg
Copy link
Member Author

kron4eg commented Mar 4, 2024

/cherrypick release/v1.7

@kubermatic-bot
Copy link
Contributor

@kron4eg: once the present PR merges, I will cherry-pick it on top of release/v1.6 in a new PR and assign it to you.

In response to this:

/cherrypick release/v1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubermatic-bot
Copy link
Contributor

@kron4eg: once the present PR merges, I will cherry-pick it on top of release/v1.7 in a new PR and assign it to you.

In response to this:

/cherrypick release/v1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2024
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 4, 2024
@kron4eg
Copy link
Member Author

kron4eg commented Mar 4, 2024

/test pull-kubeone-e2e-aws-default-calico-containerd-external-v1.27.7

@kubermatic-triage-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@kron4eg
Copy link
Member Author

kron4eg commented Mar 4, 2024

/lgtm cancel

@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2024
@kron4eg
Copy link
Member Author

kron4eg commented Mar 4, 2024

Looks like calico-vxlan is broken in general

@kron4eg
Copy link
Member Author

kron4eg commented Mar 5, 2024

even when I run the cluster with CNI created directly from

kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.27.2/manifests/calico-vxlan.yaml

it's still failing

@kron4eg
Copy link
Member Author

kron4eg commented Mar 5, 2024

/cc @xrstf

Please mark this failing test as ignored as it's not entirely relevant.

@xrstf
Copy link
Contributor

xrstf commented Mar 5, 2024

/override pull-kubeone-e2e-aws-default-calico-containerd-external-v1.27.7

@kubermatic-bot
Copy link
Contributor

@xrstf: Overrode contexts on behalf of xrstf: pull-kubeone-e2e-aws-default-calico-containerd-external-v1.27.7

In response to this:

/override pull-kubeone-e2e-aws-default-calico-containerd-external-v1.27.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ahmedwaleedmalik
Copy link
Member

/lgtm

🚀

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 5, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: c431b71162c45664159131fce23c8f4ec31ae637

@kubermatic-bot kubermatic-bot merged commit 6da8a17 into kubermatic:main Mar 5, 2024
15 checks passed
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.8 milestone Mar 5, 2024
@kubermatic-bot
Copy link
Contributor

@kron4eg: #3065 failed to apply on top of branch "release/v1.6":

Applying: Deploy User defined addons before external CCM initialization
Using index info to reconstruct a base tree...
M	pkg/tasks/tasks.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/tasks/tasks.go
CONFLICT (content): Merge conflict in pkg/tasks/tasks.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Deploy User defined addons before external CCM initialization
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubermatic-bot
Copy link
Contributor

@kron4eg: new pull request created: #3068

In response to this:

/cherrypick release/v1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kron4eg kron4eg deleted the external-cni-ccm branch March 5, 2024 14:03
@xmudrii xmudrii added the backport-complete Denotes a PR or issue which has been fully backported to all required release branches. label May 2, 2024
@xmudrii
Copy link
Member

xmudrii commented May 2, 2024

/release-note-edit

Deploy user defined addons before the external CCM initialization. This fixes an issue for users that use both external CCM and external CNI

@xmudrii
Copy link
Member

xmudrii commented May 2, 2024

/release-note-edit

Deploy user defined addons before the external CCM initialization. This fixes an issue with cluster provisioning for users that use both external CCM and external CNI

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-complete Denotes a PR or issue which has been fully backported to all required release branches. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants