Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
Signed-off-by: SpiritZhou <[email protected]>
  • Loading branch information
SpiritZhou committed Oct 25, 2024
1 parent 0b0a76e commit e03c00f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions config/crd/bases/keda.sh_scaledjobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ spec:
- jsonPath: .status.conditions[?(@.type=="Paused")].status
name: Paused
type: string
- jsonPath: .status.triggersNames
- jsonPath: .status.triggersTypes
name: Triggers
type: string
- jsonPath: .status.authenticationsNames
- jsonPath: .status.authenticationsTypes
name: Authentications
type: string
- jsonPath: .metadata.creationTimestamp
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/keda.sh_scaledobjects.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ spec:
- jsonPath: .status.conditions[?(@.type=="Paused")].status
name: Paused
type: string
- jsonPath: .status.triggersNames
- jsonPath: .status.triggersTypes
name: Triggers
type: string
- jsonPath: .status.authenticationsNames
- jsonPath: .status.authenticationsTypes
name: Authentications
type: string
- jsonPath: .metadata.creationTimestamp
Expand Down
10 changes: 5 additions & 5 deletions tests/internals/status_update/status_update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var (
deploymentName = fmt.Sprintf("%s-deployment", testName)
metricsServerDeploymentName = fmt.Sprintf("%s-metrics-server", testName)
servciceName = fmt.Sprintf("%s-service", testName)
triggerAuthType = fmt.Sprintf("%s-ta", testName)
triggerAuthName = fmt.Sprintf("%s-ta", testName)
scaledObjectName = fmt.Sprintf("%s-so", testName)
scaledJobName = fmt.Sprintf("%s-sj", testName)
secretName = fmt.Sprintf("%s-secret", testName)
Expand All @@ -36,7 +36,7 @@ type templateData struct {
ServciceName string
ScaledObjectName string
ScaledJobName string
TriggerAuthType string
TriggerAuthName string
SecretName string
MetricValue int
MinReplicaCount string
Expand Down Expand Up @@ -244,11 +244,11 @@ func testTriggersAndAuthenticationsTypes(t *testing.T) {
otherparameter := `-o jsonpath="{.status.triggersTypes}"`
CheckKubectlGetResult(t, "ScaledObject", scaledObjectName, testNamespace, otherparameter, "metrics-api,corn")
otherparameter = `-o jsonpath="{.status.authenticationsTypes}"`
CheckKubectlGetResult(t, "ScaledObject", scaledObjectName, testNamespace, otherparameter, triggerAuthType)
CheckKubectlGetResult(t, "ScaledObject", scaledObjectName, testNamespace, otherparameter, triggerAuthName)
otherparameter = `-o jsonpath="{.status.triggersTypes}"`
CheckKubectlGetResult(t, "ScaledJob", scaledJobName, testNamespace, otherparameter, "metrics-api,corn")
otherparameter = `-o jsonpath="{.status.authenticationsTypes}"`
CheckKubectlGetResult(t, "ScaledJob", scaledJobName, testNamespace, otherparameter, triggerAuthType)
CheckKubectlGetResult(t, "ScaledJob", scaledJobName, testNamespace, otherparameter, triggerAuthName)
}

func getTemplateData() (templateData, []Template) {
Expand All @@ -257,7 +257,7 @@ func getTemplateData() (templateData, []Template) {
DeploymentName: deploymentName,
MetricsServerDeploymentName: metricsServerDeploymentName,
ServciceName: servciceName,
TriggerAuthType: triggerAuthType,
TriggerAuthName: triggerAuthName,
ScaledObjectName: scaledObjectName,
ScaledJobName: scaledJobName,
SecretName: secretName,
Expand Down

0 comments on commit e03c00f

Please sign in to comment.