Skip to content

Conversation

ary1992
Copy link
Contributor

@ary1992 ary1992 commented Mar 10, 2025

Co-authored-by: Shafeeque E S shafeeque.e.s@sap.com
Co-Authored-By: Sonu Kumar Singh sonu.kumar.singh02@sap.com

How to categorize this PR?

/area control-plane delivery open-source scalability
/kind enhancement

What this PR does / why we need it:
This PR adapts the MCM API changes. Defaulting and validations are also added to the introduced field.

Which issue(s) this PR fixes:
Part of #10219

Special notes for your reviewer:

Release note:

NONE

@gardener-prow gardener-prow bot added area/control-plane Control plane related area/delivery Delivery related area/open-source Open Source (community, enablement, contributions, conferences, CNCF, etc.) related area/scalability Scalability related kind/enhancement Enhancement, improvement, extension cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. labels Mar 10, 2025
@gardener-prow gardener-prow bot requested review from plkokanov and ScheererJ March 10, 2025 10:35
@gardener-prow gardener-prow bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 10, 2025
@gardener-prow gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 10, 2025
@ary1992 ary1992 force-pushed the gep-31-mcm-api-adp branch from c7eb68b to c2559f7 Compare March 10, 2025 14:26
@gardener-prow gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 10, 2025
@ary1992
Copy link
Contributor Author

ary1992 commented Mar 10, 2025

/retest

ary1992 and others added 7 commits March 11, 2025 16:36
…althTimeout` supported by MCM

Co-authored-by: Shafeeque E S <shafeeque.e.s@sap.com>
Co-Authored-By: Sonu Kumar Singh <sonu.kumar.singh02@sap.com>
Co-authored-by: Shafeeque E S <shafeeque.e.s@sap.com>
Co-Authored-By: Sonu Kumar Singh <sonu.kumar.singh02@sap.com>
Co-authored-by: Shafeeque E S <shafeeque.e.s@sap.com>
Co-Authored-By: Sonu Kumar Singh <sonu.kumar.singh02@sap.com>
Co-authored-by: Shafeeque E S <shafeeque.e.s@sap.com>
Co-Authored-By: Sonu Kumar Singh <sonu.kumar.singh02@sap.com>
Co-authored-by: Shafeeque E S <shafeeque.e.s@sap.com>
Co-Authored-By: Sonu Kumar Singh <sonu.kumar.singh02@sap.com>
…f the worker pool

Co-authored-by: Shafeeque E S <shafeeque.e.s@sap.com>
Co-Authored-By: Sonu Kumar Singh <sonu.kumar.singh02@sap.com>
Co-authored-by: Shafeeque E S <shafeeque.e.s@sap.com>
Co-Authored-By: Sonu Kumar Singh <sonu.kumar.singh02@sap.com>
@ary1992 ary1992 force-pushed the gep-31-mcm-api-adp branch 2 times, most recently from 088d3f2 to 7d9b29c Compare March 12, 2025 05:24
@ary1992 ary1992 requested a review from shafeeqes March 12, 2025 08:54
@ary1992 ary1992 force-pushed the gep-31-mcm-api-adp branch from 07b348f to 6a82954 Compare March 13, 2025 03:49
@shafeeqes shafeeqes changed the title [GEP 31] Adapt MCM api changes [GEP 31] Adapt API changes for machine-controller-manager Mar 13, 2025
@shafeeqes
Copy link
Contributor

/lgtm

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2025
Copy link
Contributor

gardener-prow bot commented Mar 13, 2025

LGTM label has been added.

Git tree hash: 1ba1ee538cc05080a5ea482a59b56d950e95e473

@gardener-prow gardener-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2025
@gardener-prow gardener-prow bot requested a review from shafeeqes March 13, 2025 08:26
@ary1992 ary1992 force-pushed the gep-31-mcm-api-adp branch from fb2f8bf to 9ec2f05 Compare March 17, 2025 06:58
@ary1992 ary1992 requested a review from rfranzke March 17, 2025 07:08
@rfranzke
Copy link
Member

/lgtm

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2025
Copy link
Contributor

gardener-prow bot commented Mar 17, 2025

LGTM label has been added.

Git tree hash: b782cdb4fd8ded9edb5d81bcee0b1948cd4927b4

@acumino
Copy link
Member

acumino commented Mar 17, 2025

/approve

Copy link
Contributor

gardener-prow bot commented Mar 17, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: acumino

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

@gardener-prow gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 17, 2025
@gardener-prow gardener-prow bot merged commit 20521fd into gardener:master Mar 17, 2025
19 checks passed
@ary1992 ary1992 deleted the gep-31-mcm-api-adp branch March 18, 2025 08:09
@@ -1715,6 +1719,13 @@ type MachineControllerManagerSettings struct {
// NodeConditions are the set of conditions if set to true for the period of MachineHealthTimeout, machine will be declared failed.
// +optional
NodeConditions []string `json:"nodeConditions,omitempty" protobuf:"bytes,5,name=nodeConditions"`
// MachineInPlaceUpdateTimeout is the timeout after which in-place update is declared failed.
// +optional
MachineInPlaceUpdateTimeout *metav1.Duration `json:"inPlaceUpdateTimeout,omitempty" protobuf:"bytes,6,opt,name=inPlaceUpdateTimeout"`
Copy link
Member

Choose a reason for hiding this comment

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

Why the field is not called InPlaceUpdateTimeout? Due to it, right now it generates the following api violation:

API rule violation: names_match,github.com/gardener/gardener/pkg/apis/core/v1beta1,MachineControllerManagerSettings,MachineInPlaceUpdateTimeout

Copy link
Member

@acumino acumino Mar 18, 2025

Choose a reason for hiding this comment

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

Fields here are more or less direct copies of fields defined in MCM here. To follow the same convention like other fields MachineInPlaceUpdateTimeout was named based on the new field in MCM MachineInPlaceUpdateTimeout .

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/control-plane Control plane related area/delivery Delivery related area/open-source Open Source (community, enablement, contributions, conferences, CNCF, etc.) related area/scalability Scalability related cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants