Update

Signed-off-by: SpiritZhou <[email protected]>
kedacore · Oct 25, 2024 · 90244d2 · 90244d2
1 parent 786aeb8
commit 90244d2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/apis/keda/v1alpha1/scaledjob_types.go b/apis/keda/v1alpha1/scaledjob_types.go
@@ -35,8 +35,8 @@ const (
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status"
 // +kubebuilder:printcolumn:name="Active",type="string",JSONPath=".status.conditions[?(@.type==\"Active\")].status"
 // +kubebuilder:printcolumn:name="Paused",type="string",JSONPath=".status.conditions[?(@.type==\"Paused\")].status"
-// +kubebuilder:printcolumn:name="Triggers",type="string",JSONPath=".status.triggersNames"
-// +kubebuilder:printcolumn:name="Authentications",type="string",JSONPath=".status.authenticationsNames"
+// +kubebuilder:printcolumn:name="Triggers",type="string",JSONPath=".status.triggersTypes"
+// +kubebuilder:printcolumn:name="Authentications",type="string",JSONPath=".status.authenticationsTypes"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // ScaledJob is the Schema for the scaledjobs API

diff --git a/apis/keda/v1alpha1/scaledobject_types.go b/apis/keda/v1alpha1/scaledobject_types.go
@@ -37,8 +37,8 @@ import (
 // +kubebuilder:printcolumn:name="Active",type="string",JSONPath=".status.conditions[?(@.type==\"Active\")].status"
 // +kubebuilder:printcolumn:name="Fallback",type="string",JSONPath=".status.conditions[?(@.type==\"Fallback\")].status"
 // +kubebuilder:printcolumn:name="Paused",type="string",JSONPath=".status.conditions[?(@.type==\"Paused\")].status"
-// +kubebuilder:printcolumn:name="Triggers",type="string",JSONPath=".status.triggersNames"
-// +kubebuilder:printcolumn:name="Authentications",type="string",JSONPath=".status.authenticationsNames"
+// +kubebuilder:printcolumn:name="Triggers",type="string",JSONPath=".status.triggersTypes"
+// +kubebuilder:printcolumn:name="Authentications",type="string",JSONPath=".status.authenticationsTypes"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // ScaledObject is a specification for a ScaledObject resource

diff --git a/tests/internals/status_update/status_update_test.go b/tests/internals/status_update/status_update_test.go
@@ -19,7 +19,7 @@ var (
 	deploymentName              = fmt.Sprintf("%s-deployment", testName)
 	metricsServerDeploymentName = fmt.Sprintf("%s-metrics-server", testName)
 	servciceName                = fmt.Sprintf("%s-service", testName)
-	triggerAuthName             = fmt.Sprintf("%s-ta", testName)
+	triggerAuthType             = fmt.Sprintf("%s-ta", testName)
 	scaledObjectName            = fmt.Sprintf("%s-so", testName)
 	scaledJobName               = fmt.Sprintf("%s-sj", testName)
 	secretName                  = fmt.Sprintf("%s-secret", testName)
@@ -36,7 +36,7 @@ type templateData struct {
 	ServciceName                string
 	ScaledObjectName            string
 	ScaledJobName               string
-	TriggerAuthName             string
+	TriggerAuthType             string
 	SecretName                  string
 	MetricValue                 int
 	MinReplicaCount             string
@@ -234,21 +234,21 @@ func TestScaler(t *testing.T) {
 	CreateKubernetesResources(t, kc, testNamespace, data, templates)
 
 	// test
-	testTriggersAndAuthenticationsNames(t)
+	testTriggersAndAuthenticationsTypes(t)
 
 	// cleanup
 	DeleteKubernetesResources(t, testNamespace, data, templates)
 }
 
-func testTriggersAndAuthenticationsNames(t *testing.T) {
-	otherparameter := `-o jsonpath="{.status.triggersNames}"`
+func testTriggersAndAuthenticationsTypes(t *testing.T) {
+	otherparameter := `-o jsonpath="{.status.triggersTypes}"`
 	CheckKubectlGetResult(t, "ScaledObject", scaledObjectName, testNamespace, otherparameter, "metrics-api,corn")
-	otherparameter = `-o jsonpath="{.status.authenticationsNames}"`
-	CheckKubectlGetResult(t, "ScaledObject", scaledObjectName, testNamespace, otherparameter, triggerAuthName)
-	otherparameter = `-o jsonpath="{.status.triggersNames}"`
+	otherparameter = `-o jsonpath="{.status.authenticationsTypes}"`
+	CheckKubectlGetResult(t, "ScaledObject", scaledObjectName, testNamespace, otherparameter, triggerAuthType)
+	otherparameter = `-o jsonpath="{.status.triggersTypes}"`
 	CheckKubectlGetResult(t, "ScaledJob", scaledJobName, testNamespace, otherparameter, "metrics-api,corn")
-	otherparameter = `-o jsonpath="{.status.authenticationsNames}"`
-	CheckKubectlGetResult(t, "ScaledJob", scaledJobName, testNamespace, otherparameter, triggerAuthName)
+	otherparameter = `-o jsonpath="{.status.authenticationsTypes}"`
+	CheckKubectlGetResult(t, "ScaledJob", scaledJobName, testNamespace, otherparameter, triggerAuthType)
 }
 
 func getTemplateData() (templateData, []Template) {
@@ -257,7 +257,7 @@ func getTemplateData() (templateData, []Template) {
 			DeploymentName:              deploymentName,
 			MetricsServerDeploymentName: metricsServerDeploymentName,
 			ServciceName:                servciceName,
-			TriggerAuthName:             triggerAuthName,
+			TriggerAuthType:             triggerAuthType,
 			ScaledObjectName:            scaledObjectName,
 			ScaledJobName:               scaledJobName,
 			SecretName:                  secretName,