Skip to content

Add ClusterNamespace Annotations to Worker Nodes #1924

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

Merged

Conversation

moadqassem
Copy link
Member

What this PR does / why we need it:
The new KubeVirt CSI driver expects the tenant cluster nodes should have an annotation that determines the tenant cluster namespace in the infra cluster. This PR reads the namespace value from the machine deployment spec and adds it to the node annotations.

Which issue(s) this PR fixes:

Fixes #

What type of PR is this?
/kind chore

Special notes for your reviewer:

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

Support KubeVirt cluster namespace annotations for KubeVirt worker nodes

Documentation:

None

Signed-off-by: moadqassem <[email protected]>

Signed-off-by: moadqassem <[email protected]>
@kubermatic-bot kubermatic-bot added kind/chore Updating grunt tasks etc; no production code changes. docs/none Denotes a PR that doesn't need documentation (changes). release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. labels May 20, 2025
@moadqassem moadqassem requested a review from kron4eg May 20, 2025 11:01
@kubermatic-bot kubermatic-bot added sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 20, 2025
Copy link
Member

@kron4eg kron4eg 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 May 20, 2025
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 7e853868d6451ccf5e74eab41a370889de1c07bb

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 20, 2025
@kron4eg
Copy link
Member

kron4eg commented May 20, 2025

/retest

@moadqassem
Copy link
Member Author

/hold

@kubermatic-bot kubermatic-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed lgtm Indicates that a PR is ready to be merged. labels May 20, 2025
@kubermatic-bot kubermatic-bot requested a review from kron4eg May 20, 2025 21:15
@kubermatic-bot kubermatic-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 20, 2025
Signed-off-by: moadqassem <[email protected]>
@moadqassem moadqassem force-pushed the support-kubevirt-csi-annotations branch from a757c33 to 3d52a68 Compare May 20, 2025 21:18
@moadqassem
Copy link
Member Author

/unhold

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 20, 2025
Copy link
Member

@kron4eg kron4eg 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 May 20, 2025
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 935aac9c1ff02e482f9c7f5374d09fe531cbc4a1

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

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 merged commit 7a93ac5 into kubermatic:main May 20, 2025
12 checks passed
@moadqassem
Copy link
Member Author

/cherrypick release/v1.61

@kubermatic-bot
Copy link
Contributor

@moadqassem: #1924 failed to apply on top of branch "release/v1.61":

Applying: add clusterNamespace annotations Signed-off-by: moadqassem <[email protected]>
Applying: initialize annotation
Using index info to reconstruct a base tree...
M	pkg/admission/machines.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/admission/machines.go
CONFLICT (content): Merge conflict in pkg/admission/machines.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 initialize annotation

In response to this:

/cherrypick release/v1.61

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-sigs/prow repository.

moadqassem added a commit to moadqassem/machine-controller that referenced this pull request Jun 1, 2025
* add clusterNamespace annotations
* initialize annotation

Signed-off-by: moadqassem <[email protected]>

(cherry picked from commit 7a93ac5)
Signed-off-by: moadqassem <[email protected]>
moadqassem added a commit to moadqassem/machine-controller that referenced this pull request Jun 2, 2025
* add clusterNamespace annotations
* initialize annotation

(cherry picked from commit 7a93ac5)
Signed-off-by: moadqassem <[email protected]>
kubermatic-bot pushed a commit that referenced this pull request Jun 2, 2025
* add clusterNamespace annotations
* initialize annotation

(cherry picked from commit 7a93ac5)

Signed-off-by: moadqassem <[email protected]>
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. 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/chore Updating grunt tasks etc; no production code changes. 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. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. 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.

3 participants