Merge pull request #207 from gabemontero/switch-to-client-go

Switch to client go
openshift · Dec 11, 2019 · 8bbceb4 · 8bbceb4
2 parents 32efce3 + 83eb2ed
commit 8bbceb4
Show file tree

Hide file tree

Showing 35 changed files with 36 additions and 318 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,6 @@
 REPO=openshift
 
-all: generate build build-image
-generate:
-	./hack/codegen/update-generated.sh
+all: build build-image
 
 build:
 #FYI if we ever add back in git version into the binary, compile like

diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/jteeuwen/go-bindata v3.0.7+incompatible
 	github.com/onsi/ginkgo v1.10.2 // indirect
 	github.com/openshift/api v3.9.1-0.20191112184635-1271508fbe8f+incompatible
-	github.com/openshift/client-go v0.0.0-20191022152013-2823239d2298
+	github.com/openshift/client-go v0.0.0-20191205152420-9faca5198b4f
 	github.com/openshift/library-go v0.0.0-20191030100914-d6f3b526f033
 	github.com/prometheus/client_golang v1.0.0
 	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4

diff --git a/go.sum b/go.sum
@@ -271,6 +271,9 @@ github.com/openshift/client-go v0.0.0-20190813201236-5a5508328169 h1:rQZe9w0+xEm
 github.com/openshift/client-go v0.0.0-20190813201236-5a5508328169/go.mod h1:6rzn+JTr7+WYS2E1TExP4gByoABxMznR6y2SnUIkmxk=
 github.com/openshift/client-go v0.0.0-20191022152013-2823239d2298 h1:wg5VfVIEtKI0yaBNeHNM1N01EjwTGg7JW0Gp+jqnYGQ=
 github.com/openshift/client-go v0.0.0-20191022152013-2823239d2298/go.mod h1:6rzn+JTr7+WYS2E1TExP4gByoABxMznR6y2SnUIkmxk=
+github.com/openshift/client-go v0.0.0-20191205152420-9faca5198b4f h1:1ak9jgsR7+vJ/nvvXS2RUpBhv4Fi0LPc1Zp+wSbGtqg=
+github.com/openshift/client-go v0.0.0-20191205152420-9faca5198b4f/go.mod h1:6rzn+JTr7+WYS2E1TExP4gByoABxMznR6y2SnUIkmxk=
+github.com/openshift/client-go v3.9.0+incompatible h1:13k3Ok0B7TA2hA3bQW2aFqn6y04JaJWdk7ITTyg+Ek0=
 github.com/openshift/crd-schema-gen v1.0.0 h1:s/6kG236Z0aqOBUlIZrlykdsXLzvDl3ylHJIME17ZRg=
 github.com/openshift/crd-schema-gen v1.0.0/go.mod h1:jTmSmtfJzK2emb3ucPkHqvoOe//PuNhR3aBiUBbg/rc=
 github.com/openshift/kubernetes-api v0.0.0-20190815163222-ffaba947a5e9 h1:tbH5v9yh6GWw37cxEMPlu8vFmCKHPgqzFEpOgBD7Fb8=

