UPSTREAM: <drop>: update OpenShift dependencies

openshift · Mar 31, 2023 · 6dab629 · 6dab629
1 parent 2467206
commit 6dab629
Show file tree

Hide file tree

Showing 14 changed files with 528 additions and 19 deletions.
diff --git a/go.mod b/go.mod
@@ -55,7 +55,7 @@ require (
 	github.com/opencontainers/runc v1.1.4
 	github.com/opencontainers/selinux v1.10.0
 	github.com/openshift/api v0.0.0-20230323200117-1339ccc8302e
-	github.com/openshift/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+	github.com/openshift/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 	github.com/openshift/client-go v0.0.0-20230325134819-b83a1fcd7d77
 	github.com/openshift/library-go v0.0.0-20230325135209-cd81cd54833c
 	github.com/pkg/errors v0.9.1
@@ -254,7 +254,7 @@ require (
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460
 	github.com/openshift/api => github.com/bertinatto/api v0.0.0-20230321171305-5054c4c89a70
-	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 	github.com/openshift/client-go => github.com/bertinatto/client-go v0.0.0-20230325134819-b83a1fcd7d77
 	github.com/openshift/library-go => github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c
 	k8s.io/api => ./staging/src/k8s.io/api

diff --git a/go.sum b/go.sum
@@ -117,8 +117,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bertinatto/api v0.0.0-20230321171305-5054c4c89a70 h1:sTBjJRr7l3DAzGO+fVRyJw9rZKWga4nnwXZcWH8p32w=
 github.com/bertinatto/api v0.0.0-20230321171305-5054c4c89a70/go.mod h1:ZX7D8vpXHqcymxeUC6scuvLsqjlj14M+2RvUwyf5Q4o=
-github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b h1:lk4vcN7py8/AChnsZGs5iHxeRhOJibdtSkZifEKirM0=
-github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b/go.mod h1:HwowSZxYhwPoLCthfr/LqSjwm8ZvC9JEai3pae1ebM8=
+github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a h1:HqjNW2/S5PQeHKkoFjzWqkXY5ZPgZK2FyIMuxecjYUI=
+github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a/go.mod h1:wM9CV7p8+sr2KpwdnIDyW/Pw4EfTUoy0TndXag//Skk=
 github.com/bertinatto/client-go v0.0.0-20230325134819-b83a1fcd7d77 h1:fbeNiFwG0FWrdj23mW/PEQ26mmTXYvX5V+nF1yH9bL8=
 github.com/bertinatto/client-go v0.0.0-20230325134819-b83a1fcd7d77/go.mod h1:GeF66Kh8jGNyH3KXXtybSG+be976OIyax4mVsdJZhsI=
 github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c h1:k1kV5KmARcc5jSyGBau5iA8g5iLYW0/ZN/5h+5ZVelU=

diff --git a/staging/src/k8s.io/api/go.mod b/staging/src/k8s.io/api/go.mod
@@ -39,7 +39,7 @@ require (
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460
 	github.com/openshift/api => github.com/bertinatto/api v0.0.0-20230321171305-5054c4c89a70
-	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 	github.com/openshift/client-go => github.com/bertinatto/client-go v0.0.0-20230325134819-b83a1fcd7d77
 	github.com/openshift/library-go => github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c
 	k8s.io/api => ../api

diff --git a/staging/src/k8s.io/apiextensions-apiserver/go.mod b/staging/src/k8s.io/apiextensions-apiserver/go.mod
@@ -130,7 +130,7 @@ require (
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460
 	github.com/openshift/api => github.com/bertinatto/api v0.0.0-20230321171305-5054c4c89a70
-	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 	github.com/openshift/client-go => github.com/bertinatto/client-go v0.0.0-20230325134819-b83a1fcd7d77
 	github.com/openshift/library-go => github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c
 	k8s.io/api => ../api

diff --git a/staging/src/k8s.io/apiserver/go.mod b/staging/src/k8s.io/apiserver/go.mod
@@ -126,7 +126,7 @@ require (
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460
 	github.com/openshift/api => github.com/bertinatto/api v0.0.0-20230321171305-5054c4c89a70
-	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 	github.com/openshift/client-go => github.com/bertinatto/client-go v0.0.0-20230325134819-b83a1fcd7d77
 	github.com/openshift/library-go => github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c
 	k8s.io/api => ../api

diff --git a/staging/src/k8s.io/code-generator/examples/go.mod b/staging/src/k8s.io/code-generator/examples/go.mod
@@ -62,6 +62,6 @@ replace github.com/openshift/client-go => github.com/bertinatto/client-go v0.0.0
 
 replace github.com/openshift/library-go => github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c
 
-replace github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+replace github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 
 replace github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460
diff --git a/staging/src/k8s.io/component-base/go.mod b/staging/src/k8s.io/component-base/go.mod
@@ -85,7 +85,7 @@ require (
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460
 	github.com/openshift/api => github.com/bertinatto/api v0.0.0-20230321171305-5054c4c89a70
-	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 	github.com/openshift/client-go => github.com/bertinatto/client-go v0.0.0-20230325134819-b83a1fcd7d77
 	github.com/openshift/library-go => github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c
 	k8s.io/api => ../api

diff --git a/staging/src/k8s.io/component-helpers/go.mod b/staging/src/k8s.io/component-helpers/go.mod
@@ -53,7 +53,7 @@ require (
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460
 	github.com/openshift/api => github.com/bertinatto/api v0.0.0-20230321171305-5054c4c89a70
-	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 	github.com/openshift/client-go => github.com/bertinatto/client-go v0.0.0-20230325134819-b83a1fcd7d77
 	github.com/openshift/library-go => github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c
 	k8s.io/api => ../api

diff --git a/staging/src/k8s.io/kms/go.mod b/staging/src/k8s.io/kms/go.mod
@@ -27,7 +27,7 @@ require (
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460
 	github.com/openshift/api => github.com/bertinatto/api v0.0.0-20230321171305-5054c4c89a70
-	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 	github.com/openshift/client-go => github.com/bertinatto/client-go v0.0.0-20230325134819-b83a1fcd7d77
 	github.com/openshift/library-go => github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c
 	k8s.io/api => ../api

diff --git a/staging/src/k8s.io/kms/internal/plugins/mock/go.mod b/staging/src/k8s.io/kms/internal/plugins/mock/go.mod
@@ -34,6 +34,6 @@ replace github.com/openshift/client-go => github.com/bertinatto/client-go v0.0.0
 
 replace github.com/openshift/library-go => github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c
 
-replace github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+replace github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 
 replace github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460
diff --git a/staging/src/k8s.io/kube-aggregator/go.mod b/staging/src/k8s.io/kube-aggregator/go.mod
@@ -113,7 +113,7 @@ require (
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230317131656-c62d9de5a460
 	github.com/openshift/api => github.com/bertinatto/api v0.0.0-20230321171305-5054c4c89a70
-	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230325135526-046119c0eb1b
+	github.com/openshift/apiserver-library-go => github.com/bertinatto/apiserver-library-go v0.0.0-20230331115022-a8f1b038155a
 	github.com/openshift/client-go => github.com/bertinatto/client-go v0.0.0-20230325134819-b83a1fcd7d77
 	github.com/openshift/library-go => github.com/bertinatto/library-go v0.0.0-20230325135209-cd81cd54833c
 	k8s.io/api => ../api