From efea6c2836da4a2884551abcf8a77b10a9fb144a Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Arango Gutierrez Date: Tue, 27 Feb 2024 14:42:23 +0100 Subject: [PATCH] Move NFD api to a separate go mod Signed-off-by: Carlos Eduardo Arango Gutierrez --- Dockerfile | 1 + api/go.mod | 63 ++++++ api/go.sum | 197 ++++++++++++++++++ .../v1alpha1/annotations_labels.go | 0 .../clientset/versioned/clientset.go | 2 +- .../versioned/fake/clientset_generated.go | 6 +- .../v1alpha1}/clientset/versioned/fake/doc.go | 0 .../clientset/versioned/fake/register.go | 2 +- .../clientset/versioned/scheme/doc.go | 0 .../clientset/versioned/scheme/register.go | 2 +- .../versioned/typed/nfd/v1alpha1/doc.go | 0 .../versioned/typed/nfd/v1alpha1/fake/doc.go | 0 .../nfd/v1alpha1/fake/fake_nfd_client.go | 2 +- .../nfd/v1alpha1/fake/fake_nodefeature.go | 2 +- .../nfd/v1alpha1/fake/fake_nodefeaturerule.go | 2 +- .../typed/nfd/v1alpha1/generated_expansion.go | 0 .../typed/nfd/v1alpha1/nfd_client.go | 4 +- .../typed/nfd/v1alpha1/nodefeature.go | 4 +- .../typed/nfd/v1alpha1/nodefeaturerule.go | 4 +- {pkg/apis/nfd => api}/v1alpha1/doc.go | 0 {pkg/apis/nfd => api}/v1alpha1/feature.go | 0 .../apis/nfd => api}/v1alpha1/feature_test.go | 0 {pkg/apis/nfd => api}/v1alpha1/generate.sh | 0 .../apis/nfd => api}/v1alpha1/generated.pb.go | 0 .../apis/nfd => api}/v1alpha1/generated.proto | 2 +- .../informers/externalversions/factory.go | 6 +- .../informers/externalversions/generic.go | 2 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../externalversions/nfd/interface.go | 4 +- .../nfd/v1alpha1/interface.go | 2 +- .../nfd/v1alpha1/nodefeature.go | 8 +- .../nfd/v1alpha1/nodefeaturerule.go | 8 +- .../nfd/v1alpha1/expansion_generated.go | 0 .../listers/nfd/v1alpha1/nodefeature.go | 2 +- .../listers/nfd/v1alpha1/nodefeaturerule.go | 2 +- .../nodefeaturerule/expression-api_test.go | 4 +- .../v1alpha1/nodefeaturerule/expression.go | 2 +- .../nodefeaturerule/expression_test.go | 2 +- .../v1alpha1/nodefeaturerule/rule.go | 2 +- .../v1alpha1/nodefeaturerule/rule_test.go | 2 +- {pkg/apis/nfd => api}/v1alpha1/register.go | 0 {pkg/apis/nfd => api}/v1alpha1/types.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 0 go.mod | 30 +-- go.sum | 37 ++-- hack/generate.sh | 8 +- pkg/apis/nfd/validate/validate.go | 2 +- pkg/kubectl-nfd/dryrun.go | 4 +- pkg/kubectl-nfd/test.go | 6 +- pkg/kubectl-nfd/validate.go | 2 +- pkg/labeler/labeler.pb.go | 2 +- pkg/nfd-gc/nfd-gc.go | 4 +- pkg/nfd-gc/nfd-gc_test.go | 2 +- pkg/nfd-master/nfd-api-controller.go | 10 +- pkg/nfd-master/nfd-api-controller_test.go | 2 +- pkg/nfd-master/nfd-master-internal_test.go | 8 +- pkg/nfd-master/nfd-master.go | 4 +- pkg/nfd-master/node-updater-pool_test.go | 2 +- pkg/nfd-worker/nfd-worker-internal_test.go | 2 +- pkg/nfd-worker/nfd-worker.go | 4 +- source/cpu/cpu.go | 2 +- source/custom/api/conversion.go | 2 +- source/custom/api/conversion_test.go | 4 +- source/custom/custom.go | 4 +- source/custom/directory_features.go | 2 +- source/custom/static_features.go | 2 +- source/fake/fake.go | 2 +- source/kernel/kernel.go | 2 +- source/local/local.go | 2 +- source/memory/memory.go | 2 +- source/network/network.go | 2 +- source/pci/pci.go | 2 +- source/pci/pci_test.go | 2 +- source/pci/utils.go | 2 +- source/source.go | 2 +- source/storage/storage.go | 2 +- source/system/system.go | 2 +- source/usb/usb.go | 2 +- source/usb/utils.go | 2 +- test/e2e/nfd_gc_test.go | 4 +- test/e2e/node_feature_discovery_test.go | 4 +- test/e2e/utils/crd.go | 6 +- 82 files changed, 395 insertions(+), 131 deletions(-) create mode 100644 api/go.mod create mode 100644 api/go.sum rename {pkg/apis/nfd => api}/v1alpha1/annotations_labels.go (100%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/clientset.go (97%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/fake/clientset_generated.go (89%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/fake/doc.go (100%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/fake/register.go (96%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/scheme/doc.go (100%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/scheme/register.go (96%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/typed/nfd/v1alpha1/doc.go (100%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/typed/nfd/v1alpha1/fake/doc.go (100%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go (92%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go (98%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go (98%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go (100%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go (95%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go (97%) rename {pkg/generated => api/v1alpha1}/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go (97%) rename {pkg/apis/nfd => api}/v1alpha1/doc.go (100%) rename {pkg/apis/nfd => api}/v1alpha1/feature.go (100%) rename {pkg/apis/nfd => api}/v1alpha1/feature_test.go (100%) rename {pkg/apis/nfd => api}/v1alpha1/generate.sh (100%) rename {pkg/apis/nfd => api}/v1alpha1/generated.pb.go (100%) rename {pkg/apis/nfd => api}/v1alpha1/generated.proto (96%) rename {pkg/generated => api/v1alpha1}/informers/externalversions/factory.go (96%) rename {pkg/generated => api/v1alpha1}/informers/externalversions/generic.go (96%) rename {pkg/generated => api/v1alpha1}/informers/externalversions/internalinterfaces/factory_interfaces.go (94%) rename {pkg/generated => api/v1alpha1}/informers/externalversions/nfd/interface.go (86%) rename {pkg/generated => api/v1alpha1}/informers/externalversions/nfd/v1alpha1/interface.go (93%) rename {pkg/generated => api/v1alpha1}/informers/externalversions/nfd/v1alpha1/nodefeature.go (90%) rename {pkg/generated => api/v1alpha1}/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go (90%) rename {pkg/generated => api/v1alpha1}/listers/nfd/v1alpha1/expansion_generated.go (100%) rename {pkg/generated => api/v1alpha1}/listers/nfd/v1alpha1/nodefeature.go (98%) rename {pkg/generated => api/v1alpha1}/listers/nfd/v1alpha1/nodefeaturerule.go (97%) rename {pkg/apis/nfd => api}/v1alpha1/nodefeaturerule/expression-api_test.go (97%) rename {pkg/apis/nfd => api}/v1alpha1/nodefeaturerule/expression.go (99%) rename {pkg/apis/nfd => api}/v1alpha1/nodefeaturerule/expression_test.go (99%) rename {pkg/apis/nfd => api}/v1alpha1/nodefeaturerule/rule.go (99%) rename {pkg/apis/nfd => api}/v1alpha1/nodefeaturerule/rule_test.go (99%) rename {pkg/apis/nfd => api}/v1alpha1/register.go (100%) rename {pkg/apis/nfd => api}/v1alpha1/types.go (100%) rename {pkg/apis/nfd => api}/v1alpha1/zz_generated.deepcopy.go (100%) diff --git a/Dockerfile b/Dockerfile index df6a405f24..df102a97ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ FROM ${BUILDER_IMAGE} as builder # Get (cache) deps in a separate layer COPY go.mod go.sum /go/node-feature-discovery/ +COPY api/ /go/node-feature-discovery/api/ WORKDIR /go/node-feature-discovery diff --git a/api/go.mod b/api/go.mod new file mode 100644 index 0000000000..c5f6e83c03 --- /dev/null +++ b/api/go.mod @@ -0,0 +1,63 @@ +module sigs.k8s.io/node-feature-discovery/api + +go 1.22 + +require ( + github.com/gogo/protobuf v1.3.2 + github.com/stretchr/testify v1.8.4 + golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 + k8s.io/api v0.29.2 + k8s.io/apimachinery v0.29.2 + k8s.io/client-go v0.29.2 + k8s.io/klog/v2 v2.120.1 + sigs.k8s.io/node-feature-discovery v0.15.1 + sigs.k8s.io/yaml v1.4.0 +) + +require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/evanphx/json-patch v5.6.0+incompatible // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/swag v0.22.3 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.3.1 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + 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/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.16.0 // indirect + github.com/prometheus/client_model v0.4.0 // indirect + github.com/prometheus/common v0.44.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/oauth2 v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/term v0.15.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/time v0.5.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/grpc v1.59.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect + k8s.io/kubernetes v1.29.0 // indirect + k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect +) diff --git a/api/go.sum b/api/go.sum new file mode 100644 index 0000000000..b484c7ee46 --- /dev/null +++ b/api/go.sum @@ -0,0 +1,197 @@ +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= +github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= +github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= +github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= +github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= +github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= +github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= +github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +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/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= +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.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0= +golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= +k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= +k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= +k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= +k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= +k8s.io/kubernetes v1.29.0 h1:DOLN7g8+nnAYBi8JHoW0+/MCrZKDPIqAxzLCXDXd0cg= +k8s.io/kubernetes v1.29.0/go.mod h1:9kztbUQf9stVDcIYXx+BX3nuGCsAQDsuClkGMpPs3pA= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/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.1 h1:d+VEgp1qXQhO7GPOv1dHBnJWi5liky6KSMrv+oKVBeg= +sigs.k8s.io/node-feature-discovery v0.15.1/go.mod h1:trXFyMt5uQJwxa/UGqgyCKHDYC12thkqmt71tjII/SI= +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= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/apis/nfd/v1alpha1/annotations_labels.go b/api/v1alpha1/annotations_labels.go similarity index 100% rename from pkg/apis/nfd/v1alpha1/annotations_labels.go rename to api/v1alpha1/annotations_labels.go diff --git a/pkg/generated/clientset/versioned/clientset.go b/api/v1alpha1/clientset/versioned/clientset.go similarity index 97% rename from pkg/generated/clientset/versioned/clientset.go rename to api/v1alpha1/clientset/versioned/clientset.go index 46e3dafe6f..b1e90e5d73 100644 --- a/pkg/generated/clientset/versioned/clientset.go +++ b/api/v1alpha1/clientset/versioned/clientset.go @@ -25,7 +25,7 @@ import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/typed/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1" ) type Interface interface { diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/api/v1alpha1/clientset/versioned/fake/clientset_generated.go similarity index 89% rename from pkg/generated/clientset/versioned/fake/clientset_generated.go rename to api/v1alpha1/clientset/versioned/fake/clientset_generated.go index 5571110915..99a56da7d4 100644 --- a/pkg/generated/clientset/versioned/fake/clientset_generated.go +++ b/api/v1alpha1/clientset/versioned/fake/clientset_generated.go @@ -24,9 +24,9 @@ import ( "k8s.io/client-go/discovery" fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/typed/nfd/v1alpha1" - fakenfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake" + clientset "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1" + fakenfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/pkg/generated/clientset/versioned/fake/doc.go b/api/v1alpha1/clientset/versioned/fake/doc.go similarity index 100% rename from pkg/generated/clientset/versioned/fake/doc.go rename to api/v1alpha1/clientset/versioned/fake/doc.go diff --git a/pkg/generated/clientset/versioned/fake/register.go b/api/v1alpha1/clientset/versioned/fake/register.go similarity index 96% rename from pkg/generated/clientset/versioned/fake/register.go rename to api/v1alpha1/clientset/versioned/fake/register.go index b48e81565b..fd4a44d799 100644 --- a/pkg/generated/clientset/versioned/fake/register.go +++ b/api/v1alpha1/clientset/versioned/fake/register.go @@ -24,7 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/pkg/generated/clientset/versioned/scheme/doc.go b/api/v1alpha1/clientset/versioned/scheme/doc.go similarity index 100% rename from pkg/generated/clientset/versioned/scheme/doc.go rename to api/v1alpha1/clientset/versioned/scheme/doc.go diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/api/v1alpha1/clientset/versioned/scheme/register.go similarity index 96% rename from pkg/generated/clientset/versioned/scheme/register.go rename to api/v1alpha1/clientset/versioned/scheme/register.go index 89297224c6..40ac71d57b 100644 --- a/pkg/generated/clientset/versioned/scheme/register.go +++ b/api/v1alpha1/clientset/versioned/scheme/register.go @@ -24,7 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/doc.go b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/doc.go similarity index 100% rename from pkg/generated/clientset/versioned/typed/nfd/v1alpha1/doc.go rename to api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/doc.go diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/doc.go b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/doc.go similarity index 100% rename from pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/doc.go rename to api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/doc.go diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go similarity index 92% rename from pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go rename to api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go index bc748c80e3..fdf6f7609a 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go +++ b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nfd_client.go @@ -21,7 +21,7 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/typed/nfd/v1alpha1" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1" ) type FakeNfdV1alpha1 struct { diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go similarity index 98% rename from pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go rename to api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go index 8a8c146292..522fc25197 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go +++ b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeature.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) // FakeNodeFeatures implements NodeFeatureInterface diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go similarity index 98% rename from pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go rename to api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go index cf0dcaa8c7..fa147e16b8 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go +++ b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/fake/fake_nodefeaturerule.go @@ -26,7 +26,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) // FakeNodeFeatureRules implements NodeFeatureRuleInterface diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go similarity index 100% rename from pkg/generated/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go rename to api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/generated_expansion.go diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go similarity index 95% rename from pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go rename to api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go index 5a0a853cfd..eaf526e002 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go +++ b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/nfd_client.go @@ -22,8 +22,8 @@ import ( "net/http" rest "k8s.io/client-go/rest" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/scheme" ) type NfdV1alpha1Interface interface { diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go similarity index 97% rename from pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go rename to api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go index d058d0ed7b..37c00f3451 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go +++ b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/nodefeature.go @@ -26,8 +26,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - scheme "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + scheme "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/scheme" ) // NodeFeaturesGetter has a method to return a NodeFeatureInterface. diff --git a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go similarity index 97% rename from pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go rename to api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go index 606ae14f93..4de0ef5b5e 100644 --- a/pkg/generated/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go +++ b/api/v1alpha1/clientset/versioned/typed/nfd/v1alpha1/nodefeaturerule.go @@ -26,8 +26,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - scheme "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + scheme "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/scheme" ) // NodeFeatureRulesGetter has a method to return a NodeFeatureRuleInterface. diff --git a/pkg/apis/nfd/v1alpha1/doc.go b/api/v1alpha1/doc.go similarity index 100% rename from pkg/apis/nfd/v1alpha1/doc.go rename to api/v1alpha1/doc.go diff --git a/pkg/apis/nfd/v1alpha1/feature.go b/api/v1alpha1/feature.go similarity index 100% rename from pkg/apis/nfd/v1alpha1/feature.go rename to api/v1alpha1/feature.go diff --git a/pkg/apis/nfd/v1alpha1/feature_test.go b/api/v1alpha1/feature_test.go similarity index 100% rename from pkg/apis/nfd/v1alpha1/feature_test.go rename to api/v1alpha1/feature_test.go diff --git a/pkg/apis/nfd/v1alpha1/generate.sh b/api/v1alpha1/generate.sh similarity index 100% rename from pkg/apis/nfd/v1alpha1/generate.sh rename to api/v1alpha1/generate.sh diff --git a/pkg/apis/nfd/v1alpha1/generated.pb.go b/api/v1alpha1/generated.pb.go similarity index 100% rename from pkg/apis/nfd/v1alpha1/generated.pb.go rename to api/v1alpha1/generated.pb.go diff --git a/pkg/apis/nfd/v1alpha1/generated.proto b/api/v1alpha1/generated.proto similarity index 96% rename from pkg/apis/nfd/v1alpha1/generated.proto rename to api/v1alpha1/generated.proto index 278356ed54..5218d44d5c 100644 --- a/pkg/apis/nfd/v1alpha1/generated.proto +++ b/api/v1alpha1/generated.proto @@ -22,7 +22,7 @@ syntax = "proto2"; package v1alpha1; // Package-wide variables from generator "generated". -option go_package = "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1"; +option go_package = "sigs.k8s.io/node-feature-discovery/api/v1alpha1"; // AttributeFeatureSet is a set of features having string value. // diff --git a/pkg/generated/informers/externalversions/factory.go b/api/v1alpha1/informers/externalversions/factory.go similarity index 96% rename from pkg/generated/informers/externalversions/factory.go rename to api/v1alpha1/informers/externalversions/factory.go index 11658cd661..f0ee920f11 100644 --- a/pkg/generated/informers/externalversions/factory.go +++ b/api/v1alpha1/informers/externalversions/factory.go @@ -27,9 +27,9 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - versioned "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned" - internalinterfaces "sigs.k8s.io/node-feature-discovery/pkg/generated/informers/externalversions/internalinterfaces" - nfd "sigs.k8s.io/node-feature-discovery/pkg/generated/informers/externalversions/nfd" + versioned "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" + internalinterfaces "sigs.k8s.io/node-feature-discovery/api/v1alpha1/informers/externalversions/internalinterfaces" + nfd "sigs.k8s.io/node-feature-discovery/api/v1alpha1/informers/externalversions/nfd" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/pkg/generated/informers/externalversions/generic.go b/api/v1alpha1/informers/externalversions/generic.go similarity index 96% rename from pkg/generated/informers/externalversions/generic.go rename to api/v1alpha1/informers/externalversions/generic.go index 8139775712..bec6dfeaa4 100644 --- a/pkg/generated/informers/externalversions/generic.go +++ b/api/v1alpha1/informers/externalversions/generic.go @@ -23,7 +23,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/api/v1alpha1/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 94% rename from pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go rename to api/v1alpha1/informers/externalversions/internalinterfaces/factory_interfaces.go index 1f76cb3785..f7bc51134c 100644 --- a/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/api/v1alpha1/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - versioned "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned" + versioned "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/pkg/generated/informers/externalversions/nfd/interface.go b/api/v1alpha1/informers/externalversions/nfd/interface.go similarity index 86% rename from pkg/generated/informers/externalversions/nfd/interface.go rename to api/v1alpha1/informers/externalversions/nfd/interface.go index 60209f4167..2e0d7413d5 100644 --- a/pkg/generated/informers/externalversions/nfd/interface.go +++ b/api/v1alpha1/informers/externalversions/nfd/interface.go @@ -19,8 +19,8 @@ limitations under the License. package nfd import ( - internalinterfaces "sigs.k8s.io/node-feature-discovery/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/generated/informers/externalversions/nfd/v1alpha1" + internalinterfaces "sigs.k8s.io/node-feature-discovery/api/v1alpha1/informers/externalversions/internalinterfaces" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1/informers/externalversions/nfd/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/generated/informers/externalversions/nfd/v1alpha1/interface.go b/api/v1alpha1/informers/externalversions/nfd/v1alpha1/interface.go similarity index 93% rename from pkg/generated/informers/externalversions/nfd/v1alpha1/interface.go rename to api/v1alpha1/informers/externalversions/nfd/v1alpha1/interface.go index 5292d87ae3..4e98f71e27 100644 --- a/pkg/generated/informers/externalversions/nfd/v1alpha1/interface.go +++ b/api/v1alpha1/informers/externalversions/nfd/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "sigs.k8s.io/node-feature-discovery/pkg/generated/informers/externalversions/internalinterfaces" + internalinterfaces "sigs.k8s.io/node-feature-discovery/api/v1alpha1/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeature.go b/api/v1alpha1/informers/externalversions/nfd/v1alpha1/nodefeature.go similarity index 90% rename from pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeature.go rename to api/v1alpha1/informers/externalversions/nfd/v1alpha1/nodefeature.go index 870ba01ac7..e10d171968 100644 --- a/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeature.go +++ b/api/v1alpha1/informers/externalversions/nfd/v1alpha1/nodefeature.go @@ -26,10 +26,10 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - versioned "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned" - internalinterfaces "sigs.k8s.io/node-feature-discovery/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/generated/listers/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + versioned "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" + internalinterfaces "sigs.k8s.io/node-feature-discovery/api/v1alpha1/informers/externalversions/internalinterfaces" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1/listers/nfd/v1alpha1" ) // NodeFeatureInformer provides access to a shared informer and lister for diff --git a/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go b/api/v1alpha1/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go similarity index 90% rename from pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go rename to api/v1alpha1/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go index 10ca5b3e03..933b33ecd7 100644 --- a/pkg/generated/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go +++ b/api/v1alpha1/informers/externalversions/nfd/v1alpha1/nodefeaturerule.go @@ -26,10 +26,10 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - versioned "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned" - internalinterfaces "sigs.k8s.io/node-feature-discovery/pkg/generated/informers/externalversions/internalinterfaces" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/generated/listers/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + versioned "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" + internalinterfaces "sigs.k8s.io/node-feature-discovery/api/v1alpha1/informers/externalversions/internalinterfaces" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1/listers/nfd/v1alpha1" ) // NodeFeatureRuleInformer provides access to a shared informer and lister for diff --git a/pkg/generated/listers/nfd/v1alpha1/expansion_generated.go b/api/v1alpha1/listers/nfd/v1alpha1/expansion_generated.go similarity index 100% rename from pkg/generated/listers/nfd/v1alpha1/expansion_generated.go rename to api/v1alpha1/listers/nfd/v1alpha1/expansion_generated.go diff --git a/pkg/generated/listers/nfd/v1alpha1/nodefeature.go b/api/v1alpha1/listers/nfd/v1alpha1/nodefeature.go similarity index 98% rename from pkg/generated/listers/nfd/v1alpha1/nodefeature.go rename to api/v1alpha1/listers/nfd/v1alpha1/nodefeature.go index f06a33ef93..ef4fbabe9f 100644 --- a/pkg/generated/listers/nfd/v1alpha1/nodefeature.go +++ b/api/v1alpha1/listers/nfd/v1alpha1/nodefeature.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) // NodeFeatureLister helps list NodeFeatures. diff --git a/pkg/generated/listers/nfd/v1alpha1/nodefeaturerule.go b/api/v1alpha1/listers/nfd/v1alpha1/nodefeaturerule.go similarity index 97% rename from pkg/generated/listers/nfd/v1alpha1/nodefeaturerule.go rename to api/v1alpha1/listers/nfd/v1alpha1/nodefeaturerule.go index 5bd836646e..14c65ef86e 100644 --- a/pkg/generated/listers/nfd/v1alpha1/nodefeaturerule.go +++ b/api/v1alpha1/listers/nfd/v1alpha1/nodefeaturerule.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) // NodeFeatureRuleLister helps list NodeFeatureRules. diff --git a/pkg/apis/nfd/v1alpha1/nodefeaturerule/expression-api_test.go b/api/v1alpha1/nodefeaturerule/expression-api_test.go similarity index 97% rename from pkg/apis/nfd/v1alpha1/nodefeaturerule/expression-api_test.go rename to api/v1alpha1/nodefeaturerule/expression-api_test.go index e9974d6dff..0c7daa488e 100644 --- a/pkg/apis/nfd/v1alpha1/nodefeaturerule/expression-api_test.go +++ b/api/v1alpha1/nodefeaturerule/expression-api_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "sigs.k8s.io/yaml" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - api "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1/nodefeaturerule" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + api "sigs.k8s.io/node-feature-discovery/api/v1alpha1/nodefeaturerule" ) type BoolAssertionFunc func(assert.TestingT, bool, ...interface{}) bool diff --git a/pkg/apis/nfd/v1alpha1/nodefeaturerule/expression.go b/api/v1alpha1/nodefeaturerule/expression.go similarity index 99% rename from pkg/apis/nfd/v1alpha1/nodefeaturerule/expression.go rename to api/v1alpha1/nodefeaturerule/expression.go index 7438f3bb1b..357090956c 100644 --- a/pkg/apis/nfd/v1alpha1/nodefeaturerule/expression.go +++ b/api/v1alpha1/nodefeaturerule/expression.go @@ -26,7 +26,7 @@ import ( "golang.org/x/exp/maps" "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) var matchOps = map[nfdv1alpha1.MatchOp]struct{}{ diff --git a/pkg/apis/nfd/v1alpha1/nodefeaturerule/expression_test.go b/api/v1alpha1/nodefeaturerule/expression_test.go similarity index 99% rename from pkg/apis/nfd/v1alpha1/nodefeaturerule/expression_test.go rename to api/v1alpha1/nodefeaturerule/expression_test.go index 3b51ca12ef..b2ae67c2c3 100644 --- a/pkg/apis/nfd/v1alpha1/nodefeaturerule/expression_test.go +++ b/api/v1alpha1/nodefeaturerule/expression_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) type BoolAssertionFunc func(assert.TestingT, bool, ...interface{}) bool diff --git a/pkg/apis/nfd/v1alpha1/nodefeaturerule/rule.go b/api/v1alpha1/nodefeaturerule/rule.go similarity index 99% rename from pkg/apis/nfd/v1alpha1/nodefeaturerule/rule.go rename to api/v1alpha1/nodefeaturerule/rule.go index dd436d1155..5c2c12715d 100644 --- a/pkg/apis/nfd/v1alpha1/nodefeaturerule/rule.go +++ b/api/v1alpha1/nodefeaturerule/rule.go @@ -27,7 +27,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" ) diff --git a/pkg/apis/nfd/v1alpha1/nodefeaturerule/rule_test.go b/api/v1alpha1/nodefeaturerule/rule_test.go similarity index 99% rename from pkg/apis/nfd/v1alpha1/nodefeaturerule/rule_test.go rename to api/v1alpha1/nodefeaturerule/rule_test.go index a642404a7c..a49d7b4bc6 100644 --- a/pkg/apis/nfd/v1alpha1/nodefeaturerule/rule_test.go +++ b/api/v1alpha1/nodefeaturerule/rule_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) // newMatchExpression returns a new MatchExpression instance. diff --git a/pkg/apis/nfd/v1alpha1/register.go b/api/v1alpha1/register.go similarity index 100% rename from pkg/apis/nfd/v1alpha1/register.go rename to api/v1alpha1/register.go diff --git a/pkg/apis/nfd/v1alpha1/types.go b/api/v1alpha1/types.go similarity index 100% rename from pkg/apis/nfd/v1alpha1/types.go rename to api/v1alpha1/types.go diff --git a/pkg/apis/nfd/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/nfd/v1alpha1/zz_generated.deepcopy.go rename to api/v1alpha1/zz_generated.deepcopy.go diff --git a/go.mod b/go.mod index 67746c810d..e3ea97ec29 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.22 require ( github.com/fsnotify/fsnotify v1.7.0 - github.com/gogo/protobuf v1.3.2 github.com/golang/protobuf v1.5.3 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.5.0 @@ -20,22 +19,23 @@ require ( github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.8.4 github.com/vektra/errors v0.0.0-20140903201135-c64d83aba85a - golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 - golang.org/x/net v0.20.0 + golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 + golang.org/x/net v0.21.0 golang.org/x/time v0.5.0 google.golang.org/grpc v1.60.1 google.golang.org/protobuf v1.32.0 - k8s.io/api v0.29.0 + k8s.io/api v0.29.2 k8s.io/apiextensions-apiserver v0.29.0 - k8s.io/apimachinery v0.29.0 - k8s.io/client-go v0.29.0 - k8s.io/klog/v2 v2.110.1 + k8s.io/apimachinery v0.29.2 + k8s.io/client-go v0.29.2 + k8s.io/klog/v2 v2.120.1 k8s.io/kubectl v0.29.0 k8s.io/kubelet v0.29.0 k8s.io/kubernetes v1.29.0 k8s.io/pod-security-admission v0.29.0 k8s.io/utils v0.0.0-20230726121419-3b25d923346b - sigs.k8s.io/yaml v1.3.0 + sigs.k8s.io/node-feature-discovery/api v0.0.0 + sigs.k8s.io/yaml v1.4.0 ) require ( @@ -82,7 +82,7 @@ require ( github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/ghodss/yaml v1.0.0 // indirect - github.com/go-logr/logr v1.3.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.4 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect @@ -91,6 +91,7 @@ require ( github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect + github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect @@ -162,14 +163,14 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/crypto v0.18.0 // indirect - golang.org/x/mod v0.14.0 // indirect + golang.org/x/crypto v0.19.0 // indirect + golang.org/x/mod v0.15.0 // indirect golang.org/x/oauth2 v0.14.0 // indirect golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.16.0 // indirect + golang.org/x/sys v0.17.0 // indirect + golang.org/x/term v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/tools v0.18.0 // indirect google.golang.org/api v0.149.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect @@ -229,4 +230,5 @@ replace ( k8s.io/mount-utils => k8s.io/mount-utils v0.29.0 k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0 k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0 + sigs.k8s.io/node-feature-discovery/api => ./api ) diff --git a/go.sum b/go.sum index 70cbe65847..61c24cba26 100644 --- a/go.sum +++ b/go.sum @@ -832,8 +832,9 @@ github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= @@ -1395,8 +1396,8 @@ golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0 golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1412,8 +1413,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= -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/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1460,8 +1461,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1532,8 +1533,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1689,8 +1690,8 @@ golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1704,8 +1705,8 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1807,8 +1808,8 @@ golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2191,8 +2192,9 @@ k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kms v0.29.0 h1:KJ1zaZt74CgvgV3NR7tnURJ/mJOKC5X3nwon/WdwgxI= k8s.io/kms v0.29.0/go.mod h1:mB0f9HLxRXeXUfHfn1A7rpwOlzXI1gIWu86z6buNoYA= k8s.io/kube-aggregator v0.29.0 h1:N4fmtePxOZ+bwiK1RhVEztOU+gkoVkvterHgpwAuiTw= @@ -2270,5 +2272,6 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih 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.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/hack/generate.sh b/hack/generate.sh index 71ceedba05..8bf563b8be 100755 --- a/hack/generate.sh +++ b/hack/generate.sh @@ -13,7 +13,7 @@ go generate ./cmd/... ./pkg/... ./source/... rm -rf vendor/ -controller-gen object crd output:crd:stdout paths=./pkg/apis/... > deployment/base/nfd-crds/nfd-api-crds.yaml +controller-gen object crd output:crd:stdout paths=./api/... > deployment/base/nfd-crds/nfd-api-crds.yaml mkdir -p deployment/helm/node-feature-discovery/crds cp deployment/base/nfd-crds/nfd-api-crds.yaml deployment/helm/node-feature-discovery/crds @@ -26,14 +26,12 @@ ${K8S_CODE_GENERATOR}/generate-groups.sh client,informer,lister \ "nfd:v1alpha1" --output-base=. \ --go-header-file hack/boilerplate.go.txt -rm -rf pkg/generated - -mv sigs.k8s.io/node-feature-discovery/pkg/generated pkg/ +rm -rf api/v1alpha1/{clientset,informers,listers} +mv sigs.k8s.io/node-feature-discovery/api/generated/ api/v1alpha1/ # HACK: manually patching the auto-generated code as code-generator cannot # properly handle deepcopy of MatchExpressionSet. sed s'/out = new(map\[string\]\*MatchExpression)/out = new(MatchExpressionSet)/' -i pkg/apis/nfd/v1alpha1/zz_generated.deepcopy.go rm -rf sigs.k8s.io - diff --git a/pkg/apis/nfd/validate/validate.go b/pkg/apis/nfd/validate/validate.go index d903337ac1..fbabd6a451 100644 --- a/pkg/apis/nfd/validate/validate.go +++ b/pkg/apis/nfd/validate/validate.go @@ -25,7 +25,7 @@ import ( k8sQuantity "k8s.io/apimachinery/pkg/api/resource" k8svalidation "k8s.io/apimachinery/pkg/util/validation" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) var ( diff --git a/pkg/kubectl-nfd/dryrun.go b/pkg/kubectl-nfd/dryrun.go index c502887cac..adbd963e78 100644 --- a/pkg/kubectl-nfd/dryrun.go +++ b/pkg/kubectl-nfd/dryrun.go @@ -25,8 +25,8 @@ import ( corev1 "k8s.io/api/core/v1" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1/nodefeaturerule" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + "sigs.k8s.io/node-feature-discovery/api/v1alpha1/nodefeaturerule" "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/validate" ) diff --git a/pkg/kubectl-nfd/test.go b/pkg/kubectl-nfd/test.go index bafc83ab7d..d2bddb8540 100644 --- a/pkg/kubectl-nfd/test.go +++ b/pkg/kubectl-nfd/test.go @@ -24,9 +24,9 @@ import ( k8sLabels "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/clientcmd" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - nfdclientset "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned" - nfdinformers "sigs.k8s.io/node-feature-discovery/pkg/generated/informers/externalversions" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + nfdclientset "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" + nfdinformers "sigs.k8s.io/node-feature-discovery/api/v1alpha1/informers/externalversions" "sigs.k8s.io/yaml" ) diff --git a/pkg/kubectl-nfd/validate.go b/pkg/kubectl-nfd/validate.go index 35424bd3fb..ce00ced2a4 100644 --- a/pkg/kubectl-nfd/validate.go +++ b/pkg/kubectl-nfd/validate.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "sigs.k8s.io/yaml" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/validate" ) diff --git a/pkg/labeler/labeler.pb.go b/pkg/labeler/labeler.pb.go index 51ba107395..0f8993f65e 100644 --- a/pkg/labeler/labeler.pb.go +++ b/pkg/labeler/labeler.pb.go @@ -30,7 +30,7 @@ import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" - v1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + v1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" sync "sync" ) diff --git a/pkg/nfd-gc/nfd-gc.go b/pkg/nfd-gc/nfd-gc.go index 00cc33e106..3378efad7a 100644 --- a/pkg/nfd-gc/nfd-gc.go +++ b/pkg/nfd-gc/nfd-gc.go @@ -31,8 +31,8 @@ import ( "k8s.io/client-go/tools/cache" "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" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + nfdclientset "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/pkg/version" ) diff --git a/pkg/nfd-gc/nfd-gc_test.go b/pkg/nfd-gc/nfd-gc_test.go index 0f4ed26d8a..3fb9d1e5e9 100644 --- a/pkg/nfd-gc/nfd-gc_test.go +++ b/pkg/nfd-gc/nfd-gc_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/client-go/informers" k8sclientset "k8s.io/client-go/kubernetes" fakek8sclientset "k8s.io/client-go/kubernetes/fake" - fakenfdclientset "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/fake" + fakenfdclientset "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/fake" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/nfd-master/nfd-api-controller.go b/pkg/nfd-master/nfd-api-controller.go index 00c606eee8..e63de424bf 100644 --- a/pkg/nfd-master/nfd-api-controller.go +++ b/pkg/nfd-master/nfd-api-controller.go @@ -26,11 +26,11 @@ import ( "k8s.io/client-go/tools/cache" "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" - nfdscheme "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme" - nfdinformers "sigs.k8s.io/node-feature-discovery/pkg/generated/informers/externalversions" - nfdlisters "sigs.k8s.io/node-feature-discovery/pkg/generated/listers/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + nfdclientset "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" + nfdscheme "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/scheme" + nfdinformers "sigs.k8s.io/node-feature-discovery/api/v1alpha1/informers/externalversions" + nfdlisters "sigs.k8s.io/node-feature-discovery/api/v1alpha1/listers/nfd/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" ) diff --git a/pkg/nfd-master/nfd-api-controller_test.go b/pkg/nfd-master/nfd-api-controller_test.go index bffa9ffc20..38e5a31c4c 100644 --- a/pkg/nfd-master/nfd-api-controller_test.go +++ b/pkg/nfd-master/nfd-api-controller_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) func TestGetNodeNameForObj(t *testing.T) { diff --git a/pkg/nfd-master/nfd-master-internal_test.go b/pkg/nfd-master/nfd-master-internal_test.go index 03f8703993..5d52068872 100644 --- a/pkg/nfd-master/nfd-master-internal_test.go +++ b/pkg/nfd-master/nfd-master-internal_test.go @@ -43,10 +43,10 @@ import ( clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - fakenfdclient "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/fake" - nfdscheme "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme" - nfdinformers "sigs.k8s.io/node-feature-discovery/pkg/generated/informers/externalversions" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + fakenfdclient "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/fake" + nfdscheme "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/scheme" + nfdinformers "sigs.k8s.io/node-feature-discovery/api/v1alpha1/informers/externalversions" "sigs.k8s.io/node-feature-discovery/pkg/labeler" "sigs.k8s.io/node-feature-discovery/pkg/utils" ) diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go index e48d9c713e..50012d61f7 100644 --- a/pkg/nfd-master/nfd-master.go +++ b/pkg/nfd-master/nfd-master.go @@ -53,8 +53,8 @@ import ( taintutils "k8s.io/kubernetes/pkg/util/taints" "sigs.k8s.io/yaml" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1/nodefeaturerule" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + "sigs.k8s.io/node-feature-discovery/api/v1alpha1/nodefeaturerule" "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/validate" pb "sigs.k8s.io/node-feature-discovery/pkg/labeler" "sigs.k8s.io/node-feature-discovery/pkg/utils" diff --git a/pkg/nfd-master/node-updater-pool_test.go b/pkg/nfd-master/node-updater-pool_test.go index 5c6924bf66..a173196fc0 100644 --- a/pkg/nfd-master/node-updater-pool_test.go +++ b/pkg/nfd-master/node-updater-pool_test.go @@ -23,7 +23,7 @@ import ( . "github.com/smartystreets/goconvey/convey" fakek8sclient "k8s.io/client-go/kubernetes/fake" - fakenfdclient "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/fake" + fakenfdclient "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/fake" ) func newFakeNodeUpdaterPool(nfdMaster *nfdMaster) *nodeUpdaterPool { diff --git a/pkg/nfd-worker/nfd-worker-internal_test.go b/pkg/nfd-worker/nfd-worker-internal_test.go index 7747c1fc5b..bc3a3d20cb 100644 --- a/pkg/nfd-worker/nfd-worker-internal_test.go +++ b/pkg/nfd-worker/nfd-worker-internal_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/vektra/errors" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/labeler" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/source" diff --git a/pkg/nfd-worker/nfd-worker.go b/pkg/nfd-worker/nfd-worker.go index 99ee50859c..1ecf8e9233 100644 --- a/pkg/nfd-worker/nfd-worker.go +++ b/pkg/nfd-worker/nfd-worker.go @@ -42,8 +42,8 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - nfdclient "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + nfdclient "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" pb "sigs.k8s.io/node-feature-discovery/pkg/labeler" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/pkg/version" diff --git a/source/cpu/cpu.go b/source/cpu/cpu.go index 5775d545af..cc5e21a767 100644 --- a/source/cpu/cpu.go +++ b/source/cpu/cpu.go @@ -27,7 +27,7 @@ import ( "github.com/klauspost/cpuid/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/pkg/utils/hostpath" "sigs.k8s.io/node-feature-discovery/source" diff --git a/source/custom/api/conversion.go b/source/custom/api/conversion.go index 0034e49a63..d3e37e8812 100644 --- a/source/custom/api/conversion.go +++ b/source/custom/api/conversion.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) // convertFeaturematchertermToV1alpha1 converts the internal api type to nfdv1alpha1. diff --git a/source/custom/api/conversion_test.go b/source/custom/api/conversion_test.go index 2d0e8a7f26..1d0728ce8f 100644 --- a/source/custom/api/conversion_test.go +++ b/source/custom/api/conversion_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) func TestRuleConversion(t *testing.T) { diff --git a/source/custom/custom.go b/source/custom/custom.go index 2655279f0a..965f29f6f6 100644 --- a/source/custom/custom.go +++ b/source/custom/custom.go @@ -22,8 +22,8 @@ import ( "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - nodefeaturerule "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1/nodefeaturerule" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + nodefeaturerule "sigs.k8s.io/node-feature-discovery/api/v1alpha1/nodefeaturerule" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/source" api "sigs.k8s.io/node-feature-discovery/source/custom/api" diff --git a/source/custom/directory_features.go b/source/custom/directory_features.go index 5fc92e845e..d47d583e3f 100644 --- a/source/custom/directory_features.go +++ b/source/custom/directory_features.go @@ -22,7 +22,7 @@ import ( "strings" "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" api "sigs.k8s.io/node-feature-discovery/source/custom/api" "sigs.k8s.io/yaml" ) diff --git a/source/custom/static_features.go b/source/custom/static_features.go index 45e77cd6c8..a1210e2459 100644 --- a/source/custom/static_features.go +++ b/source/custom/static_features.go @@ -17,7 +17,7 @@ limitations under the License. package custom import ( - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) // getStaticRules returns statically configured custom features to discover diff --git a/source/fake/fake.go b/source/fake/fake.go index 92f205c0e4..da9d09e1f6 100644 --- a/source/fake/fake.go +++ b/source/fake/fake.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/source" ) diff --git a/source/kernel/kernel.go b/source/kernel/kernel.go index 28cac6a8a2..b830b1bd4b 100644 --- a/source/kernel/kernel.go +++ b/source/kernel/kernel.go @@ -22,7 +22,7 @@ import ( "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/source" ) diff --git a/source/local/local.go b/source/local/local.go index e880f685e3..a67ee97ee6 100644 --- a/source/local/local.go +++ b/source/local/local.go @@ -27,7 +27,7 @@ import ( "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/source" ) diff --git a/source/memory/memory.go b/source/memory/memory.go index dbeb6b0ee9..99b0cec5fa 100644 --- a/source/memory/memory.go +++ b/source/memory/memory.go @@ -25,7 +25,7 @@ import ( "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/pkg/utils/hostpath" "sigs.k8s.io/node-feature-discovery/source" diff --git a/source/network/network.go b/source/network/network.go index a6cd71f1fe..4bd4225b60 100644 --- a/source/network/network.go +++ b/source/network/network.go @@ -27,7 +27,7 @@ import ( "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/pkg/utils/hostpath" "sigs.k8s.io/node-feature-discovery/source" diff --git a/source/pci/pci.go b/source/pci/pci.go index 39be031fc2..7283593d40 100644 --- a/source/pci/pci.go +++ b/source/pci/pci.go @@ -23,7 +23,7 @@ import ( "golang.org/x/exp/maps" "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/source" ) diff --git a/source/pci/pci_test.go b/source/pci/pci_test.go index 8face6ce44..55f5efaeec 100644 --- a/source/pci/pci_test.go +++ b/source/pci/pci_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils/hostpath" "sigs.k8s.io/node-feature-discovery/source" ) diff --git a/source/pci/utils.go b/source/pci/utils.go index f857baa28c..39fada0e49 100644 --- a/source/pci/utils.go +++ b/source/pci/utils.go @@ -24,7 +24,7 @@ import ( "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils/hostpath" ) diff --git a/source/source.go b/source/source.go index 053ea69f04..89f5c5645e 100644 --- a/source/source.go +++ b/source/source.go @@ -21,7 +21,7 @@ package source import ( "fmt" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" ) // Source is the base interface for all other source interfaces diff --git a/source/storage/storage.go b/source/storage/storage.go index b7534ae40f..4f0e764ef2 100644 --- a/source/storage/storage.go +++ b/source/storage/storage.go @@ -24,7 +24,7 @@ import ( "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/pkg/utils/hostpath" "sigs.k8s.io/node-feature-discovery/source" diff --git a/source/system/system.go b/source/system/system.go index e1cfaff62c..241ee3c183 100644 --- a/source/system/system.go +++ b/source/system/system.go @@ -24,7 +24,7 @@ import ( "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/pkg/utils/hostpath" "sigs.k8s.io/node-feature-discovery/source" diff --git a/source/usb/usb.go b/source/usb/usb.go index ab3febcb14..8a845f7711 100644 --- a/source/usb/usb.go +++ b/source/usb/usb.go @@ -23,7 +23,7 @@ import ( "golang.org/x/exp/maps" "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/source" ) diff --git a/source/usb/utils.go b/source/usb/utils.go index 2fbf80e500..109c2f8cd7 100644 --- a/source/usb/utils.go +++ b/source/usb/utils.go @@ -25,7 +25,7 @@ import ( "k8s.io/klog/v2" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" "sigs.k8s.io/node-feature-discovery/pkg/utils/hostpath" ) diff --git a/test/e2e/nfd_gc_test.go b/test/e2e/nfd_gc_test.go index ac825d91b0..16042180c6 100644 --- a/test/e2e/nfd_gc_test.go +++ b/test/e2e/nfd_gc_test.go @@ -29,8 +29,8 @@ import ( extclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" - "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - nfdclient "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned" + "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + nfdclient "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" testutils "sigs.k8s.io/node-feature-discovery/test/e2e/utils" testdeploy "sigs.k8s.io/node-feature-discovery/test/e2e/utils/deployment" diff --git a/test/e2e/node_feature_discovery_test.go b/test/e2e/node_feature_discovery_test.go index d1d51f72fa..e64f14d583 100644 --- a/test/e2e/node_feature_discovery_test.go +++ b/test/e2e/node_feature_discovery_test.go @@ -42,8 +42,8 @@ import ( e2epod "k8s.io/kubernetes/test/e2e/framework/pod" admissionapi "k8s.io/pod-security-admission/api" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - nfdclient "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + nfdclient "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" "sigs.k8s.io/node-feature-discovery/pkg/utils" "sigs.k8s.io/node-feature-discovery/source/custom" testutils "sigs.k8s.io/node-feature-discovery/test/e2e/utils" diff --git a/test/e2e/utils/crd.go b/test/e2e/utils/crd.go index 0f36f54abe..c56cc48e4d 100644 --- a/test/e2e/utils/crd.go +++ b/test/e2e/utils/crd.go @@ -32,9 +32,9 @@ import ( apiruntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes/scheme" - nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1" - nfdclientset "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned" - nfdscheme "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned/scheme" + nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/api/v1alpha1" + nfdclientset "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned" + nfdscheme "sigs.k8s.io/node-feature-discovery/api/v1alpha1/clientset/versioned/scheme" ) var packagePath string