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

✨ Extend ControlPlane/ MD / MP builtin to include metadata #10837

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

srm09
Copy link
Contributor

@srm09 srm09 commented Jul 5, 2024

What this PR does / why we need it:
This patch extends the MachineDeployment and MachinePool builtins to include metadata from topology MachineDeployment and topology MachinePool respectively.

Which issue(s) this PR fixes:
Fixes #10836

/area clusterclass

@k8s-ci-robot
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

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. area/clusterclass Issues or PRs related to clusterclass cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 5, 2024
@srm09
Copy link
Contributor Author

srm09 commented Jul 5, 2024

The original issue only talks about MachineDeployment builtins, but when implementing I realized that this could be a requirement on the MachinePool builtins as well. Hence included that in the PR as well.

@srm09 srm09 marked this pull request as ready for review July 8, 2024 14:30
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 8, 2024
@srm09 srm09 force-pushed the add-metata-to-md-builtins branch from a6a3248 to 154d4a0 Compare July 8, 2024 14:45
@sbueringer
Copy link
Member

The original issue only talks about MachineDeployment builtins, but when implementing I realized that this could be a requirement on the MachinePool builtins as well. Hence included that in the PR as well.

Sounds good. Let's do the same for control plane.

@srm09 srm09 force-pushed the add-metata-to-md-builtins branch 3 times, most recently from bc7bbca to 36cb449 Compare July 8, 2024 18:15
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 8, 2024
@srm09
Copy link
Contributor Author

srm09 commented Jul 8, 2024

/retitle ✨ Extend ControlPlane/Deployment/Pool builtin to include metadata

@k8s-ci-robot k8s-ci-robot changed the title ✨ Extend Deployment/Pool builtin to include metadata ✨ Extend ControlPlane/Deployment/Pool builtin to include metadata Jul 8, 2024
@srm09 srm09 force-pushed the add-metata-to-md-builtins branch 3 times, most recently from 2bdebd1 to 1fc709f Compare July 8, 2024 19:14
This patch extends the ControlPlane, MachineDeployment and MachinePool builtins to
include metadata.

Signed-off-by: Sagar Muchhal <[email protected]>
@srm09 srm09 force-pushed the add-metata-to-md-builtins branch from 1fc709f to dc97411 Compare July 8, 2024 19:19
@sbueringer sbueringer changed the title ✨ Extend ControlPlane/Deployment/Pool builtin to include metadata ✨ Extend ControlPlane/ MD / MP builtin to include metadata Jul 9, 2024
@sbueringer
Copy link
Member

Thank you!

/lgtm
/approve

@sbueringer
Copy link
Member

/cherry-pick release-1.7

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 9, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 5bf5ca63e3006fe749704f3480afb118c2d60f3e

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.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-sigs/prow repository.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 9, 2024
@k8s-ci-robot k8s-ci-robot merged commit 233db3f into kubernetes-sigs:main Jul 9, 2024
27 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Jul 9, 2024
@k8s-infra-cherrypick-robot

@sbueringer: #10837 failed to apply on top of branch "release-1.7":

Applying: Extend ControlPlane/Deployment/Pool builtin to include metadata
Using index info to reconstruct a base tree...
M	docs/book/src/tasks/experimental-features/cluster-class/write-clusterclass.md
M	exp/runtime/hooks/api/v1alpha1/topologymutation_variable_types.go
M	exp/runtime/hooks/api/v1alpha1/zz_generated.openapi.go
M	internal/controllers/topology/cluster/patches/variables/variables.go
M	internal/test/builder/builders.go
M	internal/test/builder/zz_generated.deepcopy.go
Falling back to patching base and 3-way merge...
Auto-merging internal/test/builder/zz_generated.deepcopy.go
Auto-merging internal/test/builder/builders.go
Auto-merging internal/controllers/topology/cluster/patches/variables/variables.go
Auto-merging exp/runtime/hooks/api/v1alpha1/zz_generated.openapi.go
Auto-merging exp/runtime/hooks/api/v1alpha1/topologymutation_variable_types.go
Auto-merging docs/book/src/tasks/experimental-features/cluster-class/write-clusterclass.md
CONFLICT (content): Merge conflict in docs/book/src/tasks/experimental-features/cluster-class/write-clusterclass.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Extend ControlPlane/Deployment/Pool builtin to include metadata
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:

/cherry-pick release-1.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-sigs/prow repository.

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. area/clusterclass Issues or PRs related to clusterclass cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

Make MD metadata available within MachineDeployment Builtins
4 participants