build(deps): bump github.com/cert-manager/cert-manager from 1.13.6 to…

… 1.15.4 (#972)

* build(deps): bump github.com/cert-manager/cert-manager

Bumps [github.com/cert-manager/cert-manager](https://github.com/cert-manager/cert-manager) from 1.13.6 to 1.15.4.
- [Release notes](https://github.com/cert-manager/cert-manager/releases)
- [Changelog](https://github.com/cert-manager/cert-manager/blob/master/RELEASE.md)
- [Commits](cert-manager/cert-manager@v1.13.6...v1.15.4)

---
updated-dependencies:
- dependency-name: github.com/cert-manager/cert-manager
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix build failure, sync deps

* Update README

* Update cert-manager in Makefile

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Elliott Baron <[email protected]>
(cherry picked from commit ae41d03)

# Conflicts:
#	README.md
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
#	bundle/manifests/operator.cryostat.io_cryostats.yaml
#	bundle/tests/scorecard/config.yaml
#	config/crd/bases/operator.cryostat.io_cryostats.yaml
#	config/scorecard/patches/custom.config.yaml
#	go.mod
#	go.sum

Makefile

@@ -94,7 +94,7 @@ STORAGE_NAME ?= cryostat-storage
 STORAGE_VERSION ?= 3.0.1
 export STORAGE_IMG ?= $(STORAGE_NAMESPACE)/$(STORAGE_NAME):$(STORAGE_VERSION)
 
-CERT_MANAGER_VERSION ?= 1.11.5
+CERT_MANAGER_VERSION ?= 1.12.14
 CERT_MANAGER_MANIFEST ?= \
 	https://github.com/cert-manager/cert-manager/releases/download/v$(CERT_MANAGER_VERSION)/cert-manager.yaml
 

README.md

@@ -160,10 +160,20 @@ eyJhbGciOiJSUzI1NiIsImtpZCI6IkhYZC13eDdGVGwyQzdGNVpZVndScEZ2VmRxWTlzbnBUUG9HRkJp
 
 ## Manual Deployment
 
+<<<<<<< HEAD
 `make install` will create CustomResourceDefinitions and do other setup
 required to prepare the cluster for deploying the operator, using `oc` or
 `kubectl` on whichever OpenShift cluster is configured with the local client.
 `make uninstall` destroys the CRDs and undoes the setup.
+=======
+### Requirements
+- `go` v1.22+
+- [`operator-sdk`](https://github.com/operator-framework/operator-sdk) v1.31.0
+- `podman` or `docker`
+- [`jq`](https://stedolan.github.io/jq/) v1.6+
+- [`yq`](https://github.com/mikefarah/yq/) v4.35+
+- `ginkgo` (Optional)
+>>>>>>> ae41d03 (build(deps): bump github.com/cert-manager/cert-manager from 1.13.6 to 1.15.4 (#972))
 
 `make deploy` will deploy the operator in the default namespace
 (`cryostat-operator-system`). `make DEPLOY_NAMESPACE=foo-namespace deploy`

bundle/manifests/cryostat-operator.clusterserviceversion.yaml

@@ -29,8 +29,13 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
+<<<<<<< HEAD
     containerImage: quay.io/cryostat/cryostat-operator:3.0.1
     createdAt: "2024-09-20T18:43:56Z"
+=======
+    containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev
+    createdAt: "2024-12-20T16:25:35Z"
+>>>>>>> ae41d03 (build(deps): bump github.com/cert-manager/cert-manager from 1.13.6 to 1.15.4 (#972))
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {

bundle/tests/scorecard/config.yaml

@@ -70,7 +70,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - operator-install
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240911181749
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+>>>>>>> ae41d03 (build(deps): bump github.com/cert-manager/cert-manager from 1.13.6 to 1.15.4 (#972))
     labels:
       suite: cryostat
       test: operator-install
@@ -80,7 +84,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-cr
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240911181749
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+>>>>>>> ae41d03 (build(deps): bump github.com/cert-manager/cert-manager from 1.13.6 to 1.15.4 (#972))
     labels:
       suite: cryostat
       test: cryostat-cr
@@ -90,7 +98,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-multi-namespace
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240911181749
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+>>>>>>> ae41d03 (build(deps): bump github.com/cert-manager/cert-manager from 1.13.6 to 1.15.4 (#972))
     labels:
       suite: cryostat
       test: cryostat-multi-namespace
@@ -100,7 +112,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-recording
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240911181749
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+>>>>>>> ae41d03 (build(deps): bump github.com/cert-manager/cert-manager from 1.13.6 to 1.15.4 (#972))
     labels:
       suite: cryostat
       test: cryostat-recording
@@ -110,7 +126,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-config-change
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240911181749
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+>>>>>>> ae41d03 (build(deps): bump github.com/cert-manager/cert-manager from 1.13.6 to 1.15.4 (#972))
     labels:
       suite: cryostat
       test: cryostat-config-change
@@ -120,7 +140,11 @@ stages:
   - entrypoint:
     - cryostat-scorecard-tests
     - cryostat-report
+<<<<<<< HEAD
     image: quay.io/cryostat/cryostat-operator-scorecard:3.0.1-20240911181749
+=======
+    image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241220000429
+>>>>>>> ae41d03 (build(deps): bump github.com/cert-manager/cert-manager from 1.13.6 to 1.15.4 (#972))
     labels:
       suite: cryostat
       test: cryostat-report