github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107664 from yanghesong/dockershim_remove_comments

Browse Source 
Remove dockershim comments in kubelet
This commit is contained in:
Kubernetes Prow Robot 2022-01-20 16:51:59 -08:00 committed by GitHub
commit d90342e500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/kubelet/cri/remote/conversion.go
View File

@ -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))
}

2
pkg/kubelet/cri/remote/remote_runtime.go
View File

@ -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.