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 Go, CAPI, controller-runtime, k8s, controller-tools and go-logr/logr #1951

Merged

Conversation

CecileRobertMichon
Copy link
Contributor

What type of PR is this?
/kind other

What this PR does / why we need it:

  • Bumps CAPI to v1.1.0-beta.2
  • Bumps Go to 1.17
  • Bumps controller-runtime to 0.11.0
  • Bumps k8s client to 1.23
  • Bumps controller-tools to 0.8.0
  • Bumps go-logr/logr to v1.2 (from 0.4, includes breaking changes)

⚠️ IMPORTANT ⚠️ : After this PR merges, you MUST update your local Go version to 1.17 for CAPZ development

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Bumps CAPI to v1.1.0-beta.2
Bumps Go to 1.17 
Bumps controller-runtime to 0.11.0
Bumps k8s client to 1.23
Bumps controller-tools to 0.8.0
Bumps go-logr/logr to v1.2

@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. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jan 7, 2022
@k8s-ci-robot
Copy link
Contributor

@CecileRobertMichon: The label(s) kind/other cannot be applied, because the repository doesn't have them.

In response to this:

What type of PR is this?
/kind other

What this PR does / why we need it:

  • Bumps CAPI to v1.1.0-beta.2
  • Bumps Go to 1.17
  • Bumps controller-runtime to 0.11.0
  • Bumps k8s client to 1.23
  • Bumps controller-tools to 0.8.0
  • Bumps go-logr/logr to v1.2 (from 0.4, includes breaking changes)

⚠️ IMPORTANT ⚠️ : After this PR merges, you MUST update your local Go version to 1.17 for CAPZ development

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Bumps CAPI to v1.1.0-beta.2
Bumps Go to 1.17 
Bumps controller-runtime to 0.11.0
Bumps k8s client to 1.23
Bumps controller-tools to 0.8.0
Bumps go-logr/logr to v1.2

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.

@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 Jan 7, 2022
@k8s-ci-robot k8s-ci-robot added area/provider/azure Issues or PRs related to azure provider sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels Jan 7, 2022
@CecileRobertMichon CecileRobertMichon force-pushed the update-controller-runtime branch from 9d986df to 42717a2 Compare January 7, 2022 19:29
@CecileRobertMichon
Copy link
Contributor Author

Needs kubernetes/test-infra#24815 to merge to be able to run tests

@CecileRobertMichon
Copy link
Contributor Author

/retest

jobs updated

@CecileRobertMichon CecileRobertMichon force-pushed the update-controller-runtime branch from 42717a2 to 1aceeaf Compare January 7, 2022 21:25
@CecileRobertMichon CecileRobertMichon force-pushed the update-controller-runtime branch 4 times, most recently from 4ac03b4 to bdb30dd Compare January 10, 2022 21:52
@CecileRobertMichon
Copy link
Contributor Author

/retest

@CecileRobertMichon CecileRobertMichon force-pushed the update-controller-runtime branch 4 times, most recently from 92e0672 to 44700e8 Compare January 11, 2022 00:12
@CecileRobertMichon
Copy link
Contributor Author

@devigned I'm still working through the upgrade e2e tests that were deprecated in CAPI 1.1 but I would appreciate your early review on c2f66d5

I'm especially unsure of the WithCallDepth function c2f66d5#diff-62963db075cb6f1b2e13f658ea3d053f83cc5623ab160ee2fbbc1b1378970057R48 and whether we should be using the Init functions c2f66d5#diff-5a0999fa313b144f8ea095868e1b859333969530a18dba0a7e0b16099bb63ecfR38

@CecileRobertMichon
Copy link
Contributor Author

/test ls

@k8s-ci-robot
Copy link
Contributor

@CecileRobertMichon: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-azure-build
  • /test pull-cluster-api-provider-azure-e2e
  • /test pull-cluster-api-provider-azure-e2e-windows-dockershim
  • /test pull-cluster-api-provider-azure-test
  • /test pull-cluster-api-provider-azure-verify

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-azure-apidiff
  • /test pull-cluster-api-provider-azure-apiversion-upgrade
  • /test pull-cluster-api-provider-azure-capi-e2e
  • /test pull-cluster-api-provider-azure-ci-entrypoint
  • /test pull-cluster-api-provider-azure-conformance
  • /test pull-cluster-api-provider-azure-conformance-with-ci-artifacts
  • /test pull-cluster-api-provider-azure-coverage
  • /test pull-cluster-api-provider-azure-e2e-exp
  • /test pull-cluster-api-provider-azure-e2e-full
  • /test pull-cluster-api-provider-azure-e2e-workload-upgrade-1-21-1-22
  • /test pull-cluster-api-provider-azure-e2e-workload-upgrade-1-22-latest-main
  • /test pull-cluster-api-provider-azure-upstream-windows-dockershim
  • /test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts
  • /test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts-serial-slow

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

  • pull-cluster-api-provider-azure-apidiff
  • pull-cluster-api-provider-azure-build
  • pull-cluster-api-provider-azure-ci-entrypoint
  • pull-cluster-api-provider-azure-coverage
  • pull-cluster-api-provider-azure-e2e
  • pull-cluster-api-provider-azure-e2e-exp
  • pull-cluster-api-provider-azure-e2e-windows-dockershim
  • pull-cluster-api-provider-azure-test
  • pull-cluster-api-provider-azure-verify

