comment uncompatible libs for crs revendor

openshift · Oct 17, 2018 · c92ffa3 · c92ffa3
1 parent 1e3683b
commit c92ffa3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/cmd/aws-actuator/main.go b/cmd/aws-actuator/main.go
@@ -51,7 +51,7 @@ import (
 	"text/template"
 
 	"k8s.io/apimachinery/pkg/util/wait"
-	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/fake"
+	//"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/fake"
 )
 
 const (

diff --git a/cmd/machine-controller/main.go b/cmd/machine-controller/main.go
@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
 	"sigs.k8s.io/cluster-api/pkg/controller/config"
 	"sigs.k8s.io/cluster-api/pkg/controller/machine"
-	"sigs.k8s.io/cluster-api/pkg/controller/sharedinformers"
+//	"sigs.k8s.io/cluster-api/pkg/controller/sharedinformers"
 )
 
 var (

diff --git a/pkg/cloud/aws/actuators/machine/actuator.go b/pkg/cloud/aws/actuators/machine/actuator.go
@@ -32,7 +32,7 @@ import (
 	providerconfigv1 "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/aws/providerconfig/v1alpha1"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 	clusterclient "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
-	clustererror "sigs.k8s.io/cluster-api/pkg/controller/error"
+	//clustererror "sigs.k8s.io/cluster-api/pkg/controller/error"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"

diff --git a/pkg/cloud/aws/actuators/machine/actuator_test.go b/pkg/cloud/aws/actuators/machine/actuator_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
-	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/fake"
+	//"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/fake"
 
 	kubernetesfake "k8s.io/client-go/kubernetes/fake"
 

diff --git a/test/integration/create_update_delete_test.go b/test/integration/create_update_delete_test.go
@@ -9,7 +9,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/fake"
+	//"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/fake"
 
 	kubernetesfake "k8s.io/client-go/kubernetes/fake"
 

diff --git a/test/machines/machines_test.go b/test/machines/machines_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/prometheus/common/log"
 	"k8s.io/apimachinery/pkg/util/uuid"
 
-	"github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework"
-	"github.com/openshift/cluster-api-actuator-pkg/pkg/manifests"
+	//"github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework"
+	//"github.com/openshift/cluster-api-actuator-pkg/pkg/manifests"
 	"sigs.k8s.io/cluster-api-provider-aws/test/utils"
 
 	apiv1 "k8s.io/api/core/v1"