[release-4.14] Resync release-4.14 branch with main 2024-05-22

[donpenney]

Background / Context

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

This update resyncs release-4.14 branch up to: #522

The diff against main after the resync and version reset:

$ git diff main..resync-4.14-with-main-20240522
diff --git a/Dockerfile b/Dockerfile
index a8f1b671..d475479c 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.14 AS origincli
 FROM registry.access.redhat.com/ubi9/ubi-minimal:latest

 RUN if [[ ! -f /bin/nsenter ]]; then \
@@ -45,7 +44,7 @@ COPY --from=builder \

 COPY lca-cli/installation_configuration_files/ /usr/local/installation_configuration_files/

-COPY --from=origincli /usr/share/openshift/linux_amd64/oc.rhel9 /usr/bin/oc
+COPY --from=origincli /usr/share/openshift/linux_amd64/oc /usr/bin/oc

 COPY must-gather/collection-scripts/ /usr/bin/

diff --git a/Makefile b/Makefile
index e008c1cd..43de5e92 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.14.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..70eebc8c 100644
--- a/bundle/manifests/lifecycle-agent.clusterserviceversion.yaml
+++ b/bundle/manifests/lifecycle-agent.clusterserviceversion.yaml
@@ -26,7 +26,7 @@ metadata:
             ],
             "seedImageRef": {
               "image": "quay.io/xyz",
-              "version": "4.16.0"
+              "version": "4.14.0"
             },
             "stage": "Idle"
           }
@@ -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.14.999'
     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.14.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.14.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.14.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -739,4 +739,4 @@ spec:
   provider:
     name: Red Hat
   replaces: lifecycle-agent.v0.0.0
-  version: 4.17.0
+  version: 4.14.0
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 442ed8c2..be8304d2 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.14.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..3d80e15a 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.14.999'
     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.14.0
   namespace: openshift-lifecycle-agent
 spec:
   apiservicedefinitions: {}
diff --git a/config/samples/lca_v1_imagebasedupgrade.yaml b/config/samples/lca_v1_imagebasedupgrade.yaml
index 2a97c39e..ecec45ea 100644
--- a/config/samples/lca_v1_imagebasedupgrade.yaml
+++ b/config/samples/lca_v1_imagebasedupgrade.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   stage: Idle
   seedImageRef:
-    version: 4.16.0
+    version: 4.14.0
     image: quay.io/xyz
   autoRollbackOnFailure: {}
   extraManifests:

[donpenney]

/cc @jc-rh

[openshift-ci]

[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 [jc-rh]

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