bump go module version to v2 (#1324)

Signed-off-by: Zbynek Roubalik <zroubali@redhat.com>
kedacore · Nov 18, 2020 · 5c1257d · 5c1257d
1 parent b31d4b6
commit 5c1257d
Show file tree

Hide file tree

Showing 88 changed files with 163 additions and 194 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@
 ### Breaking Changes
 
 ### Other
+- Bump go module version to v2 ([#1324](https://github.com/kedacore/keda/pull/1324))
 
 ## v2.0.0
 

diff --git a/Makefile b/Makefile
@@ -233,9 +233,6 @@ clientset-verify: clientset-prepare
 .PHONY: clientset-generate
 clientset-generate: clientset-prepare
  ./hack/update-codegen.sh
- find ./pkg/generated -type f -name "*.go" |\
- xargs sed -i".out" -e "s#github.com/kedacore/keda/api/keda/v1alpha1#github.com/kedacore/keda/api/v1alpha1#g"
- find ./pkg/generated -type f -name "*.go.out" | xargs rm -rf
  rm -rf api/keda
 
 ##################################################

diff --git a/adapter/main.go b/adapter/main.go
@@ -17,11 +17,11 @@ import (
  basecmd "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/cmd"
  "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"
 
- kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1"
- prommetrics "github.com/kedacore/keda/pkg/metrics"
- kedaprovider "github.com/kedacore/keda/pkg/provider"
- "github.com/kedacore/keda/pkg/scaling"
- "github.com/kedacore/keda/version"
+ kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1"
+ prommetrics "github.com/kedacore/keda/v2/pkg/metrics"
+ kedaprovider "github.com/kedacore/keda/v2/pkg/provider"
+ "github.com/kedacore/keda/v2/pkg/scaling"
+ "github.com/kedacore/keda/v2/version"
 )
 
 // Adapter creates External Metrics Provider

diff --git a/controllers/hpa.go b/controllers/hpa.go
@@ -5,14 +5,14 @@ import (
  "fmt"
 
  "github.com/go-logr/logr"
- version "github.com/kedacore/keda/version"
+ version "github.com/kedacore/keda/v2/version"
  autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2"
  "k8s.io/apimachinery/pkg/api/equality"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
- kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1"
- kedacontrollerutil "github.com/kedacore/keda/controllers/util"
+ kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1"
+ kedacontrollerutil "github.com/kedacore/keda/v2/controllers/util"
 )
 
 const (

diff --git a/controllers/scaledjob_controller.go b/controllers/scaledjob_controller.go
@@ -14,8 +14,8 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/client"
  "sigs.k8s.io/controller-runtime/pkg/predicate"
 
- kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1"
- "github.com/kedacore/keda/pkg/scaling"
+ kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1"
+ "github.com/kedacore/keda/v2/pkg/scaling"
 )
 
 // +kubebuilder:rbac:groups=keda.sh,resources=scaledjobs;scaledjobs/finalizers;scaledjobs/status,verbs="*"

diff --git a/controllers/scaledjob_finalizer.go b/controllers/scaledjob_finalizer.go
@@ -5,8 +5,8 @@ import (
 
  "github.com/go-logr/logr"
 
- kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1"
- "github.com/kedacore/keda/controllers/util"
+ kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1"
+ "github.com/kedacore/keda/v2/controllers/util"
 )
 
 const (

diff --git a/controllers/scaledobject_controller.go b/controllers/scaledobject_controller.go
@@ -23,10 +23,10 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/manager"
  "sigs.k8s.io/controller-runtime/pkg/predicate"
 
- kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1"
- kedacontrollerutil "github.com/kedacore/keda/controllers/util"
- "github.com/kedacore/keda/pkg/scaling"
- kedautil "github.com/kedacore/keda/pkg/util"
+ kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1"
+ kedacontrollerutil "github.com/kedacore/keda/v2/controllers/util"
+ "github.com/kedacore/keda/v2/pkg/scaling"
+ kedautil "github.com/kedacore/keda/v2/pkg/util"
 )
 
 // +kubebuilder:rbac:groups=keda.sh,resources=scaledobjects;scaledobjects/finalizers;scaledobjects/status,verbs="*"

diff --git a/controllers/scaledobject_finalizer.go b/controllers/scaledobject_finalizer.go
@@ -7,8 +7,8 @@ import (
  "k8s.io/apimachinery/pkg/api/errors"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
- kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1"
- "github.com/kedacore/keda/controllers/util"
+ kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1"
+ "github.com/kedacore/keda/v2/controllers/util"
 )
 
 const (

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -29,7 +29,7 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/envtest/printer"
  logf "sigs.k8s.io/controller-runtime/pkg/log"
  "sigs.k8s.io/controller-runtime/pkg/log/zap"
- //kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1"
+ //kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1"
  // +kubebuilder:scaffold:imports
 )
 

diff --git a/controllers/util/status.go b/controllers/util/status.go
@@ -8,7 +8,7 @@ import (
  "k8s.io/apimachinery/pkg/runtime"
  runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 
- kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1"
+ kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1"
 )
 
 // SetStatusConditions patches given object with passed list of conditions based on the object's type or returns an error.

diff --git a/go.mod b/go.mod
@@ -1,11 +1,10 @@
-module github.com/kedacore/keda
+module github.com/kedacore/keda/v2
 
 go 1.15
 
 require (
  cloud.google.com/go v0.65.0
  github.com/Azure/azure-amqp-common-go/v3 v3.1.0
- github.com/Azure/azure-event-hubs-go v1.3.1 // indirect
  github.com/Azure/azure-event-hubs-go/v3 v3.3.2
  github.com/Azure/azure-sdk-for-go v48.0.0+incompatible
  github.com/Azure/azure-service-bus-go v0.10.6