In response to this:

/test ls

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.

@CecileRobertMichon
Copy link
Contributor Author

/retest

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-e2e-workload-upgrade-1-21-1-22

@CecileRobertMichon CecileRobertMichon force-pushed the update-controller-runtime branch from 8a4c7c9 to bbe1929 Compare January 12, 2022 01:10
@CecileRobertMichon CecileRobertMichon force-pushed the update-controller-runtime branch from 4dfd3d3 to cbad552 Compare January 13, 2022 18:59
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-e2e-workload-upgrade-1-21-1-22
/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon
Copy link
Contributor Author

logs are looking good now

I0113 19:09:17.862257       1 async.go:123] controller/azurecluster/async.Service.CreateResource "msg"="creating resource" "name"="capz-e2e-azx1io-ha" "namespace"="capz-e2e-azx1io" "reconciler group"="infrastructure.cluster.x-k8s.io" "reconciler kind"="AzureCluster" "x-ms-correlation-request-id"="603cbced-8a18-4d07-b2a7-b003e268c5b1" "resource"="capz-e2e-azx1io-ha" "resourceGroup"="capz-e2e-azx1io-ha" "service"="group"
I0113 19:09:19.606874       1 async.go:136] controller/azurecluster/async.Service.CreateResource "msg"="successfully created resource" "name"="capz-e2e-azx1io-ha" "namespace"="capz-e2e-azx1io" "reconciler group"="infrastructure.cluster.x-k8s.io" "reconciler kind"="AzureCluster" "x-ms-correlation-request-id"="603cbced-8a18-4d07-b2a7-b003e268c5b1" "resource"="capz-e2e-azx1io-ha" "resourceGroup"="capz-e2e-azx1io-ha" "service"="group"

PTAL @devigned @shysank

@CecileRobertMichon
Copy link
Contributor Author

/retest

exp test flake Failed to get controller-runtime client

@CecileRobertMichon
Copy link
Contributor Author

/retest

util/tele/composite_logger.go Show resolved Hide resolved
util/tele/span_logger.go Outdated Show resolved Hide resolved
func (c *compositeLogger) Info(msg string, keysAndValues ...interface{}) {
c.iter(func(l logr.Logger) {
l.Info(msg, keysAndValues...)
func (c *compositeLogSink) Info(level int, msg string, keysAndValues ...interface{}) {
Copy link
Contributor

Choose a reason for hiding this comment

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

is this meant to replace log.V(n).Info(msg) with log.Info(n,msg)? Should we do a followup for such replacements?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No. The Logger struct still has a V(n) function. It's only the LogSink interface that has Info(n, msg).

For an example of how this works, this the example logger implementation here and example usage here and here.

@CecileRobertMichon CecileRobertMichon force-pushed the update-controller-runtime branch 2 times, most recently from 6a256c3 to fc4d152 Compare January 18, 2022 17:49
@shysank
Copy link
Contributor

shysank commented Jan 18, 2022

/lgtm

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

@devigned devigned left a comment

Choose a reason for hiding this comment

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

Just a couple questions and bit of feedback on the logger correlation func. Nice work!

go.mod Show resolved Hide resolved
test/e2e/capi_test.go Show resolved Hide resolved
util/tele/composite_logger.go Show resolved Hide resolved
util/tele/corr_id.go Outdated Show resolved Hide resolved
@CecileRobertMichon CecileRobertMichon force-pushed the update-controller-runtime branch from fc4d152 to 3b48466 Compare January 19, 2022 18:21
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 19, 2022
@CecileRobertMichon
Copy link
Contributor Author

@devigned I've addressed your comments, PTAL

Copy link
Contributor

@devigned devigned left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

Awesome work, @CecileRobertMichon!

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: devigned

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 Jan 24, 2022
@CecileRobertMichon
Copy link
Contributor Author

/retest

@CecileRobertMichon
Copy link
Contributor Author

/retest

different flake, web-elb not reachable timeout

@CecileRobertMichon
Copy link
Contributor Author

/home/prow/go/src/sigs.k8s.io/cluster-api-provider-azure/test/e2e/azure_test.go:115
Timed out after 300.000s.
Expect the manually created resource group is empty after removing the manually created resources.

:( :(

running into all the possible flakes here....

/retest

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jan 25, 2022

@CecileRobertMichon: 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-azure-apidiff 3b48466 link false /test pull-cluster-api-provider-azure-apidiff

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.

@k8s-ci-robot k8s-ci-robot merged commit fee7417 into kubernetes-sigs:main Jan 25, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Jan 25, 2022
@CecileRobertMichon CecileRobertMichon deleted the update-controller-runtime branch February 17, 2023 23:25
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/provider/azure Issues or PRs related to azure provider 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. 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.

4 participants