-
Notifications
You must be signed in to change notification settings - Fork 431
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 github.com/Azure/azure-service-operator/v2 from v2.3.0 to v2.4.0 #4248
Conversation
/assign @jackfrancis |
@@ -554,3 +563,68 @@ func registerWebhooks(mgr manager.Manager) { | |||
os.Exit(1) | |||
} | |||
} | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This hunk is all copy-pasta from CAPI 1.6 so we don't have to update our CAPI.
@@ -92,7 +98,6 @@ func init() { | |||
} | |||
|
|||
var ( | |||
metricsAddr string |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes are mirrored from #4182 to account for breaking changes in controller-runtime 0.16, which ASO 2.4 has a hard dependency on.
pflag.CommandLine.AddGoFlagSet(flag.CommandLine) | ||
pflag.Parse() | ||
|
||
ctrl.SetLogger(klogr.New()) | ||
ctrl.SetLogger(textlogger.NewLogger(logConfig)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The linter was throwing an error since this pulls in a new version of klog
which deprecates klogr.New
so that caused a little bit of extra collateral damage.
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #4248 +/- ##
=======================================
Coverage 59.22% 59.22%
=======================================
Files 185 185
Lines 18778 18777 -1
=======================================
Hits 11121 11121
+ Misses 7048 7047 -1
Partials 609 609 ☔ View full report in Codecov by Sentry. |
/test pull-cluster-api-provider-azure-conformance-dual-stack-with-ci-artifacts |
d7e111b
to
a9bec1b
Compare
PR needs rebase. 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. |
Dependency review is failing because of this GHSA-8pgv-569h-w5rw which I think needs #4261 to merge first otherwise I see build failures trying to update only that module. All the e2e-like tests seem like flakes. |
Once #4261 merges, we should be able to rebase this branch and then run |
Done |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: CecileRobertMichon 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 |
LGTM label has been added. Git tree hash: 52a619d771de1b7522eee4e4d52fca13aec8fdb7
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/hold cancel
LGTM label has been added. Git tree hash: 666bf325a3110828476df5bb197c2d1fb9f53b23
|
/retest |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
@nojnhuh: The following tests failed, say
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. |
/retest |
This code was originally added in kubernetes-sigs#4248 so we could update our controller-runtime and ASO without also bumping CAPI. Now that that dust has settled, we can use this code straight from CAPI.
This code was originally added in kubernetes-sigs#4248 so we could update our controller-runtime and ASO without also bumping CAPI. Now that that dust has settled, we can use this code straight from CAPI.
This code was originally added in kubernetes-sigs#4248 so we could update our controller-runtime and ASO without also bumping CAPI. Now that that dust has settled, we can use this code straight from CAPI.
What type of PR is this?
/kind cleanup
What this PR does / why we need it: Bumps ASO to v2.4.0.
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:
ASO v2.4 is NOT published yet: https://github.com/Azure/azure-service-operator/releases/tag/v2.4.0ASO v2.4 is live!
This PR is split into two commits: The first is the intended set of changes that should be merged. The second is some hacks to refer to custom built artifacts to get test signal before the official ASO manifests/images are published. The second commit MUST be dropped before this is merged. The only other modification to be made is to update go.mod to refer to the real v2.4.0 of ASO instead of a commit on its
main
branch:go get github.com/Azure/azure-service-operator/[email protected]
./hold for the above changes
TODOs:
Release note: