From 4cab028a92b1a0976d26c21735f0392d9b510ee1 Mon Sep 17 00:00:00 2001 From: yanghesong Date: Thu, 20 Jan 2022 16:15:29 +0800 Subject: [PATCH] Remove dockershim comments in kubelet Signed-off-by: yanghesong --- pkg/kubelet/cri/remote/conversion.go | 24 ++++++++++++------------ pkg/kubelet/cri/remote/remote_runtime.go | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/kubelet/cri/remote/conversion.go b/pkg/kubelet/cri/remote/conversion.go index de4a3cab49e..1b32badafa0 100644 --- a/pkg/kubelet/cri/remote/conversion.go +++ b/pkg/kubelet/cri/remote/conversion.go @@ -44,20 +44,20 @@ func fromV1alpha2ContainerStatus(from *v1alpha2.ContainerStatus) *runtimeapi.Con } func fromV1alpha2ExecResponse(from *v1alpha2.ExecResponse) *runtimeapi.ExecResponse { - // If this function changes, also adapt the corresponding Exec dockershim code in - // pkg/kubelet/dockershim/docker_streaming.go + // If this function changes, also adapt the corresponding Exec code in + // pkg/kubelet/cri/remote/remote_runtime.go return (*runtimeapi.ExecResponse)(unsafe.Pointer(from)) } func fromV1alpha2AttachResponse(from *v1alpha2.AttachResponse) *runtimeapi.AttachResponse { - // If this function changes, also adapt the corresponding Attach dockershim code in - // pkg/kubelet/dockershim/docker_streaming.go + // If this function changes, also adapt the corresponding Attach code in + // pkg/kubelet/cri/remote/remote_runtime.go return (*runtimeapi.AttachResponse)(unsafe.Pointer(from)) } func fromV1alpha2PortForwardResponse(from *v1alpha2.PortForwardResponse) *runtimeapi.PortForwardResponse { - // If this function changes, also adapt the corresponding PortForward dockershim code in - // pkg/kubelet/dockershim/docker_streaming.go + // If this function changes, also adapt the corresponding PortForward code in + // pkg/kubelet/cri/remote/remote_runtime.go return (*runtimeapi.PortForwardResponse)(unsafe.Pointer(from)) } @@ -114,20 +114,20 @@ func v1alpha2LinuxContainerResources(from *runtimeapi.LinuxContainerResources) * } func v1alpha2ExecRequest(from *runtimeapi.ExecRequest) *v1alpha2.ExecRequest { - // If this function changes, also adapt the corresponding Exec dockershim code in - // pkg/kubelet/dockershim/docker_streaming.go + // If this function changes, also adapt the corresponding Exec code in + // pkg/kubelet/cri/remote/remote_runtime.go return (*v1alpha2.ExecRequest)(unsafe.Pointer(from)) } func v1alpha2AttachRequest(from *runtimeapi.AttachRequest) *v1alpha2.AttachRequest { - // If this function changes, also adapt the corresponding Attach dockershim code in - // pkg/kubelet/dockershim/docker_streaming.go + // If this function changes, also adapt the corresponding Attach code in + // pkg/kubelet/cri/remote/remote_runtime.go return (*v1alpha2.AttachRequest)(unsafe.Pointer(from)) } func v1alpha2PortForwardRequest(from *runtimeapi.PortForwardRequest) *v1alpha2.PortForwardRequest { - // If this function changes, also adapt the corresponding PortForward dockershim code in - // pkg/kubelet/dockershim/docker_streaming.go + // If this function changes, also adapt the corresponding PortForward code in + // pkg/kubelet/cri/remote/remote_runtime.go return (*v1alpha2.PortForwardRequest)(unsafe.Pointer(from)) } diff --git a/pkg/kubelet/cri/remote/remote_runtime.go b/pkg/kubelet/cri/remote/remote_runtime.go index 00fc9f84002..bbde8895c7c 100644 --- a/pkg/kubelet/cri/remote/remote_runtime.go +++ b/pkg/kubelet/cri/remote/remote_runtime.go @@ -56,7 +56,7 @@ const ( type CRIVersion string const ( - // APIVersionV1 references the v1 CRI API. + // CRIVersionV1 references the v1 CRI API. CRIVersionV1 CRIVersion = "v1" // CRIVersionV1alpha2 references the v1alpha2 CRI API.