diff --git a/hack/codegen/boilerplate.go.txt b/hack/codegen/boilerplate.go.txt
diff --git a/hack/codegen/update-generated.sh b/hack/codegen/update-generated.sh
diff --git a/hack/deploy.sh b/hack/deploy.sh
diff --git a/pkg/client/listers.go b/pkg/client/listers.go
@@ -6,7 +6,7 @@ import (
 	imagelisters "github.com/openshift/client-go/image/listers/image/v1"
 	templatelisters "github.com/openshift/client-go/template/listers/template/v1"
 
-	sampoplisters "github.com/openshift/cluster-samples-operator/pkg/generated/listers/samples/v1"
+	sampoplisters "github.com/openshift/client-go/samples/listers/samples/v1"
 )
 
 type Listers struct {

diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/generated/clientset/versioned/fake/doc.go b/pkg/generated/clientset/versioned/fake/doc.go
diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go
diff --git a/pkg/generated/clientset/versioned/typed/samples/v1/fake/doc.go b/pkg/generated/clientset/versioned/typed/samples/v1/fake/doc.go
diff --git a/pkg/generated/clientset/versioned/typed/samples/v1/fake/fake_config.go b/pkg/generated/clientset/versioned/typed/samples/v1/fake/fake_config.go
diff --git a/pkg/generated/clientset/versioned/typed/samples/v1/fake/fake_samples_client.go b/pkg/generated/clientset/versioned/typed/samples/v1/fake/fake_samples_client.go
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -13,7 +13,7 @@ import (
 	configv1 "github.com/openshift/api/samples/v1"
 	"github.com/openshift/cluster-samples-operator/pkg/client"
 	"github.com/openshift/cluster-samples-operator/pkg/util"
-	sampoplisters "github.com/openshift/cluster-samples-operator/pkg/generated/listers/samples/v1"
+	sampoplisters "github.com/openshift/client-go/samples/listers/samples/v1"
 
 	"github.com/sirupsen/logrus"
 )

diff --git a/pkg/operator/controller.go b/pkg/operator/controller.go
@@ -29,8 +29,8 @@ import (
 	sampopapi "github.com/openshift/api/samples/v1"
 	sampcache "github.com/openshift/cluster-samples-operator/pkg/cache"
 	sampopclient "github.com/openshift/cluster-samples-operator/pkg/client"
-	sampleclientv1 "github.com/openshift/cluster-samples-operator/pkg/generated/clientset/versioned"
-	sampopinformers "github.com/openshift/cluster-samples-operator/pkg/generated/informers/externalversions"
+	sampleclientv1 "github.com/openshift/client-go/samples/clientset/versioned"
+	sampopinformers "github.com/openshift/client-go/samples/informers/externalversions"
 
 	operatorstatus "github.com/openshift/cluster-samples-operator/pkg/operatorstatus"
 	"github.com/openshift/cluster-samples-operator/pkg/stub"

diff --git a/pkg/stub/handler.go b/pkg/stub/handler.go
@@ -32,7 +32,7 @@ import (
 	imagev1lister "github.com/openshift/client-go/image/listers/image/v1"
 	templatev1client "github.com/openshift/client-go/template/clientset/versioned/typed/template/v1"
 	templatev1lister "github.com/openshift/client-go/template/listers/template/v1"
-	configv1lister "github.com/openshift/cluster-samples-operator/pkg/generated/listers/samples/v1"
+	configv1lister "github.com/openshift/client-go/samples/listers/samples/v1"
 
 	operatorsv1api "github.com/openshift/api/operator/v1"
 	v1 "github.com/openshift/api/samples/v1"
@@ -42,7 +42,7 @@ import (
 	"github.com/openshift/cluster-samples-operator/pkg/metrics"
 	operatorstatus "github.com/openshift/cluster-samples-operator/pkg/operatorstatus"
 
-	sampleclientv1 "github.com/openshift/cluster-samples-operator/pkg/generated/clientset/versioned/typed/samples/v1"
+	sampleclientv1 "github.com/openshift/client-go/samples/clientset/versioned/typed/samples/v1"
 )
 
 const (

diff --git a/pkg/stub/interfaces.go b/pkg/stub/interfaces.go
@@ -15,8 +15,8 @@ import (
 	imagev1lister "github.com/openshift/client-go/image/listers/image/v1"
 	templatev1lister "github.com/openshift/client-go/template/listers/template/v1"
 	v1 "github.com/openshift/api/samples/v1"
-	sampleclientv1 "github.com/openshift/cluster-samples-operator/pkg/generated/clientset/versioned/typed/samples/v1"
-	configv1lister "github.com/openshift/cluster-samples-operator/pkg/generated/listers/samples/v1"
+	sampleclientv1 "github.com/openshift/client-go/samples/clientset/versioned/typed/samples/v1"
+	configv1lister "github.com/openshift/client-go/samples/listers/samples/v1"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/test/e2e/cluster_samples_operator_test.go b/test/e2e/cluster_samples_operator_test.go
@@ -27,7 +27,7 @@ import (
 	templateset "github.com/openshift/client-go/template/clientset/versioned"
 	samplesapi "github.com/openshift/api/samples/v1"
 	sampopclient "github.com/openshift/cluster-samples-operator/pkg/client"
-	sampleclientv1 "github.com/openshift/cluster-samples-operator/pkg/generated/clientset/versioned"
+	sampleclientv1 "github.com/openshift/client-go/samples/clientset/versioned"
 	operator "github.com/openshift/cluster-samples-operator/pkg/operatorstatus"
 	"github.com/openshift/cluster-samples-operator/pkg/stub"
 	"github.com/openshift/cluster-samples-operator/pkg/util"