Skip to content

Commit 3c317c6

Browse files
authored
Merge branch 'main' into feature/grpc-tls-auth
2 parents 547371b + d783df0 commit 3c317c6

File tree

72 files changed

+3144
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+3144
-481
lines changed

.github/workflows/e2e-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ jobs:
187187
188188
- name: Upload Kind container logs
189189
if: always()
190-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
190+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
191191
with:
192192
name: e2e-kind-container-logs-${{ matrix.arch }}-${{ matrix.datastore }}-${{ github.run_id }}
193193
path: /tmp/kind-container-logs/
@@ -214,15 +214,15 @@ jobs:
214214
215215
- name: Upload Kind logs
216216
if: always()
217-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
217+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
218218
with:
219219
name: e2e-kind-logs-${{ matrix.arch }}-${{ matrix.datastore }}-${{ github.run_id }}
220220
path: /tmp/kind-logs/
221221
retention-days: 7
222222

223223
- name: Upload debug artifacts
224224
if: failure()
225-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
225+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
226226
with:
227227
name: e2e-debug-artifacts-${{ matrix.arch }}-${{ matrix.datastore }}-${{ github.run_id }}
228228
path: /tmp/debug-artifacts/

.github/workflows/integration-gcp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
# Terraform
6565
- name: Terraform
66-
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
66+
uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0
6767
with:
6868
terraform_version: "1.13.5"
6969

.github/workflows/lint-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,12 @@ jobs:
255255
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
256256

257257
- name: Setup Go
258-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
258+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
259259
with:
260260
go-version: 'stable'
261261

262262
- name: Download all coverage artifacts
263-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
263+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
264264
with:
265265
pattern: "*-results"
266266
path: coverage-artifacts
@@ -308,7 +308,7 @@ jobs:
308308
echo "✅ Coverage consolidation completed successfully"
309309
310310
- name: Upload consolidated coverage
311-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
311+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
312312
with:
313313
name: consolidated-code-coverage
314314
path: consolidated-coverage/coverage.txt
@@ -452,7 +452,7 @@ jobs:
452452
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
453453

454454
- name: Download all coverage artifacts
455-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
455+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
456456
with:
457457
pattern: "*-results"
458458
path: coverage-artifacts
@@ -500,7 +500,7 @@ jobs:
500500
echo "✅ Coverage consolidation completed successfully"
501501
502502
- name: Upload consolidated coverage baseline
503-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
503+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
504504
with:
505505
name: consolidated-code-coverage
506506
path: consolidated-coverage/coverage.txt

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
cat versions.txt
8080
8181
- name: Upload versions.txt
82-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
82+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
8383
with:
8484
name: versions
8585
path: versions.txt
@@ -356,15 +356,15 @@ jobs:
356356
357357
- name: Upload Kind logs
358358
if: always()
359-
uses: actions/upload-artifact@v6
359+
uses: actions/upload-artifact@v7.0.0
360360
with:
361361
name: e2e-test-kind-logs-${{ github.run_id }}
362362
path: /tmp/kind-logs/
363363
retention-days: 7
364364

365365
- name: Upload debugging artifacts
366366
if: failure()
367-
uses: actions/upload-artifact@v6
367+
uses: actions/upload-artifact@v7.0.0
368368
with:
369369
name: e2e-test-debug-artifacts-${{ github.run_id }}
370370
path: /tmp/debug-artifacts/

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
cat versions.txt
6969
7070
- name: Upload versions.txt
71-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
71+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
7272
with:
7373
name: versions
7474
path: versions.txt
@@ -139,7 +139,7 @@ jobs:
139139
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref }}
140140

141141
- name: Download versions.txt
142-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
142+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
143143
with:
144144
name: versions
145145
path: .

.ko.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,3 +237,20 @@ builds:
237237
org.opencontainers.image.version: "{{.Env.VERSION}}"
238238
org.opencontainers.image.revision: "{{.Env.GIT_COMMIT}}"
239239
org.opencontainers.image.created: "{{.Env.BUILD_DATE}}"
240+
241+
- id: slurm-drain-monitor
242+
dir: health-monitors/slurm-drain-monitor
243+
main: .
244+
ldflags:
245+
- "-s -w"
246+
- "-X main.version={{.Env.VERSION}} -X main.commit={{.Env.GIT_COMMIT}} -X main.date={{.Env.BUILD_DATE}}"
247+
annotations:
248+
org.opencontainers.image.description: "Slurm drain monitor for detecting external Slurm drains and publishing health events"
249+
labels:
250+
org.opencontainers.image.source: "https://github.com/nvidia/nvsentinel"
251+
org.opencontainers.image.licenses: "Apache-2.0"
252+
org.opencontainers.image.title: "NVSentinel Slurm Drain Monitor"
253+
org.opencontainers.image.description: "Slurm drain monitor for detecting external Slurm drains and publishing health events"
254+
org.opencontainers.image.version: "{{.Env.VERSION}}"
255+
org.opencontainers.image.revision: "{{.Env.GIT_COMMIT}}"
256+
org.opencontainers.image.created: "{{.Env.BUILD_DATE}}"

api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/nvidia/nvsentinel/api
33
go 1.25
44

55
require (
6-
google.golang.org/grpc v1.79.1
6+
google.golang.org/grpc v1.79.2
77
google.golang.org/protobuf v1.36.11
88
)
99

api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
3232
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
3333
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
3434
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
35-
google.golang.org/grpc v1.79.1 h1:zGhSi45ODB9/p3VAawt9a+O/MULLl9dpizzNNpq7flY=
36-
google.golang.org/grpc v1.79.1/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
35+
google.golang.org/grpc v1.79.2 h1:fRMD94s2tITpyJGtBBn7MkMseNpOZU8ZxgC3MMBaXRU=
36+
google.golang.org/grpc v1.79.2/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
3737
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
3838
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=

commons/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/nvidia/nvsentinel/store-client v0.0.0
1111
github.com/prometheus/client_golang v1.23.2
1212
github.com/stretchr/testify v1.11.1
13-
golang.org/x/sync v0.19.0
13+
golang.org/x/sync v0.20.0
1414
gopkg.in/natefinch/lumberjack.v2 v2.2.1
1515
k8s.io/api v0.35.2
1616
k8s.io/apimachinery v0.35.2

commons/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
157157
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
158158
golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
159159
golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
160-
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
161-
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
160+
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
161+
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
162162
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
163163
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
164164
golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=

0 commit comments

Comments
 (0)