Update

Signed-off-by: SpiritZhou <[email protected]>
kedacore · Oct 24, 2024 · 63e0a1e · 63e0a1e
1 parent f20078b
commit 63e0a1e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
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="TriggersNames",type="string",JSONPath=".status.triggersNames"
-// +kubebuilder:printcolumn:name="AuthenticationsNames",type="string",JSONPath=".status.authenticationsNames"
+// +kubebuilder:printcolumn:name="Triggers",type="string",JSONPath=".status.triggersNames"
+// +kubebuilder:printcolumn:name="Authentications",type="string",JSONPath=".status.authenticationsNames"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // ScaledObject is a specification for a ScaledObject resource

diff --git a/config/crd/bases/keda.sh_scaledjobs.yaml b/config/crd/bases/keda.sh_scaledjobs.yaml
@@ -33,10 +33,10 @@ spec:
       name: Paused
       type: string
     - jsonPath: .status.triggersNames
-      name: TriggersNames
+      name: Triggers
       type: string
     - jsonPath: .status.authenticationsNames
-      name: AuthenticationsNames
+      name: Authentications
       type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age

diff --git a/config/crd/bases/keda.sh_scaledobjects.yaml b/config/crd/bases/keda.sh_scaledobjects.yaml
@@ -42,10 +42,10 @@ spec:
       name: Paused
       type: string
     - jsonPath: .status.triggersNames
-      name: TriggersNames
+      name: Triggers
       type: string
     - jsonPath: .status.authenticationsNames
-      name: AuthenticationsNames
+      name: Authentications
       type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age

diff --git a/controllers/keda/scaledjob_controller.go b/controllers/keda/scaledjob_controller.go
@@ -411,7 +411,7 @@ func (r *ScaledJobReconciler) updateTriggerAuthenticationStatusOnDelete(ctx cont
 }
 
 func (r *ScaledJobReconciler) updateStatusWithTriggersAndAuthsNames(ctx context.Context, logger logr.Logger, scaledJob *kedav1alpha1.ScaledJob) error {
-	triggersNames, authsNames := kedav1alpha1.GetCombinedTriggersAndAuthenticationsNames(scaledJob.Spec.Triggers)
+	triggersNames, authsNames := kedav1alpha1.CombinedTriggersAndAuthenticationsNames(scaledJob.Spec.Triggers)
 	status := scaledJob.Status.DeepCopy()
 	status.TriggersNames = &triggersNames
 	status.AuthenticationsNames = &authsNames

diff --git a/controllers/keda/scaledobject_controller.go b/controllers/keda/scaledobject_controller.go
@@ -628,7 +628,7 @@ func (r *ScaledObjectReconciler) updateTriggerAuthenticationStatusOnDelete(ctx c
 }
 
 func (r *ScaledObjectReconciler) updateStatusWithTriggersAndAuthsNames(ctx context.Context, logger logr.Logger, scaledObject *kedav1alpha1.ScaledObject) error {
-	triggersNames, authsNames := kedav1alpha1.GetCombinedTriggersAndAuthenticationsNames(scaledObject.Spec.Triggers)
+	triggersNames, authsNames := kedav1alpha1.CombinedTriggersAndAuthenticationsNames(scaledObject.Spec.Triggers)
 	status := scaledObject.Status.DeepCopy()
 	status.TriggersNames = &triggersNames
 	status.AuthenticationsNames = &authsNames