Skip to content

Commit

Permalink
Merge changes from main to 1.6.2 branch (#226)
Browse files Browse the repository at this point in the history
* Change to bringup host IDPF netdevices (#221)

When VSP gets started, if host IDPF net devices are not there, VSP
will do rmmod/modprobe to bring up those those net devices.

* This PR is a follow-up to SetNumVFs proto file change in DPU-> (#223)

openshift/dpu-operator#124
Support for SetNumVfs added to DevicePluginService.
As part of this PR, we look for Intel IPU PCI device(1452), on
the host system, and set the sriov_numvfs for it.
VSP(intel plugin) returns the numvfs set back to caller(DPU).
Added polling to check thro cli-client query if VF net devices
have been created.

* Changes for removing args passed in vsp-ds.yaml. (#224)

We can still pass args(for debugging purpose). But
for now, except for log level, rest have been removed.
Also code to find vsi for bridge interface(on ACC side) has
been added.

* Randomize last 2 bytes(5th and 6th) of MAC address in node policy. (#225)
  • Loading branch information
sudhar-krishnakumar authored Sep 19, 2024
1 parent bab79b5 commit 8c0d509
Show file tree
Hide file tree
Showing 10 changed files with 506 additions and 247 deletions.
2 changes: 1 addition & 1 deletion e2e/artefacts/k8s/vsp-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
securityContext:
privileged: true
command: [ "/usr/bin/ipuplugin" ]
args: [ "--bridgeType=linux", "--interface=enp0s1f0d3", "--portMuxVsi=0x0b", "--ovsCliDir=/opt/p4/p4-cp-nws", "-v=debug"]
args: [ "-v=debug"]
volumeMounts:
- name: vendor-plugin-sock
mountPath: /var/run/dpu-daemon/
Expand Down
88 changes: 43 additions & 45 deletions ipu-plugin/go.mod
Original file line number Diff line number Diff line change
@@ -1,43 +1,45 @@
module github.com/intel/ipu-opi-plugins/ipu-plugin

go 1.21
go 1.22.5

require (
github.com/ipdk-io/k8s-infra-offload v0.0.0-20230824210601-791f4fa3562a
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.33.0
github.com/openshift/dpu-operator/dpu-api v0.0.0-20240412210924-8e89acf05ba6
github.com/opiproject/opi-api v0.0.0-20230831141553-56e46f754823
github.com/ipdk-io/k8s-infra-offload v0.0.0-20240826154825-76dc262912bf
github.com/onsi/ginkgo/v2 v2.20.1
github.com/onsi/gomega v1.34.1
github.com/openshift/dpu-operator/dpu-api v0.0.0-20240821182608-7547f5b185c4
github.com/opiproject/opi-api v0.0.0-20240808163627-6cd218088dda
github.com/pkg/sftp v1.13.6
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.2
github.com/vishvananda/netlink v1.2.1-beta.2
golang.org/x/crypto v0.22.0
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
k8s.io/kubelet v0.29.3
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.19.0
github.com/vishvananda/netlink v1.3.0
golang.org/x/crypto v0.26.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
k8s.io/kubelet v0.31.0
)

require (
github.com/containernetworking/cni v1.1.2 // indirect
github.com/containernetworking/cni v1.2.3 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // 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/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // 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/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -48,7 +50,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
Expand All @@ -57,34 +59,30 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.17.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
golang.org/x/tools v0.24.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.29.3 // indirect
k8s.io/apimachinery v0.29.3 // indirect
k8s.io/client-go v0.29.3 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
k8s.io/api v0.31.0 // indirect
k8s.io/apimachinery v0.31.0 // indirect
k8s.io/client-go v0.31.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

// replace github.com/openshift/dpu-operator/tree/main/dpu-api => ./dpu-operator/dpu-api
Loading

0 comments on commit 8c0d509

Please sign in to comment.