Skip to content

CM-1222: z-stream 1.17.2 operator release with sustaining CVE backports - #470

Merged
openshift-merge-bot[bot] merged 5 commits into
openshift:cert-manager-1.17from
sakshiep1:cert-manager-1.17
Sep 25, 2026
Merged

openshift-merge-bot[bot] merged 5 commits into
openshift:cert-manager-1.17from
sakshiep1:cert-manager-1.17

Conversation

@sakshiep1

@sakshiep1 sakshiep1 commented Aug 10, 2026 •

Copy link
Copy Markdown

Summary

Operator z-stream release 1.17.2 for CM-1222, with downstream openshift-sustaining CVE backports in operator go.mod and patched operand sources from jetstack.

Component Version
Operator (OLM bundle) 1.17.2
Operand (cert-manager) v1.17.4 (label unchanged; rebuilt with CVE fixes)

Jetstack dependency

Operand CVE fixes are delivered via openshift/jetstack-cert-manager:

  • #45 (merged a953710…) — initial sustaining backports
  • #51 (merged 70e2228…) — bump to latest Go 1.24 sustaining tags

Operator go.mod jetstack replace points at #51 merge commit:
v1.17.5-0.20260924124801-70e2228def37

operand.Dockerfile clones release-1.17 so operand image builds include both #45 and #51 fixes.

Changes

Operator version bump (1.17.1 → 1.17.2)

  • BUNDLE_VERSION → 1.17.2 in Makefile
  • CSV: OLM bundle name, version, replaces, skipRange
  • OPERATOR_IMAGE_VERSION in config/manager/manager.yaml

CVE fixes (operator go.mod)

