UPSTREAM: <drop>: ./hack/update-vendor.sh - temporary vendor update

openshift · Dec 7, 2023 · 28dcbf5 · 28dcbf5
1 parent d109126
commit 28dcbf5
Show file tree

Hide file tree

Showing 25 changed files with 50 additions and 18 deletions.
diff --git a/go.mod b/go.mod
@@ -55,7 +55,7 @@ require (
 	github.com/onsi/gomega v1.29.0
 	github.com/opencontainers/runc v1.1.10
 	github.com/opencontainers/selinux v1.11.0
-	github.com/openshift/api v0.0.0-20231205121914-b5716b30456a
+	github.com/openshift/api v0.0.0-20231207065154-3d9bb9d14890
 	github.com/openshift/apiserver-library-go v0.0.0-20231206141838-abcb146ad474
 	github.com/openshift/client-go v0.0.0-20231206140631-42822e9bf3f0
 	github.com/openshift/library-go v0.0.0-20231206141207-23716e2abf46
@@ -258,6 +258,7 @@ require (
 
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7
+	github.com/openshift/api => github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890
 	github.com/openshift/apiserver-library-go => github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474
 	github.com/openshift/client-go => github.com/sairameshv/client-go v0.0.0-20231206140631-42822e9bf3f0
 	github.com/openshift/library-go => github.com/sairameshv/library-go v0.0.0-20231206141207-23716e2abf46

diff --git a/go.sum b/go.sum
@@ -687,8 +687,6 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R
 github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=
 github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
-github.com/openshift/api v0.0.0-20231205121914-b5716b30456a h1:HdOIa5C84YZaiJ70IdPf5W0JUGOLjxCwf1PTPLpJ0QY=
-github.com/openshift/api v0.0.0-20231205121914-b5716b30456a/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:ACi574W+KszWNNkWT+8xNY7NpvpoHA+EPOKLlHB4MiQ=
 github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
@@ -741,6 +739,8 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890 h1:r7svNidPXGX0x22LBkILChgJYE+HJz623YSI/0v++MU=
+github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890/go.mod h1:CRoNc1OdSm2D+63++hQb2Wt8d9aU+JF6z4J5gkTdgFI=
 github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474 h1:MB5LtDflsOQ54Bxvh/9zWtDSdp7EIpDPrnb1Zvn9XWQ=
 github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474/go.mod h1:O9V+IpKNhTg4aie0WI7NOWVeNMDw/TQ7wrPiU4HOM9k=
 github.com/sairameshv/client-go v0.0.0-20231206140631-42822e9bf3f0 h1:6VurcGl8LO8YDBqmePUUNQWKRGkmZPzl4OHGGL0isdQ=

diff --git a/staging/src/k8s.io/api/go.mod b/staging/src/k8s.io/api/go.mod
@@ -39,6 +39,7 @@ require (
 
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7
+	github.com/openshift/api => github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890
 	github.com/openshift/apiserver-library-go => github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474
 	github.com/openshift/client-go => github.com/sairameshv/client-go v0.0.0-20231206140631-42822e9bf3f0
 	github.com/openshift/library-go => github.com/sairameshv/library-go v0.0.0-20231206141207-23716e2abf46

diff --git a/staging/src/k8s.io/api/go.sum b/staging/src/k8s.io/api/go.sum
diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/google/go-cmp v0.6.0
 	github.com/google/gofuzz v1.2.0
 	github.com/google/uuid v1.3.0
-	github.com/openshift/api v0.0.0-20231205121914-b5716b30456a
+	github.com/openshift/api v0.0.0-20231207065154-3d9bb9d14890
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
@@ -131,6 +131,7 @@ require (
 
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7
+	github.com/openshift/api => github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890
 	github.com/openshift/apiserver-library-go => github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474
 	github.com/openshift/client-go => github.com/sairameshv/client-go v0.0.0-20231206140631-42822e9bf3f0
 	github.com/openshift/library-go => github.com/sairameshv/library-go v0.0.0-20231206141207-23716e2abf46

diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.sum b/staging/src/k8s.io/apiextensions-apiserver/go.sum
diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod
@@ -128,6 +128,7 @@ require (
 
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7
+	github.com/openshift/api => github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890
 	github.com/openshift/apiserver-library-go => github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474
 	github.com/openshift/client-go => github.com/sairameshv/client-go v0.0.0-20231206140631-42822e9bf3f0
 	github.com/openshift/library-go => github.com/sairameshv/library-go v0.0.0-20231206141207-23716e2abf46

diff --git a/staging/src/k8s.io/apiserver/go.sum b/staging/src/k8s.io/apiserver/go.sum
diff --git a/staging/src/k8s.io/cloud-provider/go.mod b/staging/src/k8s.io/cloud-provider/go.mod
@@ -113,6 +113,7 @@ require (
 
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7
+	github.com/openshift/api => github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890
 	github.com/openshift/client-go => github.com/sairameshv/client-go v0.0.0-20231206140631-42822e9bf3f0
 	github.com/openshift/library-go => github.com/sairameshv/library-go v0.0.0-20231206141207-23716e2abf46
 	k8s.io/api => ../api

diff --git a/staging/src/k8s.io/cloud-provider/go.sum b/staging/src/k8s.io/cloud-provider/go.sum
diff --git a/staging/src/k8s.io/code-generator/examples/go.mod b/staging/src/k8s.io/code-generator/examples/go.mod
@@ -63,3 +63,5 @@ replace github.com/openshift/library-go => github.com/sairameshv/library-go v0.0
 replace github.com/openshift/apiserver-library-go => github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474
 
 replace github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7
+
+replace github.com/openshift/api => github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890
diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod
@@ -84,6 +84,7 @@ require (
 
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7
+	github.com/openshift/api => github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890
 	github.com/openshift/apiserver-library-go => github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474
 	github.com/openshift/client-go => github.com/sairameshv/client-go v0.0.0-20231206140631-42822e9bf3f0
 	github.com/openshift/library-go => github.com/sairameshv/library-go v0.0.0-20231206141207-23716e2abf46

diff --git a/staging/src/k8s.io/component-base/go.sum b/staging/src/k8s.io/component-base/go.sum
diff --git a/staging/src/k8s.io/component-helpers/go.mod b/staging/src/k8s.io/component-helpers/go.mod
@@ -54,6 +54,7 @@ require (
 
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7
+	github.com/openshift/api => github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890
 	github.com/openshift/apiserver-library-go => github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474
 	github.com/openshift/client-go => github.com/sairameshv/client-go v0.0.0-20231206140631-42822e9bf3f0
 	github.com/openshift/library-go => github.com/sairameshv/library-go v0.0.0-20231206141207-23716e2abf46

diff --git a/staging/src/k8s.io/component-helpers/go.sum b/staging/src/k8s.io/component-helpers/go.sum
diff --git a/staging/src/k8s.io/kms/internal/plugins/_mock/go.mod b/staging/src/k8s.io/kms/internal/plugins/_mock/go.mod
@@ -30,3 +30,5 @@ replace github.com/openshift/library-go => github.com/sairameshv/library-go v0.0
 replace github.com/openshift/apiserver-library-go => github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474
 
 replace github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7
+
+replace github.com/openshift/api => github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890
diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod
@@ -115,6 +115,7 @@ require (
 
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7
+	github.com/openshift/api => github.com/sairameshv/api v0.0.0-20231207065154-3d9bb9d14890
 	github.com/openshift/apiserver-library-go => github.com/sairameshv/apiserver-library-go v0.0.0-20231206141838-abcb146ad474
 	github.com/openshift/client-go => github.com/sairameshv/client-go v0.0.0-20231206140631-42822e9bf3f0
 	github.com/openshift/library-go => github.com/sairameshv/library-go v0.0.0-20231206141207-23716e2abf46