WIP local vendor commit DO NOT MERGE

openshift · Jun 10, 2021 · 9f9c78d · 9f9c78d
1 parent 6d800e9
commit 9f9c78d
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 20 deletions.
diff --git a/go.mod b/go.mod
@@ -26,3 +26,5 @@ require (
 
 // points to temporary-watch-reduction-patch-1.21 to pick up k/k/pull/101102 - please remove it once the pr merges and a new Z release is cut
 replace k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99
+
+replace github.com/openshift/api => github.com/patrickdillon/api v0.0.0-20210609155658-6734eef7cb10
diff --git a/go.sum b/go.sum
@@ -431,6 +431,8 @@ github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99/go.
 github.com/openshift/library-go v0.0.0-20210127081712-a4f002827e42 h1:MFQV6xoA94IMhsrZGyjmhLTPljPY4biNPwDjn2hjZUc=
 github.com/openshift/library-go v0.0.0-20210127081712-a4f002827e42/go.mod h1:udseDnqxn5ON8i+NBjDp00fBTK0JRu1/6Y6tf6EivDE=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/patrickdillon/api v0.0.0-20210609155658-6734eef7cb10 h1:hc92JgK/FFv//H5drIB9zCfZXbMI+BpkgV4aM1tszlo=
+github.com/patrickdillon/api v0.0.0-20210609155658-6734eef7cb10/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=

diff --git a/vendor/github.com/openshift/api/build/v1/generated.proto b/vendor/github.com/openshift/api/build/v1/generated.proto
diff --git a/vendor/github.com/openshift/api/build/v1/types.go b/vendor/github.com/openshift/api/build/v1/types.go
diff --git a/vendor/github.com/openshift/api/build/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/build/v1/zz_generated.swagger_doc_generated.go
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver.crd.yaml
diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
diff --git a/vendor/github.com/openshift/api/config/v1/types_apiserver.go b/vendor/github.com/openshift/api/config/v1/types_apiserver.go
diff --git a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go
diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
diff --git a/vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01_crd.yaml b/vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01_crd.yaml
diff --git a/...hub.com/openshift/api/operator/v1/0000_70_dns-operator_00-custom-resource-definition.yaml b/...hub.com/openshift/api/operator/v1/0000_70_dns-operator_00-custom-resource-definition.yaml
diff --git a/vendor/github.com/openshift/api/operator/v1/types_dns.go b/vendor/github.com/openshift/api/operator/v1/types_dns.go
diff --git a/vendor/github.com/openshift/api/operator/v1/types_network.go b/vendor/github.com/openshift/api/operator/v1/types_network.go
diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -95,7 +95,7 @@ github.com/modern-go/concurrent
 github.com/modern-go/reflect2
 # github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
 github.com/munnerz/goautoneg
-# github.com/openshift/api v0.0.0-20210527122704-efd9d5958e01
+# github.com/openshift/api v0.0.0-20210527122704-efd9d5958e01 => github.com/patrickdillon/api v0.0.0-20210609155658-6734eef7cb10
 ## explicit
 github.com/openshift/api
 github.com/openshift/api/apiserver
@@ -960,3 +960,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit
 sigs.k8s.io/yaml
 # k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99
+# github.com/openshift/api => github.com/patrickdillon/api v0.0.0-20210609155658-6734eef7cb10