Skip to content

Commit b873e9c

Browse files
elezarelezar
authored
Merge pull request #1043 from elezar/bump-nfd-in-tests
Bump sigs.k8s.io/node-feature-discovery to v0.16.6 in tests
2 parents 23334f7 + 9293daa commit b873e9c

File tree

23 files changed

+710
-61
lines changed

23 files changed

+710
-61
lines changed

‎Makefile‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,32 @@ goimports:
8787
lint:
8888
golangci-lint run ./...
8989

90-
vendor:
91-
go mod tidy
92-
go mod vendor
93-
go mod verify
90+
91+
mod-tidy:
92+
@for mod in $$(find . -name go.mod); do \
93+
echo "Tidying $$mod..."; ( \
94+
cd $$(dirname $$mod) && go mod tidy \
95+
) || exit 1; \
96+
done
97+
98+
mod-verify:
99+
@for mod in $$(find . -name go.mod); do \
100+
echo "Verifying $$mod..."; ( \
101+
cd $$(dirname $$mod) && go mod verify | sed 's/^/ /g' \
102+
) || exit 1; \
103+
done
104+
105+
mod-vendor: mod-tidy
106+
@for mod in $$(find . -name go.mod); do \
107+
echo "Verifying $$mod..."; ( \
108+
cd $$(dirname $$mod) && go mod vendor \
109+
) || exit 1; \
110+
done
111+
112+
vendor: mod-vendor
94113

95114
check-modules: vendor
96-
git diff --quiet HEAD -- go.mod go.sum vendor
115+
git diff --quiet HEAD -- $$(find . -name go.mod -o -name go.sum -o -name vendor)
97116

98117
COVERAGE_FILE := coverage.out
99118
test: build cmds

‎tests/go.mod‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ require (
1313
k8s.io/apimachinery v0.31.1
1414
k8s.io/client-go v0.31.1
1515
k8s.io/klog/v2 v2.130.1
16-
sigs.k8s.io/node-feature-discovery v0.15.4
16+
sigs.k8s.io/node-feature-discovery v0.16.6
17+
sigs.k8s.io/node-feature-discovery/api/nfd v0.16.6
1718
sigs.k8s.io/yaml v1.4.0
1819
)
1920

