Skip to content

koordlet: upgrade nri to 0.6.1 #2132

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
koordinator-bot merged 1 commit into from
Jul 15, 2024
Merged

koordlet: upgrade nri to 0.6.1 #2132

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
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.20
require (
github.com/NVIDIA/go-nvml v0.11.6-0.0.20220823120812-7e2082095e82
github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5
github.com/containerd/nri v0.3.0
github.com/containerd/nri v0.6.1
github.com/docker/docker v20.10.21+incompatible
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/fsnotify/fsnotify v1.6.0
Expand Down Expand Up @@ -39,7 +39,7 @@ require (
golang.org/x/net v0.19.0
golang.org/x/sys v0.15.0
golang.org/x/time v0.3.0
google.golang.org/grpc v1.56.3
google.golang.org/grpc v1.57.1
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.28.7
Expand Down Expand Up @@ -67,7 +67,7 @@ require (
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/containerd/containerd v1.6.9 // indirect
github.com/containerd/ttrpc v1.2.2 // indirect
github.com/containerd/ttrpc v1.2.3 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand All @@ -78,7 +78,7 @@ require (
github.com/stoewer/go-strcase v1.2.0 // indirect
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d // indirect
k8s.io/controller-manager v0.28.7 // indirect
k8s.io/dynamic-resource-allocation v0.28.7 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
Expand Down
7 changes: 4 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,17 +436,18 @@ github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJ
github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c=
github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
github.com/containerd/nri v0.3.0 h1:2ZM4WImye1ypSnE7COjOvPAiLv84kaPILBDvb1tbDK8=
github.com/containerd/nri v0.3.0/go.mod h1:Zw9q2lP16sdg0zYybemZ9yTDy8g7fPCIB3KXOGlggXI=
github.com/containerd/nri v0.6.1 h1:xSQ6elnQ4Ynidm9u49ARK9wRKHs80HCUI+bkXOxV4mA=
github.com/containerd/nri v0.6.1/go.mod h1:7+sX3wNx+LR7RzhjnJiUkFDhn18P5Bg/0VnJ/uXpRJM=
github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM=
github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=
github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ=
github.com/containerd/ttrpc v1.2.2 h1:9vqZr0pxwOF5koz6N0N3kJ0zDHokrcPxIR/ZR2YFtOs=
github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak=
github.com/containerd/ttrpc v1.2.3 h1:4jlhbXIGvijRtNC8F/5CpuJZ7yKOBFGFOOXg1bkISz0=
github.com/containerd/ttrpc v1.2.3/go.mod h1:ieWsXucbb8Mj9PH0rXCw1i8IunRbbAiDkpXkbfflWBM=
github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk=
github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg=
Expand Down
12 changes: 6 additions & 6 deletions pkg/koordlet/runtimehooks/nri/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func (p *NriServer) Stop() {
p.stub.Stop()
}

func (p *NriServer) Configure(config, runtime, version string) (stub.EventMask, error) {
func (p *NriServer) Configure(_ context.Context, config, runtime, version string) (stub.EventMask, error) {
klog.V(4).Infof("got configuration data: %q from runtime %s %s", config, runtime, version)
if config == "" {
return p.mask, nil
Expand All @@ -173,12 +173,12 @@ func (p *NriServer) Configure(config, runtime, version string) (stub.EventMask,
return p.mask, nil
}

func (p *NriServer) Synchronize(pods []*api.PodSandbox, containers []*api.Container) ([]*api.ContainerUpdate, error) {
func (p *NriServer) Synchronize(_ context.Context, pods []*api.PodSandbox, containers []*api.Container) ([]*api.ContainerUpdate, error) {
// todo: update existed containers configure
return nil, nil
}

func (p *NriServer) RunPodSandbox(pod *api.PodSandbox) error {
func (p *NriServer) RunPodSandbox(_ context.Context, pod *api.PodSandbox) error {
podCtx := &protocol.PodContext{}
podCtx.FromNri(pod)
// todo: return error or bypass error based on PluginFailurePolicy
Expand All @@ -195,7 +195,7 @@ func (p *NriServer) RunPodSandbox(pod *api.PodSandbox) error {
return nil
}

func (p *NriServer) CreateContainer(pod *api.PodSandbox, container *api.Container) (*api.ContainerAdjustment, []*api.ContainerUpdate, error) {
func (p *NriServer) CreateContainer(_ context.Context, pod *api.PodSandbox, container *api.Container) (*api.ContainerAdjustment, []*api.ContainerUpdate, error) {
containerCtx := &protocol.ContainerContext{}
containerCtx.FromNri(pod, container)
// todo: return error or bypass error based on PluginFailurePolicy
Expand All @@ -218,7 +218,7 @@ func (p *NriServer) CreateContainer(pod *api.PodSandbox, container *api.Containe
return adjust, nil, nil
}

func (p *NriServer) UpdateContainer(pod *api.PodSandbox, container *api.Container) ([]*api.ContainerUpdate, error) {
func (p *NriServer) UpdateContainer(_ context.Context, pod *api.PodSandbox, container *api.Container, r *api.LinuxResources) ([]*api.ContainerUpdate, error) {
containerCtx := &protocol.ContainerContext{}
containerCtx.FromNri(pod, container)
// todo: return error or bypass error based on PluginFailurePolicy
Expand All @@ -241,7 +241,7 @@ func (p *NriServer) UpdateContainer(pod *api.PodSandbox, container *api.Containe
return []*api.ContainerUpdate{update}, nil
}

func (p *NriServer) RemovePodSandbox(pod *api.PodSandbox) error {
func (p *NriServer) RemovePodSandbox(_ context.Context, pod *api.PodSandbox) error {
podCtx := &protocol.PodContext{}
podCtx.FromNri(pod)
// todo: return error or bypass error based on PluginFailurePolicy
Expand Down
13 changes: 7 additions & 6 deletions pkg/koordlet/runtimehooks/nri/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package nri

import (
"context"
"fmt"
"reflect"
"testing"
Expand Down Expand Up @@ -288,7 +289,7 @@ func TestNriServer_Configure(t *testing.T) {
mask: tt.fields.mask,
options: tt.fields.options,
}
_, err := p.Configure(tt.args.config, tt.args.runtime, tt.args.version)
_, err := p.Configure(context.TODO(), tt.args.config, tt.args.runtime, tt.args.version)
if (err != nil) != tt.wantErr {
t.Errorf("Configure() error = %v, wantErr %v", err, tt.wantErr)
return
Expand Down Expand Up @@ -338,7 +339,7 @@ func TestNriServer_Synchronize(t *testing.T) {
mask: tt.fields.mask,
options: tt.fields.options,
}
got, err := p.Synchronize(tt.args.pods, tt.args.containers)
got, err := p.Synchronize(context.TODO(), tt.args.pods, tt.args.containers)
if (err != nil) != tt.wantErr {
t.Errorf("Synchronize() error = %v, wantErr %v", err, tt.wantErr)
return
Expand Down Expand Up @@ -411,7 +412,7 @@ func TestNriServer_RunPodSandbox(t *testing.T) {
options: tt.fields.options,
}

if err := p.RunPodSandbox(tt.args.pod); (err != nil) != tt.wantErr {
if err := p.RunPodSandbox(context.TODO(), tt.args.pod); (err != nil) != tt.wantErr {
t.Errorf("RunPodSandbox() error = %v, wantErr %v", err, tt.wantErr)
}
})
Expand Down Expand Up @@ -475,7 +476,7 @@ func TestNriServer_CreateContainer(t *testing.T) {
newStopCh := make(chan struct{})
defer close(newStopCh)
p.options.Executor.Run(newStopCh)
_, _, err := p.CreateContainer(tt.args.pod, tt.args.container)
_, _, err := p.CreateContainer(context.TODO(), tt.args.pod, tt.args.container)
if (err != nil) != tt.wantErr {
t.Errorf("CreateContainer() error = %v, wantErr %v", err, tt.wantErr)
return
Expand Down Expand Up @@ -536,7 +537,7 @@ func TestNriServer_UpdateContainer(t *testing.T) {
mask: tt.fields.mask,
options: tt.fields.options,
}
_, err := p.UpdateContainer(tt.args.pod, tt.args.container)
_, err := p.UpdateContainer(context.TODO(), tt.args.pod, tt.args.container, nil)
if (err != nil) != tt.wantErr {
t.Errorf("UpdateContainer() error = %v, wantErr %v", err, tt.wantErr)
return
Expand Down Expand Up @@ -626,7 +627,7 @@ func TestNriServer_RemovePodSandbox(t *testing.T) {
if tt.fields.plugin != nil {
tt.fields.plugin.Register(hooks.Options{})
}
if err := p.RemovePodSandbox(tt.args.pod); (err != nil) != tt.wantErr {
if err := p.RemovePodSandbox(context.TODO(), tt.args.pod); (err != nil) != tt.wantErr {
t.Errorf("RemovePodSandbox() error = %v, wantErr %v", err, tt.wantErr)
}
})
Expand Down