diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 000000000..0e0eed213 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,25 @@ +{ + "name": "Kubebuilder DevContainer", + "image": "docker.io/golang:1.23", + "features": { + "ghcr.io/devcontainers/features/docker-in-docker:2": {}, + "ghcr.io/devcontainers/features/git:1": {} + }, + + "runArgs": ["--network=host"], + + "customizations": { + "vscode": { + "settings": { + "terminal.integrated.shell.linux": "/bin/bash" + }, + "extensions": [ + "ms-kubernetes-tools.vscode-kubernetes-tools", + "ms-azuretools.vscode-docker" + ] + } + }, + + "onCreateCommand": "bash .devcontainer/post-install.sh" +} + diff --git a/.devcontainer/post-install.sh b/.devcontainer/post-install.sh new file mode 100644 index 000000000..265c43ee8 --- /dev/null +++ b/.devcontainer/post-install.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -x + +curl -Lo ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64 +chmod +x ./kind +mv ./kind /usr/local/bin/kind + +curl -L -o kubebuilder https://go.kubebuilder.io/dl/latest/linux/amd64 +chmod +x kubebuilder +mv kubebuilder /usr/local/bin/ + +KUBECTL_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt) +curl -LO "https://dl.k8s.io/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl" +chmod +x kubectl +mv kubectl /usr/local/bin/kubectl + +docker network create -d=bridge --subnet=172.19.0.0/24 kind + +kind version +kubebuilder version +docker --version +go version +kubectl version --client diff --git a/.gitignore b/.gitignore index c1b7daa07..5415e5f50 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,28 @@ - # Binaries for programs and plugins *.exe *.exe~ *.dll *.so *.dylib -bin +bin/* testbin/* +Dockerfile.cross -# Test binary, build with `go test -c` +# Test binary, built with `go test -c` *.test # Output of the go coverage tool, specifically when used with LiteIDE *.out -# Kubernetes Generated files - skip generated files, except for vendored files +# Go workspace file +go.work +# Kubernetes Generated files - skip generated files, except for vendored files !vendor/**/zz_generated.* # editor and IDE paraphernalia .idea +.vscode *.swp *.swo *~ diff --git a/.golangci.yaml b/.golangci.yml similarity index 100% rename from .golangci.yaml rename to .golangci.yml diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index f3cb6304c..a40012f0e 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -60,16 +60,16 @@ is derived by the controller-gen/operator-sdk/kubebuilder tooling. The master source is the set of annotated go types. -The main content is `api/numaresourcesoperator` whose subfolders hold the versioned api: +The main content is `api` whose subfolders hold the versioned api: `v1alpha1`, `v1`... -The top-level api packages (`api/numaresourcesoperator/v1`) should have minimal deps: they +The top-level api packages (`api/v1`) should have minimal deps: they should depend only on 1. stdlib 2. other API packages (e.g. k8s, ocp) We add helper packages which build on top of api packages and provide utilities: they sit in -`api/numaresources/$VERSION/helper/$HELPER/...` and these packages *can* have more dependencies. +`api/$VERSION/helper/$HELPER/...` and these packages *can* have more dependencies. NOTE: helper packages can depend on top-level api packages, but top-level api packages **must not** depend on helpers. Keep the top-level dependencies minimal and controlled! diff --git a/Makefile b/Makefile index 62b11e278..043b05fb2 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ test-unit-pkgs: generate-source pkg/ go test ./api/... ./pkg/... ./rte/pkg/... ./internal/... ./nrovalidate/validator/... test-unit-pkgs-cover: generate-source - go test -coverprofile=coverage.out ./api/numaresourcesoperator/v1/helper/... ./api/numaresourcesoperator/v1alpha1/helper/... ./pkg/... ./rte/pkg/... ./internal/... ./nrovalidate/validator/... + go test -coverprofile=coverage.out ./api/v1/helper/... ./api/v1alpha1/helper/... ./pkg/... ./rte/pkg/... ./internal/... ./nrovalidate/validator/... test-controllers: envtest generate-source KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./controllers/... @@ -162,7 +162,7 @@ cover-summary: binary: build-tools LDFLAGS="-s -w"; \ LDFLAGS+=" -X github.com/openshift-kni/numaresources-operator/pkg/images.tag=$(VERSION)"; \ - go build -mod=vendor -o bin/manager -ldflags "$$LDFLAGS" -tags "$$GOTAGS" main.go + go build -mod=vendor -o bin/manager -ldflags "$$LDFLAGS" -tags "$$GOTAGS" cmd/main.go binary-rte: build-tools LDFLAGS="-s -w"; \ @@ -272,7 +272,7 @@ bin-dir: @mkdir -p bin || : run: manifests generate generate-source fmt vet ## Run a controller from your host. - go run ./main.go + go run ./cmd/main.go # backward compatibility docker-build: container-build @@ -467,4 +467,4 @@ golangci-lint: pkg/version/_buildinfo.json else\ echo "Using golangci-lint cached at $(GOLANGCI_LINT), current version $(GOLANGCI_LINT_LOCAL_VERSION) expected version: $(GOLANGCI_LINT_VERSION)";\ fi - $(GOLANGCI_LINT) run --verbose --print-resources-usage -c .golangci.yaml + $(GOLANGCI_LINT) run --verbose --print-resources-usage -c .golangci.yml diff --git a/PROJECT b/PROJECT index ddccce5a1..a8a8037f8 100644 --- a/PROJECT +++ b/PROJECT @@ -1,6 +1,10 @@ +# Code generated by tool. DO NOT EDIT. +# This file is used to track the info used to scaffold your project +# and allow the plugins properly work. +# More info: https://book.kubebuilder.io/reference/project-config.html domain: openshift.io layout: -- go.kubebuilder.io/v3 +- go.kubebuilder.io/v4 plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} @@ -14,7 +18,7 @@ resources: domain: openshift.io group: nodetopology kind: NUMAResourcesOperator - path: github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1alpha1 + path: github.com/openshift-kni/numaresources-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -32,7 +36,7 @@ resources: domain: openshift.io group: nodetopology kind: NUMAResourcesScheduler - path: github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1alpha1 + path: github.com/openshift-kni/numaresources-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 diff --git a/api/numaresourcesoperator/v1/groupversion_info.go b/api/v1/groupversion_info.go similarity index 90% rename from api/numaresourcesoperator/v1/groupversion_info.go rename to api/v1/groupversion_info.go index 8467b622b..dc72da50b 100644 --- a/api/numaresourcesoperator/v1/groupversion_info.go +++ b/api/v1/groupversion_info.go @@ -14,7 +14,7 @@ * limitations under the License. */ -// Package v1 contains API Schema definitions for the nodetopology v1 API group +// Package v1 contains API Schema definitions for the nodetopology v1 API group. // +kubebuilder:object:generate=true // +groupName=nodetopology.openshift.io package v1 @@ -25,15 +25,12 @@ import ( ) var ( - // GroupVersion is group version used to register these objects + // GroupVersion is group version used to register these objects. GroupVersion = schema.GroupVersion{Group: "nodetopology.openshift.io", Version: "v1"} - // SchemeBuilder is used to add go types to the GroupVersionKind scheme + // SchemeBuilder is used to add go types to the GroupVersionKind scheme. SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} // AddToScheme adds the types in this group-version to the given scheme. AddToScheme = SchemeBuilder.AddToScheme - - // SchemeGroupVersion is DEPRECATED, needed for the client generation - SchemeGroupVersion = GroupVersion ) diff --git a/api/numaresourcesoperator/v1/helper/namespacedname/namespacedname.go b/api/v1/helper/namespacedname/namespacedname.go similarity index 92% rename from api/numaresourcesoperator/v1/helper/namespacedname/namespacedname.go rename to api/v1/helper/namespacedname/namespacedname.go index 7c90fe623..7debc2597 100644 --- a/api/numaresourcesoperator/v1/helper/namespacedname/namespacedname.go +++ b/api/v1/helper/namespacedname/namespacedname.go @@ -19,7 +19,7 @@ package namespacedname import ( "sigs.k8s.io/controller-runtime/pkg/client" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) func AsObjectKey(nn nropv1.NamespacedName) client.ObjectKey { diff --git a/api/numaresourcesoperator/v1/helper/namespacedname/namespacedname_test.go b/api/v1/helper/namespacedname/namespacedname_test.go similarity index 96% rename from api/numaresourcesoperator/v1/helper/namespacedname/namespacedname_test.go rename to api/v1/helper/namespacedname/namespacedname_test.go index 46f03445a..18e6885d9 100644 --- a/api/numaresourcesoperator/v1/helper/namespacedname/namespacedname_test.go +++ b/api/v1/helper/namespacedname/namespacedname_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - v1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + v1 "github.com/openshift-kni/numaresources-operator/api/v1" ) func TestAsObjectKey(t *testing.T) { diff --git a/api/numaresourcesoperator/v1/helper/nodegroup/nodegroup.go b/api/v1/helper/nodegroup/nodegroup.go similarity index 98% rename from api/numaresourcesoperator/v1/helper/nodegroup/nodegroup.go rename to api/v1/helper/nodegroup/nodegroup.go index 226ef3863..8d1ae209b 100644 --- a/api/numaresourcesoperator/v1/helper/nodegroup/nodegroup.go +++ b/api/v1/helper/nodegroup/nodegroup.go @@ -25,7 +25,7 @@ import ( mcov1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) // Tree maps a NodeGroup to the MachineConfigPool identified by the NodeGroup's MCPSelector. diff --git a/api/numaresourcesoperator/v1/helper/nodegroup/nodegroup_test.go b/api/v1/helper/nodegroup/nodegroup_test.go similarity index 99% rename from api/numaresourcesoperator/v1/helper/nodegroup/nodegroup_test.go rename to api/v1/helper/nodegroup/nodegroup_test.go index 70adb5e21..4954d30c4 100644 --- a/api/numaresourcesoperator/v1/helper/nodegroup/nodegroup_test.go +++ b/api/v1/helper/nodegroup/nodegroup_test.go @@ -28,7 +28,7 @@ import ( mcov1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) func TestFindTreesOpenshift(t *testing.T) { diff --git a/api/numaresourcesoperator/v1/namespacedname.go b/api/v1/namespacedname.go similarity index 100% rename from api/numaresourcesoperator/v1/namespacedname.go rename to api/v1/namespacedname.go diff --git a/api/numaresourcesoperator/v1/namespacedname_test.go b/api/v1/namespacedname_test.go similarity index 100% rename from api/numaresourcesoperator/v1/namespacedname_test.go rename to api/v1/namespacedname_test.go diff --git a/api/numaresourcesoperator/v1/numaresourcesoperator_conversion.go b/api/v1/numaresourcesoperator_conversion.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesoperator_conversion.go rename to api/v1/numaresourcesoperator_conversion.go diff --git a/api/numaresourcesoperator/v1/numaresourcesoperator_defaults.go b/api/v1/numaresourcesoperator_defaults.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesoperator_defaults.go rename to api/v1/numaresourcesoperator_defaults.go diff --git a/api/numaresourcesoperator/v1/numaresourcesoperator_defaults_test.go b/api/v1/numaresourcesoperator_defaults_test.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesoperator_defaults_test.go rename to api/v1/numaresourcesoperator_defaults_test.go diff --git a/api/numaresourcesoperator/v1/numaresourcesoperator_normalize.go b/api/v1/numaresourcesoperator_normalize.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesoperator_normalize.go rename to api/v1/numaresourcesoperator_normalize.go diff --git a/api/numaresourcesoperator/v1/numaresourcesoperator_normalize_test.go b/api/v1/numaresourcesoperator_normalize_test.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesoperator_normalize_test.go rename to api/v1/numaresourcesoperator_normalize_test.go diff --git a/api/numaresourcesoperator/v1/numaresourcesoperator_types.go b/api/v1/numaresourcesoperator_types.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesoperator_types.go rename to api/v1/numaresourcesoperator_types.go diff --git a/api/numaresourcesoperator/v1/numaresourcesoperator_types_test.go b/api/v1/numaresourcesoperator_types_test.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesoperator_types_test.go rename to api/v1/numaresourcesoperator_types_test.go diff --git a/api/numaresourcesoperator/v1/numaresourcesoperator_webhook.go b/api/v1/numaresourcesoperator_webhook.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesoperator_webhook.go rename to api/v1/numaresourcesoperator_webhook.go diff --git a/api/numaresourcesoperator/v1/numaresourcesscheduler_conversion.go b/api/v1/numaresourcesscheduler_conversion.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesscheduler_conversion.go rename to api/v1/numaresourcesscheduler_conversion.go diff --git a/api/numaresourcesoperator/v1/numaresourcesscheduler_defaults.go b/api/v1/numaresourcesscheduler_defaults.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesscheduler_defaults.go rename to api/v1/numaresourcesscheduler_defaults.go diff --git a/api/numaresourcesoperator/v1/numaresourcesscheduler_defaults_test.go b/api/v1/numaresourcesscheduler_defaults_test.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesscheduler_defaults_test.go rename to api/v1/numaresourcesscheduler_defaults_test.go diff --git a/api/numaresourcesoperator/v1/numaresourcesscheduler_normalize.go b/api/v1/numaresourcesscheduler_normalize.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesscheduler_normalize.go rename to api/v1/numaresourcesscheduler_normalize.go diff --git a/api/numaresourcesoperator/v1/numaresourcesscheduler_normalize_test.go b/api/v1/numaresourcesscheduler_normalize_test.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesscheduler_normalize_test.go rename to api/v1/numaresourcesscheduler_normalize_test.go diff --git a/api/numaresourcesoperator/v1/numaresourcesscheduler_types.go b/api/v1/numaresourcesscheduler_types.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesscheduler_types.go rename to api/v1/numaresourcesscheduler_types.go diff --git a/api/numaresourcesoperator/v1/numaresourcesscheduler_webhook.go b/api/v1/numaresourcesscheduler_webhook.go similarity index 100% rename from api/numaresourcesoperator/v1/numaresourcesscheduler_webhook.go rename to api/v1/numaresourcesscheduler_webhook.go diff --git a/api/numaresourcesoperator/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go similarity index 100% rename from api/numaresourcesoperator/v1/zz_generated.deepcopy.go rename to api/v1/zz_generated.deepcopy.go diff --git a/api/numaresourcesoperator/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go similarity index 100% rename from api/numaresourcesoperator/v1alpha1/groupversion_info.go rename to api/v1alpha1/groupversion_info.go diff --git a/api/numaresourcesoperator/v1alpha1/helper/nodegroup/nodegroup.go b/api/v1alpha1/helper/nodegroup/nodegroup.go similarity index 98% rename from api/numaresourcesoperator/v1alpha1/helper/nodegroup/nodegroup.go rename to api/v1alpha1/helper/nodegroup/nodegroup.go index 7173c0b50..841bef8e7 100644 --- a/api/numaresourcesoperator/v1alpha1/helper/nodegroup/nodegroup.go +++ b/api/v1alpha1/helper/nodegroup/nodegroup.go @@ -25,7 +25,7 @@ import ( mcov1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1alpha1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1alpha1" + nropv1alpha1 "github.com/openshift-kni/numaresources-operator/api/v1alpha1" ) type Tree struct { diff --git a/api/numaresourcesoperator/v1alpha1/helper/nodegroup/nodegroup_test.go b/api/v1alpha1/helper/nodegroup/nodegroup_test.go similarity index 99% rename from api/numaresourcesoperator/v1alpha1/helper/nodegroup/nodegroup_test.go rename to api/v1alpha1/helper/nodegroup/nodegroup_test.go index a4ff4ac72..079461743 100644 --- a/api/numaresourcesoperator/v1alpha1/helper/nodegroup/nodegroup_test.go +++ b/api/v1alpha1/helper/nodegroup/nodegroup_test.go @@ -27,7 +27,7 @@ import ( mcov1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1alpha1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1alpha1" + nropv1alpha1 "github.com/openshift-kni/numaresources-operator/api/v1alpha1" ) func TestFindTrees(t *testing.T) { diff --git a/api/numaresourcesoperator/v1alpha1/namespacedname.go b/api/v1alpha1/namespacedname.go similarity index 100% rename from api/numaresourcesoperator/v1alpha1/namespacedname.go rename to api/v1alpha1/namespacedname.go diff --git a/api/numaresourcesoperator/v1alpha1/namespacedname_test.go b/api/v1alpha1/namespacedname_test.go similarity index 100% rename from api/numaresourcesoperator/v1alpha1/namespacedname_test.go rename to api/v1alpha1/namespacedname_test.go diff --git a/api/numaresourcesoperator/v1alpha1/numaresourcesoperator_conversion.go b/api/v1alpha1/numaresourcesoperator_conversion.go similarity index 99% rename from api/numaresourcesoperator/v1alpha1/numaresourcesoperator_conversion.go rename to api/v1alpha1/numaresourcesoperator_conversion.go index bf4267f8c..c917304d9 100644 --- a/api/numaresourcesoperator/v1alpha1/numaresourcesoperator_conversion.go +++ b/api/v1alpha1/numaresourcesoperator_conversion.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/conversion" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" mcov1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" ) diff --git a/api/numaresourcesoperator/v1alpha1/numaresourcesoperator_defaults.go b/api/v1alpha1/numaresourcesoperator_defaults.go similarity index 100% rename from api/numaresourcesoperator/v1alpha1/numaresourcesoperator_defaults.go rename to api/v1alpha1/numaresourcesoperator_defaults.go diff --git a/api/numaresourcesoperator/v1alpha1/numaresourcesoperator_defaults_test.go b/api/v1alpha1/numaresourcesoperator_defaults_test.go similarity index 100% rename from api/numaresourcesoperator/v1alpha1/numaresourcesoperator_defaults_test.go rename to api/v1alpha1/numaresourcesoperator_defaults_test.go diff --git a/api/numaresourcesoperator/v1alpha1/numaresourcesoperator_normalize.go b/api/v1alpha1/numaresourcesoperator_normalize.go similarity index 100% rename from api/numaresourcesoperator/v1alpha1/numaresourcesoperator_normalize.go rename to api/v1alpha1/numaresourcesoperator_normalize.go diff --git a/api/numaresourcesoperator/v1alpha1/numaresourcesoperator_normalize_test.go b/api/v1alpha1/numaresourcesoperator_normalize_test.go similarity index 100% rename from api/numaresourcesoperator/v1alpha1/numaresourcesoperator_normalize_test.go rename to api/v1alpha1/numaresourcesoperator_normalize_test.go diff --git a/api/numaresourcesoperator/v1alpha1/numaresourcesoperator_types.go b/api/v1alpha1/numaresourcesoperator_types.go similarity index 100% rename from api/numaresourcesoperator/v1alpha1/numaresourcesoperator_types.go rename to api/v1alpha1/numaresourcesoperator_types.go diff --git a/api/numaresourcesoperator/v1alpha1/numaresourcesscheduler_conversion.go b/api/v1alpha1/numaresourcesscheduler_conversion.go similarity index 97% rename from api/numaresourcesoperator/v1alpha1/numaresourcesscheduler_conversion.go rename to api/v1alpha1/numaresourcesscheduler_conversion.go index 03c8001b5..119e3d80a 100644 --- a/api/numaresourcesoperator/v1alpha1/numaresourcesscheduler_conversion.go +++ b/api/v1alpha1/numaresourcesscheduler_conversion.go @@ -21,7 +21,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/conversion" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) var _ conversion.Convertible = &NUMAResourcesScheduler{} diff --git a/api/numaresourcesoperator/v1alpha1/numaresourcesscheduler_types.go b/api/v1alpha1/numaresourcesscheduler_types.go similarity index 100% rename from api/numaresourcesoperator/v1alpha1/numaresourcesscheduler_types.go rename to api/v1alpha1/numaresourcesscheduler_types.go diff --git a/api/numaresourcesoperator/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from api/numaresourcesoperator/v1alpha1/zz_generated.deepcopy.go rename to api/v1alpha1/zz_generated.deepcopy.go diff --git a/main.go b/cmd/main.go similarity index 98% rename from main.go rename to cmd/main.go index 2937438f1..025efc0b7 100644 --- a/main.go +++ b/cmd/main.go @@ -53,10 +53,10 @@ import ( rtemanifests "github.com/k8stopologyawareschedwg/deployer/pkg/manifests/rte" "github.com/k8stopologyawareschedwg/deployer/pkg/options" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - nropv1alpha1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1alpha1" - "github.com/openshift-kni/numaresources-operator/controllers" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + nropv1alpha1 "github.com/openshift-kni/numaresources-operator/api/v1alpha1" "github.com/openshift-kni/numaresources-operator/internal/api/features" + "github.com/openshift-kni/numaresources-operator/internal/controller" intkloglevel "github.com/openshift-kni/numaresources-operator/internal/kloglevel" "github.com/openshift-kni/numaresources-operator/pkg/hash" "github.com/openshift-kni/numaresources-operator/pkg/images" @@ -282,7 +282,7 @@ func main() { os.Exit(1) } - if err = (&controllers.NUMAResourcesOperatorReconciler{ + if err = (&controller.NUMAResourcesOperatorReconciler{ Client: mgr.GetClient(), Scheme: mgr.GetScheme(), Recorder: mgr.GetEventRecorderFor("numaresources-controller"), @@ -300,7 +300,7 @@ func main() { klog.ErrorS(err, "unable to create controller", "controller", "NUMAResourcesOperator") os.Exit(1) } - if err = (&controllers.KubeletConfigReconciler{ + if err = (&controller.KubeletConfigReconciler{ Client: mgr.GetClient(), Scheme: mgr.GetScheme(), Recorder: mgr.GetEventRecorderFor("kubeletconfig-controller"), @@ -324,7 +324,7 @@ func main() { } klog.InfoS("manifests loaded", "component", "Scheduler") - if err = (&controllers.NUMAResourcesSchedulerReconciler{ + if err = (&controller.NUMAResourcesSchedulerReconciler{ Client: mgr.GetClient(), Scheme: mgr.GetScheme(), SchedulerManifests: schedMf, diff --git a/cmd/numaresources-operator/README.md b/cmd/numaresources-operator/README.md deleted file mode 100644 index b09e0f776..000000000 --- a/cmd/numaresources-operator/README.md +++ /dev/null @@ -1 +0,0 @@ -Please use the top-level `main.go`. We follow the source tree laid out by `operator-sdk` and `kubebuilder`. diff --git a/cmd/resource-topology-exporter/README.md b/cmd/resource-topology-exporter/README.md deleted file mode 100644 index 9114ac209..000000000 --- a/cmd/resource-topology-exporter/README.md +++ /dev/null @@ -1 +0,0 @@ -Please use the top-level `rte/main.go`. RTE is bundled for logistic reasons and doesn't follow the standard conventions to convey a sense of exception. diff --git a/internal/api/annotations/helper/helper.go b/internal/api/annotations/helper/helper.go index 934459696..e4339e389 100644 --- a/internal/api/annotations/helper/helper.go +++ b/internal/api/annotations/helper/helper.go @@ -17,7 +17,7 @@ package helper import ( - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" anns "github.com/openshift-kni/numaresources-operator/internal/api/annotations" ) diff --git a/controllers/kubeletconfig_controller.go b/internal/controller/kubeletconfig_controller.go similarity index 99% rename from controllers/kubeletconfig_controller.go rename to internal/controller/kubeletconfig_controller.go index 050a6b251..f7f7e926b 100644 --- a/controllers/kubeletconfig_controller.go +++ b/internal/controller/kubeletconfig_controller.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package controllers +package controller import ( "context" @@ -42,7 +42,7 @@ import ( mcov1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/k8stopologyawareschedwg/deployer/pkg/deployer/platform" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/machineconfigpools" "github.com/openshift-kni/numaresources-operator/pkg/apply" "github.com/openshift-kni/numaresources-operator/pkg/kubeletconfig" diff --git a/controllers/kubeletconfig_controller_test.go b/internal/controller/kubeletconfig_controller_test.go similarity index 99% rename from controllers/kubeletconfig_controller_test.go rename to internal/controller/kubeletconfig_controller_test.go index 4c4b3a928..c715033bb 100644 --- a/controllers/kubeletconfig_controller_test.go +++ b/internal/controller/kubeletconfig_controller_test.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package controllers +package controller import ( "context" @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/k8stopologyawareschedwg/deployer/pkg/deployer/platform" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" rteconfig "github.com/openshift-kni/numaresources-operator/rte/pkg/config" diff --git a/controllers/numaresourcesoperator_controller.go b/internal/controller/numaresourcesoperator_controller.go similarity index 99% rename from controllers/numaresourcesoperator_controller.go rename to internal/controller/numaresourcesoperator_controller.go index 40a8b5c16..16c75da0f 100644 --- a/controllers/numaresourcesoperator_controller.go +++ b/internal/controller/numaresourcesoperator_controller.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package controllers +package controller import ( "context" @@ -51,9 +51,9 @@ import ( "github.com/k8stopologyawareschedwg/deployer/pkg/manifests" apimanifests "github.com/k8stopologyawareschedwg/deployer/pkg/manifests/api" k8swgrteupdate "github.com/k8stopologyawareschedwg/deployer/pkg/objectupdate/rte" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/namespacedname" - nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + "github.com/openshift-kni/numaresources-operator/api/v1/helper/namespacedname" + nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/v1/helper/nodegroup" "github.com/openshift-kni/numaresources-operator/internal/api/annotations" "github.com/openshift-kni/numaresources-operator/internal/dangling" "github.com/openshift-kni/numaresources-operator/internal/relatedobjects" diff --git a/controllers/numaresourcesoperator_controller_test.go b/internal/controller/numaresourcesoperator_controller_test.go similarity index 99% rename from controllers/numaresourcesoperator_controller_test.go rename to internal/controller/numaresourcesoperator_controller_test.go index 14896d55e..782ef3bce 100644 --- a/controllers/numaresourcesoperator_controller_test.go +++ b/internal/controller/numaresourcesoperator_controller_test.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package controllers +package controller import ( "context" @@ -50,7 +50,7 @@ import ( securityv1 "github.com/openshift/api/security/v1" machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/api/annotations" inthelper "github.com/openshift-kni/numaresources-operator/internal/api/annotations/helper" testobjs "github.com/openshift-kni/numaresources-operator/internal/objects" diff --git a/controllers/numaresourcesscheduler_controller.go b/internal/controller/numaresourcesscheduler_controller.go similarity index 99% rename from controllers/numaresourcesscheduler_controller.go rename to internal/controller/numaresourcesscheduler_controller.go index 59e4006fd..a581d8b3c 100644 --- a/controllers/numaresourcesscheduler_controller.go +++ b/internal/controller/numaresourcesscheduler_controller.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package controllers +package controller import ( "context" @@ -40,7 +40,7 @@ import ( k8swgmanifests "github.com/k8stopologyawareschedwg/deployer/pkg/manifests" k8swgrbacupdate "github.com/k8stopologyawareschedwg/deployer/pkg/objectupdate/rbac" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/api/annotations" "github.com/openshift-kni/numaresources-operator/internal/relatedobjects" "github.com/openshift-kni/numaresources-operator/pkg/apply" diff --git a/controllers/numaresourcesscheduler_controller_test.go b/internal/controller/numaresourcesscheduler_controller_test.go similarity index 99% rename from controllers/numaresourcesscheduler_controller_test.go rename to internal/controller/numaresourcesscheduler_controller_test.go index ddd35ca05..419a9d2cb 100644 --- a/controllers/numaresourcesscheduler_controller_test.go +++ b/internal/controller/numaresourcesscheduler_controller_test.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package controllers +package controller import ( "context" @@ -39,7 +39,7 @@ import ( depmanifests "github.com/k8stopologyawareschedwg/deployer/pkg/manifests" depobjupdate "github.com/k8stopologyawareschedwg/deployer/pkg/objectupdate" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/pkg/hash" nrosched "github.com/openshift-kni/numaresources-operator/pkg/numaresourcesscheduler" schedmanifests "github.com/openshift-kni/numaresources-operator/pkg/numaresourcesscheduler/manifests/sched" diff --git a/controllers/controllers_suite_test.go b/internal/controller/suite_test.go similarity index 95% rename from controllers/controllers_suite_test.go rename to internal/controller/suite_test.go index a7d579056..99c69ae34 100644 --- a/controllers/controllers_suite_test.go +++ b/internal/controller/suite_test.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package controllers +package controller import ( "path/filepath" @@ -23,7 +23,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" securityv1 "github.com/openshift/api/security/v1" machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/internal/dangling/dangling.go b/internal/dangling/dangling.go index b83395d54..346cefb7c 100644 --- a/internal/dangling/dangling.go +++ b/internal/dangling/dangling.go @@ -35,8 +35,8 @@ import ( machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/v1/helper/nodegroup" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" ) diff --git a/internal/machineconfigpools/machineconfigpools.go b/internal/machineconfigpools/machineconfigpools.go index e54d8163c..7c2c3d95b 100644 --- a/internal/machineconfigpools/machineconfigpools.go +++ b/internal/machineconfigpools/machineconfigpools.go @@ -25,8 +25,8 @@ import ( mcov1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/v1/helper/nodegroup" ) func GetListByNodeGroupsV1(ctx context.Context, cli client.Client, nodeGroups []nropv1.NodeGroup) ([]*mcov1.MachineConfigPool, error) { diff --git a/internal/objects/objects.go b/internal/objects/objects.go index 099386e1f..ee8dbd051 100644 --- a/internal/objects/objects.go +++ b/internal/objects/objects.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) func NewNUMAResourcesOperator(name string, nodeGroups ...nropv1.NodeGroup) *nropv1.NUMAResourcesOperator { diff --git a/internal/objects/objects_test.go b/internal/objects/objects_test.go index f5052f6e9..7ea495578 100644 --- a/internal/objects/objects_test.go +++ b/internal/objects/objects_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) func TestNewNUMAResourcesOperator(t *testing.T) { diff --git a/internal/relatedobjects/objects.go b/internal/relatedobjects/objects.go index 7c689593d..0aec82342 100644 --- a/internal/relatedobjects/objects.go +++ b/internal/relatedobjects/objects.go @@ -19,7 +19,7 @@ package relatedobjects import ( configv1 "github.com/openshift/api/config/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) // 'Resource' should be in lowercase and plural diff --git a/internal/relatedobjects/objects_test.go b/internal/relatedobjects/objects_test.go index b3292e118..65cde2814 100644 --- a/internal/relatedobjects/objects_test.go +++ b/internal/relatedobjects/objects_test.go @@ -22,7 +22,7 @@ import ( configv1 "github.com/openshift/api/config/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) func TestResourceTopologyExporter(t *testing.T) { diff --git a/internal/schedcache/synced.go b/internal/schedcache/synced.go index 00841bdc4..092327cd7 100644 --- a/internal/schedcache/synced.go +++ b/internal/schedcache/synced.go @@ -32,7 +32,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/k8stopologyawareschedwg/podfingerprint" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" "github.com/openshift-kni/numaresources-operator/pkg/status" diff --git a/internal/wait/job.go b/internal/wait/job.go index d23cd0097..6cf270641 100644 --- a/internal/wait/job.go +++ b/internal/wait/job.go @@ -24,8 +24,8 @@ import ( k8swait "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" - v1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/namespacedname" + v1 "github.com/openshift-kni/numaresources-operator/api/v1" + "github.com/openshift-kni/numaresources-operator/api/v1/helper/namespacedname" ) func (wt Waiter) ForJobCompleted(ctx context.Context, nname v1.NamespacedName) (*batchv1.Job, error) { diff --git a/internal/wait/numaresources.go b/internal/wait/numaresources.go index adf5fccf5..ef5ebd098 100644 --- a/internal/wait/numaresources.go +++ b/internal/wait/numaresources.go @@ -23,7 +23,7 @@ import ( k8swait "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" testobjs "github.com/openshift-kni/numaresources-operator/internal/objects" ) diff --git a/nrovalidate/main.go b/nrovalidate/main.go index f8af1c104..9077a6182 100644 --- a/nrovalidate/main.go +++ b/nrovalidate/main.go @@ -35,7 +35,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" deployervalidator "github.com/k8stopologyawareschedwg/deployer/pkg/validator" diff --git a/nrovalidate/validator/validator.go b/nrovalidate/validator/validator.go index 13219b5ed..f0921c25b 100644 --- a/nrovalidate/validator/validator.go +++ b/nrovalidate/validator/validator.go @@ -34,7 +34,7 @@ import ( "github.com/k8stopologyawareschedwg/deployer/pkg/validator" deployervalidator "github.com/k8stopologyawareschedwg/deployer/pkg/validator" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/machineconfigpools" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" diff --git a/pkg/numaresourcesscheduler/objectstate/sched/sched.go b/pkg/numaresourcesscheduler/objectstate/sched/sched.go index ccf7ae837..4e4bead84 100644 --- a/pkg/numaresourcesscheduler/objectstate/sched/sched.go +++ b/pkg/numaresourcesscheduler/objectstate/sched/sched.go @@ -27,8 +27,8 @@ import ( "github.com/k8stopologyawareschedwg/deployer/pkg/manifests" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/namespacedname" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + "github.com/openshift-kni/numaresources-operator/api/v1/helper/namespacedname" schedmanifests "github.com/openshift-kni/numaresources-operator/pkg/numaresourcesscheduler/manifests/sched" "github.com/openshift-kni/numaresources-operator/pkg/objectstate" "github.com/openshift-kni/numaresources-operator/pkg/objectstate/compare" diff --git a/pkg/numaresourcesscheduler/objectstate/sched/sched_test.go b/pkg/numaresourcesscheduler/objectstate/sched/sched_test.go index 50ebd3593..a90c117aa 100644 --- a/pkg/numaresourcesscheduler/objectstate/sched/sched_test.go +++ b/pkg/numaresourcesscheduler/objectstate/sched/sched_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) var dp = &appsv1.Deployment{ diff --git a/pkg/objectstate/rte/machineconfigpool.go b/pkg/objectstate/rte/machineconfigpool.go index 96c97181b..618319dbb 100644 --- a/pkg/objectstate/rte/machineconfigpool.go +++ b/pkg/objectstate/rte/machineconfigpool.go @@ -25,8 +25,8 @@ import ( machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/v1/helper/nodegroup" "github.com/openshift-kni/numaresources-operator/internal/api/annotations" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" "github.com/openshift-kni/numaresources-operator/pkg/objectstate" diff --git a/pkg/objectstate/rte/nodegroup.go b/pkg/objectstate/rte/nodegroup.go index 7ffd9195d..902c8e6df 100644 --- a/pkg/objectstate/rte/nodegroup.go +++ b/pkg/objectstate/rte/nodegroup.go @@ -23,8 +23,8 @@ import ( appsv1 "k8s.io/api/apps/v1" "sigs.k8s.io/controller-runtime/pkg/client" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/v1/helper/nodegroup" "github.com/openshift-kni/numaresources-operator/internal/api/annotations" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" "github.com/openshift-kni/numaresources-operator/pkg/objectstate" diff --git a/pkg/objectstate/rte/rte.go b/pkg/objectstate/rte/rte.go index 4e413d2b9..c13a4f5fb 100644 --- a/pkg/objectstate/rte/rte.go +++ b/pkg/objectstate/rte/rte.go @@ -30,8 +30,8 @@ import ( securityv1 "github.com/openshift/api/security/v1" machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/v1/helper/nodegroup" "github.com/openshift-kni/numaresources-operator/internal/api/annotations" rtemetrics "github.com/openshift-kni/numaresources-operator/pkg/metrics/manifests/monitor" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" diff --git a/pkg/objectstate/rte/rte_test.go b/pkg/objectstate/rte/rte_test.go index 817485df0..8ee15bfc9 100644 --- a/pkg/objectstate/rte/rte_test.go +++ b/pkg/objectstate/rte/rte_test.go @@ -23,7 +23,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/objectupdate/rte/rte.go b/pkg/objectupdate/rte/rte.go index 25c66a578..69cb12cec 100644 --- a/pkg/objectupdate/rte/rte.go +++ b/pkg/objectupdate/rte/rte.go @@ -33,7 +33,7 @@ import ( k8swgrteupdate "github.com/k8stopologyawareschedwg/deployer/pkg/objectupdate/rte" "github.com/k8stopologyawareschedwg/podfingerprint" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/pkg/hash" ) diff --git a/pkg/objectupdate/rte/rte_test.go b/pkg/objectupdate/rte/rte_test.go index fa407ce19..95dd3979e 100644 --- a/pkg/objectupdate/rte/rte_test.go +++ b/pkg/objectupdate/rte/rte_test.go @@ -26,7 +26,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) var commonArgs = []string{ diff --git a/pkg/objectupdate/sched/sched.go b/pkg/objectupdate/sched/sched.go index 1797b90c6..157aebae5 100644 --- a/pkg/objectupdate/sched/sched.go +++ b/pkg/objectupdate/sched/sched.go @@ -27,7 +27,7 @@ import ( k8swgobjupdate "github.com/k8stopologyawareschedwg/deployer/pkg/objectupdate" k8swgschedupdate "github.com/k8stopologyawareschedwg/deployer/pkg/objectupdate/sched" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/pkg/hash" schedstate "github.com/openshift-kni/numaresources-operator/pkg/numaresourcesscheduler/objectstate/sched" ) diff --git a/pkg/objectupdate/sched/sched_test.go b/pkg/objectupdate/sched/sched_test.go index 6e9779da5..2aa860e7e 100644 --- a/pkg/objectupdate/sched/sched_test.go +++ b/pkg/objectupdate/sched/sched_test.go @@ -29,7 +29,7 @@ import ( k8swgmanifests "github.com/k8stopologyawareschedwg/deployer/pkg/manifests" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/pkg/hash" schedstate "github.com/openshift-kni/numaresources-operator/pkg/numaresourcesscheduler/objectstate/sched" ) diff --git a/pkg/status/status.go b/pkg/status/status.go index 8922ae805..52fda4bf6 100644 --- a/pkg/status/status.go +++ b/pkg/status/status.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) // TODO: are we duping these? diff --git a/pkg/status/status_test.go b/pkg/status/status_test.go index a38be1f1f..8a70a46aa 100644 --- a/pkg/status/status_test.go +++ b/pkg/status/status_test.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" testobjs "github.com/openshift-kni/numaresources-operator/internal/objects" ) diff --git a/pkg/validation/validation.go b/pkg/validation/validation.go index 5c5cba1ca..feeb875bc 100644 --- a/pkg/validation/validation.go +++ b/pkg/validation/validation.go @@ -24,8 +24,8 @@ import ( "github.com/k8stopologyawareschedwg/deployer/pkg/deployer/platform" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/v1/helper/nodegroup" "github.com/openshift-kni/numaresources-operator/internal/api/annotations" ) diff --git a/pkg/validation/validation_test.go b/pkg/validation/validation_test.go index 818c1fedb..cccbb0b45 100644 --- a/pkg/validation/validation_test.go +++ b/pkg/validation/validation_test.go @@ -25,8 +25,8 @@ import ( "github.com/k8stopologyawareschedwg/deployer/pkg/deployer/platform" machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/v1/helper/nodegroup" "github.com/openshift-kni/numaresources-operator/internal/api/annotations" testobjs "github.com/openshift-kni/numaresources-operator/internal/objects" ) diff --git a/rte/pkg/config/config.go b/rte/pkg/config/config.go index 15ccb3c2f..41c3e2984 100644 --- a/rte/pkg/config/config.go +++ b/rte/pkg/config/config.go @@ -28,7 +28,7 @@ import ( "github.com/k8stopologyawareschedwg/resource-topology-exporter/pkg/podres/middleware/podexclude" "github.com/k8stopologyawareschedwg/resource-topology-exporter/pkg/resourcemonitor" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) const ( diff --git a/test/e2e/install/install_test.go b/test/e2e/install/install_test.go index acf7add14..5b25ae24a 100644 --- a/test/e2e/install/install_test.go +++ b/test/e2e/install/install_test.go @@ -36,7 +36,7 @@ import ( "github.com/k8stopologyawareschedwg/deployer/pkg/assets/selinux" "github.com/k8stopologyawareschedwg/deployer/pkg/manifests/rte" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/pkg/status" machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" diff --git a/test/e2e/must-gather/must_gather_suite_test.go b/test/e2e/must-gather/must_gather_suite_test.go index 8e1569942..0312aa29a 100644 --- a/test/e2e/must-gather/must_gather_suite_test.go +++ b/test/e2e/must-gather/must_gather_suite_test.go @@ -25,7 +25,7 @@ import ( "github.com/k8stopologyawareschedwg/deployer/pkg/deployer/platform" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" e2eclient "github.com/openshift-kni/numaresources-operator/test/utils/clients" "github.com/openshift-kni/numaresources-operator/test/utils/configuration" "github.com/openshift-kni/numaresources-operator/test/utils/deploy" diff --git a/test/e2e/must-gather/must_gather_test.go b/test/e2e/must-gather/must_gather_test.go index f5e353b94..4480049f5 100644 --- a/test/e2e/must-gather/must_gather_test.go +++ b/test/e2e/must-gather/must_gather_test.go @@ -31,8 +31,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/v1/helper/nodegroup" "github.com/openshift-kni/numaresources-operator/internal/wait" e2eclient "github.com/openshift-kni/numaresources-operator/test/utils/clients" "github.com/openshift-kni/numaresources-operator/test/utils/objects" diff --git a/test/e2e/rte/rte_test.go b/test/e2e/rte/rte_test.go index e58aedd2c..873ab5f4f 100644 --- a/test/e2e/rte/rte_test.go +++ b/test/e2e/rte/rte_test.go @@ -43,8 +43,8 @@ import ( nrtv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2" "github.com/k8stopologyawareschedwg/podfingerprint" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/nodegroup" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + nodegroupv1 "github.com/openshift-kni/numaresources-operator/api/v1/helper/nodegroup" "github.com/openshift-kni/numaresources-operator/internal/machineconfigpools" testobjs "github.com/openshift-kni/numaresources-operator/internal/objects" "github.com/openshift-kni/numaresources-operator/internal/podlist" diff --git a/test/e2e/sched/install/install_test.go b/test/e2e/sched/install/install_test.go index 1128b2336..6f53d914a 100644 --- a/test/e2e/sched/install/install_test.go +++ b/test/e2e/sched/install/install_test.go @@ -32,7 +32,7 @@ import ( "github.com/k8stopologyawareschedwg/deployer/pkg/clientutil/nodes" "github.com/k8stopologyawareschedwg/deployer/pkg/deployer" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/podlist" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" "github.com/openshift-kni/numaresources-operator/pkg/status" diff --git a/test/e2e/sched/sched_test.go b/test/e2e/sched/sched_test.go index e141a1716..c4f2d5cc2 100644 --- a/test/e2e/sched/sched_test.go +++ b/test/e2e/sched/sched_test.go @@ -35,7 +35,7 @@ import ( "github.com/openshift-kni/numaresources-operator/internal/wait" "github.com/k8stopologyawareschedwg/deployer/pkg/manifests" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" schedstate "github.com/openshift-kni/numaresources-operator/pkg/numaresourcesscheduler/objectstate/sched" e2eclient "github.com/openshift-kni/numaresources-operator/test/utils/clients" e2eimages "github.com/openshift-kni/numaresources-operator/test/utils/images" diff --git a/test/e2e/serial/config/fixture.go b/test/e2e/serial/config/fixture.go index 41bf7b08f..b03cbf9c4 100644 --- a/test/e2e/serial/config/fixture.go +++ b/test/e2e/serial/config/fixture.go @@ -23,7 +23,7 @@ import ( nrtv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" intnrt "github.com/openshift-kni/numaresources-operator/internal/noderesourcetopology" diff --git a/test/e2e/serial/config/infra.go b/test/e2e/serial/config/infra.go index 4356e3fe1..1e25a2384 100644 --- a/test/e2e/serial/config/infra.go +++ b/test/e2e/serial/config/infra.go @@ -34,7 +34,7 @@ import ( nrtv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/machineconfigpools" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" diff --git a/test/e2e/serial/tests/configuration.go b/test/e2e/serial/tests/configuration.go index 127b295a7..87fb0dd26 100644 --- a/test/e2e/serial/tests/configuration.go +++ b/test/e2e/serial/tests/configuration.go @@ -51,8 +51,8 @@ import ( perfprof "github.com/openshift/cluster-node-tuning-operator/pkg/apis/performanceprofile/v2" machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/namespacedname" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + "github.com/openshift-kni/numaresources-operator/api/v1/helper/namespacedname" nropmcp "github.com/openshift-kni/numaresources-operator/internal/machineconfigpools" intnrt "github.com/openshift-kni/numaresources-operator/internal/noderesourcetopology" intobjs "github.com/openshift-kni/numaresources-operator/internal/objects" diff --git a/test/e2e/serial/tests/metrics.go b/test/e2e/serial/tests/metrics.go index 9326c20d4..bf5d9b606 100644 --- a/test/e2e/serial/tests/metrics.go +++ b/test/e2e/serial/tests/metrics.go @@ -31,7 +31,7 @@ import ( . "github.com/onsi/gomega" e2etestenv "github.com/k8stopologyawareschedwg/resource-topology-exporter/test/e2e/utils/testenv" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/remoteexec" e2eclient "github.com/openshift-kni/numaresources-operator/test/utils/clients" "github.com/openshift-kni/numaresources-operator/test/utils/deploy" diff --git a/test/e2e/serial/tests/non_regression_fundamentals.go b/test/e2e/serial/tests/non_regression_fundamentals.go index f4c32790f..b0c7acc50 100644 --- a/test/e2e/serial/tests/non_regression_fundamentals.go +++ b/test/e2e/serial/tests/non_regression_fundamentals.go @@ -31,7 +31,7 @@ import ( nrtv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/wait" serialconfig "github.com/openshift-kni/numaresources-operator/test/e2e/serial/config" e2efixture "github.com/openshift-kni/numaresources-operator/test/utils/fixture" diff --git a/test/e2e/serial/tests/scheduler_cache.go b/test/e2e/serial/tests/scheduler_cache.go index 72f7c19f1..bb4f07135 100644 --- a/test/e2e/serial/tests/scheduler_cache.go +++ b/test/e2e/serial/tests/scheduler_cache.go @@ -33,7 +33,7 @@ import ( nrtv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" e2enrtint "github.com/openshift-kni/numaresources-operator/internal/noderesourcetopology" e2ereslist "github.com/openshift-kni/numaresources-operator/internal/resourcelist" "github.com/openshift-kni/numaresources-operator/internal/wait" diff --git a/test/e2e/serial/tests/scheduler_cache_stall.go b/test/e2e/serial/tests/scheduler_cache_stall.go index 0a0c64656..c2c462fad 100644 --- a/test/e2e/serial/tests/scheduler_cache_stall.go +++ b/test/e2e/serial/tests/scheduler_cache_stall.go @@ -33,8 +33,8 @@ import ( nrtv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" - "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1/helper/namespacedname" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" + "github.com/openshift-kni/numaresources-operator/api/v1/helper/namespacedname" intnrt "github.com/openshift-kni/numaresources-operator/internal/noderesourcetopology" e2ereslist "github.com/openshift-kni/numaresources-operator/internal/resourcelist" "github.com/openshift-kni/numaresources-operator/internal/wait" diff --git a/test/e2e/serial/tests/scheduler_removal.go b/test/e2e/serial/tests/scheduler_removal.go index 34f8efe38..ca3f98983 100644 --- a/test/e2e/serial/tests/scheduler_removal.go +++ b/test/e2e/serial/tests/scheduler_removal.go @@ -31,7 +31,7 @@ import ( depwait "github.com/k8stopologyawareschedwg/deployer/pkg/deployer/wait" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/wait" e2efixture "github.com/openshift-kni/numaresources-operator/test/utils/fixture" diff --git a/test/e2e/serial/tests/tolerations.go b/test/e2e/serial/tests/tolerations.go index f2dde943d..c4572b08c 100644 --- a/test/e2e/serial/tests/tolerations.go +++ b/test/e2e/serial/tests/tolerations.go @@ -39,7 +39,7 @@ import ( nrtv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2" machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" nropmcp "github.com/openshift-kni/numaresources-operator/internal/machineconfigpools" "github.com/openshift-kni/numaresources-operator/internal/podlist" "github.com/openshift-kni/numaresources-operator/internal/wait" diff --git a/test/e2e/serial/tests/workload_placement_no_nrt.go b/test/e2e/serial/tests/workload_placement_no_nrt.go index fc0fe0b1b..289ddd322 100644 --- a/test/e2e/serial/tests/workload_placement_no_nrt.go +++ b/test/e2e/serial/tests/workload_placement_no_nrt.go @@ -30,7 +30,7 @@ import ( nrtv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/wait" serialconfig "github.com/openshift-kni/numaresources-operator/test/e2e/serial/config" e2eclient "github.com/openshift-kni/numaresources-operator/test/utils/clients" diff --git a/test/e2e/upgrade/upgrade_test.go b/test/e2e/upgrade/upgrade_test.go index 7967de471..bcf86a4e8 100644 --- a/test/e2e/upgrade/upgrade_test.go +++ b/test/e2e/upgrade/upgrade_test.go @@ -30,7 +30,7 @@ import ( machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" inthelper "github.com/openshift-kni/numaresources-operator/internal/api/annotations/helper" diff --git a/test/utils/clients/clients.go b/test/utils/clients/clients.go index 7f392e6c4..0c79337f2 100644 --- a/test/utils/clients/clients.go +++ b/test/utils/clients/clients.go @@ -30,7 +30,7 @@ import ( hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1" mcov1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/test/utils/hypershift" ) diff --git a/test/utils/deploy/deploy.go b/test/utils/deploy/deploy.go index ad34d6eda..4b670bf75 100644 --- a/test/utils/deploy/deploy.go +++ b/test/utils/deploy/deploy.go @@ -32,7 +32,7 @@ import ( machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/k8stopologyawareschedwg/deployer/pkg/deployer/platform" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" nropmcp "github.com/openshift-kni/numaresources-operator/internal/machineconfigpools" "github.com/openshift-kni/numaresources-operator/internal/wait" rtestate "github.com/openshift-kni/numaresources-operator/pkg/objectstate/rte" diff --git a/test/utils/deploy/find.go b/test/utils/deploy/find.go index eccc66eaa..eb3070250 100644 --- a/test/utils/deploy/find.go +++ b/test/utils/deploy/find.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" ) func FindNUMAResourcesOperatorPod(ctx context.Context, cli client.Client, nrop *nropv1.NUMAResourcesOperator) (*corev1.Pod, error) { diff --git a/test/utils/deploy/hypershift.go b/test/utils/deploy/hypershift.go index 0b6cd6318..3e1252ca4 100644 --- a/test/utils/deploy/hypershift.go +++ b/test/utils/deploy/hypershift.go @@ -18,7 +18,7 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/internal/nodepools" "github.com/openshift-kni/numaresources-operator/internal/wait" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" diff --git a/test/utils/deploy/kubernetes.go b/test/utils/deploy/kubernetes.go index 7580cdc64..7c8905974 100644 --- a/test/utils/deploy/kubernetes.go +++ b/test/utils/deploy/kubernetes.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + v1 "github.com/openshift-kni/numaresources-operator/api/v1" e2eclient "github.com/openshift-kni/numaresources-operator/test/utils/clients" "github.com/openshift-kni/numaresources-operator/test/utils/objects" ) diff --git a/test/utils/deploy/openshift.go b/test/utils/deploy/openshift.go index bbb9d2c80..87e5fa6a1 100644 --- a/test/utils/deploy/openshift.go +++ b/test/utils/deploy/openshift.go @@ -15,7 +15,7 @@ import ( machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" inthelper "github.com/openshift-kni/numaresources-operator/internal/api/annotations/helper" nropmcp "github.com/openshift-kni/numaresources-operator/internal/machineconfigpools" diff --git a/test/utils/nrosched/nrosched.go b/test/utils/nrosched/nrosched.go index 0961f61ce..391c58e07 100644 --- a/test/utils/nrosched/nrosched.go +++ b/test/utils/nrosched/nrosched.go @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" intnrt "github.com/openshift-kni/numaresources-operator/internal/noderesourcetopology" "github.com/openshift-kni/numaresources-operator/pkg/status" "github.com/openshift-kni/numaresources-operator/test/utils/objects" diff --git a/test/utils/objects/objects.go b/test/utils/objects/objects.go index 44ed3422a..545ba4769 100644 --- a/test/utils/objects/objects.go +++ b/test/utils/objects/objects.go @@ -30,7 +30,7 @@ import ( kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" operatorv1 "github.com/openshift/api/operator/v1" machineconfigv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" diff --git a/test/utils/objects/pause/mcps.go b/test/utils/objects/pause/mcps.go index e4623f540..1f534b250 100644 --- a/test/utils/objects/pause/mcps.go +++ b/test/utils/objects/pause/mcps.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" nropmcp "github.com/openshift-kni/numaresources-operator/internal/machineconfigpools" e2eclient "github.com/openshift-kni/numaresources-operator/test/utils/clients" ) diff --git a/tools/nrtcacheck/nrtcacheck.go b/tools/nrtcacheck/nrtcacheck.go index 6af2bba44..e29209084 100644 --- a/tools/nrtcacheck/nrtcacheck.go +++ b/tools/nrtcacheck/nrtcacheck.go @@ -42,7 +42,7 @@ import ( "github.com/k8stopologyawareschedwg/deployer/pkg/clientutil/nodes" "github.com/k8stopologyawareschedwg/deployer/pkg/deployer" - nropv1 "github.com/openshift-kni/numaresources-operator/api/numaresourcesoperator/v1" + nropv1 "github.com/openshift-kni/numaresources-operator/api/v1" "github.com/openshift-kni/numaresources-operator/pkg/objectnames" rteupdate "github.com/openshift-kni/numaresources-operator/pkg/objectupdate/rte"