Skip to content

Mount multus socket and invoke delegate #24

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

Merged
merged 4 commits into from
Oct 5, 2022
Merged

Mount multus socket and invoke delegate #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bec5969
build, vendor: add the multus API / CNI dependencies
maiqueb Sep 30, 2022
9db758e
multus client: add the multus-cni REST client pkg
maiqueb Sep 30, 2022
40e1567
controller, multus: invoke the delegates via multus server
maiqueb Sep 30, 2022
f8b1577
controller, network status: update pod after interface add/remove
maiqueb Sep 30, 2022
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
4 changes: 2 additions & 2 deletions cmd/dynamic-networks-controller/networks-controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri"
"github.com/maiqueb/multus-dynamic-networks-controller/pkg/cri/containerd"
"github.com/maiqueb/multus-dynamic-networks-controller/pkg/logging"
"github.com/maiqueb/multus-dynamic-networks-controller/pkg/multuscni"
)

const (
Expand Down Expand Up @@ -96,11 +97,10 @@ func newController(stopChannel chan struct{}, configuration *config.Multus) (*co
nadInformerFactory,
eventBroadcaster,
newEventRecorder(eventBroadcaster),
configuration.MultusSocketPath,
k8sClient,
nadClientSet,
containerRuntime,
)
multuscni.NewClient(configuration.MultusSocketPath))
if err != nil {
return nil, fmt.Errorf("failed to create the pod networks controller: %v", err)
}
Expand Down
53 changes: 44 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ go 1.18

require (
github.com/containerd/containerd v1.6.8
github.com/containernetworking/cni v1.1.2
github.com/gogo/protobuf v1.3.2
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.3.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/ginkgo/v2 v2.1.3
github.com/onsi/gomega v1.17.0
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
gopkg.in/k8snetworkplumbingwg/multus-cni.v3 v3.9.1
k8s.io/api v0.24.4
k8s.io/apimachinery v0.24.4
k8s.io/client-go v0.24.4
Expand All @@ -28,12 +33,11 @@ require (
github.com/emicklei/go-restful v2.10.0+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-logr/logr v1.2.2 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gogo/googleapis v1.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
Expand All @@ -54,29 +58,60 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
github.com/opencontainers/runc v1.1.2 // indirect
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
github.com/opencontainers/selinux v1.10.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
google.golang.org/grpc v1.43.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.24.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.4
k8s.io/apimachinery => k8s.io/apimachinery v0.24.4
k8s.io/apiserver => k8s.io/apiserver v0.24.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.4
k8s.io/client-go => k8s.io/client-go v0.24.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.4
k8s.io/code-generator => k8s.io/code-generator v0.24.4
k8s.io/component-base => k8s.io/component-base v0.24.4
k8s.io/component-helpers => k8s.io/component-helpers v0.24.4
k8s.io/controller-manager => k8s.io/controller-manager v0.24.4
k8s.io/cri-api => k8s.io/cri-api v0.24.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.4
k8s.io/kubectl => k8s.io/kubectl v0.24.4
k8s.io/kubelet => k8s.io/kubelet v0.24.4
k8s.io/kubernetes => k8s.io/kubernetes v1.22.8
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.4
k8s.io/metrics => k8s.io/metrics v0.24.4
k8s.io/mount-utils => k8s.io/mount-utils v0.24.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.4
)

replace gopkg.in/k8snetworkplumbingwg/multus-cni.v3 => github.com/k8snetworkplumbingwg/multus-cni v0.0.0-20220926142625-1aac2431b86a
Loading