Merge pull request #1023 from ArangoGutierrez/revert1007

Bump sigs.k8s.io/node-feature-discovery to v0.16.6
NVIDIA · Oct 31, 2024 · d430dcc · d430dcc
2 parents 9c63701 + 55e8254
commit d430dcc
Show file tree

Hide file tree

Showing 29 changed files with 688 additions and 68 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,9 +6,6 @@ updates:
   - package-ecosystem: "gomod"
     target-branch: main
     directory: "/"
-    ignore:
-    - dependency-name: "sigs.k8s.io/node-feature-discovery"
-      versions: ["0.16.x"]
     schedule:
       interval: "weekly"
       day: "sunday"
@@ -58,9 +55,6 @@ updates:
   - package-ecosystem: "gomod"
     target-branch: release-0.16
     directory: "/"
-    ignore:
-    - dependency-name: "sigs.k8s.io/node-feature-discovery"
-      versions: ["0.16.x"]
     schedule:
       interval: "weekly"
       day: "sunday"

diff --git a/go.mod b/go.mod
@@ -24,7 +24,8 @@ require (
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kubelet v0.31.1
 	k8s.io/mount-utils v0.31.1
-	sigs.k8s.io/node-feature-discovery v0.15.4
+	sigs.k8s.io/node-feature-discovery v0.16.6
+	sigs.k8s.io/node-feature-discovery/api/nfd v0.16.6
 	sigs.k8s.io/yaml v1.4.0
 	tags.cncf.io/container-device-interface v0.8.0
 	tags.cncf.io/container-device-interface/specs-go v0.8.0
@@ -54,7 +55,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/onsi/gomega v1.33.1 // indirect
 	github.com/opencontainers/runc v1.1.14 // indirect
 	github.com/opencontainers/runtime-spec v1.2.0 // indirect
 	github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect

diff --git a/go.sum b/go.sum
@@ -30,7 +30,6 @@ github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdX
 github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4=
 github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE=
 github.com/go-openapi/swag v0.22.9/go.mod h1:3/OXnFfnMAwBD099SwYRk7GD3xOrr1iL7d/XNLXVVwE=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -140,8 +139,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
-golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o=
+golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
@@ -219,8 +218,10 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/node-feature-discovery v0.15.4 h1:IoSN/G+Bl94Liu+b862a3gx/rqCKdeUtcPxbL4VnOYg=
-sigs.k8s.io/node-feature-discovery v0.15.4/go.mod h1:vp165AxVdzCWYIKuaLkckGo53/D5OR+WSyePSUEIYQw=
+sigs.k8s.io/node-feature-discovery v0.16.6 h1:G+n0gStHnLojsLVLgP/ArsC2gwP1fkw7TrHr0MJ4x8k=
+sigs.k8s.io/node-feature-discovery v0.16.6/go.mod h1:7qS1l8P6UdfLa/ec8VneMvINbdWbuhTuuQr1wZ7/Jbg=
+sigs.k8s.io/node-feature-discovery/api/nfd v0.16.6 h1:07AwnEocbzPG98VIwkskfac6fVwzumZMGt9ePyAa60I=
+sigs.k8s.io/node-feature-discovery/api/nfd v0.16.6/go.mod h1:p8V8+A+enKGj31HFeBSpuTjfe6WUdIG0nl0Yze/d/+Q=
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

diff --git a/internal/flags/kubeclient.go b/internal/flags/kubeclient.go
@@ -25,7 +25,7 @@ import (
 	coreclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	nfdclientset "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned"
+	nfdclientset "sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned"
 )
 
 type KubeClientConfig struct {

diff --git a/internal/lm/output.go b/internal/lm/output.go
@@ -28,8 +28,8 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
-	nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1"
-	nfdclientset "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned"
+	nfdclientset "sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned"
+	nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/nfd/v1alpha1"
 
 	"github.com/google/renameio"
 

diff --git a/tests/e2e/common/diagnostics/collector.go b/tests/e2e/common/diagnostics/collector.go
@@ -25,7 +25,7 @@ import (
 
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
-	nfdclient "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned"
+	nfdclient "sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned"
 	"sigs.k8s.io/yaml"
 )
 

diff --git a/tests/e2e/common/diagnostics/options.go b/tests/e2e/common/diagnostics/options.go
@@ -19,7 +19,7 @@ package diagnostics
 import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"
-	nfdclient "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned"
+	nfdclient "sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned"
 )
 
 const (

diff --git a/tests/e2e/common/kubernetes.go b/tests/e2e/common/kubernetes.go
@@ -29,8 +29,8 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientset "k8s.io/client-go/kubernetes"
-	nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1"
-	nfdclient "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned"
+	nfdclient "sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned"
+	nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/nfd/v1alpha1"
 )
 
 // GetNonControlPlaneNodes gets the nodes that are not tainted for exclusive control-plane usage

diff --git a/tests/e2e/gpu-feature-discovery_test.go b/tests/e2e/gpu-feature-discovery_test.go
@@ -31,7 +31,7 @@ import (
 	extclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/rand"
-	nfdclient "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned"
+	nfdclient "sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned"
 
 	"github.com/NVIDIA/k8s-device-plugin/tests/e2e/common"
 	"github.com/NVIDIA/k8s-device-plugin/tests/e2e/common/diagnostics"

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -137,8 +137,6 @@ github.com/modern-go/reflect2
 # github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
 ## explicit
 github.com/munnerz/goautoneg
-# github.com/onsi/gomega v1.33.1
-## explicit; go 1.20
 # github.com/opencontainers/runc v1.1.14
 ## explicit; go 1.18
 github.com/opencontainers/runc/libcontainer/configs
@@ -614,12 +612,14 @@ k8s.io/utils/trace
 ## explicit; go 1.18
 sigs.k8s.io/json
 sigs.k8s.io/json/internal/golang/encoding/json
-# sigs.k8s.io/node-feature-discovery v0.15.4
-## explicit; go 1.21
-sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1
-sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned
-sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme
-sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/typed/nfd/v1alpha1
+# sigs.k8s.io/node-feature-discovery v0.16.6
+## explicit; go 1.22.2
+sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned
+sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned/scheme
+sigs.k8s.io/node-feature-discovery/api/generated/clientset/versioned/typed/nfd/v1alpha1
+# sigs.k8s.io/node-feature-discovery/api/nfd v0.16.6
+## explicit; go 1.22.2
+sigs.k8s.io/node-feature-discovery/api/nfd/v1alpha1
 # sigs.k8s.io/structured-merge-diff/v4 v4.4.1
 ## explicit; go 1.13
 sigs.k8s.io/structured-merge-diff/v4/fieldpath

diff --git a/...enerated/clientset/versioned/clientset.go → ...enerated/clientset/versioned/clientset.go b/...enerated/clientset/versioned/clientset.go → ...enerated/clientset/versioned/clientset.go
diff --git a/...nerated/clientset/versioned/scheme/doc.go → ...nerated/clientset/versioned/scheme/doc.go b/...nerated/clientset/versioned/scheme/doc.go → ...nerated/clientset/versioned/scheme/doc.go
diff --git a/...ed/clientset/versioned/scheme/register.go → ...ed/clientset/versioned/scheme/register.go b/...ed/clientset/versioned/scheme/register.go → ...ed/clientset/versioned/scheme/register.go
diff --git a/...ntset/versioned/typed/nfd/v1alpha1/doc.go → ...ntset/versioned/typed/nfd/v1alpha1/doc.go b/...ntset/versioned/typed/nfd/v1alpha1/doc.go → ...ntset/versioned/typed/nfd/v1alpha1/doc.go
diff --git a/...typed/nfd/v1alpha1/generated_expansion.go → ...typed/nfd/v1alpha1/generated_expansion.go b/...typed/nfd/v1alpha1/generated_expansion.go → ...typed/nfd/v1alpha1/generated_expansion.go
diff --git a/...ersioned/typed/nfd/v1alpha1/nfd_client.go → ...ersioned/typed/nfd/v1alpha1/nfd_client.go b/...ersioned/typed/nfd/v1alpha1/nfd_client.go → ...ersioned/typed/nfd/v1alpha1/nfd_client.go
diff --git a/...rsioned/typed/nfd/v1alpha1/nodefeature.go → ...rsioned/typed/nfd/v1alpha1/nodefeature.go b/...rsioned/typed/nfd/v1alpha1/nodefeature.go → ...rsioned/typed/nfd/v1alpha1/nodefeature.go