Skip to content

Commit b220fe2

Browse files
jasonopsleveljasonopslevel
committed
Add subscribedTemplateIds to RunnerRegister
1 parent 0cca15a commit b220fe2

16 files changed

+28
-36
lines changed

‎src/cmd/faktory.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
worker "github.com/contribsys/faktory_worker_go"
1111
"github.com/mitchellh/mapstructure"
12-
"github.com/opslevel/opslevel-go/v2024"
12+
"github.com/opslevel/opslevel-go/v2026"
1313
"github.com/opslevel/opslevel-runner/pkg"
1414
"github.com/rs/zerolog/log"
1515
"github.com/spf13/viper"

‎src/cmd/root.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ func init() {
5151
rootCmd.PersistentFlags().Int("job-pod-log-max-interval", 30, "The max amount of time between when pod logs are shipped to OpsLevel. Works in tandem with 'job-pod-log-max-size'")
5252
rootCmd.PersistentFlags().Int("job-pod-log-max-size", 1000000, "The max amount in bytes to buffer before pod logs are shipped to OpsLevel. Works in tandem with 'job-pod-log-max-interval'")
5353
rootCmd.PersistentFlags().Bool("job-agent-mode", false, "Enable agent mode with privileged security context for Container-in-Container support. WARNING: This grants elevated privileges and should only be enabled for trusted workloads.")
54+
rootCmd.PersistentFlags().String("queue", "", "The queue this runner should process jobs from. Empty means the default queue.")
5455

5556
rootCmd.PersistentFlags().String("runner-pod-name", "", "overrides environment variable 'RUNNER_POD_NAME'")
5657
rootCmd.PersistentFlags().String("runner-pod-namespace", "default", "The kubernetes namespace the runner pod is deployed in. Overrides environment variable 'RUNNER_POD_NAMESPACE'")
@@ -73,6 +74,7 @@ func init() {
7374
viper.BindEnv("job-pod-log-max-interval", "OPSLEVEL_JOB_POD_LOG_MAX_INTERVAL")
7475
viper.BindEnv("job-pod-log-max-size", "OPSLEVEL_JOB_POD_LOG_MAX_SIZE")
7576
viper.BindEnv("job-agent-mode", "OPSLEVEL_JOB_AGENT_MODE")
77+
viper.BindEnv("queue", "OPSLEVEL_QUEUE")
7678

7779
viper.BindEnv("runner-pod-name", "RUNNER_POD_NAME")
7880
viper.BindEnv("runner-pod-namespace", "RUNNER_POD_NAMESPACE")

‎src/cmd/run.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/opslevel/opslevel-runner/signal"
1212

1313
"github.com/getsentry/sentry-go"
14-
"github.com/opslevel/opslevel-go/v2024"
14+
"github.com/opslevel/opslevel-go/v2026"
1515
"github.com/opslevel/opslevel-runner/pkg"
1616
"github.com/rs/zerolog/log"
1717
"github.com/spf13/cobra"
@@ -53,7 +53,12 @@ func doRun(cmd *cobra.Command, args []string) {
5353
runFaktory()
5454
case "api":
5555
client := pkg.NewGraphClient()
56-
runner, err := client.RunnerRegister()
56+
var registerArgs []string
57+
if queue := viper.GetString("queue"); queue != "" {
58+
log.Info().Str("queue", queue).Msg("Registering with queue")
59+
registerArgs = append(registerArgs, queue)
60+
}
61+
runner, err := client.RunnerRegister(registerArgs...)
5762
pkg.CheckErr(err)
5863

5964
pkg.StartMetricsServer(string(runner.Id), viper.GetInt("metrics-port"))

‎src/cmd/test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88
"time"
99

10-
"github.com/opslevel/opslevel-go/v2024"
10+
"github.com/opslevel/opslevel-go/v2026"
1111
"github.com/opslevel/opslevel-runner/pkg"
1212
"github.com/opslevel/opslevel-runner/signal"
1313
"github.com/rs/zerolog/log"

‎src/go.mod‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/getsentry/sentry-go v0.29.1
1111
github.com/go-resty/resty/v2 v2.17.1
1212
github.com/mitchellh/mapstructure v1.5.0
13-
github.com/opslevel/opslevel-go/v2024 v2024.12.24
13+
github.com/opslevel/opslevel-go/v2026 v2026.1.15
1414
github.com/prometheus/client_golang v1.20.5
1515
github.com/rocktavious/autopilot/v2023 v2023.12.7
1616
github.com/rs/zerolog v1.34.0
@@ -28,7 +28,7 @@ require (
2828
require (
2929
dario.cat/mergo v1.0.1 // indirect
3030
github.com/Masterminds/goutils v1.1.1 // indirect
31-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
31+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3232
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
3333
github.com/beorn7/perks v1.0.1 // indirect
3434
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -54,8 +54,6 @@ require (
5454
github.com/gorilla/websocket v1.5.0 // indirect
5555
github.com/gosimple/slug v1.15.0 // indirect
5656
github.com/gosimple/unidecode v1.0.1 // indirect
57-
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
58-
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
5957
github.com/hasura/go-graphql-client v0.15.1 // indirect
6058
github.com/huandu/xstrings v1.5.0 // indirect
6159
github.com/imdario/mergo v0.3.16 // indirect
@@ -108,4 +106,4 @@ require (
108106
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
109107
)
110108

111-
//replace github.com/opslevel/opslevel-go/v2024 => ./submodules/opslevel-go
109+
replace github.com/opslevel/opslevel-go/v2026 => /Users/jason/workspace/opslevel-go

‎src/go.sum‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
22
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
33
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
44
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
5-
github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
6-
github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
5+
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
6+
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
77
github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
88
github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
99
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
@@ -27,10 +27,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
2727
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2828
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
2929
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
30-
github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
31-
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
32-
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
33-
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
3430
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
3531
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
3632
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
@@ -69,8 +65,6 @@ github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlnd
6965
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
7066
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
7167
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
72-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
73-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
7468
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
7569
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
7670
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
@@ -92,12 +86,6 @@ github.com/gosimple/slug v1.15.0 h1:wRZHsRrRcs6b0XnxMUBM6WK1U1Vg5B0R7VkIf1Xzobo=
9286
github.com/gosimple/slug v1.15.0/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ=
9387
github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o=
9488
github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
95-
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
96-
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
97-
github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
98-
github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
99-
github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=
100-
github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=
10189
github.com/hasura/go-graphql-client v0.15.1 h1:mCb5I+8Bk3FU3GKWvf/zDXkTh7FbGlqJmP3oisBdnN8=
10290
github.com/hasura/go-graphql-client v0.15.1/go.mod h1:jfSZtBER3or+88Q9vFhWHiFMPppfYILRyl+0zsgPIIw=
10391
github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
@@ -157,8 +145,6 @@ github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
157145
github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
158146
github.com/opslevel/moredefaults v0.0.0-20240529152742-17d1318a3c12 h1:OQZ3W8kbyCcdS8QUWFTnZd6xtdkfhdckc7Paro7nXio=
159147
github.com/opslevel/moredefaults v0.0.0-20240529152742-17d1318a3c12/go.mod h1:g2GSXVP6LO+5+AIsnMRPN+BeV86OXuFRTX7HXCDtYeI=
160-
github.com/opslevel/opslevel-go/v2024 v2024.12.24 h1:yqByehj/HBKcHV2xnZK9ozAhE+qQfXSWxtp6KLS1f9s=
161-
github.com/opslevel/opslevel-go/v2024 v2024.12.24/go.mod h1:cIwzFyu8HURaGdZKWtKn4pijsyYs8xP8uuDwqgohWgo=
162148
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
163149
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
164150
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=

‎src/pkg/api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/go-resty/resty/v2"
1010

11-
"github.com/opslevel/opslevel-go/v2024"
11+
"github.com/opslevel/opslevel-go/v2026"
1212
"github.com/spf13/cobra"
1313
"github.com/spf13/viper"
1414
)

‎src/pkg/faktoryRunnerAppendJobLogProcessor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
faktory "github.com/contribsys/faktory/client"
88
faktoryWorker "github.com/contribsys/faktory_worker_go"
9-
"github.com/opslevel/opslevel-go/v2024"
9+
"github.com/opslevel/opslevel-go/v2026"
1010
"github.com/rs/zerolog"
1111
)
1212

‎src/pkg/faktorySetOutcomeProcessor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
faktory "github.com/contribsys/faktory/client"
88
faktoryWorker "github.com/contribsys/faktory_worker_go"
9-
"github.com/opslevel/opslevel-go/v2024"
9+
"github.com/opslevel/opslevel-go/v2026"
1010
"github.com/rs/zerolog"
1111
)
1212

‎src/pkg/k8s.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/client-go/tools/clientcmd"
2525
"k8s.io/client-go/tools/remotecommand"
2626

27-
"github.com/opslevel/opslevel-go/v2024"
27+
"github.com/opslevel/opslevel-go/v2026"
2828
"github.com/rs/zerolog"
2929
"github.com/spf13/viper"
3030
)
@@ -126,6 +126,7 @@ func (s *JobRunner) getConfigMapObject(identifier string, job opslevel.RunnerJob
126126
for _, file := range job.Files {
127127
data[file.Name] = file.Contents
128128
}
129+
immutable := true
129130
return &corev1.ConfigMap{
130131
ObjectMeta: metav1.ObjectMeta{
131132
Name: identifier,
@@ -139,7 +140,7 @@ func (s *JobRunner) getConfigMapObject(identifier string, job opslevel.RunnerJob
139140
// },
140141
//},
141142
},
142-
Immutable: opslevel.RefOf(true),
143+
Immutable: &immutable,
143144
Data: data,
144145
}
145146
}

0 commit comments

Comments
 (0)