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.

Sign up for GitHub

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

Jump to bottom

Vendor mcm 0.47.1 #40

Merged
merged 1 commit into from
Feb 23, 2023
Merged

Vendor mcm 0.47.1 #40

merged 1 commit into from
Feb 23, 2023

Conversation

himanshu-kun
Copy link
Contributor

@himanshu-kun himanshu-kun commented Feb 22, 2023 •
edited
Loading

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Release note:

Fix a bug in the bootstrap token creation that caused node to not be able to join the cluster due to an expired bootstrap token.

@himanshu-kun himanshu-kun requested review from a team as code owners February 22, 2023 13:27
@gardener-robot-ci-3 gardener-robot-ci-3 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Feb 22, 2023
@gardener-robot gardener-robot added the needs/review Needs review label Feb 22, 2023
@gardener-robot-ci-3 gardener-robot-ci-3 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Feb 22, 2023
@gardener-robot gardener-robot added the size/s Size of pull request is small (see gardener-robot robot/bots/size.py) label Feb 22, 2023
@himanshu-kun himanshu-kun force-pushed the automated-cherry-pick-of-#39-upstream-rel-v0.7 branch from 36d1f3a to 8d23a5b Compare February 22, 2023 13:35
@gardener-robot gardener-robot added size/xs Size of pull request is tiny (see gardener-robot robot/bots/size.py) and removed size/s Size of pull request is small (see gardener-robot robot/bots/size.py) labels Feb 22, 2023
@himanshu-kun himanshu-kun changed the title Automated cherry pick of #39: vendor mcm 0.48.1 Vendor mcm 0.47.1 Feb 22, 2023
@gardener-robot-ci-1 gardener-robot-ci-1 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Feb 22, 2023
@gardener-robot-ci-2 gardener-robot-ci-2 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Feb 22, 2023
rishabh-11
rishabh-11 approved these changes Feb 22, 2023
View reviewed changes
Copy link
Contributor

@rishabh-11 rishabh-11 left a comment

Choose a reason for hiding this comment

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

/lgtm

@gardener-robot gardener-robot added reviewed/lgtm Has approval for merging and removed needs/review Needs review labels Feb 22, 2023
@gardener-robot-ci-2 gardener-robot-ci-2 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Feb 22, 2023
@rishabh-11 rishabh-11 removed the needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Feb 22, 2023
@gardener-robot-ci-2 gardener-robot-ci-2 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Feb 22, 2023
@himanshu-kun
Copy link
Contributor Author

himanshu-kun commented Feb 23, 2023 •
edited
Loading

The IT tests are failing as we currently run the latest master for MCM, and with PR gardener/machine-controller-manager#745 , the CRDs deployed would not have .status.node field, but since the current branch vendors mcm v0.47.1 , so it will rely on .status.node field.

But since in Gardener deployment on landscapes , the CRDs of MCM repo are not used, but the ones in g/g are used, which still have status.node , so it won't cause issues.

@himanshu-kun himanshu-kun merged commit 7c91937 into gardener:rel-v0.7 Feb 23, 2023
@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Feb 23, 2023
@himanshu-kun himanshu-kun deleted the automated-cherry-pick-of-#39-upstream-rel-v0.7 branch February 23, 2023 05:59
@himanshu-kun himanshu-kun mentioned this pull request Mar 8, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rishabh-11 rishabh-11 rishabh-11 approved these changes

Assignees
No one assigned
Labels
needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) reviewed/lgtm Has approval for merging size/xs Size of pull request is tiny (see gardener-robot robot/bots/size.py) status/closed Issue is closed (either delivered or triaged)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@himanshu-kun @rishabh-11 @gardener-robot-ci-1 @gardener-robot-ci-2 @gardener-robot-ci-3 @gardener-robot