Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Job refactor #1508

Merged
merged 6 commits into from
Dec 20, 2023
Merged

Job refactor #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
083f1bf
chore: remove obsolete push mode
moshloop Dec 20, 2023
926e7b5
chore: switch to new shared job model
moshloop Dec 20, 2023
aae663f
fix: remove time window heuristics
moshloop Dec 20, 2023
ed60779
feat: add helmRef envvar source
moshloop Dec 20, 2023
3185c6b
chore: regen manifests
moshloop Dec 20, 2023
379e581
chore: fix operator tests
moshloop Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions checks/azure_devops_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package checks
import (
"testing"

"github.com/flanksource/canary-checker/pkg/utils"
"github.com/microsoft/azure-devops-go-api/azuredevops/v7/pipelines"
"github.com/samber/lo"
)

func TestMatchPipelineVariables(t *testing.T) {
Expand All @@ -27,8 +27,8 @@ func TestMatchPipelineVariables(t *testing.T) {
"key2": "value2",
},
got: &map[string]pipelines.Variable{
"key1": {Value: utils.Ptr("value1")},
"key2": {Value: utils.Ptr("value2")},
"key1": {Value: lo.ToPtr("value1")},
"key2": {Value: lo.ToPtr("value2")},
},
wantResult: true,
},
Expand All @@ -39,7 +39,7 @@ func TestMatchPipelineVariables(t *testing.T) {
"key2": "value2",
},
got: &map[string]pipelines.Variable{
"key1": {Value: utils.Ptr("value1")},
"key1": {Value: lo.ToPtr("value1")},
},
wantResult: false,
},
Expand All @@ -50,8 +50,8 @@ func TestMatchPipelineVariables(t *testing.T) {
"key2": "value2",
},
got: &map[string]pipelines.Variable{
"key1": {Value: utils.Ptr("value1")},
"key2": {Value: utils.Ptr("value3")},
"key1": {Value: lo.ToPtr("value1")},
"key2": {Value: lo.ToPtr("value3")},
},
wantResult: false,
},
Expand Down
17 changes: 8 additions & 9 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,11 @@ var Root = &cobra.Command{
}

var (
httpPort = 8080
publicEndpoint = "http://localhost:8080"
pushServers, pullServers []string
sharedLibrary []string
exposeEnv bool
logPass, logFail bool
httpPort = 8080
publicEndpoint = "http://localhost:8080"
sharedLibrary []string
exposeEnv bool
logPass, logFail bool

otelcollectorURL string
otelServiceName string
Expand All @@ -68,20 +67,20 @@ func ServerFlags(flags *pflag.FlagSet) {
_ = flags.MarkDeprecated("devGuiPort", "")
_ = flags.MarkDeprecated("metricsPort", "Extra metrics server removed")
_ = flags.MarkDeprecated("dev", "")
_ = flags.MarkDeprecated("push-servers", "")
_ = flags.MarkDeprecated("pull-servers", "")

flags.StringVar(&publicEndpoint, "public-endpoint", publicEndpoint, "Host on which the health dashboard is exposed. Could be used for generting-links, redirects etc.")
flags.StringSliceVar(&runner.IncludeCanaries, "include-check", []string{}, "Run matching canaries - useful for debugging")
flags.StringSliceVar(&runner.IncludeTypes, "include-type", []string{}, "Check type to disable")
flags.StringSliceVar(&runner.IncludeNamespaces, "include-namespace", []string{}, "Check type to disable")
flags.IntVar(&cache.DefaultCacheCount, "maxStatusCheckCount", 5, "Maximum number of past checks in the in memory cache")
flags.StringSliceVar(&pushServers, "push-servers", []string{}, "push check results to multiple canary servers")
flags.StringSliceVar(&pullServers, "pull-servers", []string{}, "push check results to multiple canary servers")
flags.StringVar(&runner.RunnerName, "name", "local", "Server name shown in aggregate dashboard")
flags.StringVar(&prometheus.PrometheusURL, "prometheus", "", "URL of the prometheus server that is scraping this instance")
flags.StringVar(&db.ConnectionString, "db", "DB_URL", "Connection string for the postgres database. Use embedded:///path/to/dir to use the embedded database")
flags.IntVar(&db.DefaultExpiryDays, "cache-timeout", 90, "Cache timeout in days")
flags.StringVarP(&cache.DefaultWindow, "default-window", "", "1h", "Default search window")
flags.IntVar(&db.CheckStatusRetentionDays, "check-status-retention-period", db.DefaultCheckStatusRetentionDays, "Check status retention period in days")
flags.IntVar(&db.CheckStatusRetention, "check-status-retention-period", db.CheckStatusRetention, "Check status retention period in days")
flags.IntVar(&db.CheckRetentionDays, "check-retention-period", db.DefaultCheckRetentionDays, "Check retention period in days")
flags.IntVar(&db.CanaryRetentionDays, "canary-retention-period", db.DefaultCanaryRetentionDays, "Canary retention period in days")
flags.StringVar(&checks.DefaultArtifactConnection, "artifact-connection", "", "Specify the default connection to use for artifacts")
Expand Down
18 changes: 4 additions & 14 deletions cmd/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,16 @@ import (
"github.com/flanksource/canary-checker/pkg/db"
"github.com/flanksource/canary-checker/pkg/jobs"
canaryJobs "github.com/flanksource/canary-checker/pkg/jobs/canary"
"github.com/flanksource/duty"

"github.com/flanksource/canary-checker/pkg/runner"

"github.com/flanksource/canary-checker/pkg/push"

"github.com/flanksource/canary-checker/pkg/api"
"github.com/flanksource/canary-checker/pkg/cache"
"github.com/flanksource/canary-checker/pkg/prometheus"
commonsCtx "github.com/flanksource/commons/context"
"github.com/flanksource/commons/logger"
dutyContext "github.com/flanksource/duty/context"
"github.com/flanksource/duty/models"
prom "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -64,12 +62,6 @@ func setup() {
}
cache.PostgresCache = cache.NewPostgresCache(db.Pool)

push.AddServers(pushServers)

if err := models.SetPropertiesInDBFromFile(db.Gorm, propertiesFile); err != nil {
logger.Fatalf("Error setting properties in database: %v", err)
}

kommonsClient, k8s, err := pkg.NewKommonsClient()
if err != nil {
logger.Warnf("failed to get kommons client, checks that read kubernetes configs will fail: %v", err)
Expand All @@ -81,7 +73,9 @@ func setup() {
WithKommons(kommonsClient).
WithNamespace(runner.WatchNamespace)

go push.Start()
if err := duty.UpdatePropertiesFromFile(apicontext.DefaultContext, propertiesFile); err != nil {
logger.Fatalf("Error setting properties in database: %v", err)
}
}

func postgrestResponseModifier(r *http.Response) error {
Expand Down Expand Up @@ -123,9 +117,6 @@ func serve() {
// PostgREST needs to know how it is exposed to create the correct links
db.HTTPEndpoint = publicEndpoint + "/db"

push.AddServers(pushServers)
go push.Start()

runner.Prometheus, _ = prometheus.NewPrometheusAPI(prometheus.PrometheusURL)

if debug {
Expand All @@ -147,7 +138,6 @@ func serve() {
}
})

e.GET("/api", api.CheckSummary)
e.GET("/api/summary", api.HealthSummary) // Deprecated: Use Post request for filtering
e.POST("/api/summary", api.HealthSummary)
e.GET("/about", api.About)
Expand Down
Loading
Loading