Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move pkg/topology to proper upstream #1379

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

move pkg/topology to proper upstream #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
OLM_MANIFESTS = deployments/operator/manifests
BUNDLE_DIR = community-operators/operators/intel-device-plugins-operator/$(TAG)

TESTDATA_DIR = pkg/topology/testdata

EXTRA_BUILD_ARGS += --build-arg GOLICENSES_VERSION=$(GOLICENSES_VERSION)

pkgs = $(shell $(GO) list ./... | grep -v vendor | grep -v e2e | grep -v envtest)
Expand All @@ -50,13 +48,7 @@ go-mod-tidy:
$(GO) mod download all
@report=`$(GO) mod tidy -v 2>&1` ; if [ -n "$$report" ]; then echo "$$report"; exit 1; fi

update-fixture:
@scripts/ttar -C $(TESTDATA_DIR) -c -f $(TESTDATA_DIR)/sys.ttar sys/

fixture:
@scripts/ttar --recursive-unlink -C $(TESTDATA_DIR) -x -f $(TESTDATA_DIR)/sys.ttar

test: fixture
test:
ifndef WHAT
@$(GO) test -tags $(BUILDTAGS) -race -coverprofile=coverage.txt -covermode=atomic $(pkgs)
else
Expand All @@ -68,7 +60,7 @@ else
exit $$rc
endif

test-with-kind: fixture intel-sgx-admissionwebhook intel-fpga-admissionwebhook intel-deviceplugin-operator install-tools
test-with-kind: intel-sgx-admissionwebhook intel-fpga-admissionwebhook intel-deviceplugin-operator install-tools
# Build a Cluster with KinD & Load Images & Install Cert-Manager
kind create cluster
kind load docker-image $(REG)intel-sgx-admissionwebhook:$(TAG)
Expand Down Expand Up @@ -241,7 +233,7 @@ check-github-actions:
jq -e '$(images_json) - [$(skip_images)] - .jobs.image.strategy.matrix.image == []' > /dev/null || \
(echo "Make sure all images are listed in .github/workflows/ci.yaml"; exit 1)

.PHONY: all format test lint build images $(cmds) $(images) lock-images vendor pre-pull set-version check-github-actions envtest fixture update-fixture install-tools test-image-base-layer
.PHONY: all format test lint build images $(cmds) $(images) lock-images vendor pre-pull set-version check-github-actions envtest install-tools test-image-base-layer

SPHINXOPTS =
SPHINXBUILD = sphinx-build
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/intel/intel-device-plugins-for-kubernetes
go 1.20

require (
github.com/containers/nri-plugins/pkg/topology v0.0.0-20230417061637-0847843000f8
github.com/fsnotify/fsnotify v1.6.0
github.com/go-ini/ini v1.67.0
github.com/go-logr/logr v1.2.4
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
github.com/containers/nri-plugins/pkg/topology v0.0.0-20230417061637-0847843000f8 h1:fcv6mtBBQd+woQSqZN1QJ1g91TRwUNNijj1WKjqub5Q=
github.com/containers/nri-plugins/pkg/topology v0.0.0-20230417061637-0847843000f8/go.mod h1:XHuUl2t6TVLTfGsy8+w3MdxOjSn2hN0lc1PuaxOEFEc=
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd/v22 v22.4.0 h1:y9YHcjnjynCd/DVbg5j9L/33jQM3MxJlbj/zWskzfGU=
Expand Down
125 changes: 0 additions & 125 deletions pkg/topology/testdata/sys.ttar
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions pkg/topology/testdata/sys/devices/virtual/mem/null/local_cpulist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0-7
1 change: 1 addition & 0 deletions pkg/topology/testdata/sys/devices/virtual/mem/null/numa_node
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1,2,3
1 change: 1 addition & 0 deletions pkg/topology/testdata/sys/devices/virtual/mem/random/local_cpulist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0-7
1 change: 1 addition & 0 deletions pkg/topology/testdata/sys/devices/virtual/mem/random/numa_node
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-1
1 change: 1 addition & 0 deletions pkg/topology/testdata/sys/devices/virtual/tty/tty/local_cpulist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0-7
1 change: 1 addition & 0 deletions pkg/topology/testdata/sys/devices/virtual/tty/tty/numa_node
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4,5,6
Loading