OCPBUGS-35282: Revendor installer

[celebdor]

In the process of revendoring the installer, a dependency conflict was found in which OCP updated its direct dependencies to a new backwards incompatible Prometheus version (0.48.0). The corresponding k8s dependency update to the new Prometheus version was only present in k8s 0.31.x+. The new installer version was dependent on the new Prometheus version as well as the old version of k8s (0.29.x). This dependency on the old version of k8s was pulled in by hive through the direct dependency on openshift/generic-admission-server, which depends on k8s.io/component-base.

To rectify this issue, update k8s.io/component-base to 0.31.x. As a byproduct, update controller-runtime to be compatible with component-base 0.31.x.

Should also address: ACM-12693 ACM-12256 ACM-10978 ACM-11533

[openshift-ci-robot]

@celebdor: This pull request references Jira Issue OCPBUGS-35282, which is valid.

3 validation(s) were run on this bug

* bug is open, matching expected state (open) * bug target version (4.17.0) matches configured target version for branch (4.17.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @jianping-shu

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/hive/pull/2393): >[OCPBUGS-35282](https://issues.redhat.com/browse/OCPBUGS-35282) > >In the process of revendoring the installer, a dependency conflict was found in which OCP updated its direct dependencies to a new backwards incompatible Prometheus version (0.48.0). The corresponding k8s dependency update to the new Prometheus version was only present in k8s 0.31.x+. The new installer version was dependent on the new Prometheus version as well as the old version of k8s (0.29.x). This dependency on the old version of k8s was pulled in by hive through the direct dependency on openshift/generic-admission-server, which depends on k8s.io/component-base. > >To rectify this issue, update k8s.io/component-base to 0.31.x. As a byproduct, update controller-runtime to be compatible with component-base 0.31.x. > >Should also address: >[ACM-12693](https://issues.redhat.com//browse/ACM-12693) >[ACM-12256](https://issues.redhat.com//browse/ACM-12256) >[ACM-10978](https://issues.redhat.com//browse/ACM-10978) >[ACM-11533](https://issues.redhat.com//browse/ACM-11533) Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fhive). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.

[2uasimojo]

/ok-to-test

[2uasimojo]

/lgtm /approve

...assuming CI is happy.

[celebdor]

/test all

[openshift-ci[bot]]

@celebdor: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 46.26%. Comparing base (7601b0c) to head (d622ebd).

Additional details and impacted files

[](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift) ```diff @@ Coverage Diff @@ ## master #2393 +/- ## ========================================== + Coverage 46.23% 46.26% +0.02% ========================================== Files 279 279 Lines 32784 32750 -34 ========================================== - Hits 15159 15153 -6 + Misses 16351 16324 -27 + Partials 1274 1273 -1 ``` | [Files](https://app.codecov.io/gh/openshift/hive/pull/2393?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift) | Coverage Δ | | |---|---|---| | [cmd/hiveadmission/main.go](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&filepath=cmd%2Fhiveadmission%2Fmain.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-Y21kL2hpdmVhZG1pc3Npb24vbWFpbi5nbw==) | `0.00% <ø> (ø)` | | | [...roller/argocdregister/argocdregister\_controller.go](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&filepath=pkg%2Fcontroller%2Fargocdregister%2Fargocdregister_controller.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-cGtnL2NvbnRyb2xsZXIvYXJnb2NkcmVnaXN0ZXIvYXJnb2NkcmVnaXN0ZXJfY29udHJvbGxlci5nbw==) | `50.75% <ø> (+0.25%)` | :arrow_up: | | [...roller/awsprivatelink/awsprivatelink\_controller.go](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&filepath=pkg%2Fcontroller%2Fawsprivatelink%2Fawsprivatelink_controller.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-cGtnL2NvbnRyb2xsZXIvYXdzcHJpdmF0ZWxpbmsvYXdzcHJpdmF0ZWxpbmtfY29udHJvbGxlci5nbw==) | `68.32% <ø> (+0.23%)` | :arrow_up: | | [...controller/clusterclaim/clusterclaim\_controller.go](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&filepath=pkg%2Fcontroller%2Fclusterclaim%2Fclusterclaim_controller.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-cGtnL2NvbnRyb2xsZXIvY2x1c3RlcmNsYWltL2NsdXN0ZXJjbGFpbV9jb250cm9sbGVyLmdv) | `62.50% <ø> (-1.10%)` | :arrow_down: | | [.../clusterdeployment/clusterdeployment\_controller.go](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&filepath=pkg%2Fcontroller%2Fclusterdeployment%2Fclusterdeployment_controller.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-cGtnL2NvbnRyb2xsZXIvY2x1c3RlcmRlcGxveW1lbnQvY2x1c3RlcmRlcGxveW1lbnRfY29udHJvbGxlci5nbw==) | `66.99% <ø> (+0.20%)` | :arrow_up: | | [...kg/controller/clusterdeployment/clusterinstalls.go](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&filepath=pkg%2Fcontroller%2Fclusterdeployment%2Fclusterinstalls.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-cGtnL2NvbnRyb2xsZXIvY2x1c3RlcmRlcGxveW1lbnQvY2x1c3Rlcmluc3RhbGxzLmdv) | `75.57% <ø> (ø)` | | | [.../controller/clusterdeployment/clusterprovisions.go](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&filepath=pkg%2Fcontroller%2Fclusterdeployment%2Fclusterprovisions.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-cGtnL2NvbnRyb2xsZXIvY2x1c3RlcmRlcGxveW1lbnQvY2x1c3RlcnByb3Zpc2lvbnMuZ28=) | `62.27% <ø> (ø)` | | | [...lusterdeprovision/clusterdeprovision\_controller.go](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&filepath=pkg%2Fcontroller%2Fclusterdeprovision%2Fclusterdeprovision_controller.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-cGtnL2NvbnRyb2xsZXIvY2x1c3RlcmRlcHJvdmlzaW9uL2NsdXN0ZXJkZXByb3Zpc2lvbl9jb250cm9sbGVyLmdv) | `53.03% <ø> (+0.20%)` | :arrow_up: | | [...oller/clusterpool/clusterdeploymentexpectations.go](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&filepath=pkg%2Fcontroller%2Fclusterpool%2Fclusterdeploymentexpectations.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-cGtnL2NvbnRyb2xsZXIvY2x1c3RlcnBvb2wvY2x1c3RlcmRlcGxveW1lbnRleHBlY3RhdGlvbnMuZ28=) | `0.00% <ø> (ø)` | | | [...g/controller/clusterpool/clusterpool\_controller.go](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree&filepath=pkg%2Fcontroller%2Fclusterpool%2Fclusterpool_controller.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift#diff-cGtnL2NvbnRyb2xsZXIvY2x1c3RlcnBvb2wvY2x1c3RlcnBvb2xfY29udHJvbGxlci5nbw==) | `56.88% <ø> (+0.78%)` | :arrow_up: | | ... and [34 more](https://app.codecov.io/gh/openshift/hive/pull/2393?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift) | | ... and [2 files with indirect coverage changes](https://app.codecov.io/gh/openshift/hive/pull/2393/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=openshift)

[2uasimojo]

/lgtm

[openshift-ci-robot]

@celebdor: Jira Issue OCPBUGS-35282: All pull requests linked via external trackers have merged:

• openshift/hive#2339
• openshift/hive#2393

Jira Issue OCPBUGS-35282 has been moved to the MODIFIED state.

In response to [this](https://github.com/openshift/hive/pull/2393): >In the process of revendoring the installer, a dependency conflict was found in which OCP updated its direct dependencies to a new backwards incompatible Prometheus version (0.48.0). The corresponding k8s dependency update to the new Prometheus version was only present in k8s 0.31.x+. The new installer version was dependent on the new Prometheus version as well as the old version of k8s (0.29.x). This dependency on the old version of k8s was pulled in by hive through the direct dependency on openshift/generic-admission-server, which depends on k8s.io/component-base. > >To rectify this issue, update k8s.io/component-base to 0.31.x. As a byproduct, update controller-runtime to be compatible with component-base 0.31.x. > >Should also address: >[ACM-12693](https://issues.redhat.com//browse/ACM-12693) >[ACM-12256](https://issues.redhat.com//browse/ACM-12256) >[ACM-10978](https://issues.redhat.com//browse/ACM-10978) >[ACM-11533](https://issues.redhat.com//browse/ACM-11533) Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fhive). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.

[openshift-ci[bot]]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 2uasimojo, celebdor

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: - ~~[OWNERS](https://github.com/openshift/hive/blob/master/OWNERS)~~ [2uasimojo] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment