Skip to content

Commit d4d7e6f

Browse files
authored
Merge branch 'main' into 192-application
2 parents 7d64c6a + a84099d commit d4d7e6f

File tree

140 files changed

+16151
-3681
lines changed

Some content is hidden

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

140 files changed

+16151
-3681
lines changed

.github/actions/setup-ci-env/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ runs:
4646
echo "gocover_cobertura_version=$(yq '.go_tools.gocover_cobertura' .versions.yaml)" >> $GITHUB_OUTPUT
4747
echo "goimports_version=$(yq '.go_tools.goimports' .versions.yaml)" >> $GITHUB_OUTPUT
4848
echo "crane_version=$(yq '.go_tools.crane' .versions.yaml)" >> $GITHUB_OUTPUT
49+
echo "helm_version=$(yq '.testing_tools.helm' .versions.yaml)" >> $GITHUB_OUTPUT
4950
5051
- name: Install base dependencies
5152
shell: bash
@@ -78,7 +79,7 @@ runs:
7879
- name: Install Helm
7980
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
8081
with:
81-
version: 'v3.14.4'
82+
version: ${{ steps.versions.outputs.helm_version }}
8283

8384
- name: Cache Helm plugins
8485
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0

.github/workflows/lint-test.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,18 @@ jobs:
7979
- name: ${{ matrix.step_name }}
8080
run: ${{ matrix.make_command }}
8181

82+
- name: Load Helm version from .versions.yaml
83+
if: matrix.component == 'helm-charts'
84+
id: helm-version
85+
run: |
86+
HELM_VERSION=$(yq eval '.testing_tools.helm' .versions.yaml)
87+
echo "helm_version=${HELM_VERSION}" >> $GITHUB_OUTPUT
88+
8289
- name: Setup Helm
8390
if: matrix.component == 'helm-charts'
8491
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
8592
with:
86-
version: 'v3.14.4'
93+
version: ${{ steps.helm-version.outputs.helm_version }}
8794

8895
- name: Validate Helm Charts
8996
if: matrix.component == 'helm-charts'

.github/workflows/release.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,16 @@ jobs:
8282
with:
8383
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref }}
8484

85+
- name: Load Helm version from .versions.yaml
86+
id: helm-version
87+
run: |
88+
HELM_VERSION=$(yq eval '.testing_tools.helm' .versions.yaml)
89+
echo "helm_version=${HELM_VERSION}" >> $GITHUB_OUTPUT
90+
8591
- name: Install helm
8692
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
8793
with:
88-
version: 'v3.14.4'
94+
version: ${{ steps.helm-version.outputs.helm_version }}
8995

9096
- name: Configure Helm for GitHub Packages
9197
run: |

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ linters:
5353
- noctx
5454
- whitespace
5555
- wsl_v5
56+
- gosec
5657
exclusions:
5758
generated: lax
5859
presets:

.versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ container_tools:
6868
# Testing & E2E Tools
6969
testing_tools:
7070
kind: '0.30.0'
71-
helm: 'v3.14.4'
71+
helm: 'v3.19.2'
7272
kwok: 'v0.7.0'
7373
kwok_chart: '0.2.0' # KWOK Helm chart version (different from app version)
7474
ctlptl: '0.8.43'

commons/go.mod

Lines changed: 46 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ toolchain go1.25.3
66

