From 99d7debc8e621525f25d7b0a4f2e52a550c17ebb Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 23 Mar 2023 14:29:33 +0100 Subject: [PATCH] rebase: prevent using old openshift/api package Signed-off-by: Niels de Vos --- api/go.mod | 5 ++++- api/go.sum | 4 ++-- go.mod | 5 ++++- go.sum | 4 ++-- vendor/modules.txt | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/api/go.mod b/api/go.mod index a394cdd3b..0ae91f55f 100644 --- a/api/go.mod +++ b/api/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/ghodss/yaml v1.0.0 - github.com/openshift/api v3.9.0+incompatible + github.com/openshift/api v0.0.0-20230320192226-1fc631efd341 github.com/stretchr/testify v1.8.2 k8s.io/api v0.26.3 ) @@ -29,3 +29,6 @@ require ( sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) + +// version 3.9 is really old, don't use that! +exclude github.com/openshift/api v3.9.0+incompatible diff --git a/api/go.sum b/api/go.sum index a25768e8f..c1b539fb6 100644 --- a/api/go.sum +++ b/api/go.sum @@ -23,8 +23,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs= -github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= +github.com/openshift/api v0.0.0-20230320192226-1fc631efd341 h1:PhLdiIlVqgN4frwrG8lNlbQdJ4eJcGdjX/vhlN6xupk= +github.com/openshift/api v0.0.0-20230320192226-1fc631efd341/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= diff --git a/go.mod b/go.mod index e6cd4f880..70445564d 100644 --- a/go.mod +++ b/go.mod @@ -114,7 +114,7 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/selinux v1.10.0 // indirect - github.com/openshift/api v0.0.0-20230310143623-1b126331a735 // indirect + github.com/openshift/api v0.0.0-20230320192226-1fc631efd341 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -208,4 +208,7 @@ exclude ( // This tag doesn't exist, but is imported by github.com/portworx/sched-ops. github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc2 + + // version 3.9 is really old, don't use that! + github.com/openshift/api v3.9.0+incompatible ) diff --git a/go.sum b/go.sum index 796dbeaa3..ee883a15e 100644 --- a/go.sum +++ b/go.sum @@ -891,8 +891,8 @@ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59P github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/openshift/api v0.0.0-20210105115604-44119421ec6b/go.mod h1:aqU5Cq+kqKKPbDMqxo9FojgDeSpNJI7iuskjXjtojDg= -github.com/openshift/api v0.0.0-20230310143623-1b126331a735 h1:fNETz6MeaYFobHP/2k4etgqFSzQ1X69DM3reOB2M2qU= -github.com/openshift/api v0.0.0-20230310143623-1b126331a735/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= +github.com/openshift/api v0.0.0-20230320192226-1fc631efd341 h1:PhLdiIlVqgN4frwrG8lNlbQdJ4eJcGdjX/vhlN6xupk= +github.com/openshift/api v0.0.0-20230320192226-1fc631efd341/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47/go.mod h1:u7NRAjtYVAKokiI9LouzTv4mhds8P4S1TwdVAfbjKSk= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= diff --git a/vendor/modules.txt b/vendor/modules.txt index 51306d772..cae045f0d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -421,7 +421,7 @@ github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label github.com/opencontainers/selinux/pkg/pwalk github.com/opencontainers/selinux/pkg/pwalkdir -# github.com/openshift/api v0.0.0-20230310143623-1b126331a735 +# github.com/openshift/api v0.0.0-20230320192226-1fc631efd341 ## explicit; go 1.19 github.com/openshift/api/security/v1 # github.com/pierrec/lz4 v2.6.1+incompatible