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

✨Bump cluster-api dependency to v1.4.1 #1833

Merged
merged 1 commit into from
Apr 5, 2023

Conversation

srm09
Copy link
Contributor

@srm09 srm09 commented Mar 21, 2023

What this PR does / why we need it:
This patch bumps the CAPI module dependency to v1.4.1 to integrate the latest minor release of CAPI with the CAPV release.

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

Special notes for your reviewer:
n/a

Release note:

Bump cluster-api dependency to v1.4.1

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 21, 2023
@k8s-ci-robot k8s-ci-robot requested review from MaxRink and yastij March 21, 2023 00:55
@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Mar 21, 2023
@srm09 srm09 added this to the v1.7.0 milestone Mar 21, 2023
@srm09 srm09 force-pushed the capi/1.4.0-rc branch 3 times, most recently from e29f8d6 to 42429b5 Compare March 22, 2023 23:33
@srm09
Copy link
Contributor Author

srm09 commented Mar 24, 2023

Blocked due to kubernetes-sigs/cluster-api#8357
/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 24, 2023
@srm09 srm09 force-pushed the capi/1.4.0-rc branch 2 times, most recently from b18dee9 to f04e82e Compare March 28, 2023 19:17
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 28, 2023
@srm09
Copy link
Contributor Author

srm09 commented Mar 28, 2023

/retitle ✨Bump cluster-api dependency to v1.4.0

@k8s-ci-robot k8s-ci-robot changed the title Bump cluster-api dependency to v1.4.0-rc.0 ✨Bump cluster-api dependency to v1.4.0 Mar 28, 2023
@srm09
Copy link
Contributor Author

srm09 commented Mar 28, 2023

/retest
/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 28, 2023
@srm09
Copy link
Contributor Author

srm09 commented Mar 29, 2023

/retest pull-cluster-api-provider-vsphere-e2e
The e2e test suite CI is failing due to the planned upgrades on the underlying infrastructure. Re-triggering.

@k8s-ci-robot
Copy link
Contributor

@srm09: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-e2e
  • /test pull-cluster-api-provider-vsphere-full-e2e
  • /test pull-cluster-api-provider-vsphere-integration-test
  • /test pull-cluster-api-provider-vsphere-test
  • /test pull-cluster-api-provider-vsphere-verify-markdown
  • /test pull-cluster-api-provider-vsphere-verify-shell

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-vsphere-apidiff-main
  • /test pull-cluster-api-provider-vsphere-verify-crds
  • /test pull-cluster-api-provider-vsphere-verify-gen

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-vsphere-apidiff-main
  • pull-cluster-api-provider-vsphere-e2e
  • pull-cluster-api-provider-vsphere-integration-test
  • pull-cluster-api-provider-vsphere-test
  • pull-cluster-api-provider-vsphere-verify-crds
  • pull-cluster-api-provider-vsphere-verify-gen

In response to this:

/retest pull-cluster-api-provider-vsphere-e2e
The e2e test suite CI is failing due to the planned upgrades on the underlying infrastructure. Re-triggering.

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/test-infra repository.

@srm09
Copy link
Contributor Author

srm09 commented Mar 29, 2023

/test pull-cluster-api-provider-vsphere-e2e

@geetikabatra
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 29, 2023
@@ -18,7 +18,6 @@ spec:
containers:
- args:
- --leader-elect
- --logtostderr
Copy link
Contributor

Choose a reason for hiding this comment

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

can this be problematic? seems like something that changed on controller-gen maybe and just re-generated? not sure

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://cluster-api.sigs.k8s.io/developer/providers/v1.3-to-v1.4.html#other mentions the removal of these deprecated flags from component-base which was necessary to get the CAPV manager running.

@rikatz
Copy link
Contributor

rikatz commented Mar 29, 2023

Overall lgtm, left a minor comment on removing logtostderr (can't remember if this was something from klog that does not exist anymore, or at least what is the motivation of changing this), but otherwise :shipit: :)

@k8s-ci-robot
Copy link
Contributor

@rikatz: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-e2e
  • /test pull-cluster-api-provider-vsphere-full-e2e
  • /test pull-cluster-api-provider-vsphere-integration-test
  • /test pull-cluster-api-provider-vsphere-test
  • /test pull-cluster-api-provider-vsphere-verify-markdown
  • /test pull-cluster-api-provider-vsphere-verify-shell

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-vsphere-apidiff-main
  • /test pull-cluster-api-provider-vsphere-verify-crds
  • /test pull-cluster-api-provider-vsphere-verify-gen

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-vsphere-apidiff-main
  • pull-cluster-api-provider-vsphere-e2e
  • pull-cluster-api-provider-vsphere-integration-test
  • pull-cluster-api-provider-vsphere-test
  • pull-cluster-api-provider-vsphere-verify-crds
  • pull-cluster-api-provider-vsphere-verify-gen

In response to this:

/test

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/test-infra repository.

@rikatz
Copy link
Contributor

rikatz commented Mar 29, 2023

/test pull-cluster-api-provider-vsphere-e2e
Forgot to paste test name

@srm09
Copy link
Contributor Author

srm09 commented Mar 29, 2023

/test pull-cluster-api-provider-vsphere-e2e
Last failure was due to the older vCenter thumbprint value being used from the ExternalSecret CR defined for CAPV prow jobs. Retrying..

@srm09
Copy link
Contributor Author

srm09 commented Apr 3, 2023

/test pull-cluster-api-provider-vsphere-e2e

2 similar comments
@srm09
Copy link
Contributor Author

srm09 commented Apr 4, 2023

/test pull-cluster-api-provider-vsphere-e2e

@srm09
Copy link
Contributor Author

srm09 commented Apr 5, 2023

/test pull-cluster-api-provider-vsphere-e2e

@k8s-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Apr 5, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 5, 2023
@srm09
Copy link
Contributor Author

srm09 commented Apr 5, 2023

/retitle ✨Bump cluster-api dependency to v1.4.1

@k8s-ci-robot k8s-ci-robot changed the title ✨Bump cluster-api dependency to v1.4.0 ✨Bump cluster-api dependency to v1.4.1 Apr 5, 2023
- Updates generated CRD manifests
  This was triggered since the controller-tools dependency version was
  upgrdaed to v0.11.3
- Updates label name references from CAPI
- Updates deprecated function references
- CAPI v1.3-v1.4 upgrade doc mentions the recommnedation to drop the
  usages of logs.AddFlags(fs, logs.SkipLoggingConfigurationFlags())
- Fixes linter issues
- Fixes tests
- Fixes label replcaements
- Update e2e components to use 1.4.1 images

Signed-off-by: Sagar Muchhal <muchhals@vmware.com>
@srm09
Copy link
Contributor Author

srm09 commented Apr 5, 2023

Adding back the lgtm label which was lost due to rebase.

@srm09 srm09 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 5, 2023
@srm09
Copy link
Contributor Author

srm09 commented Apr 5, 2023

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: srm09

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 Apr 5, 2023
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Apr 5, 2023

@srm09: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-vsphere-apidiff-main 4f91fcc link false /test pull-cluster-api-provider-vsphere-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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/test-infra repository. I understand the commands that are listed here.

@srm09
Copy link
Contributor Author

srm09 commented Apr 5, 2023

/test pull-cluster-api-provider-vsphere-e2e

@k8s-ci-robot k8s-ci-robot merged commit ab54b8d into kubernetes-sigs:main Apr 5, 2023
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. 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bump cluster-api to v1.4.1
4 participants