CVE Package Fix
CVE-2026-33186 google.golang.org/grpc replace → openshift-sustaining/grpc-go@v1.75.1-sec.1
CVE-2026-39821 golang.org/x/net/idna replace → openshift-sustaining/net@v0.50.0-sec.4
CVE-2026-25681 golang.org/x/net/html same net replace (cumulative)
CVE-2026-33814 golang.org/x/net same net replace (sec.4)
CVE-2026-27136 golang.org/x/net/html same net replace (sec.4)
CVE-2026-46597 golang.org/x/crypto/ssh replace → openshift-sustaining/crypto@v0.48.0-sec.3
CVE-2026-39829 golang.org/x/crypto same crypto replace (sec.3)
CVE-2026-39832 golang.org/x/crypto same crypto replace (sec.3)
CVE-2026-34986 go-jose/v4 N/A on operator (fixed in jetstack #45 only)

Sustaining backports used instead of upstream minor bumps to remain compatible with Go 1.24 builder (rhel-9-golang-1.24-openshift-4.20).

Jetstack / operand build

  • go.mod: jetstack replace → merge commit 70e2228… (post–CM-13 Added CR examples #51)
  • images/ci/operand.Dockerfile: RELEASE_BRANCH v1.17.4 → release-1.17

Commits

  • CM-1222: bump BUNDLE_VERSION to 1.17.2
  • CM-1222: update CSV OLM bundle name, version, replaces, skipRange
  • CM-1222: update OPERATOR_IMAGE_VERSION references
  • CM-1222: Apply openshift-sustaining CVE backports in operator go.mod
  • CM-1222: Point jetstack replace to post-CVE merge commit

Verification

go mod tidy
go mod vendor
go build ./...
govulncheck ./...  # target CVE govulncheck entries cleared
make update-bindata
make bundle

- CVE-2026-33186: replace grpc => openshift-sustaining/grpc-go@v1.75.1-sec.1
- CVE-2026-39821 + CVE-2026-25681: replace net => openshift-sustaining/net@v0.50.0-sec.2
- CVE-2026-46597: replace crypto => openshift-sustaining/crypto@v0.48.0-sec.1
Depends on openshift/jetstack-cert-manager#45 for operand image rebuild.
Jetstack replace will be updated after openshift#45 merges.
Jira: CM-1222
Signed-off-by: Sakshi Patidar <spatidar@redhat.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 10, 2026
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 10, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 10, 2026 •

Copy link
Copy Markdown

@sakshiep1: This pull request references CM-1222 which is a valid jira issue.

Details

In response to this:

Summary

Operator z-stream release 1.17.2 for CM-1222, with downstream openshift-sustaining CVE backports in operator go.mod.

Component Version
Operator (OLM bundle) 1.17.2
Operand (cert-manager) v1.17.4 (unchanged)

Depends on

After #45 merges, this PR will be updated with the jetstack merge commit (or tag) in the go.mod replace directive before marking ready for review.

Changes

Operator version bump (1.17.1 → 1.17.2)

  • BUNDLE_VERSION → 1.17.2 in Makefile
  • CSV: OLM bundle name, version, replaces, skipRange
  • OPERATOR_IMAGE_VERSION in config/manager/manager.yaml

CVE fixes (operator go.mod)

CVE Package Fix
CVE-2026-33186 google.golang.org/grpc replace → openshift-sustaining/grpc-go@v1.75.1-sec.1
CVE-2026-39821 golang.org/x/net/idna replace → openshift-sustaining/net@v0.50.0-sec.2
CVE-2026-25681 golang.org/x/net/html same net replace (cumulative)
CVE-2026-46597 golang.org/x/crypto/ssh replace → openshift-sustaining/crypto@v0.48.0-sec.1
CVE-2026-34986 go-jose/v4 N/A on operator (fixed in jetstack #45 only)

Sustaining backports used instead of upstream minor bumps to remain compatible with Go 1.24 builder (rhel-9-golang-1.24-openshift-4.20).

Commits

  • CM-1222: bump BUNDLE_VERSION to 1.17.2
  • CM-1222: update CSV OLM bundle name, version, replaces, skipRange
  • CM-1222: update OPERATOR_IMAGE_VERSION references
  • CM-1222: Apply openshift-sustaining CVE backports in operator go.mod

Verification

go mod tidy
go mod vendor
go build ./...
govulncheck ./...  # target CVE govulncheck entries cleared
make update-bindata
make bundle

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-ci

openshift-ci Bot commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai

coderabbitai Bot commented Aug 10, 2026 •

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: f512a7c9-0e63-41f4-a00d-84202a892450

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Comment @coderabbitai help to get the list of available commands.

@sakshiep1
sakshiep1 marked this pull request as ready for review August 24, 2026 07:02
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 24, 2026
@openshift-ci
openshift-ci Bot requested review from TrilokGeer and swghosh August 24, 2026 07:03
Comment thread Makefile
# - use environment variables to overwrite this value (e.g export BUNDLE_VERSION=0.0.2)
BUNDLE_VERSION ?= 1.17.1
BUNDLE_VERSION ?= 1.17.2
CERT_MANAGER_VERSION ?= "v1.17.4"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

There is a newer(1.17.4) z-stream of cert-manager 1.17 available, we should be updating to that.
The same isn't required for istio-csr, since it's TP in 1.17

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Also is the downstream fork release branch release-1.17 synched with v1.17.4 of upstream?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

  1. The CERT_MANAGER_VERSION is already at v1.17.4 (unchanged from the base branch). Are you asking us to bump BUNDLE_VERSION from 1.17.2 to 1.17.4 to match the cert-manager operand version?
  2. Yes, release-1.17 is synced with v1.17.4 and includes the additional CVE backports from [https://github.com/CM-1222: UPSTREAM: <carry>: Apply openshift-sustaining CVE backports for go 1.24 jetstack-cert-manager#45] (merge commit a9537101948b).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Sorry for the confusion. I think got confused with the changes in Makefile and assumed operand was still at 1.17.2

@bharath-b-rh bharath-b-rh left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

/lgtm

Adding below labels based on CI results

/label docs-approved
/label qe-approved
/label px-approved

/hold

If @mytreya-rh / @arun717 wants to take a second look.

@openshift-ci openshift-ci Bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. docs-approved Signifies that Docs has signed off on this PR qe-approved Signifies that QE has signed off on this PR px-approved Signifies that Product Support has signed off on this PR labels Sep 15, 2026
@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 15, 2026
@arun717

arun717 commented Sep 23, 2026 •

Copy link
Copy Markdown
Contributor

Could you please update to the latest versions. Those have some more CVE fixes....even if we aren't impacted with those.

Pin             This PR                 Latest for Go 1.24                     Missing
x/net        v0.50.0-sec.2            v0.50.0-sec.4                      CVE-2026-33814, CVE-2026-27136
x/crypto  v0.48.0-sec.1             v0.48.0-sec.3                      CVE-2026-39829, CVE-2026-39832

@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 23, 2026
@arun717

arun717 commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 23, 2026
Also bump sustaining forks to latest Go 1.24 tags per reviewer feedback:
- x/net: v0.50.0-sec.2 → v0.50.0-sec.4 (CVE-2026-33814, CVE-2026-27136)
- x/crypto: v0.48.0-sec.1 → v0.48.0-sec.3 (CVE-2026-39829, CVE-2026-39832)

Signed-off-by: Sakshi Patidar <spatidar@redhat.com>
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2026
@sakshiep1

Copy link
Copy Markdown
Author

Updated jetstack replace to merged jetstack-cert-manager#51 (70e2228). Operator and operand are now aligned on x/net@sec.4 / x/crypto@sec.3. Ready for review.

@openshift-ci

openshift-ci Bot commented Sep 25, 2026

Copy link
Copy Markdown
Contributor

@sakshiep1: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@arun717

arun717 commented Sep 25, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@arun717

arun717 commented Sep 25, 2026

Copy link
Copy Markdown
Contributor

/unhold

@openshift-ci openshift-ci Bot added lgtm 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 Sep 25, 2026
@openshift-ci

openshift-ci Bot commented Sep 25, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arun717, bharath-b-rh, sakshiep1

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@openshift-merge-bot
openshift-merge-bot Bot merged commit f85cecf into openshift:cert-manager-1.17 Sep 25, 2026
11 checks passed
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. docs-approved Signifies that Docs has signed off on this PR jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants