Resync 4.15 with main 2024-05-13

[donpenney]

This update resyncs release-4.15 branch up to: https://github.com/openshift-kni/lifecycle-agent/pull/502

The diff against main is same as previous resync:

$ git diff main..resync-4.15-with-main-20240513
diff --git a/Dockerfile b/Dockerfile
index 618d5d3..401ef45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,8 +25,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -mod=vendor -a

 #####################################################################################################
 # Build the operator image
-# note: update origin-cli-artifacts from `latest` to an appropriate OCP verison during release e.g `4.16`
-FROM quay.io/openshift/origin-cli-artifacts:latest AS origincli
+FROM quay.io/openshift/origin-cli-artifacts:4.15 AS origincli
 FROM registry.access.redhat.com/ubi9/ubi-minimal:latest

 RUN if [[ ! -f /bin/nsenter ]]; then \
diff --git a/Makefile b/Makefile
index 2abe96a..08b1da2 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 4.16.0
+VERSION ?= 4.15.0

 # You can use podman or docker as a container engine. Notice that there are some options that might be only valid for one of them.
 ENGINE ?= docker
diff --git a/bundle/manifests/lifecycle-agent.clusterserviceversion.yaml b/bundle/manifests/lifecycle-agent.clusterserviceversion.yaml
index ea7d84b..e3cbc24 100644
--- a/bundle/manifests/lifecycle-agent.clusterserviceversion.yaml
+++ b/bundle/manifests/lifecycle-agent.clusterserviceversion.yaml
@@ -56,7 +56,7 @@ metadata:
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
-    olm.skipRange: '>=4.14.0 <4.16.0'
+    olm.skipRange: '>=4.14.0 <4.15.0'
     operatorframework.io/suggested-namespace: openshift-lifecycle-agent
     operatorframework.io/suggested-namespace-template: |-
       {
@@ -77,7 +77,7 @@ metadata:
     support: Red Hat
   labels:
     operatorframework.io/arch.amd64: supported
-  name: lifecycle-agent.v4.16.0
+  name: lifecycle-agent.v4.15.0
   namespace: openshift-lifecycle-agent
 spec:
   apiservicedefinitions: {}
@@ -631,7 +631,7 @@ spec:
                 - /usr/local/bin/manager
                 env:
                 - name: PRECACHE_WORKLOAD_IMG
-                  value: quay.io/openshift-kni/lifecycle-agent-operator:4.16.0
+                  value: quay.io/openshift-kni/lifecycle-agent-operator:4.15.0
                 - name: MY_POD_NAME
                   valueFrom:
                     fieldRef:
@@ -640,7 +640,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: quay.io/openshift-kni/lifecycle-agent-operator:4.16.0
+                image: quay.io/openshift-kni/lifecycle-agent-operator:4.15.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -738,4 +738,4 @@ spec:
   provider:
     name: Red Hat
   replaces: lifecycle-agent.v0.0.0
-  version: 4.16.0
+  version: 4.15.0
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index aaec521..2670852 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -13,6 +13,6 @@ configMapGenerator:
 images:
 - name: controller
   newName: quay.io/openshift-kni/lifecycle-agent-operator
-  newTag: 4.16.0
+  newTag: 4.15.0
 patches:
 - path: related-images/patch.yaml
diff --git a/config/manifests/bases/lifecycle-agent.clusterserviceversion.yaml b/config/manifests/bases/lifecycle-agent.clusterserviceversion.yaml
index aae0228..f79cf33 100644
--- a/config/manifests/bases/lifecycle-agent.clusterserviceversion.yaml
+++ b/config/manifests/bases/lifecycle-agent.clusterserviceversion.yaml
@@ -17,7 +17,7 @@ metadata:
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
-    olm.skipRange: '>=4.14.0 <4.16.0'
+    olm.skipRange: '>=4.14.0 <4.15.0'
     operatorframework.io/suggested-namespace: openshift-lifecycle-agent
     operatorframework.io/suggested-namespace-template: |-
       {
diff --git a/internal/common/consts.go b/internal/common/consts.go
index 53c026d..e071b6e 100644
--- a/internal/common/consts.go
+++ b/internal/common/consts.go
@@ -38,7 +38,7 @@ const (
        KubeconfigFile        = "/etc/kubernetes/static-pod-resources/kube-apiserver-certs/secrets/node-kubeconfigs/lb-ext.kubeconfig"

        RecertImageEnvKey      = "RELATED_IMAGE_RECERT_IMAGE"
-       DefaultRecertImage     = "quay.io/edge-infrastructure/recert:v0"
+       DefaultRecertImage     = "quay.io/edge-infrastructure/recert:release-4.15"
        EtcdStaticPodFile      = "/etc/kubernetes/manifests/etcd-pod.yaml"
        EtcdStaticPodContainer = "etcd"
        EtcdDefaultEndpoint    = "localhost:2379"

[donpenney]

/cc @jc-rh @rauhersu

[donpenney]

/hold for testing

[openshift-ci[bot]]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jc-rh

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-kni/lifecycle-agent/blob/release-4.15/OWNERS)~~ [jc-rh] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment