Replace deprecated controller-runtime scheme package location

Kubernetes controller-runtime dependency deprecated the old location operator-framework/operator-sdk#1876 Replace sigs.k8s.io/controller-runtime/pkg/runtime/log with sigs.k8s.io/controller-runtime/pkg/log
3scale · Feb 15, 2020 · f755b18 · f755b18
1 parent 34e93e1
commit f755b18
Show file tree

Hide file tree

Showing 25 changed files with 40 additions and 33 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -26,10 +26,10 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 	crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 )
 
 // Change below variables to serve metrics on different host or port.

diff --git a/pkg/3scale/amp/operator/ampimages_reconciler_test.go b/pkg/3scale/amp/operator/ampimages_reconciler_test.go
@@ -14,7 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestAMPImagesReconciler(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/apicast_reconciler_test.go b/pkg/3scale/amp/operator/apicast_reconciler_test.go
@@ -2,9 +2,10 @@ package operator
 
 import (
 	"context"
-	"k8s.io/api/policy/v1beta1"
 	"testing"
 
+	"k8s.io/api/policy/v1beta1"
+
 	appsv1alpha1 "github.com/3scale/3scale-operator/pkg/apis/apps/v1alpha1"
 	appsv1 "github.com/openshift/api/apps/v1"
 	imagev1 "github.com/openshift/api/image/v1"
@@ -15,7 +16,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestApicastReconciler(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/backend_reconciler_test.go b/pkg/3scale/amp/operator/backend_reconciler_test.go
@@ -2,9 +2,10 @@ package operator
 
 import (
 	"context"
-	"k8s.io/api/policy/v1beta1"
 	"testing"
 
+	"k8s.io/api/policy/v1beta1"
+
 	"github.com/3scale/3scale-operator/pkg/3scale/amp/component"
 	appsv1alpha1 "github.com/3scale/3scale-operator/pkg/apis/apps/v1alpha1"
 	appsv1 "github.com/openshift/api/apps/v1"
@@ -16,7 +17,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestNewBackendReconciler(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/configmap_reconciler_test.go b/pkg/3scale/amp/operator/configmap_reconciler_test.go
@@ -13,7 +13,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestCreateOnlyConfigMapReconciler(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/deployment_config_reconciler_test.go b/pkg/3scale/amp/operator/deployment_config_reconciler_test.go
@@ -17,7 +17,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestDeploymentConfigBaseReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/imagestream_reconciler_test.go b/pkg/3scale/amp/operator/imagestream_reconciler_test.go
@@ -13,7 +13,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestImageStreamBaseReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/memcached_reconciler_test.go b/pkg/3scale/amp/operator/memcached_reconciler_test.go
@@ -10,7 +10,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestMemcachedDCReconciler(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/persistent_volume_claim_reconciler_test.go b/pkg/3scale/amp/operator/persistent_volume_claim_reconciler_test.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestPVCBaseReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/pod_disruption_budget_reconciler_test.go b/pkg/3scale/amp/operator/pod_disruption_budget_reconciler_test.go
@@ -2,6 +2,9 @@ package operator
 
 import (
 	"context"
+	"reflect"
+	"testing"
+
 	appsv1alpha1 "github.com/3scale/3scale-operator/pkg/apis/apps/v1alpha1"
 	policyv1beta1 "k8s.io/api/policy/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -10,10 +13,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/kubernetes/scheme"
-	"reflect"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
-	"testing"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestPodDisruptionBudgetBaseReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/redis_reconciler_test.go b/pkg/3scale/amp/operator/redis_reconciler_test.go
@@ -13,7 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestRedisBackendDCReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/role_binding_reconciler_test.go b/pkg/3scale/amp/operator/role_binding_reconciler_test.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestRoleBindingBaseReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/role_reconciler_test.go b/pkg/3scale/amp/operator/role_reconciler_test.go
@@ -13,7 +13,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestRoleBaseReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/route_reconciler_test.go b/pkg/3scale/amp/operator/route_reconciler_test.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestRouteBaseReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/secret_reconciler_test.go b/pkg/3scale/amp/operator/secret_reconciler_test.go
@@ -15,7 +15,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestCreateOnlySecretReconciler(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/service_account_reconciler_test.go b/pkg/3scale/amp/operator/service_account_reconciler_test.go
@@ -13,7 +13,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestServiceAccountBaseReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/service_reconciler_test.go b/pkg/3scale/amp/operator/service_reconciler_test.go
@@ -13,7 +13,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestServiceBaseReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/system_mysql_image_reconciler_test.go b/pkg/3scale/amp/operator/system_mysql_image_reconciler_test.go
@@ -11,7 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestSystemMySQLImageReconciler(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/system_postgresql_image_reconciler_test.go b/pkg/3scale/amp/operator/system_postgresql_image_reconciler_test.go
@@ -11,7 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestSystemPostgreSQLImageReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/system_postgresql_reconciler_test.go b/pkg/3scale/amp/operator/system_postgresql_reconciler_test.go
@@ -14,7 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestSystemPostgreSQLReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/system_reconciler_test.go b/pkg/3scale/amp/operator/system_reconciler_test.go
@@ -2,9 +2,10 @@ package operator
 
 import (
 	"context"
-	"k8s.io/api/policy/v1beta1"
 	"testing"
 
+	"k8s.io/api/policy/v1beta1"
+
 	"github.com/3scale/3scale-operator/pkg/3scale/amp/component"
 	appsv1alpha1 "github.com/3scale/3scale-operator/pkg/apis/apps/v1alpha1"
 	appsv1 "github.com/openshift/api/apps/v1"
@@ -15,7 +16,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestSystemReconcilerCreate(t *testing.T) {

diff --git a/pkg/3scale/amp/operator/zync_reconciler_test.go b/pkg/3scale/amp/operator/zync_reconciler_test.go
@@ -2,9 +2,10 @@ package operator
 
 import (
 	"context"
-	"k8s.io/api/policy/v1beta1"
 	"testing"
 
+	"k8s.io/api/policy/v1beta1"
+
 	"github.com/3scale/3scale-operator/pkg/3scale/amp/component"
 	appsv1alpha1 "github.com/3scale/3scale-operator/pkg/apis/apps/v1alpha1"
 	appsv1 "github.com/openshift/api/apps/v1"
@@ -17,7 +18,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 func TestNewZyncReconciler(t *testing.T) {

diff --git a/pkg/controller/apimanager/apimanager_controller.go b/pkg/controller/apimanager/apimanager_controller.go
@@ -3,9 +3,10 @@ package apimanager
 import (
 	"context"
 	"fmt"
-	"k8s.io/api/policy/v1beta1"
 	"reflect"
 
+	"k8s.io/api/policy/v1beta1"
+
 	"github.com/3scale/3scale-operator/version"
 
 	"github.com/3scale/3scale-operator/pkg/3scale/amp/product"
@@ -20,9 +21,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 

diff --git a/pkg/controller/binding/binding_controller.go b/pkg/controller/binding/binding_controller.go
@@ -2,6 +2,8 @@ package binding
 
 import (
 	"context"
+	"time"
+
 	apiv1alpha1 "github.com/3scale/3scale-operator/pkg/apis/capabilities/v1alpha1"
 	"github.com/3scale/3scale-operator/pkg/helper"
 	"github.com/go-logr/logr"
@@ -11,11 +13,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 	"sigs.k8s.io/controller-runtime/pkg/source"
-	"time"
 )
 
 var log = logf.Log.WithName("controller_binding")

diff --git a/pkg/controller/tenant/tenant_controller.go b/pkg/controller/tenant/tenant_controller.go
@@ -15,9 +15,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )