DNM: Wrong branch: [release-4.16] Resync release-4.16 branch with main 2024-06-10

[donpenney]

Until LCA reaches GA, we will periodically resync the release branches with main to ensure content is aligned.

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

The diff against main after the resync and version reset:

$ git diff main..resync-4.16-with-main-20240610
diff --git a/Dockerfile b/Dockerfile
index a8f1b671..07a5c005 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.17`
-FROM quay.io/openshift/origin-cli-artifacts:latest AS origincli
+FROM quay.io/openshift/origin-cli-artifacts:4.16 AS origincli
 FROM registry.access.redhat.com/ubi9/ubi-minimal:latest

 RUN if [[ ! -f /bin/nsenter ]]; then \
diff --git a/Makefile b/Makefile
index e008c1cd..791b493f 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.17.0
+VERSION ?= 4.16.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 856f74db..146c3e48 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.17.0'
+    olm.skipRange: '>=4.14.0 <4.16.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.17.0
+  name: lifecycle-agent.v4.16.0
   namespace: openshift-lifecycle-agent
 spec:
   apiservicedefinitions: {}
@@ -632,7 +632,7 @@ spec:
                 - /usr/local/bin/manager
                 env:
                 - name: PRECACHE_WORKLOAD_IMG
-                  value: quay.io/openshift-kni/lifecycle-agent-operator:4.17.0
+                  value: quay.io/openshift-kni/lifecycle-agent-operator:4.16.0
                 - name: MY_POD_NAME
                   valueFrom:
                     fieldRef:
@@ -641,7 +641,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: quay.io/openshift-kni/lifecycle-agent-operator:4.17.0
+                image: quay.io/openshift-kni/lifecycle-agent-operator:4.16.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -672,7 +672,7 @@ spec:
                 - --logtostderr=true
                 - --v=10
                 - --http2-disable=true
-                image: quay.io/openshift/origin-kube-rbac-proxy:4.14
+                image: quay.io/openshift/origin-kube-rbac-proxy:4.16
                 name: kube-rbac-proxy
                 ports:
                 - containerPort: 8443
@@ -739,4 +739,4 @@ spec:
   provider:
     name: Red Hat
   replaces: lifecycle-agent.v0.0.0
-  version: 4.17.0
+  version: 4.16.0
diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
index aa0dc7bc..57fd78f7 100644
--- a/config/default/manager_auth_proxy_patch.yaml
+++ b/config/default/manager_auth_proxy_patch.yaml
@@ -14,7 +14,7 @@ spec:
         - "--health-probe-bind-address=:8081"
         - "--metrics-bind-address=127.0.0.1:8080"
       - name: kube-rbac-proxy
-        image: quay.io/openshift/origin-kube-rbac-proxy:4.14
+        image: quay.io/openshift/origin-kube-rbac-proxy:4.16
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 442ed8c2..aaec5218 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.17.0
+  newTag: 4.16.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 bf4163ce..cda5d814 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.17.0'
+    olm.skipRange: '>=4.14.0 <4.16.0'
     operatorframework.io/suggested-namespace: openshift-lifecycle-agent
     operatorframework.io/suggested-namespace-template: |-
       {
@@ -36,7 +36,7 @@ metadata:
     support: Red Hat
   labels:
     operatorframework.io/arch.amd64: supported
-  name: lifecycle-agent.v4.17.0
+  name: lifecycle-agent.v4.16.0
   namespace: openshift-lifecycle-agent
 spec:
   apiservicedefinitions: {}

[openshift-ci[bot]]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Once this PR has been reviewed and has the lgtm label, please ask for approval from donpenney. For more information see the Kubernetes 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](https://github.com/openshift-kni/lifecycle-agent/blob/main/OWNERS)** Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

[donpenney]

/cc @browsell @jc-rh

[browsell]

/lgtm

[donpenney]

Created against the wrong branch