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

[release/v1.4] Replace MachineAnnotations with NodeAnnotations and add MachineObjectAnnotations #2077

Merged
merged 1 commit into from
Jun 1, 2022

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented Jun 1, 2022

What type of PR is this?

/kind feature

What this PR does / why we need it:

This is a manual cherry-pick of #2074 required for #2075.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
xref #2071

Does this PR introduce a user-facing change?:

Add `machineObjectAnnotations` field to DynamicWorkerNodes used to apply annotations to resulting Machine objects
Add `nodeAnnotations` field to DynamicWorkerNodes Config as a replacement for deprecated `machineAnnotations` field

/assign @kron4eg

…Annotations

* Replace MachineAnnotations with NodeAnnotations and introduce MachineObjectAnnotations

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>

* Update example Terraform configs with NodeAnnotations and MachineObjectAnnotations

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>

* Update API docs

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
@xmudrii xmudrii requested a review from kron4eg June 1, 2022 13:59
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 1, 2022
@kron4eg
Copy link
Member

kron4eg commented Jun 1, 2022

/approve
/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jun 1, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 138b8825d793b156e9e34082b9643eec5d9b658b

@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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 1, 2022
@kubermatic-bot kubermatic-bot merged commit 829cbb6 into release/v1.4 Jun 1, 2022
@kubermatic-bot kubermatic-bot deleted the machineobj-annotations-cp branch June 1, 2022 14:41
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. kind/feature Categorizes issue or PR as related to a new feature. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants