diff --git a/Makefile b/Makefile index 772469a9250..dcd2bc63c59 100644 --- 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 index 80f93ef9328..9cbbfb0fc4b 100644 --- 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 index 26076ccad56..33548899fed 100644 --- 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 index 80cdcf31cf2..ec9ba88f7e3 100644 --- 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 index 82aa68328e3..aa0ca78c7a6 100644 --- 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 index 8cfd297aab2..016211926fe 100644 --- 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 index 355285d98a3..778ee67ee25 100644 --- 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 index b33532b935b..452350c81ad 100644 --- 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 index 7fee1862d15..0449f4d2d38 100644 --- 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 index ce293d448d2..7d6d6715b31 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kedacore/keda +module github.com/kedacore/keda/v2 go 1.15 diff --git a/go.sum b/go.sum index 06b1dc4b172..976925cd5de 100644 --- a/go.sum +++ b/go.sum @@ -29,7 +29,6 @@ contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA= contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs= -contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200615190824-f8c219d2d895/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY= contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY= contrib.go.opencensus.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A= contrib.go.opencensus.io/exporter/prometheus v0.2.1-0.20200609204449-6bcf6f8577f0/go.mod h1:MjHoxkI7Ny27toPeFkRbXbzVjzIGkwOAptrAy8Mxtm8= @@ -69,8 +68,6 @@ github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v42.3.0+incompatible h1:PAHkmPqd/vQV4LJcqzEUM1elCyTMWjbrO8oFMl0dvBE= github.com/Azure/azure-sdk-for-go v42.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v46.0.0+incompatible h1:4qlEOCDcDQZTGczYGzbGYCdJfVpZLIs8AEo5+MoXBPw= -github.com/Azure/azure-sdk-for-go v46.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v47.0.0+incompatible h1:Hn9OhJUtoLjm27f17/JKw38KBQny0cjpnsBHn7kPpTI= github.com/Azure/azure-sdk-for-go v47.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-service-bus-go v0.9.1 h1:G1qBLQvHCFDv9pcpgwgFkspzvnGknJRR0PYJ9ytY/JA= @@ -107,7 +104,6 @@ github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8 github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= github.com/Azure/go-autorest/autorest v0.10.2 h1:NuSF3gXetiHyUbVdneJMEVyPUYAe5wh+aN08JYAf1tI= github.com/Azure/go-autorest/autorest v0.10.2/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= -github.com/Azure/go-autorest/autorest v0.11.0/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= github.com/Azure/go-autorest/autorest v0.11.3 h1:fyYnmYujkIXUgv88D9/Wo2ybE4Zwd/TmQd5sSI5u2Ws= github.com/Azure/go-autorest/autorest v0.11.3/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= github.com/Azure/go-autorest/autorest v0.11.9 h1:P0ZF0dEYoUPUVDQo3mA1CvH5b8mKev7DDcmTwauuNME= @@ -123,20 +119,14 @@ github.com/Azure/go-autorest/autorest/adal v0.9.0 h1:SigMbuFNuKgc1xcGhaeapbh+8fg github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= github.com/Azure/go-autorest/autorest/adal v0.9.1 h1:xjPqigMQe2+0DAJ5A6MLUPp5D2r2Io8qHCuCMMI/yJU= github.com/Azure/go-autorest/autorest/adal v0.9.1/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= -github.com/Azure/go-autorest/autorest/adal v0.9.2 h1:Aze/GQeAN1RRbGmnUJvUj+tFGBzFdIg3293/A9rbxC4= -github.com/Azure/go-autorest/autorest/adal v0.9.2/go.mod h1:/3SMAM86bP6wC9Ev35peQDUeqFZBMH07vvUOmg4z/fE= github.com/Azure/go-autorest/autorest/adal v0.9.5 h1:Y3bBUV4rTuxenJJs41HU3qmqsb+auo+a3Lz+PlJPpL0= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 h1:iM6UAvjR97ZIeR93qTcwpKNMpV+/FTWjwEbuPD495Tk= github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM= -github.com/Azure/go-autorest/autorest/azure/auth v0.5.1 h1:bvUhZciHydpBxBmCheUgxxbSwJy7xcfjkUsjUcqSojc= -github.com/Azure/go-autorest/autorest/azure/auth v0.5.1/go.mod h1:ea90/jvmnAwDrSooLH4sRIehEPtG/EPUXavDh31MnA4= github.com/Azure/go-autorest/autorest/azure/auth v0.5.3 h1:lZifaPRAk1bqg5vGqreL6F8uLC5V0fDpY8nFvc3boFc= github.com/Azure/go-autorest/autorest/azure/auth v0.5.3/go.mod h1:4bJZhUhcq8LB20TruwHbAQsmUs2Xh+QR7utuJpLXX3A= github.com/Azure/go-autorest/autorest/azure/cli v0.3.1 h1:LXl088ZQlP0SBppGFsRZonW6hSvwgL5gRByMbvUbx8U= github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw= -github.com/Azure/go-autorest/autorest/azure/cli v0.4.0 h1:Ml+UCrnlKD+cJmSzrZ/RDcDw86NjkRUpnFh7V5JUhzU= -github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod h1:JljT387FplPzBA31vUcvsetLKF3pec5bdAxjVU4kI2s= github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 h1:dMOmEJfkLKW/7JsokJqkyoYSgmR08hi9KrhjZb+JALY= github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod h1:7qkJkT+j6b+hIpzMOwPChJhTqS8VbsqqgULzMNRugoM= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= @@ -214,8 +204,6 @@ github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:H github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.23.1 h1:XxJBCZEoWJtoWjf/xRbmGUpAmTZGnuuF0ON0EvxxBrs= github.com/Shopify/sarama v1.23.1/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= -github.com/Shopify/sarama v1.27.0 h1:tqo2zmyzPf1+gwTTwhI6W+EXDw4PVSczynpHKFtVAmo= -github.com/Shopify/sarama v1.27.0/go.mod h1:aCdj6ymI8uyPEux1JJ9gcaDT6cinjGhNCAhs54taSUo= github.com/Shopify/sarama v1.27.1 h1:iUlzHymqWsITyttu6KxazcAz8WEj5FqcwFK/oEi7rE8= github.com/Shopify/sarama v1.27.1/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= @@ -279,8 +267,6 @@ github.com/aws/aws-sdk-go v1.30.16/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZve github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.31.12 h1:SxRRGyhlCagI0DYkhOg+FgdXGXzRTE3vEX/gsgFaiKQ= github.com/aws/aws-sdk-go v1.31.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go v1.34.18 h1:Mo/Clq3u1dQFzpg8YQqBii8m+Vl3fWIfHi6kXs5wpuM= -github.com/aws/aws-sdk-go v1.34.18/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.35.9 h1:b1HiUpdkFLJyoOQ7zas36YHzjNHH0ivHx/G5lWBeg+U= github.com/aws/aws-sdk-go v1.35.9/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= @@ -457,8 +443,7 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.8.1 h1:PvpJR0Uq8SdX+zagCMsarBMlhz6ysGTf1+pRmCsRXqY= github.com/frankban/quicktest v1.8.1/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= -github.com/frankban/quicktest v1.10.0 h1:Gfh+GAJZOAoKZsIZeZbdn2JF10kN1XHNvjsvQK8gVkE= -github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= +github.com/frankban/quicktest v1.10.2 h1:19ARM85nVi4xH7xPXuc5eM/udya5ieh7b/Sv+d844Tk= github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= @@ -775,6 +760,7 @@ github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqC github.com/grpc-ecosystem/grpc-gateway v1.12.2/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/grpc-ecosystem/grpc-gateway v1.14.6 h1:8ERzHx8aj1Sc47mu9n/AksaKCSWrMchFtkdrS4BIj5o= github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= +github.com/grpc-ecosystem/grpc-gateway v1.14.8 h1:hXClj+iFpmLM8i3lkO6i4Psli4P2qObQuQReiII26U8= github.com/grpc-ecosystem/grpc-gateway v1.14.8/go.mod h1:NZE8t6vs6TnwLL/ITkaK8W3ecMLGAbh2jXTclvpiwYo= github.com/h2non/gock v1.0.9/go.mod h1:CZMcB0Lg5IWnr9bF79pPMg9WeV6WumxQiUJ1UvdO1iE= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= @@ -876,6 +862,7 @@ github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2 github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= @@ -911,8 +898,6 @@ github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.10.10 h1:a/y8CglcM7gLGYmlbP/stPE5sR3hbhFRUjCBfd/0B3I= -github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.0 h1:wJbzvpYMVGG9iTI9VxpnNZfd4DzMPoCWze3GgSqz8yg= github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= @@ -930,6 +915,7 @@ github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.0.0/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -1078,8 +1064,6 @@ github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1 h1:mFwc4LvZ0xpSvDZ3E+k8Yte0hLOMxXUlP+yXtJqkYfQ= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4= -github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -1093,8 +1077,6 @@ github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs= -github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= @@ -1328,7 +1310,6 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -1576,7 +1557,6 @@ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200528225125-3c3fba18258b/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -1778,9 +1758,7 @@ golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200701000337-a32c0cb1d5b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200709181711-e327e1019dfe/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200725200936-102e7d357031/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200731060945-b5fad4ed8dd6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858 h1:xLt+iB5ksWcZVxqc+g9K41ZHy+6MKWfXCDsjSThnsPA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3 h1:DywqrEscRX7O2phNjkT0L6lhHKGBoMLCNX+XcAe7t6s= golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1836,6 +1814,7 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= @@ -1890,8 +1869,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200601152816-913338de1bd2 h1:VEmvx0P+GVTgkNu2EdTN988YCZPcD3lo9AoczZpucwc= -gopkg.in/yaml.v3 v3.0.0-20200601152816-913338de1bd2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= @@ -1904,6 +1881,7 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20180904230853-4e7be11eab3f/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= k8s.io/api v0.0.0-20181018013834-843ad2d9b9ae/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= @@ -1949,7 +1927,6 @@ k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCk k8s.io/apimachinery v0.18.7-rc.0/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= k8s.io/apimachinery v0.18.8 h1:jimPrycCqgx2QPearX3to1JePz7wSbVLq+7PdBTTwQ0= k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig= -k8s.io/apimachinery v0.19.2 h1:5Gy9vQpAGTKHPVOh5c4plE274X8D/6cuEiTO2zve7tc= k8s.io/apiserver v0.18.8 h1:Au4kMn8sb1zFdyKqc8iMHLsYLxRI6Y+iAhRNKKQtlBY= k8s.io/apiserver v0.18.8/go.mod h1:12u5FuGql8Cc497ORNj79rhPdiXQC4bf53X/skR/1YM= k8s.io/cli-runtime v0.17.2/go.mod h1:aa8t9ziyQdbkuizkNLAw3qe3srSyWh9zlSB7zTqRNPI= @@ -2046,8 +2023,6 @@ knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2/go.mod h1:Q6sL35DdGs8hIQZKdaC knative.dev/pkg v0.0.0-20200515002500-16d7b963416f/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY= knative.dev/pkg v0.0.0-20200528142800-1c6815d7e4c9/go.mod h1:QgNZTxnwpB/oSpNcfnLVlw+WpEwwyKAvJlvR3hgeltA= knative.dev/pkg v0.0.0-20200711004937-22502028e31a/go.mod h1:AqAJV6rYi8IGikDjJ/9ZQd9qKdkXVlesVnVjwx62YB8= -knative.dev/pkg v0.0.0-20200911145400-2d4efecc6bc1 h1:YO9A5F0xo6sTeJZyrV9/IIeVNfKqNz9udsWsofe9eQk= -knative.dev/pkg v0.0.0-20200911145400-2d4efecc6bc1/go.mod h1:igZfLQk2QpRo+cxbH4NfsgbdavqsXr1rMr818/xVu3c= knative.dev/pkg v0.0.0-20201019114258-95e9532f0457 h1:FYTkblGgEnRffT22HvPQa2G+Q/T9MDxumHtzKVDvVqE= knative.dev/pkg v0.0.0-20201019114258-95e9532f0457/go.mod h1:Gd7eJYKYPveffVad0/wImHpQSYn+Pt9q09HGJyL/b54= knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ= @@ -2055,7 +2030,6 @@ knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxP knative.dev/test-infra v0.0.0-20200513011557-d03429a76034/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE= knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9/go.mod h1:A5b2OAXTOeHT3hHhVQm3dmtbuWvIDP7qzgtqxA3/2pE= knative.dev/test-infra v0.0.0-20200707183444-aed09e56ddc7/go.mod h1:RjYAhXnZqeHw9+B0zsbqSPlae0lCvjekO/nw5ZMpLCs= -knative.dev/test-infra v0.0.0-20200909211651-72eb6ae3c773/go.mod h1:Pmg2c7Z7q7BGFUV/GOpU5BlrD3ePJft4MPqx8AYBplc= knative.dev/test-infra v0.0.0-20201015231956-d236fb0ea9ff/go.mod h1:lm0U0k6ARXr8Po0LcSTCfETg63LOF3ajUxcoqy5JSH0= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 80fb847fccc..c1820ccf796 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -14,9 +14,22 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code- # bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \ # Deepcopy is generated by operator-sdk bash "${CODEGEN_PKG}"/generate-groups.sh "client,informer,lister" \ - github.com/kedacore/keda/pkg/generated github.com/kedacore/keda/api \ + github.com/kedacore/keda/v2/pkg/generated github.com/kedacore/keda/v2/api \ keda:v1alpha1 \ --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt -# To use your own boilerplate text append: -# --go-header-file "${SCRIPT_ROOT}"/hack/custom-boilerplate.go.txt +# (Zbynek): If v2 is specified in go.mod, codegen unfortunately outputs to 'v2/pkg/generated' instead of 'pkg/generated', +# therefore we need to move the generated code around the repo a bit +if [ -d v2/pkg/generated ]; then + rm -rf pkg/generated + mv v2/pkg/generated pkg/ + rm -rf v2 +fi + +# (Zbynek): Kubebuilder project layout has api under 'api/v1alpha1' +# client-go codegen expects group name in the path ie. 'api/keda/v1alpha' +# Because there's no way how to modify any of these settings, +# we need to hack things a little bit (replace the name of package) +find pkg/generated -type f -name "*.go" |\ +xargs sed -i".out" -e "s#github.com/kedacore/keda/v2/api/keda/v1alpha1#github.com/kedacore/keda/v2/api/v1alpha1#g" +find pkg/generated -type f -name "*.go.out" | xargs rm -rf diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index cefcd4677a7..b2c49767f2a 100755 --- a/hack/verify-codegen.sh +++ b/hack/verify-codegen.sh @@ -22,11 +22,12 @@ cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}" "${SCRIPT_ROOT}/hack/update-codegen.sh" -# Kubebuilder project layout has api under 'api/v1alpha1' +# (Zbynek): Kubebuilder project layout has api under 'api/v1alpha1' # client-go codegen expects group name in the path ie. 'api/keda/v1alpha' # Because there's no way how to modify any of these settings, # we need to hack things a little bit (replace the name of package) -find "${DIFFROOT}/generated" -type f -name "*.go" | xargs sed -i "s#github.com/kedacore/keda/api/keda/v1alpha1#github.com/kedacore/keda/api/v1alpha1#g" +find "${DIFFROOT}/generated" -type f -name "*.go" |\ +xargs sed -i "s#github.com/kedacore/keda/v2/api/keda/v1alpha1#github.com/kedacore/keda/v2/api/v1alpha1#g" echo "diffing ${DIFFROOT} against freshly generated codegen" ret=0 diff --git a/main.go b/main.go index 397d8542c1e..d768fdaeea6 100644 --- a/main.go +++ b/main.go @@ -30,9 +30,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - "github.com/kedacore/keda/controllers" - "github.com/kedacore/keda/version" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + "github.com/kedacore/keda/v2/controllers" + "github.com/kedacore/keda/v2/version" // +kubebuilder:scaffold:imports ) diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go index c8dac2b3a44..2d28ac0d9cb 100644 --- a/pkg/generated/clientset/versioned/clientset.go +++ b/pkg/generated/clientset/versioned/clientset.go @@ -21,7 +21,7 @@ package versioned import ( "fmt" - kedav1alpha1 "github.com/kedacore/keda/pkg/generated/clientset/versioned/typed/keda/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned/typed/keda/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go index dff4a6365f5..04ba826dfb3 100644 --- a/pkg/generated/clientset/versioned/fake/clientset_generated.go +++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - clientset "github.com/kedacore/keda/pkg/generated/clientset/versioned" - kedav1alpha1 "github.com/kedacore/keda/pkg/generated/clientset/versioned/typed/keda/v1alpha1" - fakekedav1alpha1 "github.com/kedacore/keda/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake" + clientset "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned" + kedav1alpha1 "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned/typed/keda/v1alpha1" + fakekedav1alpha1 "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go index 04ff2fe5526..3cdfe7e59ce 100644 --- a/pkg/generated/clientset/versioned/fake/register.go +++ b/pkg/generated/clientset/versioned/fake/register.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go index 5d5909d70f5..382f0f81822 100644 --- a/pkg/generated/clientset/versioned/scheme/register.go +++ b/pkg/generated/clientset/versioned/scheme/register.go @@ -19,7 +19,7 @@ limitations under the License. package scheme import ( - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_keda_client.go b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_keda_client.go index e9b92ebd1e2..d0a922524e1 100644 --- a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_keda_client.go +++ b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_keda_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/kedacore/keda/pkg/generated/clientset/versioned/typed/keda/v1alpha1" + v1alpha1 "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned/typed/keda/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_scaledjob.go b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_scaledjob.go index 12431a99376..2131bf6c758 100644 --- a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_scaledjob.go +++ b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_scaledjob.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_scaledobject.go b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_scaledobject.go index 64b49ea664f..5b5e4386b14 100644 --- a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_scaledobject.go +++ b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_scaledobject.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_triggerauthentication.go b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_triggerauthentication.go index f8563efc042..a48b1b43ff7 100644 --- a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_triggerauthentication.go +++ b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/fake/fake_triggerauthentication.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/keda_client.go b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/keda_client.go index 45bc97ec9d4..fa3b9067ade 100644 --- a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/keda_client.go +++ b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/keda_client.go @@ -19,8 +19,8 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" - "github.com/kedacore/keda/pkg/generated/clientset/versioned/scheme" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/scaledjob.go b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/scaledjob.go index 7901db85eb9..73087a3451a 100644 --- a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/scaledjob.go +++ b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/scaledjob.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" - scheme "github.com/kedacore/keda/pkg/generated/clientset/versioned/scheme" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + scheme "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/scaledobject.go b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/scaledobject.go index 8abd7660e34..bfe9e1af755 100644 --- a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/scaledobject.go +++ b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/scaledobject.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" - scheme "github.com/kedacore/keda/pkg/generated/clientset/versioned/scheme" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + scheme "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/triggerauthentication.go b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/triggerauthentication.go index 1dee1cff530..ddeafcafa63 100644 --- a/pkg/generated/clientset/versioned/typed/keda/v1alpha1/triggerauthentication.go +++ b/pkg/generated/clientset/versioned/typed/keda/v1alpha1/triggerauthentication.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" - scheme "github.com/kedacore/keda/pkg/generated/clientset/versioned/scheme" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + scheme "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/informers/externalversions/factory.go b/pkg/generated/informers/externalversions/factory.go index b574ce91b9b..e76f4b0fa49 100644 --- a/pkg/generated/informers/externalversions/factory.go +++ b/pkg/generated/informers/externalversions/factory.go @@ -23,9 +23,9 @@ import ( sync "sync" time "time" - versioned "github.com/kedacore/keda/pkg/generated/clientset/versioned" - internalinterfaces "github.com/kedacore/keda/pkg/generated/informers/externalversions/internalinterfaces" - keda "github.com/kedacore/keda/pkg/generated/informers/externalversions/keda" + versioned "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned" + internalinterfaces "github.com/kedacore/keda/v2/pkg/generated/informers/externalversions/internalinterfaces" + keda "github.com/kedacore/keda/v2/pkg/generated/informers/externalversions/keda" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/generated/informers/externalversions/generic.go b/pkg/generated/informers/externalversions/generic.go index c6896af6107..7c3a21c19a3 100644 --- a/pkg/generated/informers/externalversions/generic.go +++ b/pkg/generated/informers/externalversions/generic.go @@ -21,7 +21,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index 36b53219d34..6185090c4a9 100644 --- a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/kedacore/keda/pkg/generated/clientset/versioned" + versioned "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/informers/externalversions/keda/interface.go b/pkg/generated/informers/externalversions/keda/interface.go index 77e69f635eb..80de0694ba8 100644 --- a/pkg/generated/informers/externalversions/keda/interface.go +++ b/pkg/generated/informers/externalversions/keda/interface.go @@ -19,8 +19,8 @@ limitations under the License. package keda import ( - internalinterfaces "github.com/kedacore/keda/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kedacore/keda/pkg/generated/informers/externalversions/keda/v1alpha1" + internalinterfaces "github.com/kedacore/keda/v2/pkg/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kedacore/keda/v2/pkg/generated/informers/externalversions/keda/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/generated/informers/externalversions/keda/v1alpha1/interface.go b/pkg/generated/informers/externalversions/keda/v1alpha1/interface.go index 7d2c56838da..66502e45034 100644 --- a/pkg/generated/informers/externalversions/keda/v1alpha1/interface.go +++ b/pkg/generated/informers/externalversions/keda/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/kedacore/keda/pkg/generated/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/kedacore/keda/v2/pkg/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/generated/informers/externalversions/keda/v1alpha1/scaledjob.go b/pkg/generated/informers/externalversions/keda/v1alpha1/scaledjob.go index 8efa1b07469..03994c72fe8 100644 --- a/pkg/generated/informers/externalversions/keda/v1alpha1/scaledjob.go +++ b/pkg/generated/informers/externalversions/keda/v1alpha1/scaledjob.go @@ -22,10 +22,10 @@ import ( "context" time "time" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - versioned "github.com/kedacore/keda/pkg/generated/clientset/versioned" - internalinterfaces "github.com/kedacore/keda/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kedacore/keda/pkg/generated/listers/keda/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + versioned "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned" + internalinterfaces "github.com/kedacore/keda/v2/pkg/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kedacore/keda/v2/pkg/generated/listers/keda/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/informers/externalversions/keda/v1alpha1/scaledobject.go b/pkg/generated/informers/externalversions/keda/v1alpha1/scaledobject.go index 33a904569ba..7738b7e1865 100644 --- a/pkg/generated/informers/externalversions/keda/v1alpha1/scaledobject.go +++ b/pkg/generated/informers/externalversions/keda/v1alpha1/scaledobject.go @@ -22,10 +22,10 @@ import ( "context" time "time" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - versioned "github.com/kedacore/keda/pkg/generated/clientset/versioned" - internalinterfaces "github.com/kedacore/keda/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kedacore/keda/pkg/generated/listers/keda/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + versioned "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned" + internalinterfaces "github.com/kedacore/keda/v2/pkg/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kedacore/keda/v2/pkg/generated/listers/keda/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/informers/externalversions/keda/v1alpha1/triggerauthentication.go b/pkg/generated/informers/externalversions/keda/v1alpha1/triggerauthentication.go index 2bca1227bcf..bf010c6d63a 100644 --- a/pkg/generated/informers/externalversions/keda/v1alpha1/triggerauthentication.go +++ b/pkg/generated/informers/externalversions/keda/v1alpha1/triggerauthentication.go @@ -22,10 +22,10 @@ import ( "context" time "time" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - versioned "github.com/kedacore/keda/pkg/generated/clientset/versioned" - internalinterfaces "github.com/kedacore/keda/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/kedacore/keda/pkg/generated/listers/keda/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + versioned "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned" + internalinterfaces "github.com/kedacore/keda/v2/pkg/generated/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/kedacore/keda/v2/pkg/generated/listers/keda/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/generated/listers/keda/v1alpha1/scaledjob.go b/pkg/generated/listers/keda/v1alpha1/scaledjob.go index 0a1b9f6c513..4d70d3d640e 100644 --- a/pkg/generated/listers/keda/v1alpha1/scaledjob.go +++ b/pkg/generated/listers/keda/v1alpha1/scaledjob.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/listers/keda/v1alpha1/scaledobject.go b/pkg/generated/listers/keda/v1alpha1/scaledobject.go index 785adcd4265..2d185c6817c 100644 --- a/pkg/generated/listers/keda/v1alpha1/scaledobject.go +++ b/pkg/generated/listers/keda/v1alpha1/scaledobject.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/generated/listers/keda/v1alpha1/triggerauthentication.go b/pkg/generated/listers/keda/v1alpha1/triggerauthentication.go index e0aa7d6b0c3..a0f28d3834a 100644 --- a/pkg/generated/listers/keda/v1alpha1/triggerauthentication.go +++ b/pkg/generated/listers/keda/v1alpha1/triggerauthentication.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kedacore/keda/api/v1alpha1" + v1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go index ab6ee238e3a..1528c6847cc 100644 --- a/pkg/provider/provider.go +++ b/pkg/provider/provider.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - prommetrics "github.com/kedacore/keda/pkg/metrics" - "github.com/kedacore/keda/pkg/scaling" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + prommetrics "github.com/kedacore/keda/v2/pkg/metrics" + "github.com/kedacore/keda/v2/pkg/scaling" "github.com/go-logr/logr" "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" diff --git a/pkg/scalers/artemis_scaler.go b/pkg/scalers/artemis_scaler.go index 5017fe022fe..6535fdd62b6 100644 --- a/pkg/scalers/artemis_scaler.go +++ b/pkg/scalers/artemis_scaler.go @@ -17,7 +17,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) type artemisScaler struct { diff --git a/pkg/scalers/aws_cloudwatch_scaler.go b/pkg/scalers/aws_cloudwatch_scaler.go index 800e905fcbb..554d53bac06 100644 --- a/pkg/scalers/aws_cloudwatch_scaler.go +++ b/pkg/scalers/aws_cloudwatch_scaler.go @@ -19,7 +19,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/aws_kinesis_stream_scaler.go b/pkg/scalers/aws_kinesis_stream_scaler.go index 486c1353309..57afa871703 100644 --- a/pkg/scalers/aws_kinesis_stream_scaler.go +++ b/pkg/scalers/aws_kinesis_stream_scaler.go @@ -18,7 +18,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/aws_sqs_queue_scaler.go b/pkg/scalers/aws_sqs_queue_scaler.go index b0c1edd152f..2610bbacb35 100644 --- a/pkg/scalers/aws_sqs_queue_scaler.go +++ b/pkg/scalers/aws_sqs_queue_scaler.go @@ -20,7 +20,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/azure/azure_blob.go b/pkg/scalers/azure/azure_blob.go index afd6edb48ce..ec2c74b115d 100644 --- a/pkg/scalers/azure/azure_blob.go +++ b/pkg/scalers/azure/azure_blob.go @@ -5,7 +5,7 @@ import ( "github.com/Azure/azure-storage-blob-go/azblob" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) // GetAzureBlobListLength returns the count of the blobs in blob container in int diff --git a/pkg/scalers/azure/azure_eventhub.go b/pkg/scalers/azure/azure_eventhub.go index 03edd66900f..b814b6d6e81 100644 --- a/pkg/scalers/azure/azure_eventhub.go +++ b/pkg/scalers/azure/azure_eventhub.go @@ -14,7 +14,7 @@ import ( eventhub "github.com/Azure/azure-event-hubs-go" "github.com/Azure/azure-storage-blob-go/azblob" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) type baseCheckpoint struct { diff --git a/pkg/scalers/azure/azure_monitor.go b/pkg/scalers/azure/azure_monitor.go index 53a2baf9b36..a55fcdfd019 100644 --- a/pkg/scalers/azure/azure_monitor.go +++ b/pkg/scalers/azure/azure_monitor.go @@ -12,7 +12,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure/auth" "k8s.io/klog" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) // Much of the code in this file is taken from the Azure Kubernetes Metrics Adapter diff --git a/pkg/scalers/azure/azure_queue.go b/pkg/scalers/azure/azure_queue.go index a5fa02eb7fc..63d5f08cb34 100644 --- a/pkg/scalers/azure/azure_queue.go +++ b/pkg/scalers/azure/azure_queue.go @@ -5,7 +5,7 @@ import ( "github.com/Azure/azure-storage-queue-go/azqueue" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) // GetAzureQueueLength returns the length of a queue in int diff --git a/pkg/scalers/azure/azure_storage.go b/pkg/scalers/azure/azure_storage.go index 74ba03e4b19..8adbc184a45 100644 --- a/pkg/scalers/azure/azure_storage.go +++ b/pkg/scalers/azure/azure_storage.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/azure-storage-blob-go/azblob" "github.com/Azure/azure-storage-queue-go/azqueue" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) /* ParseAzureStorageConnectionString parses a storage account connection string into (endpointProtocol, accountName, key, endpointSuffix) diff --git a/pkg/scalers/azure_blob_scaler.go b/pkg/scalers/azure_blob_scaler.go index 6b4779da520..a387af4cfb6 100644 --- a/pkg/scalers/azure_blob_scaler.go +++ b/pkg/scalers/azure_blob_scaler.go @@ -5,7 +5,7 @@ import ( "fmt" "strconv" - "github.com/kedacore/keda/pkg/scalers/azure" + "github.com/kedacore/keda/v2/pkg/scalers/azure" v2beta2 "k8s.io/api/autoscaling/v2beta2" "k8s.io/apimachinery/pkg/api/resource" @@ -14,8 +14,8 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - kedautil "github.com/kedacore/keda/pkg/util" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/azure_blob_scaler_test.go b/pkg/scalers/azure_blob_scaler_test.go index 403fd612ce9..6efa739355b 100644 --- a/pkg/scalers/azure_blob_scaler_test.go +++ b/pkg/scalers/azure_blob_scaler_test.go @@ -3,7 +3,7 @@ package scalers import ( "testing" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) var testAzBlobResolvedEnv = map[string]string{ diff --git a/pkg/scalers/azure_eventhub_scaler.go b/pkg/scalers/azure_eventhub_scaler.go index 1dc50eed33f..87d8feedcb9 100644 --- a/pkg/scalers/azure_eventhub_scaler.go +++ b/pkg/scalers/azure_eventhub_scaler.go @@ -7,7 +7,7 @@ import ( "math" "strconv" - "github.com/kedacore/keda/pkg/scalers/azure" + "github.com/kedacore/keda/v2/pkg/scalers/azure" eventhub "github.com/Azure/azure-event-hubs-go" "github.com/Azure/azure-storage-blob-go/azblob" @@ -18,7 +18,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/azure_eventhub_scaler_test.go b/pkg/scalers/azure_eventhub_scaler_test.go index f760aae04f0..3b33122df3b 100644 --- a/pkg/scalers/azure_eventhub_scaler_test.go +++ b/pkg/scalers/azure_eventhub_scaler_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "github.com/kedacore/keda/pkg/scalers/azure" + "github.com/kedacore/keda/v2/pkg/scalers/azure" eventhub "github.com/Azure/azure-event-hubs-go" "github.com/Azure/azure-storage-blob-go/azblob" diff --git a/pkg/scalers/azure_log_analytics_scaler.go b/pkg/scalers/azure_log_analytics_scaler.go index d3a8bae688a..8e9a060c5ca 100644 --- a/pkg/scalers/azure_log_analytics_scaler.go +++ b/pkg/scalers/azure_log_analytics_scaler.go @@ -22,8 +22,8 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - kedautil "github.com/kedacore/keda/pkg/util" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/azure_log_analytics_scaler_test.go b/pkg/scalers/azure_log_analytics_scaler_test.go index 4bbc386adc0..765d52a8458 100644 --- a/pkg/scalers/azure_log_analytics_scaler_test.go +++ b/pkg/scalers/azure_log_analytics_scaler_test.go @@ -3,7 +3,7 @@ package scalers import ( "testing" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) const ( diff --git a/pkg/scalers/azure_monitor_scaler.go b/pkg/scalers/azure_monitor_scaler.go index 5d667424f97..a7746841ce7 100644 --- a/pkg/scalers/azure_monitor_scaler.go +++ b/pkg/scalers/azure_monitor_scaler.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/kedacore/keda/pkg/scalers/azure" + "github.com/kedacore/keda/v2/pkg/scalers/azure" v2beta2 "k8s.io/api/autoscaling/v2beta2" "k8s.io/apimachinery/pkg/api/resource" @@ -15,8 +15,8 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - kedautil "github.com/kedacore/keda/pkg/util" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/azure_monitor_scaler_test.go b/pkg/scalers/azure_monitor_scaler_test.go index c69c7b50591..51ec9807b77 100644 --- a/pkg/scalers/azure_monitor_scaler_test.go +++ b/pkg/scalers/azure_monitor_scaler_test.go @@ -3,7 +3,7 @@ package scalers import ( "testing" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) type parseAzMonitorMetadataTestData struct { diff --git a/pkg/scalers/azure_queue_scaler.go b/pkg/scalers/azure_queue_scaler.go index 7163c6427db..f4ef4723466 100644 --- a/pkg/scalers/azure_queue_scaler.go +++ b/pkg/scalers/azure_queue_scaler.go @@ -5,7 +5,7 @@ import ( "fmt" "strconv" - "github.com/kedacore/keda/pkg/scalers/azure" + "github.com/kedacore/keda/v2/pkg/scalers/azure" v2beta2 "k8s.io/api/autoscaling/v2beta2" "k8s.io/apimachinery/pkg/api/resource" @@ -14,8 +14,8 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - kedautil "github.com/kedacore/keda/pkg/util" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/azure_queue_scaler_test.go b/pkg/scalers/azure_queue_scaler_test.go index 8ad9bc595f8..2e21c340a34 100644 --- a/pkg/scalers/azure_queue_scaler_test.go +++ b/pkg/scalers/azure_queue_scaler_test.go @@ -3,7 +3,7 @@ package scalers import ( "testing" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) var testAzQueueResolvedEnv = map[string]string{ diff --git a/pkg/scalers/azure_servicebus_scaler.go b/pkg/scalers/azure_servicebus_scaler.go index fbd0fed6342..7aa5c4fd97e 100755 --- a/pkg/scalers/azure_servicebus_scaler.go +++ b/pkg/scalers/azure_servicebus_scaler.go @@ -7,7 +7,7 @@ import ( "github.com/Azure/azure-amqp-common-go/v3/auth" servicebus "github.com/Azure/azure-service-bus-go" - "github.com/kedacore/keda/pkg/scalers/azure" + "github.com/kedacore/keda/v2/pkg/scalers/azure" v2beta2 "k8s.io/api/autoscaling/v2beta2" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -15,8 +15,8 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - kedautil "github.com/kedacore/keda/pkg/util" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) type entityType int diff --git a/pkg/scalers/azure_servicebus_scaler_test.go b/pkg/scalers/azure_servicebus_scaler_test.go index e5ad78988f3..190bc1ab418 100755 --- a/pkg/scalers/azure_servicebus_scaler_test.go +++ b/pkg/scalers/azure_servicebus_scaler_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) const ( diff --git a/pkg/scalers/cron_scaler.go b/pkg/scalers/cron_scaler.go index 1fb46c501c6..894974cdfbe 100644 --- a/pkg/scalers/cron_scaler.go +++ b/pkg/scalers/cron_scaler.go @@ -15,7 +15,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/external_scaler.go b/pkg/scalers/external_scaler.go index 77c9e932060..66d9d6125bf 100644 --- a/pkg/scalers/external_scaler.go +++ b/pkg/scalers/external_scaler.go @@ -9,7 +9,7 @@ import ( "github.com/mitchellh/hashstructure" - pb "github.com/kedacore/keda/pkg/scalers/externalscaler" + pb "github.com/kedacore/keda/v2/pkg/scalers/externalscaler" "google.golang.org/grpc" "google.golang.org/grpc/credentials" v2beta2 "k8s.io/api/autoscaling/v2beta2" diff --git a/pkg/scalers/external_scaler_test.go b/pkg/scalers/external_scaler_test.go index af8ae3e7e19..a780a7a2b61 100644 --- a/pkg/scalers/external_scaler_test.go +++ b/pkg/scalers/external_scaler_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - pb "github.com/kedacore/keda/pkg/scalers/externalscaler" + pb "github.com/kedacore/keda/v2/pkg/scalers/externalscaler" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/scalers/gcp_pub_sub_scaler.go b/pkg/scalers/gcp_pub_sub_scaler.go index d44aac63850..feac8efc4ee 100644 --- a/pkg/scalers/gcp_pub_sub_scaler.go +++ b/pkg/scalers/gcp_pub_sub_scaler.go @@ -12,7 +12,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/huawei_cloudeye_scaler.go b/pkg/scalers/huawei_cloudeye_scaler.go index c258bac98eb..73788b2950b 100644 --- a/pkg/scalers/huawei_cloudeye_scaler.go +++ b/pkg/scalers/huawei_cloudeye_scaler.go @@ -17,7 +17,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/ibmmq_scaler.go b/pkg/scalers/ibmmq_scaler.go index 97dfeb9282e..f577e025266 100644 --- a/pkg/scalers/ibmmq_scaler.go +++ b/pkg/scalers/ibmmq_scaler.go @@ -17,7 +17,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/metrics/pkg/apis/external_metrics" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) // Default variables and settings diff --git a/pkg/scalers/kafka_scaler.go b/pkg/scalers/kafka_scaler.go index 81e8bc7355c..b1983210496 100644 --- a/pkg/scalers/kafka_scaler.go +++ b/pkg/scalers/kafka_scaler.go @@ -15,7 +15,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) type kafkaScaler struct { diff --git a/pkg/scalers/liiklus/mocks/mock_liiklus.go b/pkg/scalers/liiklus/mocks/mock_liiklus.go index 7f58e9f5f86..419805c668c 100644 --- a/pkg/scalers/liiklus/mocks/mock_liiklus.go +++ b/pkg/scalers/liiklus/mocks/mock_liiklus.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/kedacore/keda/pkg/scalers/liiklus (interfaces: LiiklusServiceClient) +// Source: github.com/kedacore/keda/v2/pkg/scalers/liiklus (interfaces: LiiklusServiceClient) // Package mock_liiklus is a generated GoMock package. package mock_liiklus @@ -8,7 +8,7 @@ import ( context "context" gomock "github.com/golang/mock/gomock" empty "github.com/golang/protobuf/ptypes/empty" - liiklus "github.com/kedacore/keda/pkg/scalers/liiklus" + liiklus "github.com/kedacore/keda/v2/pkg/scalers/liiklus" grpc "google.golang.org/grpc" reflect "reflect" ) diff --git a/pkg/scalers/liiklus_scaler.go b/pkg/scalers/liiklus_scaler.go index 6449ee9b22f..ebc11b6acde 100644 --- a/pkg/scalers/liiklus_scaler.go +++ b/pkg/scalers/liiklus_scaler.go @@ -14,8 +14,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/metrics/pkg/apis/external_metrics" - liiklus_service "github.com/kedacore/keda/pkg/scalers/liiklus" - kedautil "github.com/kedacore/keda/pkg/util" + liiklus_service "github.com/kedacore/keda/v2/pkg/scalers/liiklus" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) type liiklusScaler struct { diff --git a/pkg/scalers/liiklus_scaler_test.go b/pkg/scalers/liiklus_scaler_test.go index d1f6b85a5c1..a8f8580d4f6 100644 --- a/pkg/scalers/liiklus_scaler_test.go +++ b/pkg/scalers/liiklus_scaler_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/kedacore/keda/pkg/scalers/liiklus" - mock_liiklus "github.com/kedacore/keda/pkg/scalers/liiklus/mocks" + "github.com/kedacore/keda/v2/pkg/scalers/liiklus" + mock_liiklus "github.com/kedacore/keda/v2/pkg/scalers/liiklus/mocks" "github.com/pkg/errors" ) diff --git a/pkg/scalers/metrics_api_scaler.go b/pkg/scalers/metrics_api_scaler.go index 9b794e0170f..7dd8c59f9e7 100644 --- a/pkg/scalers/metrics_api_scaler.go +++ b/pkg/scalers/metrics_api_scaler.go @@ -20,7 +20,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) type metricsAPIScaler struct { diff --git a/pkg/scalers/mysql_scaler.go b/pkg/scalers/mysql_scaler.go index 64a939dd635..9cc469ce466 100644 --- a/pkg/scalers/mysql_scaler.go +++ b/pkg/scalers/mysql_scaler.go @@ -14,7 +14,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) type mySQLScaler struct { diff --git a/pkg/scalers/postgresql_scaler.go b/pkg/scalers/postgresql_scaler.go index d4b84218ac7..b1086347deb 100644 --- a/pkg/scalers/postgresql_scaler.go +++ b/pkg/scalers/postgresql_scaler.go @@ -15,7 +15,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) type postgreSQLScaler struct { diff --git a/pkg/scalers/prometheus_scaler.go b/pkg/scalers/prometheus_scaler.go index 01d348482b3..db01d2519b4 100644 --- a/pkg/scalers/prometheus_scaler.go +++ b/pkg/scalers/prometheus_scaler.go @@ -17,7 +17,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/rabbitmq_scaler.go b/pkg/scalers/rabbitmq_scaler.go index 64a030a3606..25c0a16bc7e 100644 --- a/pkg/scalers/rabbitmq_scaler.go +++ b/pkg/scalers/rabbitmq_scaler.go @@ -18,7 +18,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/redis_scaler.go b/pkg/scalers/redis_scaler.go index 258dbd2dc95..bd9da22e003 100644 --- a/pkg/scalers/redis_scaler.go +++ b/pkg/scalers/redis_scaler.go @@ -14,7 +14,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/redis_streams_scaler.go b/pkg/scalers/redis_streams_scaler.go index 5677c5b4620..46276a82221 100644 --- a/pkg/scalers/redis_streams_scaler.go +++ b/pkg/scalers/redis_streams_scaler.go @@ -14,7 +14,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) const ( diff --git a/pkg/scalers/scaler.go b/pkg/scalers/scaler.go index eb3c475a705..ce209f7e8b9 100644 --- a/pkg/scalers/scaler.go +++ b/pkg/scalers/scaler.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/metrics/pkg/apis/external_metrics" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) // Scaler interface diff --git a/pkg/scalers/stan_scaler.go b/pkg/scalers/stan_scaler.go index f5721051c56..bcde34ac80a 100644 --- a/pkg/scalers/stan_scaler.go +++ b/pkg/scalers/stan_scaler.go @@ -15,7 +15,7 @@ import ( "k8s.io/metrics/pkg/apis/external_metrics" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedautil "github.com/kedacore/keda/pkg/util" + kedautil "github.com/kedacore/keda/v2/pkg/util" ) type monitorChannelInfo struct { diff --git a/pkg/scaling/executor/scale_executor.go b/pkg/scaling/executor/scale_executor.go index aebf65fc3a6..4a703afe8d8 100644 --- a/pkg/scaling/executor/scale_executor.go +++ b/pkg/scaling/executor/scale_executor.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) const ( diff --git a/pkg/scaling/executor/scale_jobs.go b/pkg/scaling/executor/scale_jobs.go index 81eac699629..d98be6a0347 100644 --- a/pkg/scaling/executor/scale_jobs.go +++ b/pkg/scaling/executor/scale_jobs.go @@ -12,8 +12,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - version "github.com/kedacore/keda/version" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + version "github.com/kedacore/keda/v2/version" ) const ( diff --git a/pkg/scaling/executor/scale_jobs_test.go b/pkg/scaling/executor/scale_jobs_test.go index 14906ba80ab..415ae556d28 100644 --- a/pkg/scaling/executor/scale_jobs_test.go +++ b/pkg/scaling/executor/scale_jobs_test.go @@ -15,8 +15,8 @@ import ( runtimeclient "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - "github.com/kedacore/keda/pkg/mock/mock_client" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + "github.com/kedacore/keda/v2/pkg/mock/mock_client" ) func TestCleanUpNormalCase(t *testing.T) { diff --git a/pkg/scaling/executor/scale_scaledobjects.go b/pkg/scaling/executor/scale_scaledobjects.go index 9e131243753..39ab752396a 100644 --- a/pkg/scaling/executor/scale_scaledobjects.go +++ b/pkg/scaling/executor/scale_scaledobjects.go @@ -8,7 +8,7 @@ import ( autoscalingv1 "k8s.io/api/autoscaling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) func (e *scaleExecutor) RequestScale(ctx context.Context, scaledObject *kedav1alpha1.ScaledObject, isActive bool) { diff --git a/pkg/scaling/resolver/hashicorpvault_handler.go b/pkg/scaling/resolver/hashicorpvault_handler.go index f9b51e225bf..04095303d37 100644 --- a/pkg/scaling/resolver/hashicorpvault_handler.go +++ b/pkg/scaling/resolver/hashicorpvault_handler.go @@ -8,7 +8,7 @@ import ( "github.com/go-logr/logr" vaultApi "github.com/hashicorp/vault/api" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) // HashicorpVaultHandler is specification of Hashi Corp Vault diff --git a/pkg/scaling/resolver/scale_resolvers.go b/pkg/scaling/resolver/scale_resolvers.go index 6f950e490d8..e3d9614ce31 100644 --- a/pkg/scaling/resolver/scale_resolvers.go +++ b/pkg/scaling/resolver/scale_resolvers.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" ) const ( diff --git a/pkg/scaling/resolver/scale_resolvers_test.go b/pkg/scaling/resolver/scale_resolvers_test.go index 19ae4948aaa..72db639a5c2 100644 --- a/pkg/scaling/resolver/scale_resolvers_test.go +++ b/pkg/scaling/resolver/scale_resolvers_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/scaling/scale_handler.go b/pkg/scaling/scale_handler.go index 3ce57b8a274..248f2e69e30 100644 --- a/pkg/scaling/scale_handler.go +++ b/pkg/scaling/scale_handler.go @@ -18,10 +18,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" - "github.com/kedacore/keda/pkg/scalers" - "github.com/kedacore/keda/pkg/scaling/executor" - "github.com/kedacore/keda/pkg/scaling/resolver" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" + "github.com/kedacore/keda/v2/pkg/scalers" + "github.com/kedacore/keda/v2/pkg/scaling/executor" + "github.com/kedacore/keda/v2/pkg/scaling/resolver" ) const ( diff --git a/pkg/util/gvkr.go b/pkg/util/gvkr.go index 857c11b1439..bc434da0199 100644 --- a/pkg/util/gvkr.go +++ b/pkg/util/gvkr.go @@ -1,7 +1,7 @@ package util import ( - kedav1alpha1 "github.com/kedacore/keda/api/v1alpha1" + kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime/schema"