Merge branch 'main' into dependabot/go_modules/k8s-766ae9ea57

Author: jc-rh

.konflux/Dockerfile.catalog

@@ -1,5 +1,6 @@
 # The opm image is expected to contain /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
-ARG OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.20
+ARG OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.20
+# CNF-18555: When there is a Konflux build available for this then we need to update from the brew image
 ARG BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
 
 # build the catalog

.konflux/catalog/bundle.builds.in.yaml

@@ -1,2 +1,2 @@
 ---
-quay: quay.io/redhat-user-workloads/telco-5g-tenant/lifecycle-agent-operator-bundle-4-20@sha256:df3772a1402d366be6a146372dbe917d4fc3b87f1fd0b2e87aa7fb86943149d4
+quay: quay.io/redhat-user-workloads/telco-5g-tenant/lifecycle-agent-operator-bundle-4-20@sha256:f4ba736320be274bb8de52c328f1e5263b459b055b243f53171842e4129a56ef

.konflux/container_build_args.conf

@@ -3,21 +3,22 @@ KONFLUX=true
 #
 
 # The builder image is used to compile golang code
+# CNF-18555: When there is a Konflux build available for this then we need to update from the brew image
 BUILDER_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24@sha256:b91431604c435f3cabec20ddb653c0537c8ba8097ada57960d54a1266f95a7c3
 #
 
 # The openshift cli image is used to fetch the oc binary
 # When 4.20 is released, we need to update from the v4.18 tag
-OPENSHIFT_CLI_IMAGE=registry.redhat.io/openshift4/ose-cli-rhel9:v4.18@sha256:0fea17baf0f6e10bf43b2e05d413cbe092e3edc807c4eae93a9bd5cee479a343
+OPENSHIFT_CLI_IMAGE=registry.redhat.io/openshift4/ose-cli-rhel9:v4.18@sha256:505fdc081f1dc0fda7c10a36c51bb32cda0ae0e36277ed6b7211931098462425
 #
 
 # The opm image is used to serve the FBC
 # There is a metadata processing bug preventing us from pinning this particular image for now
-# OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.20@sha256:3c89f04f5299307eda4a6d732aab8529ff15fb4fc081e1296f165f6360e418be
+# OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.20@sha256:a7ce355c287b89aa5565d3c9d0e6e9913fac9fa7819759ac4acf0a32dcb4a27a
 #
 
 # The runtime image is used to run the binaries
-RUNTIME_IMAGE=registry.redhat.io/rhel9-4-els/rhel-minimal:9.4@sha256:83865568f25a483dcd7f84831dd0de8cef393943515bbb1a7d3a93b72886dbf8
+RUNTIME_IMAGE=registry.redhat.io/rhel9-4-els/rhel-minimal:9.4@sha256:08f50c8e4b8ae004bbd2588bd6c1f61ee55dbe7fa10232e44e5cc779ef2fde2e
 #
 
 # The yq image is used at build time to manipulate yaml

.konflux/overlay/pin_images.in.yaml

@@ -2,7 +2,7 @@
 # Manager
 - key: manager
   source: quay.io/openshift-kni/lifecycle-agent-operator:4.20.0
-  target: quay.io/redhat-user-workloads/telco-5g-tenant/lifecycle-agent-4-20@sha256:8ca66f0b7e5799ec75c32e2cb4ab5c9c038b5bba72a13f6da0f3e4b43252118e
+  target: quay.io/redhat-user-workloads/telco-5g-tenant/lifecycle-agent-4-20@sha256:8098db9cfa79d2101c9b99553e7eab108ab7a6b60e6ce3efe8a83aa13a0b932f
 #
 # Recert
 - key: recert_image

.yamllint.yaml

@@ -1,12 +1,14 @@
 ---
 extends: default
 ignore:
+  - .konflux/catalog/catalog-template.out.yaml   # This is generated for Konflux builds
+  - .konflux/catalog/lifecycle-agent/catalog.yaml  # This is generated for Konflux builds
   - bin/
   - bundle/   # These are generated files so linting them is problematic
   - config/   # These are generated files so linting them is problematic
   - git/
+  - telco5g-konflux/
   - testbin/
   - vendor/
-  - telco5g-konflux/
 rules:
   line-length: disable

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.9.1
 	github.com/stretchr/testify v1.10.0
-	github.com/vmware-tanzu/velero v1.16.1
+	github.com/vmware-tanzu/velero v1.16.2
 	go.uber.org/mock v0.5.2
 	golang.org/x/crypto v0.40.0
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -287,8 +287,8 @@ github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o
 github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
 github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI=
 github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
-github.com/vmware-tanzu/velero v1.16.1 h1:T9Jdt/6Jl1x+nT+OCCyOBtiakCdInHZAB3qU/jH6yGg=
-github.com/vmware-tanzu/velero v1.16.1/go.mod h1:+wInt9pLqlRiUZAWsO5eSxLZK9Q3jSV9MFaUrBfvGN0=
+github.com/vmware-tanzu/velero v1.16.2 h1:Zhve1mKtX4n0oVhHwbEOsgB9fjKKwm96HJK4WaV/28o=
+github.com/vmware-tanzu/velero v1.16.2/go.mod h1:rGIxqbeVHne/47AMtA8vV0ebeQOzyF7VEullayyTEto=
 github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
 github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=