OCPBUGS-59768: Synchronize From Upstream Repositories #1129
Conversation
openshift-ci-robot
added
jira/severity-moderate
|
@anik120: This pull request references Jira Issue OCPBUGS-59768, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
anik120
force-pushed
the
sync-upstream-with-bug-fix
branch
2 times, most recently
from
3c7761e to
bd46b41
Compare
|
/retest-required |
|
Hi @Xia-Zhao-rh , could you help verify it? Thanks! |
|
Hi, @anik120 I try to test the metrics. The health of the catalog-operator/olm-operator metric is down |
|
/retest-required |
|
/retest-required |
|
@Xia-Zhao-rh I've been unable to get a cluster myself to test this fix, and related to that, CI hasn't been working for us the entire day, presumably because every openshift team is queuing up to get their stuff in right now. I'll try again tomorrow, in case you're able to get a cluster and test this fix that'll be helpful, please let me know! Thanks. |
|
/retest-required |
1 similar comment
|
/retest-required |
|
Hi, @anik120 |
anik120
force-pushed
the
sync-upstream-with-bug-fix
branch
from
3d38d73 to
a97ab20
Compare
|
Managed to get a cluster with the latest push and the metrics endpoints are working: Working to get this plumbed from upstream...stay tuned... |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: anik120, tmshort 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 |
openshift-ci
bot
added
the
approved
|
/hold @tmshort I have to get this plumbed though first operator-framework/operator-lifecycle-manager#3681 |
openshift-ci
bot
added
the
do-not-merge/hold
* ServiceMonitor RBAC for authenticated metrics endpoints Add additional permission to allow Prometheus in OCP to access authenticated metrics without HTTP 500 errors. * Skip metrics e2e tests for now Upstream-repository: operator-lifecycle-manager Upstream-commit: ca9fb302aeff6f375120a0817dc9d201e5bbcbbb
…cs authentication (#3686) Upstream-repository: operator-lifecycle-manager Upstream-commit: bdbfb2d6b975ee9a0fabef0b8ded86502763bd97
…772) * Bump the k8s-dependencies group across 1 directory with 6 updates Bumps the k8s-dependencies group with 4 updates in the / directory: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver), [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) and [sigs.k8s.io/kind](https://github.com/kubernetes-sigs/kind). Updates `k8s.io/api` from 0.33.4 to 0.34.0 - [Commits](kubernetes/api@v0.33.4...v0.34.0) Updates `k8s.io/apiextensions-apiserver` from 0.33.4 to 0.34.0 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.33.4...v0.34.0) Updates `k8s.io/apimachinery` from 0.33.4 to 0.34.0 - [Commits](kubernetes/apimachinery@v0.33.4...v0.34.0) Updates `k8s.io/client-go` from 0.33.4 to 0.34.0 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.33.4...v0.34.0) Updates `sigs.k8s.io/controller-runtime` from 0.21.0 to 0.22.0 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.21.0...v0.22.0) Updates `sigs.k8s.io/kind` from 0.29.0 to 0.30.0 - [Release notes](https://github.com/kubernetes-sigs/kind/releases) - [Commits](kubernetes-sigs/kind@v0.29.0...v0.30.0) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.22.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: sigs.k8s.io/kind dependency-version: 0.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> * Fix failing unit test Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com> Upstream-repository: operator-registry Upstream-commit: 4cceb63e701e57b47e62d0b08a152b172b9d2b18
PodMonitor is a useful resource when monitoring a set of Pods that do not have a dedicated Service resource associated. This is helpful if the only reason to add them to a Service would be to configure monitoring. Fixes #1688 Signed-off-by: Moritz Wanzenböck <moritz.wanzenboeck@linbit.com> Upstream-repository: operator-registry Upstream-commit: 017ab5353fec264c1fb1381b5d7088bb77b53b82
…sion (#1801) Signed-off-by: Joe Lanford <joe.lanford@gmail.com> Upstream-repository: operator-registry Upstream-commit: a5f1128789836e8e1d1569b6f3fb47b8194deb86
Signed-off-by: grokspawn <jordan@nimblewidget.com> Upstream-repository: operator-registry Upstream-commit: 8d4a5f96f8c65249eec876ea8e020a091aaea7e4
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.9.1 to 1.10.1. - [Release notes](https://github.com/spf13/cobra/releases) - [Commits](spf13/cobra@v1.9.1...v1.10.1) --- updated-dependencies: - dependency-name: github.com/spf13/cobra dependency-version: 1.10.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: 9ba7f1aed6694a018c4567687ce5713cd42d59e0
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.11.0 to 1.11.1. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.11.0...v1.11.1) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-version: 1.11.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: 29bdb094429b6513b7f67e9fb98032733f3fca90
Bumps [github.com/google/cel-go](https://github.com/google/cel-go) from 0.26.0 to 0.26.1. - [Release notes](https://github.com/google/cel-go/releases) - [Commits](google/cel-go@v0.26.0...v0.26.1) --- updated-dependencies: - dependency-name: github.com/google/cel-go dependency-version: 0.26.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: 37c01109c7439359dc9e32bb1f422c447f686d39
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5 to 6. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5...v6) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: 8835256d600108633a3285059321543a3709cafc
Bumps [actions/stale](https://github.com/actions/stale) from 9 to 10. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](actions/stale@v9...v10) --- updated-dependencies: - dependency-name: actions/stale dependency-version: '10' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: ee2250bf0d6fa0465b25395927f38ecd4a8d97e1
* Bump the k8s-dependencies group with 5 updates Bumps the k8s-dependencies group with 5 updates: | Package | From | To | | --- | --- | --- | | [k8s.io/api](https://github.com/kubernetes/api) | `0.33.4` | `0.34.0` | | [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.33.4` | `0.34.0` | | [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.33.4` | `0.34.0` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.33.4` | `0.34.0` | | [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) | `0.21.0` | `0.22.0` | Updates `k8s.io/api` from 0.33.4 to 0.34.0 - [Commits](kubernetes/api@v0.33.4...v0.34.0) Updates `k8s.io/apiextensions-apiserver` from 0.33.4 to 0.34.0 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.33.4...v0.34.0) Updates `k8s.io/apimachinery` from 0.33.4 to 0.34.0 - [Commits](kubernetes/apimachinery@v0.33.4...v0.34.0) Updates `k8s.io/client-go` from 0.33.4 to 0.34.0 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.33.4...v0.34.0) Updates `sigs.k8s.io/controller-runtime` from 0.21.0 to 0.22.0 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.21.0...v0.22.0) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.22.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> * Generate resources Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com> Upstream-repository: api Upstream-commit: a7542c56065a50a1ce833c07edcb27f3e85141cd
Bumps the k8s-dependencies group with 5 updates: | Package | From | To | | --- | --- | --- | | [k8s.io/api](https://github.com/kubernetes/api) | `0.34.0` | `0.34.1` | | [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.34.0` | `0.34.1` | | [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.34.0` | `0.34.1` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.34.0` | `0.34.1` | | [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) | `0.22.0` | `0.22.1` | Updates `k8s.io/api` from 0.34.0 to 0.34.1 - [Commits](kubernetes/api@v0.34.0...v0.34.1) Updates `k8s.io/apiextensions-apiserver` from 0.34.0 to 0.34.1 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.34.0...v0.34.1) Updates `k8s.io/apimachinery` from 0.34.0 to 0.34.1 - [Commits](kubernetes/apimachinery@v0.34.0...v0.34.1) Updates `k8s.io/client-go` from 0.34.0 to 0.34.1 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.34.0...v0.34.1) Updates `sigs.k8s.io/controller-runtime` from 0.22.0 to 0.22.1 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.22.0...v0.22.1) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.22.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: api Upstream-commit: bef2351bb84e27fb2deee8ee78e0d670120efb8f
The pin was originally added due gov1.23 limitations. The project is currently on gov1.24.4. See: operator-framework/operator-lifecycle-manager#3284
…service-ca Configure serviceCa support in values.yaml and regenerate manifests to use OpenShift service-ca-operator for automatic TLS certificates.
anik120
force-pushed
the
sync-upstream-with-bug-fix
branch
from
409ff4e to
6e79ccc
Compare
|
/lgtm |
|
@anik120: The following test failed, say
Full PR test history. Your PR dashboard. 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-sigs/prow repository. I understand the commands that are listed here. |
|
Looks like @jianzhangbjz's commit fixed it |
|
/label qe-approved |
openshift-ci
bot
added
the
qe-approved
openshift-ci-robot
added
the
verified
|
@bandrade: This PR has been marked as verified by In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
openshift-merge-bot
bot
merged commit 7ff5cb5
into
openshift:main
|
@anik120: Jira Issue Verification Checks: Jira Issue OCPBUGS-59768 Jira Issue OCPBUGS-59768 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓 In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
Fix included in accepted release 4.21.0-0.nightly-2025-10-25-183621 |
13 participants
This PR supercedes #1120, with the addition of OCPBUGS-59768 implementation, which is required for building successfully due to 2 related upstream commits coming in.
The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:
This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.
/cc @openshift/openshift-team-operator-framework
The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:Date Commit Author Message
2025-10-03 19:09:56 operator-framework/operator-lifecycle-manager@99f5f8b dependabot[bot] 🌱 Bump the k8s-dependencies group with 10 updates (#3638)
2025-10-09 15:48:06 operator-framework/operator-lifecycle-manager@16f86e1 dependabot[bot] 🌱 Bump google.golang.org/grpc from 1.75.1 to 1.76.0 (#3665)
2025-10-09 15:51:00 operator-framework/operator-lifecycle-manager@f175eae dependabot[bot] 🌱 Bump github.com/onsi/ginkgo/v2 from 2.25.3 to 2.26.0 (#3667)
2025-10-09 15:53:51 operator-framework/operator-lifecycle-manager@3a6fecc Camila Macedo 🌱 Bump github.com/operator-framework/api from 0.34.0 to 0.35.0 (#3670)
2025-10-10 11:50:49 operator-framework/operator-lifecycle-manager@b650272 dependabot[bot] 🌱 Bump the k8s-dependencies group across 1 directory with 2 updates (#3671)
2025-10-10 12:04:33 operator-framework/operator-lifecycle-manager@589a5d0 Anik Secure metrics endpoint with cntrlr-runtime metrics authz mechanics (#3660)
2025-10-14 14:04:38 operator-framework/operator-lifecycle-manager@47ef860 Jordan Keister bump o-f deps (#3662)
2025-10-17 08:55:53 operator-framework/operator-lifecycle-manager@7b5f17b dependabot[bot] 🌱 Bump sigs.k8s.io/controller-runtime (#3672)
2025-10-17 08:58:32 operator-framework/operator-lifecycle-manager@cab994f dependabot[bot] 🌱 Bump github.com/prometheus/common from 0.66.1 to 0.67.1 (#3673)
2025-10-17 09:01:15 operator-framework/operator-lifecycle-manager@3061363 dependabot[bot] 🌱 Bump golang.org/x/time from 0.13.0 to 0.14.0 (#3674)
2025-10-17 14:55:53 operator-framework/operator-lifecycle-manager@b107642 Justin Pierce Remove use of retracted o/api version (#3679)
2025-10-17 16:29:29 operator-framework/operator-lifecycle-manager@62e3677 Per Goncalves da Silva Add AGENTS.md (#3678)
2025-10-20 15:12:18 operator-framework/operator-lifecycle-manager@971d680 Anik Add OpenShift service-ca support for authenticated metrics endpoints (#3677)
2025-10-23 15:19:16 operator-framework/operator-lifecycle-manager@b1278ee dependabot[bot] 🌱 Bump go.podman.io/image/v5 from 5.37.0 to 5.38.0 (#3680)
2025-10-23 17:38:56 operator-framework/operator-lifecycle-manager@ce26d16 Jian Zhang Fix TOCTOU race condition in ensureInstallPlan (#3682)
2025-10-23 18:40:20 operator-framework/operator-lifecycle-manager@465ea2e Anik Fix container image short names for OpenShift compatibility (#3685)
2025-10-23 18:56:53 operator-framework/operator-lifecycle-manager@ca9fb30 Anik Fix ServiceMonitor RBAC for authenticated metrics endpoints (#3681)
2025-10-24 11:35:29 operator-framework/operator-lifecycle-manager@bdbfb2d Jian Zhang fix: Use rest.HTTPClientFor to create TLS-configured client for metrics authentication (#3686)
2025-09-17 16:16:08 operator-framework/operator-registry@4cceb63 dependabot[bot] Bump the k8s-dependencies group across 1 directory with 6 updates (#1772)
2025-09-22 08:52:47 operator-framework/operator-registry@017ab53 Moritz Wanzenböck Add PodMonitor to supported resources (#1795)
2025-09-30 19:52:34 operator-framework/operator-registry@a5f1128 Joe Lanford release/goreleaser.opm.Dockerfile: parameterize grpc-health-probe version (#1801)
2025-10-03 14:05:07 operator-framework/operator-registry@8d4a5f9 Jordan Keister update o-f/api as prep for release (#1806)
2025-09-03 08:08:39 operator-framework/api@9ba7f1a dependabot[bot] Bump github.com/spf13/cobra from 1.9.1 to 1.10.1 (#445)
2025-09-03 09:47:34 operator-framework/api@29bdb09 dependabot[bot] Bump github.com/stretchr/testify from 1.11.0 to 1.11.1 (#446)
2025-09-03 09:56:07 operator-framework/api@37c0110 dependabot[bot] Bump github.com/google/cel-go from 0.26.0 to 0.26.1 (#448)
2025-09-09 07:38:25 operator-framework/api@8835256 dependabot[bot] Bump actions/setup-go from 5 to 6 (#449)
2025-09-09 07:41:23 operator-framework/api@ee2250b dependabot[bot] Bump actions/stale from 9 to 10 (#450)
2025-09-17 16:13:19 operator-framework/api@a7542c5 dependabot[bot] Bump the k8s-dependencies group with 5 updates (#447)
2025-10-03 13:44:27 operator-framework/api@bef2351 dependabot[bot] Bump the k8s-dependencies group with 5 updates (#451)
This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.
/cc @openshift/openshift-team-operator-framework