Skip to content

Commit

Permalink
chore: bump duty
Browse files Browse the repository at this point in the history
  • Loading branch information
@adityathebe @moshloop
adityathebe authored and moshloop committed Sep 3, 2024
1 parent f854e78 commit fc4fe61
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cmd/operator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ 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"
"github.com/flanksource/canary-checker/pkg/controllers"
"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"
Expand Down
15 changes: 15 additions & 0 deletions config/deploy/crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
15 changes: 15 additions & 0 deletions config/deploy/manifests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions config/schemas/component.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,9 @@
"parentLookup": {
"$ref": "#/$defs/ParentLookup"
},
"statusExpr": {
"type": "string"
},
"healthExpr": {
"type": "string"
},
Expand Down Expand Up @@ -1031,6 +1034,9 @@
"parentLookup": {
"$ref": "#/$defs/ParentLookup"
},
"statusExpr": {
"type": "string"
},
"healthExpr": {
"type": "string"
},
Expand Down
9 changes: 9 additions & 0 deletions config/schemas/topology.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,9 @@
"parentLookup": {
"$ref": "#/$defs/ParentLookup"
},
"statusExpr": {
"type": "string"
},
"healthExpr": {
"type": "string"
},
Expand Down Expand Up @@ -1010,6 +1013,9 @@
"parentLookup": {
"$ref": "#/$defs/ParentLookup"
},
"statusExpr": {
"type": "string"
},
"healthExpr": {
"type": "string"
},
Expand Down Expand Up @@ -4433,6 +4439,9 @@
"healthExpr": {
"type": "string"
},
"statusExpr": {
"type": "string"
},
"properties": {
"$ref": "#/$defs/Properties"
},
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
1 change: 0 additions & 1 deletion pkg/topology/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fc4fe61

Please sign in to comment.