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

Jump to bottom

pkg/cri: remove support for the obsolete v1alpha2 CRI protocol. #1081

Merged
merged 3 commits into from
Jan 5, 2024
Merged

pkg/cri: remove support for the obsolete v1alpha2 CRI protocol. #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94fb0b1
pkg/cri: remove support for CRI v1alpha2.
klihub Jan 5, 2024
3ffff03
go.{mod,sum}: update CRI deps to release 1.29/v0.29.0.
klihub Jan 5, 2024
30e1c64
test/e2e: run static-pools test on default distro.
klihub Jan 5, 2024
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ require (
k8s.io/api v0.29.0
k8s.io/apimachinery v0.29.0
k8s.io/client-go v0.29.0
k8s.io/cri-api v0.25.16
k8s.io/cri-api v0.29.0
k8s.io/klog/v2 v2.110.1
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -98,5 +98,5 @@ replace (
k8s.io/apiserver => k8s.io/apiserver v0.29.0
k8s.io/client-go => k8s.io/client-go v0.29.0
k8s.io/component-base => k8s.io/component-base v0.29.0
k8s.io/cri-api => k8s.io/cri-api v0.25.16
k8s.io/cri-api => k8s.io/cri-api v0.29.0
)
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,8 @@ k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o=
k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8=
k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38=
k8s.io/cri-api v0.25.16 h1:NSa4jRRP8zvEKBVfnWvMEaemvAsMXw5UQkLPQCRa2cc=
k8s.io/cri-api v0.25.16/go.mod h1:0vfZsZhEs3LoY5Lqm6Zgx43M633ToNlTUtEQc+VvXhw=
k8s.io/cri-api v0.29.0 h1:atenAqOltRsFqcCQlFFpDnl/R4aGfOELoNLTDJfd7t8=
k8s.io/cri-api v0.29.0/go.mod h1:Rls2JoVwfC7kW3tndm7267kriuRukQ02qfht0PCRuIc=
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
Expand Down
20 changes: 9 additions & 11 deletions pkg/cri/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
"github.com/intel/cri-resource-manager/pkg/utils"

v1 "github.com/intel/cri-resource-manager/pkg/cri/client/v1"
v1alpha2 "github.com/intel/cri-resource-manager/pkg/cri/client/v1alpha2"
)

// DialNotifyFn is a function to call after a successful net.Dial[Timeout]().
Expand Down Expand Up @@ -128,9 +127,6 @@ func (c *client) Connect(options ConnectOptions) error {
}

client, err := v1.Connect(c.rcc, c.icc)
if err != nil {
client, err = v1alpha2.Connect(c.rcc, c.icc)
}
if err != nil {
return err
}
Expand Down Expand Up @@ -446,23 +442,25 @@ func (c *client) Status(ctx context.Context, in *criv1.StatusRequest, _ ...grpc.
return c.client.Status(ctx, in)
}

/*
func (c *client) CheckpointContainer(ctx context.Context, in *criv1.CheckpointContainerRequest, _ ...grpc.CallOption) (*criv1.CheckpointContainerResponse, error) {
return nil, fmt.Errorf("unimplemented by CRI RuntimeService")
return c.client.CheckpointContainer(ctx, in)
}

func (c *client) GetContainerEvents(ctx context.Context, in *criv1.GetContainerEventsRequest, _ ...grpc.CallOption) (criv1.RuntimeService_GetContainerEventsClient, error) {
return nil, fmt.Errorf("unimplemented by CRI RuntimeService")
func (c *client) GetContainerEvents(ctx context.Context, in *criv1.GetEventsRequest, _ ...grpc.CallOption) (criv1.RuntimeService_GetContainerEventsClient, error) {
return c.client.GetContainerEvents(ctx, in)
}

func (c *client) ListMetricDescriptors(ctx context.Context, in *criv1.ListMetricDescriptorsRequest, _ ...grpc.CallOption) (*criv1.ListMetricDescriptorsResponse, error) {
return nil, fmt.Errorf("unimplemented by CRI RuntimeService")
return c.client.ListMetricDescriptors(ctx, in)
}

func (c *client) ListPodSandboxMetrics(ctx context.Context, in *criv1.ListPodSandboxMetricsRequest, _ ...grpc.CallOption) (*criv1.ListPodSandboxMetricsResponse, error) {
return nil, fmt.Errorf("unimplemented by CRI RuntimeService")
return c.client.ListPodSandboxMetrics(ctx, in)
}

func (c *client) RuntimeConfig(ctx context.Context, in *criv1.RuntimeConfigRequest, _ ...grpc.CallOption) (*criv1.RuntimeConfigResponse, error) {
return c.client.RuntimeConfig(ctx, in)
}
*/

func (c *client) ListImages(ctx context.Context, in *criv1.ListImagesRequest, _ ...grpc.CallOption) (*criv1.ListImagesResponse, error) {
if err := c.checkImageService(); err != nil {
Expand Down
17 changes: 10 additions & 7 deletions pkg/cri/client/v1/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ func Connect(runtime, image *grpc.ClientConn) (Client, error) {

func (c *client) checkRuntimeService() error {
if c.rcc == nil {
return fmt.Errorf("no CRI v1alpha2 RuntimeService client")
return fmt.Errorf("no CRI v1 RuntimeService client")
}
return nil
}

func (c *client) checkImageService() error {
if c.icc == nil {
return fmt.Errorf("no CRI v1alpha2 ImageService client")
return fmt.Errorf("no CRI v1 ImageService client")
}
return nil
}
Expand Down Expand Up @@ -294,10 +294,6 @@ func (c *client) GetContainerEvents(ctx context.Context, in *criv1.GetEventsRequ
return eventsClient, err
}

//
// These are being introduced but they are not defined yet for the
// CRI API version we are compiling against.
/*
func (c *client) ListMetricDescriptors(ctx context.Context, in *criv1.ListMetricDescriptorsRequest, _ ...grpc.CallOption) (*criv1.ListMetricDescriptorsResponse, error) {
if err := c.checkRuntimeService(); err != nil {
return nil, err
Expand All @@ -313,7 +309,14 @@ func (c *client) ListPodSandboxMetrics(ctx context.Context, in *criv1.ListPodSan

return c.rsc.ListPodSandboxMetrics(ctx, in)
}
*/

func (c *client) RuntimeConfig(ctx context.Context, in *criv1.RuntimeConfigRequest, _ ...grpc.CallOption) (*criv1.RuntimeConfigResponse, error) {
if err := c.checkRuntimeService(); err != nil {
return nil, err
}

return c.rsc.RuntimeConfig(ctx, in)
}

func (c *client) ListImages(ctx context.Context, in *criv1.ListImagesRequest, _ ...grpc.CallOption) (*criv1.ListImagesResponse, error) {
if err := c.checkImageService(); err != nil {
Expand Down
Loading
Loading