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 github.com/Azure/azure-service-operator/v2 from v2.3.0 to v2.4.0 #4248

Merged
merged 2 commits into from
Nov 15, 2023

Conversation

nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Nov 9, 2023

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.0
ASO 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].

  • done

/hold for the above changes

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

CAPZ now depends on ASO v2.4.0

@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. release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 9, 2023
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 9, 2023

/assign @jackfrancis

@@ -554,3 +563,68 @@ func registerWebhooks(mgr manager.Manager) {
os.Exit(1)
}
}

Copy link
Contributor Author

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
Copy link
Contributor Author

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))
Copy link
Contributor Author

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.

Copy link

codecov bot commented Nov 9, 2023

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (d586453) 59.22% compared to head (86baed0) 59.22%.

Files Patch % Lines
internal/test/env/env.go 0.00% 1 Missing ⚠️
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.
📢 Have feedback on the report? Share it here.

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 9, 2023

/test pull-cluster-api-provider-azure-conformance-dual-stack-with-ci-artifacts

@nojnhuh nojnhuh force-pushed the aso24 branch 2 times, most recently from d7e111b to a9bec1b Compare November 13, 2023 17:39
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 13, 2023
@k8s-ci-robot
Copy link
Contributor

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.

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 13, 2023

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.

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 13, 2023

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 go get go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc@latest to fix the CVE.

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2023

Once #4261 merges, we should be able to rebase this branch and then run go get go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc@latest to fix the CVE.

Done

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 14, 2023
@k8s-ci-robot k8s-ci-robot removed the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 14, 2023
@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 15, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 15, 2023
@k8s-ci-robot
Copy link
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 52a619d771de1b7522eee4e4d52fca13aec8fdb7

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2023
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 15, 2023
@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 Nov 15, 2023
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/lgtm
/hold cancel

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Nov 15, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 666bf325a3110828476df5bb197c2d1fb9f53b23

@jackfrancis
Copy link
Contributor

/retest

Copy link
Contributor

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot
Copy link
Contributor

@nojnhuh: 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-azure-capi-e2e 86baed0 link false /test pull-cluster-api-provider-azure-capi-e2e
pull-cluster-api-provider-azure-windows-custom-builds 86baed0 link false /test pull-cluster-api-provider-azure-windows-custom-builds

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.

@CecileRobertMichon
Copy link
Contributor

/retest

@k8s-ci-robot k8s-ci-robot merged commit d192f41 into kubernetes-sigs:main Nov 15, 2023
23 of 28 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Nov 15, 2023
@nojnhuh nojnhuh deleted the aso24 branch November 21, 2023 01:20
@nojnhuh nojnhuh mentioned this pull request Jan 3, 2024
4 tasks
nojnhuh added a commit to nojnhuh/cluster-api-provider-azure that referenced this pull request Apr 27, 2024
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.
nojnhuh added a commit to nojnhuh/cluster-api-provider-azure that referenced this pull request May 1, 2024
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.
nojnhuh added a commit to nojnhuh/cluster-api-provider-azure that referenced this pull request May 3, 2024
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.
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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants