CM-553: Rebase for operator v1.16.0 release with upstream cert-manager v1.16.4 #263

siddhibhor-56 · 2025-04-02T10:59:49Z

Rebases downstream operator with upstream cert-manager v1.16.4 for next release [v1.16.4] :

go dependencies
update bundle description to include upstream version of cert-manager
skipRange: ">=1.15.1 <1.16.0", replaces: "v1.15.1"
downstream fork updates
-https://github.com/openshift/jetstack-cert-manager/releases/tag/v1.16.4

openshift-ci · 2025-04-02T11:01:38Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: siddhibhor-56
Once this PR has been reviewed and has the lgtm label, please assign swghosh for approval. For more information see the Code Review Process.

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

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

swghosh · 2025-04-09T08:33:09Z

images/ci/operand.Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder

 ARG RELEASE_BRANCH=release-1.15


Suggested change

ARG RELEASE_BRANCH=release-1.15

ARG RELEASE_BRANCH=release-1.16

swghosh · 2025-04-09T11:34:44Z

/test e2e-operator

swghosh · 2025-04-14T08:28:21Z

/retest

swghosh · 2025-04-24T13:40:14Z

config/manager/manager.yaml

+              value: quay.io/jetstack/cert-manager-webhook
            - name: RELATED_IMAGE_CERT_MANAGER_CA_INJECTOR
-              value: quay.io/jetstack/cert-manager-cainjector:v1.15.5
+              value: quay.io/jetstack/cert-manager-cainjector
            - name: RELATED_IMAGE_CERT_MANAGER_CONTROLLER
-              value: quay.io/jetstack/cert-manager-controller:v1.15.5
+              value: quay.io/jetstack/cert-manager-controller


Due to openshift/release#64190, we would need :latest appended to these. That should help the fix ImagePullBackOff on the e2e.

siddhibhor-56 · 2025-04-24T16:13:05Z

/retest

- replace github.com/cert-manager/cert-manager => github.com/openshift/jetstack-cert-manager v1.16.4

- make bundle - make update - make update-bindata

- replaces : cert-manager-operator.v1.15.1 - olm.skipRange: '>=1.15.1 <1.16.0'

…atorSpec,PatchOperatorStatus functions Changes

siddhibhor-56 · 2025-04-28T19:14:13Z

/retest

swghosh · 2025-04-29T10:52:25Z

pkg/operator/operatorclient/operatorclient.go

+	return nil
+}
+
+func (c OperatorClient) ApplyOperatorStatus(ctx context.Context, fieldManager string, applyConfiguration *applyoperatorv1.OperatorStatusApplyConfiguration) (err error) {


Since we're adding custom (non-auto generated) code for this ApplyOperatorStatus which is required required in the deployment_controller (and possibly other controllers) vendored from library-go (eg. traces in https://github.com/search?q=repo%3Aopenshift%2Flibrary-go%20ApplyOperatorStatus&type=code), we need to add unit tests here to ensure this is never broken.

For reference, I added a few unit test cases: f1863ac that would test such scenarios. Today, the operator only adds/updates into status.OperatorStatus.Conditions and status.OperatorStatus.Generations.

The fake client unfortunately does not support client.Apply funcs yet (ref: kubernetes-sigs/controller-runtime#2341) which is why the results of testing the implementation against it are not accurate. We can follow-up with Envtest based integration test instead of unit tests based on fake client, but that'll require some work to add a new CI job where integration tests are run separately.

openshift-ci · 2025-04-29T14:07:30Z

@siddhibhor-56: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-operator-tech-preview	`24c1bc7`	link	false	`/test e2e-operator-tech-preview`

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.

swghosh · 2025-04-30T07:03:07Z

/cc @Senthamilarasu-STA
for px-approved label
This bump is required for the next 1.16.0 operator release.

swghosh · 2025-04-30T07:07:22Z

/label docs-approved
Added docs-needed label to parent epic: CM-526, @subhtk is aware of the 1.16 docs.

swghosh

Please tidy up the commits to include meaningful chunks of changes in each that doesn't repeat/revert the same changes, update the ApplyOperatorStatus code so it doesn't panic and this should be good to go after.

swghosh · 2025-04-30T07:09:12Z

.idea/.gitignore

Please remove this entire .idea directory, also you can add .idea/ to the top-level .gitignore so it's automatically ignored from future git tracking.

swghosh · 2025-04-30T07:10:59Z

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-deployment.yaml

@@ -18,12 +18,16 @@ spec:
      app.kubernetes.io/name: cainjector
  template:
    metadata:
+      annotations:


Notes to my self,
Future TODO: test cainjector metrics, update our ServiceMonitor docs with these metric paths.

swghosh · 2025-04-30T07:12:42Z

bindata/cert-manager-deployment/webhook/cert-manager-webhook-deployment.yaml

@@ -18,12 +18,16 @@ spec:
      app.kubernetes.io/name: webhook
  template:
    metadata:
+      annotations:


Notes to my self,
Future TODO: test webhook metrics, update our ServiceMonitor docs with these metric paths.

swghosh · 2025-04-30T07:17:02Z

README.md

@@ -4,7 +4,7 @@ This repository contains Cert Manager Operator designed for OpenShift. The opera

 ## The operator architecture and design assumptions

-The Operator uses the [upstream deployment manifests](https://github.com/jetstack/cert-manager/releases/download/v1.15.5/cert-manager.yaml). It divides them into separate files and deploys using 3 controllers:
+The Operator uses the [upstream deployment manifests](https://github.com/jetstack/cert-manager/releases/download/v1.16.4/cert-manager.yaml). It divides them into separate files and deploys using 3 controllers:


If we make this link generic and update it to https://github.com/cert-manager/cert-manager/releases so we don't need to update this link during every rebase manually.

swghosh · 2025-04-30T07:18:18Z

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
  name: builder
  namespace: ocp
-  tag: rhel-9-golang-1.22-openshift-4.17
+  tag: rhel-9-golang-1.23-openshift-4.19


Let's update the CI base image bumps in a different commit.

swghosh · 2025-04-30T07:21:43Z

pkg/operator/operatorclient/operatorclient.go

You have to additionally update starter.go to with

operatorClient := &operatorclient.OperatorClient{ Informers: certManagerInformers, Client: certManagerOperatorClient.OperatorV1alpha1(), + Clock: cc.Clock, }

otherwise the OperatorClient's clock stays nil which'll cause panics.

swghosh · 2025-04-30T07:40:14Z

/retitle CM-553: Rebase for operator v1.16.0 release with upstream cert-manager v1.16.4

openshift-ci-robot · 2025-04-30T07:40:22Z

@siddhibhor-56: This pull request references CM-553 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Rebases downstream operator with upstream cert-manager v1.16.4 for next release [v1.16.4] :

go dependencies

update bundle description to include upstream version of cert-manager

skipRange: ">=1.15.1 <1.16.0", replaces: "v1.15.1"

downstream fork updates
-https://github.com/openshift/jetstack-cert-manager/releases/tag/v1.16.4

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.

swghosh · 2025-04-30T11:11:41Z

/reopen

openshift-ci · 2025-04-30T11:12:01Z

@swghosh: Failed to re-open PR: state cannot be changed. The repository that submitted this pull request has been deleted.

In response to this:

/reopen

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.

swghosh · 2025-04-30T11:14:21Z

/reopen

openshift-ci · 2025-04-30T11:14:35Z

@swghosh: Failed to re-open PR: state cannot be changed. The repository that submitted this pull request has been deleted.

In response to this:

/reopen

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.

openshift-ci bot requested review from deads2k and swghosh April 2, 2025 11:01

siddhibhor-56 force-pushed the cert-manager-1-16 branch 3 times, most recently from 9e148b6 to 725545a Compare April 8, 2025 11:08

swghosh mentioned this pull request Apr 8, 2025

CM-553: update pipeline image tags to use v1.16.4 openshift/release#63465

Merged

swghosh reviewed Apr 9, 2025

View reviewed changes

siddhibhor-56 force-pushed the cert-manager-1-16 branch 2 times, most recently from e850cf9 to e35df1c Compare April 10, 2025 09:28

siddhibhor-56 force-pushed the cert-manager-1-16 branch from b29b1a6 to 57ed333 Compare April 15, 2025 10:03

siddhibhor-56 force-pushed the cert-manager-1-16 branch from 45edc05 to e8b23bb Compare April 24, 2025 11:48

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 24, 2025

swghosh reviewed Apr 24, 2025

View reviewed changes

siddhibhor-56 force-pushed the cert-manager-1-16 branch from e8b23bb to 0123fd8 Compare April 24, 2025 16:05

siddhibhor-56 force-pushed the cert-manager-1-16 branch 4 times, most recently from 798c9b1 to 0ba495d Compare April 25, 2025 10:00

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 25, 2025

siddhibhor-56 force-pushed the cert-manager-1-16 branch from 0ba495d to fbc2357 Compare April 25, 2025 13:27

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 25, 2025

siddhibhor-56 force-pushed the cert-manager-1-16 branch from fbc2357 to 14204f2 Compare April 25, 2025 14:43

siddhibhor-56 added 4 commits April 25, 2025 20:18

Bump dependencies with upstream cert-manager@v1.16.4

db0a73e

- replace github.com/cert-manager/cert-manager => github.com/openshift/jetstack-cert-manager v1.16.4

updates bundle version to v1.16.4 for next z-stream

6852c00

- make bundle - make update - make update-bindata

Changes to OLM bundle replaces and SkipRange for v1.16.4

ae73537

- replaces : cert-manager-operator.v1.15.1 - olm.skipRange: '>=1.15.1 <1.16.0'

Changes in update-client-gen script for ApplyOperatorStatus,ApplyOper…

1c02600

…atorSpec,PatchOperatorStatus functions Changes

siddhibhor-56 added 2 commits April 25, 2025 20:18

removes v1.15.5 tag

9d29b35

updates deepcopy

6d7c421

siddhibhor-56 force-pushed the cert-manager-1-16 branch from 14204f2 to 6d7c421 Compare April 25, 2025 14:49

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 25, 2025

swghosh mentioned this pull request Apr 28, 2025

[release-1.16] CM-534: Update configs for operator release v1.16.0 openshift/cert-manager-operator-release#386

Merged

siddhibhor-56 force-pushed the cert-manager-1-16 branch 2 times, most recently from 2a9685a to 6d7c421 Compare April 29, 2025 07:11

swghosh mentioned this pull request Apr 29, 2025

Avoid e2e to pass with faulty status #267

Merged

Changes

c0931cf

swghosh reviewed Apr 29, 2025

View reviewed changes

siddhibhor-56 added 2 commits April 29, 2025 16:38

Changes

5d2973b

Changes

24c1bc7

openshift-ci bot requested a review from Senthamilarasu-STA April 30, 2025 07:03

openshift-ci bot added the docs-approved Signifies that Docs has signed off on this PR label Apr 30, 2025

swghosh suggested changes Apr 30, 2025

View reviewed changes

openshift-ci bot changed the title ~~CM-553 : Rebase Upstream cert-manager v1.16.4 for cert-manager-operator.v1.16.0 release~~ CM-553: Rebase for operator v1.16.0 release with upstream cert-manager v1.16.4 Apr 30, 2025

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 30, 2025

siddhibhor-56 closed this by deleting the head repository Apr 30, 2025

siddhibhor-56 mentioned this pull request Apr 30, 2025

CM-553: Rebase for operator v1.16.0 release with upstream cert-manager v1.16.4 #268

Merged

swghosh mentioned this pull request May 12, 2025

CM-499: Enable disconnected support via annotation in operator CSV #271

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CM-553: Rebase for operator v1.16.0 release with upstream cert-manager v1.16.4 #263

CM-553: Rebase for operator v1.16.0 release with upstream cert-manager v1.16.4 #263

siddhibhor-56 commented Apr 2, 2025 •

edited

Loading

openshift-ci bot commented Apr 2, 2025

swghosh Apr 9, 2025

siddhibhor-56 Apr 9, 2025

swghosh commented Apr 9, 2025

swghosh commented Apr 14, 2025

swghosh Apr 24, 2025

siddhibhor-56 commented Apr 24, 2025

siddhibhor-56 commented Apr 28, 2025

swghosh Apr 29, 2025 •

edited

Loading

swghosh Apr 30, 2025

openshift-ci bot commented Apr 29, 2025

swghosh commented Apr 30, 2025

swghosh commented Apr 30, 2025

swghosh left a comment

swghosh Apr 30, 2025

swghosh Apr 30, 2025

swghosh Apr 30, 2025

swghosh Apr 30, 2025

swghosh Apr 30, 2025

swghosh Apr 30, 2025

swghosh commented Apr 30, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Apr 30, 2025 •

edited by openshift-ci bot

Loading

swghosh commented Apr 30, 2025

openshift-ci bot commented Apr 30, 2025

swghosh commented Apr 30, 2025

openshift-ci bot commented Apr 30, 2025

	ARG RELEASE_BRANCH=release-1.15
	ARG RELEASE_BRANCH=release-1.16

CM-553: Rebase for operator v1.16.0 release with upstream cert-manager v1.16.4 #263

CM-553: Rebase for operator v1.16.0 release with upstream cert-manager v1.16.4 #263

Conversation

siddhibhor-56 commented Apr 2, 2025 • edited Loading

openshift-ci bot commented Apr 2, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

swghosh commented Apr 9, 2025

swghosh commented Apr 14, 2025

Choose a reason for hiding this comment

siddhibhor-56 commented Apr 24, 2025

siddhibhor-56 commented Apr 28, 2025

swghosh Apr 29, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-ci bot commented Apr 29, 2025

swghosh commented Apr 30, 2025

swghosh commented Apr 30, 2025

swghosh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

swghosh commented Apr 30, 2025 • edited by openshift-ci bot Loading

openshift-ci-robot commented Apr 30, 2025 • edited by openshift-ci bot Loading

swghosh commented Apr 30, 2025

openshift-ci bot commented Apr 30, 2025

swghosh commented Apr 30, 2025

openshift-ci bot commented Apr 30, 2025

siddhibhor-56 commented Apr 2, 2025 •

edited

Loading

swghosh Apr 29, 2025 •

edited

Loading

swghosh commented Apr 30, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Apr 30, 2025 •

edited by openshift-ci bot

Loading