@@ -169,10 +170,10 @@ require (
169170
gopkg.in/yaml.v3 v3.0.1 // indirect
170171
helm.sh/helm/v3 v3.15.2 // indirect
171172
k8s.io/apiserver v0.31.1 // indirect
172-
k8s.io/cli-runtime v0.30.0 // indirect
173+
k8s.io/cli-runtime v0.30.3 // indirect
173174
k8s.io/component-base v0.31.1 // indirect
174175
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
175-
k8s.io/kubectl v0.30.0 // indirect
176+
k8s.io/kubectl v0.30.3 // indirect
176177
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
177178
oras.land/oras-go v1.2.5 // indirect
178179
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

‎tests/go.sum‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -561,8 +561,8 @@ k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
561561
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
562562
k8s.io/apiserver v0.31.1 h1:Sars5ejQDCRBY5f7R3QFHdqN3s61nhkpaX8/k1iEw1c=
563563
k8s.io/apiserver v0.31.1/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM=
564-
k8s.io/cli-runtime v0.30.0 h1:0vn6/XhOvn1RJ2KJOC6IRR2CGqrpT6QQF4+8pYpWQ48=
565-
k8s.io/cli-runtime v0.30.0/go.mod h1:vATpDMATVTMA79sZ0YUCzlMelf6rUjoBzlp+RnoM+cg=
564+
k8s.io/cli-runtime v0.30.3 h1:aG69oRzJuP2Q4o8dm+f5WJIX4ZBEwrvdID0+MXyUY6k=
565+
k8s.io/cli-runtime v0.30.3/go.mod h1:hwrrRdd9P84CXSKzhHxrOivAR9BRnkMt0OeP5mj7X30=
566566
k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0=
567567
k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg=
568568
k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8=
@@ -571,8 +571,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
571571
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
572572
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
573573
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
574-
k8s.io/kubectl v0.30.0 h1:xbPvzagbJ6RNYVMVuiHArC1grrV5vSmmIcSZuCdzRyk=
575-
k8s.io/kubectl v0.30.0/go.mod h1:zgolRw2MQXLPwmic2l/+iHs239L49fhSeICuMhQQXTI=
574+
k8s.io/kubectl v0.30.3 h1:YIBBvMdTW0xcDpmrOBzcpUVsn+zOgjMYIu7kAq+yqiI=
575+
k8s.io/kubectl v0.30.3/go.mod h1:IcR0I9RN2+zzTRUa1BzZCm4oM0NLOawE6RzlDvd1Fpo=
576576
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
577577
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
578578
oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
@@ -583,8 +583,10 @@ sigs.k8s.io/kustomize/api v0.16.0 h1:/zAR4FOQDCkgSDmVzV2uiFbuy9bhu3jEzthrHCuvm1g
583583
sigs.k8s.io/kustomize/api v0.16.0/go.mod h1:MnFZ7IP2YqVyVwMWoRxPtgl/5hpA+eCCrQR/866cm5c=
584584
sigs.k8s.io/kustomize/kyaml v0.16.0 h1:6J33uKSoATlKZH16unr2XOhDI+otoe2sR3M8PDzW3K0=
585585
sigs.k8s.io/kustomize/kyaml v0.16.0/go.mod h1:xOK/7i+vmE14N2FdFyugIshB8eF6ALpy7jI87Q2nRh4=
586-
sigs.k8s.io/node-feature-discovery v0.15.4 h1:IoSN/G+Bl94Liu+b862a3gx/rqCKdeUtcPxbL4VnOYg=
587-
sigs.k8s.io/node-feature-discovery v0.15.4/go.mod h1:vp165AxVdzCWYIKuaLkckGo53/D5OR+WSyePSUEIYQw=
586+
sigs.k8s.io/node-feature-discovery v0.16.6 h1:G+n0gStHnLojsLVLgP/ArsC2gwP1fkw7TrHr0MJ4x8k=
587+
sigs.k8s.io/node-feature-discovery v0.16.6/go.mod h1:7qS1l8P6UdfLa/ec8VneMvINbdWbuhTuuQr1wZ7/Jbg=
588+
sigs.k8s.io/node-feature-discovery/api/nfd v0.16.6 h1:07AwnEocbzPG98VIwkskfac6fVwzumZMGt9ePyAa60I=
589+
sigs.k8s.io/node-feature-discovery/api/nfd v0.16.6/go.mod h1:p8V8+A+enKGj31HFeBSpuTjfe6WUdIG0nl0Yze/d/+Q=
588590
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
589591
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
590592
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

‎tests/vendor/modules.txt‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ k8s.io/apimachinery/third_party/forked/golang/reflect
957957
# k8s.io/apiserver v0.31.1
958958
## explicit; go 1.22.0
959959
k8s.io/apiserver/pkg/endpoints/deprecation
960-
# k8s.io/cli-runtime v0.30.0
960+
# k8s.io/cli-runtime v0.30.3
961961
## explicit; go 1.22.0
962962
k8s.io/cli-runtime/pkg/genericclioptions
963963
k8s.io/cli-runtime/pkg/genericiooptions
@@ -1148,7 +1148,7 @@ k8s.io/kube-openapi/pkg/spec3
11481148
k8s.io/kube-openapi/pkg/util/proto
11491149
k8s.io/kube-openapi/pkg/util/proto/validation
11501150
k8s.io/kube-openapi/pkg/validation/spec
1151-
# k8s.io/kubectl v0.30.0
1151+
# k8s.io/kubectl v0.30.3
11521152
## explicit; go 1.22.0
11531153
k8s.io/kubectl/pkg/cmd/util
11541154
k8s.io/kubectl/pkg/scheme
@@ -1270,12 +1270,14 @@ sigs.k8s.io/kustomize/kyaml/yaml/merge2
12701270
sigs.k8s.io/kustomize/kyaml/yaml/merge3
12711271
sigs.k8s.io/kustomize/kyaml/yaml/schema
12721272
sigs.k8s.io/kustomize/kyaml/yaml/walk
1273-
# sigs.k8s.io/node-feature-discovery v0.15.4
1274-
## explicit; go 1.21
1275-
sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1
1276-
sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned
1277-
sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme
1278-
sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/typed/nfd/v1alpha1
1273+
# sigs.k8s.io/node-feature-discovery v0.16.6
1274+
## explicit; go 1.22.2
1275+
sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned
1276+
sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned/scheme
1277+
sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned/typed/nfd/v1alpha1
1278+
# sigs.k8s.io/node-feature-discovery/api/nfd v0.16.6
1279+
## explicit; go 1.22.2
1280+
sigs.k8s.io/node-feature-discovery/api/nfd/v1alpha1
12791281
# sigs.k8s.io/structured-merge-diff/v4 v4.4.1
12801282
## explicit; go 1.13
12811283
sigs.k8s.io/structured-merge-diff/v4/fieldpath

tests/vendor/sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/clientset.go renamed to tests/vendor/sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned/clientset.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/vendor/sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme/doc.go renamed to tests/vendor/sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned/scheme/doc.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/vendor/sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme/register.go renamed to tests/vendor/sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned/scheme/register.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/vendor/sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/doc.go renamed to tests/vendor/sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned/typed/nfd/v1alpha1/doc.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/vendor/sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go renamed to tests/vendor/sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/vendor/sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go renamed to tests/vendor/sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)