github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 05:02:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107945 from saschagrunert/cri-verbose

Browse Source 
Add support for CRI `verbose` fields
This commit is contained in:
Kubernetes Prow Robot
2022-02-14 17:58:12 -08:00
committed by GitHub
parent 4e30fe40df effbcd3a0a
commit 64e83a7e43
22 changed files with 198 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e_node/container_log_rotation_test.go
View File

@@ -19,7 +19,7 @@ package e2enode
import (
"time"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
@@ -74,9 +74,9 @@ var _ = SIGDescribe("ContainerLogRotation [Slow] [Serial] [Disruptive]", func()
id := kubecontainer.ParseContainerID(pod.Status.ContainerStatuses[0].ContainerID).ID
r, _, err := getCRIClient()
framework.ExpectNoError(err)
status, err := r.ContainerStatus(id)
resp, err := r.ContainerStatus(id, false)
framework.ExpectNoError(err)
logPath := status.GetLogPath()
logPath := resp.GetStatus().GetLogPath()
ginkgo.By("wait for container log being rotated to max file limit")
gomega.Eventually(func() (int, error) {
logs, err := kubelogs.GetAllLogs(logPath)

4
test/e2e_node/image_list.go
View File

@@ -125,8 +125,8 @@ func (rp *remotePuller) Name() string {
}
func (rp *remotePuller) Pull(image string) ([]byte, error) {
imageStatus, err := rp.imageService.ImageStatus(&runtimeapi.ImageSpec{Image: image})
if err == nil && imageStatus != nil {
resp, err := rp.imageService.ImageStatus(&runtimeapi.ImageSpec{Image: image}, false)
if err == nil && resp.GetImage() != nil {
return nil, nil
}
_, err = rp.imageService.PullImage(&runtimeapi.ImageSpec{Image: image}, nil, nil)