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

🌱 Update CAPI to v1.2.1 #1602

Merged
merged 6 commits into from
Sep 9, 2022

Conversation

srm09
Copy link
Contributor

@srm09 srm09 commented Aug 23, 2022

What this PR does / why we need it:
This patch updates the CAPI version used by CAPV to v1.2.1. Following is the summary of all the changes:

  1. Updates k8s dependencies to k8s 1.24
  2. Update golang to v1.18
  3. Updates CAPI references to v1.2.1
  4. Changes logging to be in line with upstream k/k logging
  5. Changes VSphereMachineTemplate to support SSA and dry runs.
  6. Updates golang-ci lint to v1.47.3

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

Special notes for your reviewer:
The e2e test for SSA does not exercise the changes for SSA currently, since we are waiting for kubernetes-sigs/cluster-api#7134 to be merged, added a TODO to describe the change.

Release note:

Update CAPI dependency to v1.2.1

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 23, 2022
@k8s-ci-robot k8s-ci-robot requested review from MaxRink and yastij August 23, 2022 05:11
@srm09 srm09 force-pushed the update-capi-v1.2.0 branch 2 times, most recently from 6061c1f to 0288c00 Compare August 23, 2022 21:19
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 23, 2022
@srm09 srm09 force-pushed the update-capi-v1.2.0 branch 8 times, most recently from 6761144 to f463ffa Compare August 30, 2022 18:50
@srm09
Copy link
Contributor Author

srm09 commented Aug 30, 2022

/retest

@srm09 srm09 force-pushed the update-capi-v1.2.0 branch from f463ffa to 07460fe Compare August 30, 2022 21:25
@srm09 srm09 added this to the v1.4.0 milestone Aug 30, 2022
- Updates golang version to 1.18.x

Signed-off-by: Sagar Muchhal <[email protected]>
@srm09 srm09 force-pushed the update-capi-v1.2.0 branch from 07460fe to 79f780b Compare August 30, 2022 21:59
pkg/record/recorder.go Show resolved Hide resolved
main.go Outdated Show resolved Hide resolved
main.go Show resolved Hide resolved
main.go Show resolved Hide resolved
apis/v1beta1/vspheremachinetemplate_webhooks_test.go Outdated Show resolved Hide resolved
config/manager/manager.yaml Show resolved Hide resolved
@srm09
Copy link
Contributor Author

srm09 commented Sep 7, 2022

/retest

@yastij yastij self-assigned this Sep 7, 2022
Copy link
Member

@yastij yastij left a comment

Choose a reason for hiding this comment

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

/approve

few nits/questions

apis/v1alpha3/cloudprovider_types.go Outdated Show resolved Hide resolved
@@ -15,3 +15,236 @@ require (
sigs.k8s.io/kustomize/kustomize/v4 v4.4.0
sigs.k8s.io/testing_frameworks v0.1.2
)

require (
4d63.com/gochecknoglobals v0.1.0 // indirect
Copy link
Member

Choose a reason for hiding this comment

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

is this intake expected? all coming from golangci-lint?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Most of them are because we updated the golang version to 1.18 which basically brings in the Module graph pruning changes (from [email protected])

@@ -246,10 +246,9 @@ func defaultKubeadmInitSpec(files []bootstrapv1.File) bootstrapv1.KubeadmConfigS
},
ControllerManager: defaultControlPlaneComponent(),
},
Users: defaultUsers(),
PreKubeadmCommands: defaultPreKubeadmCommands(),
UseExperimentalRetryJoin: true,
Copy link
Member

Choose a reason for hiding this comment

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

why did we drop UseExperimentalRetryJoin it's still needed in slow/flaky envs

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: yastij

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 Sep 8, 2022
- Also updates the golang linter version to v1.47.3
- Ignores lintering for deprecated API types

Signed-off-by: Sagar Muchhal <[email protected]>

temp commit for linters
This introdcues the use of logging via component-base/logs which is in
line with the upstream Kubernetes community.

Signed-off-by: Sagar Muchhal <[email protected]>
In k8s 1.24, kubeadm adds the label
`node-role.kubernetes.io/control-plane` to the control plane nodes. To
deploy CAPV to 1.24 k8s clusters, the toleration needs to be added to
the CAPV deployment to support running the controllers on 1.24 control
plane nodes.

Signed-off-by: Sagar Muchhal <[email protected]>
Signed-off-by: Sagar Muchhal <[email protected]>
@srm09 srm09 force-pushed the update-capi-v1.2.0 branch from a43e00e to 1dbb057 Compare September 9, 2022 02:17
@k8s-ci-robot
Copy link
Contributor

@srm09: The following tests 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-verify-markdown 6296a47 link true /test pull-cluster-api-provider-vsphere-verify-markdown
pull-cluster-api-provider-vsphere-apidiff-main 1dbb057 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.

@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 Sep 9, 2022
@k8s-ci-robot k8s-ci-robot merged commit 623cd59 into kubernetes-sigs:main Sep 9, 2022
srm09 added a commit to srm09/cluster-api-provider-vsphere that referenced this pull request Oct 11, 2022
This is a subset of the changes in the PR kubernetes-sigs#1602 that was merged in the
main branch. This specifically updates the feature gate import so that
we are not by default exposing the CAPI feature flags on CAPV which are
not usable.
This is needed since node anti affinity and node labeling
functionalities are under separate and 2 new feature flags

Signed-off-by: Sagar Muchhal <[email protected]>
srm09 added a commit to srm09/cluster-api-provider-vsphere that referenced this pull request Oct 11, 2022
This is a subset of the changes in the PR kubernetes-sigs#1602 that was merged in the
main branch. This specifically updates the feature gate import so that
we are not by default exposing the CAPI feature flags on CAPV which are
not usable.
This is needed since node anti affinity and node labeling
functionalities are under separate and 2 new feature flags

Signed-off-by: Sagar Muchhal <[email protected]>
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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update CAPI version to v1.2.0
7 participants