From 25ad302ed231983a6236ce2c7c1351852997322f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 5 Mar 2024 23:27:20 -0500 Subject: [PATCH] refactor: use enum to represent authentication type --- plugins/scheduler-k3s/functions.go | 5 ++++- plugins/scheduler-k3s/template.go | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/plugins/scheduler-k3s/functions.go b/plugins/scheduler-k3s/functions.go index 6ae1cf38b..4d37ac2ec 100644 --- a/plugins/scheduler-k3s/functions.go +++ b/plugins/scheduler-k3s/functions.go @@ -515,11 +515,12 @@ func getAutoscaling(input GetAutoscalingInput) (ProcessAutoscaling, error) { if auth, ok := input.KedaValues.Authentications[trigger.Type]; ok { trigger.AuthenticationRef = &ProcessAutoscalingTriggerAuthenticationRef{ Name: auth.Name, + Kind: string(auth.Kind), } } else if auth, ok := input.KedaValues.GlobalAuthentications[trigger.Type]; ok { trigger.AuthenticationRef = &ProcessAutoscalingTriggerAuthenticationRef{ Name: auth.Name, - Kind: "ClusterTriggerAuthentication", + Kind: string(auth.Kind), } } @@ -563,6 +564,7 @@ func getKedaValues(ctx context.Context, clientset KubernetesClient, appName stri auths[authType] = KedaAuthentication{ Name: fmt.Sprintf("%s-%s", appName, authType), Type: authType, + Kind: KedaAuthenticationKind_TriggerAuthentication, Secrets: make(map[string]string), } } @@ -584,6 +586,7 @@ func getKedaValues(ctx context.Context, clientset KubernetesClient, appName stri authType := strings.TrimPrefix(item.Name, "global-auth-") globalAuths[authType] = KedaAuthentication{ Name: item.Name, + Kind: KedaAuthenticationKind_ClusterTriggerAuthentication, Type: authType, } } diff --git a/plugins/scheduler-k3s/template.go b/plugins/scheduler-k3s/template.go index 3bf76fdfd..9aebcc2f1 100644 --- a/plugins/scheduler-k3s/template.go +++ b/plugins/scheduler-k3s/template.go @@ -71,6 +71,9 @@ type KedaAuthentication struct { // Name is the name of the authentication object Name string `yaml:"name"` + // Kind is the kind of authentication object + Kind KedaAuthenticationKind `yaml:"kind,omitempty"` + // Type is the type of authentication to use Type string `yaml:"type"` @@ -78,6 +81,13 @@ type KedaAuthentication struct { Secrets map[string]string `yaml:"secrets,omitempty"` } +type KedaAuthenticationKind string + +const ( + KedaAuthenticationKind_ClusterTriggerAuthentication KedaAuthenticationKind = "ClusterTriggerAuthentication" + KedaAuthenticationKind_TriggerAuthentication KedaAuthenticationKind = "TriggerAuthentication" +) + type ProcessValues struct { Annotations ProcessAnnotations `yaml:"annotations,omitempty"` Args []string `yaml:"args,omitempty"`