From e4a0aa348000654848908e98dab7a6300a1f6e24 Mon Sep 17 00:00:00 2001 From: Harsh Thakur Date: Fri, 5 Feb 2021 10:28:54 +0530 Subject: [PATCH] Migrating to keda2.0 (#1868) Co-authored-by: Rahul Bhati Co-authored-by: Vishal --- go.mod | 1 - pkg/mqtrigger/scalermanager.go | 21 ++++++++++++++------- pkg/mqtrigger/scalermanager_test.go | 8 ++++---- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index f9f731c9..2fb5653a 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,6 @@ require ( github.com/opencontainers/image-spec v1.0.1 // indirect github.com/opencontainers/runc v0.1.1 // indirect github.com/ory/dockertest v3.3.5+incompatible - github.com/pierrec/lz4 v2.0.5+incompatible // indirect github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.0.0 github.com/prometheus/common v0.4.1 diff --git a/pkg/mqtrigger/scalermanager.go b/pkg/mqtrigger/scalermanager.go index 2de1bbb6..f37de2d9 100644 --- a/pkg/mqtrigger/scalermanager.go +++ b/pkg/mqtrigger/scalermanager.go @@ -27,14 +27,21 @@ import ( ) var ( + // Group refers to the group name in KEDA CRD + Group = "keda.sh" + // Version refers to the version name in KEDA CRD + Version = "v1alpha1" + + // apiVersion refers to the api version name in KEDA CRD + apiVersion = Group + "/" + Version scaledObjectGVR = schema.GroupVersionResource{ - Group: "keda.k8s.io", - Version: "v1alpha1", + Group: Group, + Version: Version, Resource: "scaledobjects", } authTriggerGVR = schema.GroupVersionResource{ - Group: "keda.k8s.io", - Version: "v1alpha1", + Group: Group, + Version: Version, Resource: "triggerauthentications", } matchFirstCap = regexp.MustCompile("(.)([A-Z][a-z]+)") @@ -306,7 +313,7 @@ func getAuthTriggerSpec(mqt *fv1.MessageQueueTrigger, authenticationRef string, authTriggerObj := &unstructured.Unstructured{ Object: map[string]interface{}{ "kind": "TriggerAuthentication", - "apiVersion": "keda.k8s.io/v1alpha1", + "apiVersion": apiVersion, "metadata": map[string]interface{}{ "name": authenticationRef, "namespace": mqt.ObjectMeta.Namespace, @@ -469,7 +476,7 @@ func getScaledObject(mqt *fv1.MessageQueueTrigger, authenticationRef string) *un return &unstructured.Unstructured{ Object: map[string]interface{}{ "kind": "ScaledObject", - "apiVersion": "keda.k8s.io/v1alpha1", + "apiVersion": apiVersion, "metadata": map[string]interface{}{ "name": mqt.ObjectMeta.Name, "namespace": mqt.ObjectMeta.Namespace, @@ -489,7 +496,7 @@ func getScaledObject(mqt *fv1.MessageQueueTrigger, authenticationRef string) *un "minReplicaCount": &mqt.Spec.MinReplicaCount, "pollingInterval": &mqt.Spec.PollingInterval, "scaleTargetRef": map[string]interface{}{ - "deploymentName": mqt.ObjectMeta.Name, + "name": mqt.ObjectMeta.Name, }, "triggers": []interface{}{ map[string]interface{}{ diff --git a/pkg/mqtrigger/scalermanager_test.go b/pkg/mqtrigger/scalermanager_test.go index e724801a..02f58f46 100644 --- a/pkg/mqtrigger/scalermanager_test.go +++ b/pkg/mqtrigger/scalermanager_test.go @@ -388,10 +388,10 @@ func newUnstructured(apiVersion, kind, namespace, name, resourceVersion string) func Test_getResourceVersion(t *testing.T) { scheme := runtime.NewScheme() - client := dynfake.NewSimpleDynamicClient(scheme, newUnstructured("keda.k8s.io/v1alpha1", "ScaledObject", "default", "test-1", "12345")) + client := dynfake.NewSimpleDynamicClient(scheme, newUnstructured(apiVersion, "ScaledObject", "default", "test-1", "12345")) dynamicResourceClient := client.Resource(schema.GroupVersionResource{ - Group: "keda.k8s.io", - Version: "v1alpha1", + Group: Group, + Version: Version, Resource: "scaledobjects", }) type args struct { @@ -489,7 +489,7 @@ func Test_getAuthTriggerSpec(t *testing.T) { expectedAuthTriggerObj := &unstructured.Unstructured{ Object: map[string]interface{}{ "kind": "TriggerAuthentication", - "apiVersion": "keda.k8s.io/v1alpha1", + "apiVersion": apiVersion, "metadata": map[string]interface{}{ "name": authenticationRef, "namespace": mqt1.ObjectMeta.Namespace,