77
require (
88
github.com/BurntSushi/toml v1.5.0
9+
github.com/nvidia/nvsentinel/data-models v0.0.0
10+
github.com/nvidia/nvsentinel/store-client v0.0.0
911
github.com/prometheus/client_golang v1.23.2
1012
github.com/stretchr/testify v1.11.1
1113
golang.org/x/sync v0.18.0
@@ -17,45 +19,65 @@ require (
1719
require (
1820
github.com/beorn7/perks v1.0.1 // indirect
1921
github.com/cespare/xxhash/v2 v2.3.0 // indirect
20-
github.com/davecgh/go-spew v1.1.1 // indirect
21-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
22+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
23+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
2224
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
23-
github.com/go-logr/logr v1.4.2 // indirect
24-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
25-
github.com/go-openapi/jsonreference v0.20.2 // indirect
26-
github.com/go-openapi/swag v0.23.0 // indirect
25+
github.com/go-logr/logr v1.4.3 // indirect
26+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
27+
github.com/go-openapi/jsonreference v0.21.2 // indirect
28+
github.com/go-openapi/swag v0.25.1 // indirect
29+
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
30+
github.com/go-openapi/swag/conv v0.25.1 // indirect
31+
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
32+
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
33+
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
34+
github.com/go-openapi/swag/loading v0.25.1 // indirect
35+
github.com/go-openapi/swag/mangling v0.25.1 // indirect
36+
github.com/go-openapi/swag/netutils v0.25.1 // indirect
37+
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
38+
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
39+
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
2740
github.com/gogo/protobuf v1.3.2 // indirect
2841
github.com/google/gnostic-models v0.7.0 // indirect
42+
github.com/google/pprof v0.0.0-20251007162407-5df77e3f7d1d // indirect
2943
github.com/google/uuid v1.6.0 // indirect
30-
github.com/josharian/intern v1.0.0 // indirect
3144
github.com/json-iterator/go v1.1.12 // indirect
32-
github.com/mailru/easyjson v0.7.7 // indirect
3345
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3446
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
3547
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
36-
github.com/pkg/errors v0.9.1 // indirect
37-
github.com/pmezard/go-difflib v1.0.0 // indirect
48+
github.com/onsi/ginkgo/v2 v2.26.0 // indirect
49+
github.com/onsi/gomega v1.38.2 // indirect
50+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3851
github.com/prometheus/client_model v0.6.2 // indirect
39-
github.com/prometheus/common v0.66.1 // indirect
40-
github.com/prometheus/procfs v0.16.1 // indirect
52+
github.com/prometheus/common v0.67.2 // indirect
53+
github.com/prometheus/procfs v0.17.0 // indirect
54+
github.com/spf13/pflag v1.0.10 // indirect
4155
github.com/x448/float16 v0.8.4 // indirect
42-
go.yaml.in/yaml/v2 v2.4.2 // indirect
56+
go.yaml.in/yaml/v2 v2.4.3 // indirect
4357
go.yaml.in/yaml/v3 v3.0.4 // indirect
44-
golang.org/x/net v0.43.0 // indirect
45-
golang.org/x/oauth2 v0.30.0 // indirect
46-
golang.org/x/sys v0.35.0 // indirect
47-
golang.org/x/term v0.34.0 // indirect
48-
golang.org/x/text v0.28.0 // indirect
49-
golang.org/x/time v0.9.0 // indirect
50-
google.golang.org/protobuf v1.36.8 // indirect
51-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
58+
golang.org/x/net v0.46.0 // indirect
59+
golang.org/x/oauth2 v0.32.0 // indirect
60+
golang.org/x/sys v0.37.0 // indirect
61+
golang.org/x/term v0.36.0 // indirect
62+
golang.org/x/text v0.30.0 // indirect
63+
golang.org/x/time v0.14.0 // indirect
64+
golang.org/x/tools v0.38.0 // indirect
65+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
66+
google.golang.org/grpc v1.76.0 // indirect
67+
google.golang.org/protobuf v1.36.10 // indirect
68+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
5269
gopkg.in/inf.v0 v0.9.1 // indirect
5370
gopkg.in/yaml.v3 v3.0.1 // indirect
5471
k8s.io/klog/v2 v2.130.1 // indirect
55-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
56-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
57-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
72+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
73+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
74+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
5875
sigs.k8s.io/randfill v1.0.0 // indirect
5976
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
6077
sigs.k8s.io/yaml v1.6.0 // indirect
6178
)
79+
80+
replace (
81+
github.com/nvidia/nvsentinel/data-models => ../data-models
82+
github.com/nvidia/nvsentinel/store-client => ../store-client
83+
)

0 commit comments

Comments
 (0)