OCPBUGS-83713: Backport oadp-1.6 dependencies with release-4.22 hypershift API (#245)

* UPSTREAM: <drop>: Update go.mod to align with new velero oadp-1.6

Signed-off-by: Michal Pryc <mpryc@redhat.com>

* UPSTREAM: <drop>: Fix inconsistent vendoring

Run 'go mod tidy && go mod vendor' to sync vendor directory with go.mod.
The postsubmit promotion job was failing due to:
- velero replacement mismatch between go.mod and vendor/modules.txt
- stale external-snapshotter/client/v7 in vendor (removed from go.mod)
- google.golang.org/grpc and genproto not properly marked in modules.txt

This blocked image promotion to the CI registry, breaking the
periodic-image-mirroring-konveyor job.

Signed-off-by: Michal Pryc <mpryc@redhat.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Update velero dependency to latest oadp-1.6 branch

Update go directive to 1.25.8 and bump velero replace to
v0.10.2-0.20260409141000-1b0e11aebe70 (latest oadp-1.6).
Run go mod tidy and go mod vendor.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Update velero dependency to latest oadp-1.6 branch

Update the velero replace directive to point to the latest
openshift/velero oadp-1.6 commit (ea34d4d90057) and regenerate
the vendor directory.

Key changes:
- external-snapshotter/client/v8: v8.2.0 -> v8.4.0
- velero: 1b0e11aebe70 -> ea34d4d90057

Signed-off-by: Michal Pryc <mpryc@redhat.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Update dependencies for oadp-1.6 backport with release-4.22 hypershift API

- Set DEPS_UPSTREAM_BRANCH to release-4.22
- Update hypershift/api to release-4.22 branch (v0.0.0-20260417092826-5431b93cee3c)
- Sync vendor with updated go.mod

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>

---------

Signed-off-by: Michal Pryc <mpryc@redhat.com>
Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
Co-authored-by: Michal Pryc <mpryc@redhat.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: 3 people

Makefile

@@ -21,7 +21,7 @@ VERSION ?= $(shell git describe --tags --always)
 ARCHS ?= amd64 arm64
 DOCKER_BUILD_ARGS ?= --platform=linux/$(ARCH)
 GO=GO111MODULE=on GOWORK=off GOFLAGS=-mod=vendor go
-DEPS_UPSTREAM_BRANCH ?= main
+DEPS_UPSTREAM_BRANCH ?= release-4.22
 
 .PHONY: install-goreleaser
 install-goreleaser:

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/kubernetes-csi/external-snapshotter/client/v8 v8.4.0
 	github.com/onsi/gomega v1.39.1
 	github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff
-	github.com/openshift/hypershift/api v0.0.0-20260410203959-783f7956d4f9
+	github.com/openshift/hypershift/api v0.0.0-20260417092826-5431b93cee3c
 	github.com/sirupsen/logrus v1.9.4
 	github.com/vmware-tanzu/velero v1.14.0
 	k8s.io/api v0.35.3
@@ -90,4 +90,4 @@ require (
 	sigs.k8s.io/yaml v1.6.0 // indirect
 )
 
-replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260323170432-5ef912f438f6
+replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260323191807-216dd62a1caf

go.sum

@@ -207,10 +207,10 @@ github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
 github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
 github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff h1:6C1z4xMAruyeiTFGqahxNDpI1cXPCjpaFeIeIodty08=
 github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff/go.mod h1:1vBNCcWNpQyFCz83PWYT/lHUFJ9ost2t5FijHElh6gQ=
-github.com/openshift/hypershift/api v0.0.0-20260410203959-783f7956d4f9 h1:mVzLud8ewZi1W8dnV37L+eY9IJsoFfpkASgPvDRM61Q=
-github.com/openshift/hypershift/api v0.0.0-20260410203959-783f7956d4f9/go.mod h1:mC9+bqb81FmG924VOO+7P0ofKQgvY1SdPhFp0oJ9U44=
-github.com/openshift/velero v0.10.2-0.20260323170432-5ef912f438f6 h1:nWv9+tEi34VMFMOziVZLOKvn3yXDqk68ODXlzpYU2S0=
-github.com/openshift/velero v0.10.2-0.20260323170432-5ef912f438f6/go.mod h1:YKHPM2FpS+5WrcciMi5j4bo/JMnXXrR1M+j1DoTA26U=
+github.com/openshift/hypershift/api v0.0.0-20260417092826-5431b93cee3c h1:f4yyfNyAWbWQDdOMzawbglzZZvPFfpIl1p9MjdTx3oM=
+github.com/openshift/hypershift/api v0.0.0-20260417092826-5431b93cee3c/go.mod h1:mC9+bqb81FmG924VOO+7P0ofKQgvY1SdPhFp0oJ9U44=
+github.com/openshift/velero v0.10.2-0.20260323191807-216dd62a1caf h1:idCUwNL/RfZIeS1bpUvf6LaYZJSmKCSE2GP6tc1caYI=
+github.com/openshift/velero v0.10.2-0.20260323191807-216dd62a1caf/go.mod h1:vrmFMtokf4UjYmykfPvmI/xinTU3Ljz4F6JO3pLYxKs=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

vendor/github.com/vmware-tanzu/velero/pkg/apis/velero/v1/labels_annotations.go

@@ -158,7 +158,7 @@ github.com/openshift/hive/apis/hive/v1/openstack
 github.com/openshift/hive/apis/hive/v1/ovirt
 github.com/openshift/hive/apis/hive/v1/vsphere
 github.com/openshift/hive/apis/scheme
-# github.com/openshift/hypershift/api v0.0.0-20260410203959-783f7956d4f9
+# github.com/openshift/hypershift/api v0.0.0-20260417092826-5431b93cee3c
 ## explicit; go 1.25.3
 github.com/openshift/hypershift/api/hypershift/v1beta1
 github.com/openshift/hypershift/api/ibmcapi
@@ -199,8 +199,8 @@ github.com/spf13/cobra
 # github.com/spf13/pflag v1.0.10
 ## explicit; go 1.12
 github.com/spf13/pflag
-# github.com/vmware-tanzu/velero v1.14.0 => github.com/openshift/velero v0.10.2-0.20260323170432-5ef912f438f6
-## explicit; go 1.25.0
+# github.com/vmware-tanzu/velero v1.14.0 => github.com/openshift/velero v0.10.2-0.20260323191807-216dd62a1caf
+## explicit; go 1.25.7
 github.com/vmware-tanzu/velero/internal/credentials
 github.com/vmware-tanzu/velero/internal/resourcepolicies
 github.com/vmware-tanzu/velero/pkg/apis/velero/shared
@@ -940,4 +940,4 @@ sigs.k8s.io/structured-merge-diff/v6/value
 # sigs.k8s.io/yaml v1.6.0
 ## explicit; go 1.22
 sigs.k8s.io/yaml
-# github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260323170432-5ef912f438f6
+# github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260323191807-216dd62a1caf