From fc4fe6193f2e1434f261bb60d655ce474b06481c Mon Sep 17 00:00:00 2001 From: Aditya Thebe Date: Tue, 3 Sep 2024 21:35:29 +0545 Subject: [PATCH] chore: bump duty --- cmd/operator.go | 2 +- config/deploy/crd.yaml | 15 +++++++++++++++ config/deploy/manifests.yaml | 15 +++++++++++++++ config/schemas/component.schema.json | 6 ++++++ config/schemas/topology.schema.json | 9 +++++++++ go.mod | 2 +- go.sum | 2 ++ pkg/topology/run.go | 1 - 8 files changed, 49 insertions(+), 3 deletions(-) diff --git a/cmd/operator.go b/cmd/operator.go index de5196484..9345a6592 100644 --- a/cmd/operator.go +++ b/cmd/operator.go @@ -10,6 +10,7 @@ import ( canaryJobs "github.com/flanksource/canary-checker/pkg/jobs/canary" "github.com/flanksource/canary-checker/pkg/runner" "github.com/flanksource/canary-checker/pkg/utils" + "github.com/go-logr/logr" gocache "github.com/patrickmn/go-cache" canaryv1 "github.com/flanksource/canary-checker/api/v1" @@ -17,7 +18,6 @@ import ( "github.com/flanksource/canary-checker/pkg/labels" "github.com/flanksource/commons/logger" dutyKubernetes "github.com/flanksource/duty/kubernetes" - "github.com/go-logr/logr" "github.com/spf13/cobra" "go.opentelemetry.io/otel" "k8s.io/apimachinery/pkg/runtime" diff --git a/config/deploy/crd.yaml b/config/deploy/crd.yaml index 161c45609..d91b14a67 100644 --- a/config/deploy/crd.yaml +++ b/config/deploy/crd.yaml @@ -13574,6 +13574,11 @@ spec: type: array type: object type: array + statusExpr: + description: |- + statusExpr allows defining a cel expression to evaluate the status of a component + based on the summary. + type: string summary: description: Summary is the health, incidents, insights & check summary properties: @@ -14063,6 +14068,11 @@ spec: type: array type: object type: array + statusExpr: + description: |- + statusExpr allows defining a cel expression to evaluate the status of a component + based on the summary. + type: string summary: description: Summary is the health, incidents, insights & check summary properties: @@ -14759,6 +14769,11 @@ spec: type: object schedule: type: string + statusExpr: + description: |- + statusExpr allows defining a cel expression to evaluate the status of a component + based on the summary. + type: string text: type: string tooltip: diff --git a/config/deploy/manifests.yaml b/config/deploy/manifests.yaml index 62a23dc46..4afb95a35 100644 --- a/config/deploy/manifests.yaml +++ b/config/deploy/manifests.yaml @@ -13842,6 +13842,11 @@ spec: type: array type: object type: array + statusExpr: + description: |- + statusExpr allows defining a cel expression to evaluate the status of a component + based on the summary. + type: string summary: description: Summary is the health, incidents, insights & check summary properties: @@ -14331,6 +14336,11 @@ spec: type: array type: object type: array + statusExpr: + description: |- + statusExpr allows defining a cel expression to evaluate the status of a component + based on the summary. + type: string summary: description: Summary is the health, incidents, insights & check summary properties: @@ -15027,6 +15037,11 @@ spec: type: object schedule: type: string + statusExpr: + description: |- + statusExpr allows defining a cel expression to evaluate the status of a component + based on the summary. + type: string text: type: string tooltip: diff --git a/config/schemas/component.schema.json b/config/schemas/component.schema.json index 8eb98a769..1799912b3 100644 --- a/config/schemas/component.schema.json +++ b/config/schemas/component.schema.json @@ -938,6 +938,9 @@ "parentLookup": { "$ref": "#/$defs/ParentLookup" }, + "statusExpr": { + "type": "string" + }, "healthExpr": { "type": "string" }, @@ -1031,6 +1034,9 @@ "parentLookup": { "$ref": "#/$defs/ParentLookup" }, + "statusExpr": { + "type": "string" + }, "healthExpr": { "type": "string" }, diff --git a/config/schemas/topology.schema.json b/config/schemas/topology.schema.json index ee4d08f7c..3da01f94f 100644 --- a/config/schemas/topology.schema.json +++ b/config/schemas/topology.schema.json @@ -917,6 +917,9 @@ "parentLookup": { "$ref": "#/$defs/ParentLookup" }, + "statusExpr": { + "type": "string" + }, "healthExpr": { "type": "string" }, @@ -1010,6 +1013,9 @@ "parentLookup": { "$ref": "#/$defs/ParentLookup" }, + "statusExpr": { + "type": "string" + }, "healthExpr": { "type": "string" }, @@ -4433,6 +4439,9 @@ "healthExpr": { "type": "string" }, + "statusExpr": { + "type": "string" + }, "properties": { "$ref": "#/$defs/Properties" }, diff --git a/go.mod b/go.mod index 063f3e48f..6af0c1b11 100644 --- a/go.mod +++ b/go.mod @@ -332,7 +332,7 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace github.com/flanksource/duty => ../duty +// replace github.com/flanksource/duty => ../duty // replace github.com/flanksource/artifacts => ../artifacts diff --git a/go.sum b/go.sum index f8a1335ed..154b93535 100644 --- a/go.sum +++ b/go.sum @@ -863,6 +863,8 @@ github.com/flanksource/artifacts v1.0.14 h1:Vv70bccsae0MwGaf/uSPp34J5V1/PyKfct9z github.com/flanksource/artifacts v1.0.14/go.mod h1:qHVCnQu5k50aWNJ5UhpcAKEl7pAzqUrFFKGSm147G70= github.com/flanksource/commons v1.29.4 h1:lA+iylPS85LXsKK7lp4wcNx9A3QU2d1BwUfUWIS1t7c= github.com/flanksource/commons v1.29.4/go.mod h1:bdTkBoakpFszgjQ16qJ6/qEF9n2s/sc0d2ujYYdFvGs= +github.com/flanksource/duty v1.0.617 h1:q0ILxwRJUYbcjAvzp3TiEb28QHUn9j2BgMXCz2FiCdg= +github.com/flanksource/duty v1.0.617/go.mod h1:fEsbkDxWoAcjXBDVD9unI8ekrPN/IG1v2Q2+dvoLLvs= github.com/flanksource/gomplate/v3 v3.20.4/go.mod h1:27BNWhzzSjDed1z8YShO6W+z6G9oZXuxfNFGd/iGSdc= github.com/flanksource/gomplate/v3 v3.24.27 h1:5vw7k0fUj4/b67wDyscJmC4jNCboDbjdl7ebwUF6mtc= github.com/flanksource/gomplate/v3 v3.24.27/go.mod h1:x5LuJX08JyvjzrydbG1Hvd+DKopirJsSHNShXynyE0o= diff --git a/pkg/topology/run.go b/pkg/topology/run.go index 6b603fadd..e70dd6717 100644 --- a/pkg/topology/run.go +++ b/pkg/topology/run.go @@ -693,7 +693,6 @@ func (tj *TopologyJob) run(ctx *ComponentContext, job job.JobRuntime) (pkg.Compo c.Namespace = ctx.Topology.GetNamespace() } c.Schedule = ctx.Topology.Spec.Schedule - } return results, skipComponentDeletion