Skip to content

Commit 04edab6

Browse files
k8s-ci-robotsaschagrunert
k8s-ci-robot
authored and
saschagrunert
committed
Merge pull request #1210 from lengrongfu/fix/container-valida-error
Revert "fix listCoontainerStats not filter" Signed-off-by: Sascha Grunert <[email protected]>
2 parents c810b6a + fcb21b9 commit 04edab6

File tree

374 files changed

+24710
-8526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

374 files changed

+24710
-8526
lines changed

Diff for: ‎cmd/crictl/container.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,12 @@ func CreateContainer(
699699
}
700700
}
701701

702+
image := config.GetImage().GetImage()
703+
704+
if config.Image.UserSpecifiedImage == "" {
705+
config.Image.UserSpecifiedImage = image
706+
}
707+
702708
// When there is a with-pull request or the image default mode is to
703709
// pull-image-on-create(true) and no-pull was not set we pull the image when
704710
// they ask for a create as a helper on the cli to reduce extra steps. As a
@@ -711,7 +717,6 @@ func CreateContainer(
711717
}
712718

713719
// Try to pull the image before container creation
714-
image := config.GetImage().GetImage()
715720
ann := config.GetImage().GetAnnotations()
716721
if _, err := PullImageWithSandbox(iClient, image, auth, podConfig, ann); err != nil {
717722
return "", err

Diff for: ‎go.mod

+50-47
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ require (
3333
require (
3434
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
3535
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
36-
github.com/Microsoft/go-winio v0.4.17 // indirect
36+
github.com/Microsoft/go-winio v0.6.0 // indirect
3737
github.com/beorn7/perks v1.0.1 // indirect
3838
github.com/blang/semver/v4 v4.0.0 // indirect
39-
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
40-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
39+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
40+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4141
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
4242
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
4343
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -47,30 +47,30 @@ require (
4747
github.com/go-logr/logr v1.2.4 // indirect
4848
github.com/go-logr/stdr v1.2.2 // indirect
4949
github.com/go-openapi/jsonpointer v0.19.6 // indirect
50-
github.com/go-openapi/jsonreference v0.20.1 // indirect
50+
github.com/go-openapi/jsonreference v0.20.2 // indirect
5151
github.com/go-openapi/swag v0.22.3 // indirect
5252
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5353
github.com/gogo/protobuf v1.3.2 // indirect
54-
github.com/google/gnostic v0.5.7-v3refs // indirect
54+
github.com/google/gnostic-models v0.6.8 // indirect
5555
github.com/google/go-cmp v0.5.9 // indirect
56-
github.com/google/gofuzz v1.1.0 // indirect
56+
github.com/google/gofuzz v1.2.0 // indirect
5757
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
5858
github.com/google/uuid v1.3.0 // indirect
5959
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
6060
github.com/josharian/intern v1.0.0 // indirect
6161
github.com/json-iterator/go v1.1.12 // indirect
6262
github.com/mailru/easyjson v0.7.7 // indirect
63-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
64-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
63+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
64+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6565
github.com/moby/spdystream v0.2.0 // indirect
6666
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6767
github.com/modern-go/reflect2 v1.0.2 // indirect
6868
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6969
github.com/pkg/errors v0.9.1 // indirect
70-
github.com/prometheus/client_golang v1.14.0 // indirect
70+
github.com/prometheus/client_golang v1.16.0 // indirect
7171
github.com/prometheus/client_model v0.3.0 // indirect
72-
github.com/prometheus/common v0.37.0 // indirect
73-
github.com/prometheus/procfs v0.8.0 // indirect
72+
github.com/prometheus/common v0.42.0 // indirect
73+
github.com/prometheus/procfs v0.10.1 // indirect
7474
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7575
github.com/spf13/pflag v1.0.5 // indirect
7676
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
@@ -84,53 +84,56 @@ require (
8484
go.opentelemetry.io/otel/sdk v1.11.2 // indirect
8585
go.opentelemetry.io/otel/trace v1.11.2 // indirect
8686
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
87-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
87+
golang.org/x/mod v0.10.0 // indirect
88+
golang.org/x/oauth2 v0.6.0 // indirect
8889
golang.org/x/text v0.11.0 // indirect
89-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
90+
golang.org/x/time v0.3.0 // indirect
9091
golang.org/x/tools v0.9.3 // indirect
9192
google.golang.org/appengine v1.6.7 // indirect
92-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
93-
google.golang.org/grpc v1.51.0 // indirect
94-
google.golang.org/protobuf v1.28.1 // indirect
93+
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
94+
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
95+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
96+
google.golang.org/grpc v1.54.0 // indirect
97+
google.golang.org/protobuf v1.30.0 // indirect
9598
gopkg.in/inf.v0 v0.9.1 // indirect
9699
gopkg.in/yaml.v2 v2.4.0 // indirect
97100
gotest.tools/v3 v3.4.0 // indirect
98101
k8s.io/apiserver v0.0.0 // indirect
99102
k8s.io/component-base v0.0.0 // indirect
100-
k8s.io/klog/v2 v2.90.1 // indirect
101-
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
102-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
103+
k8s.io/klog/v2 v2.100.1 // indirect
104+
k8s.io/kube-openapi v0.0.0-20230601164746-7562a1006961 // indirect
105+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
103106
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
104107
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
105108
)
106109

107110
replace (
108-
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20230411170423-1b4df30b3cdf
109-
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230411170423-1b4df30b3cdf
110-
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230411170423-1b4df30b3cdf
111-
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230411170423-1b4df30b3cdf
112-
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230411170423-1b4df30b3cdf
113-
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230411170423-1b4df30b3cdf
114-
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230411170423-1b4df30b3cdf
115-
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230411170423-1b4df30b3cdf
116-
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230411170423-1b4df30b3cdf
117-
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230411170423-1b4df30b3cdf
118-
k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230411170423-1b4df30b3cdf
119-
k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230411170423-1b4df30b3cdf
120-
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230411170423-1b4df30b3cdf
121-
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230411170423-1b4df30b3cdf
122-
k8s.io/dynamic-resource-allocation => k8s.io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230411170423-1b4df30b3cdf
123-
k8s.io/kms => k8s.io/kubernetes/staging/src/k8s.io/kms v0.0.0-20230411170423-1b4df30b3cdf
124-
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230411170423-1b4df30b3cdf
125-
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230411170423-1b4df30b3cdf
126-
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230411170423-1b4df30b3cdf
127-
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230411170423-1b4df30b3cdf
128-
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230411170423-1b4df30b3cdf
129-
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230411170423-1b4df30b3cdf
130-
k8s.io/kubernetes => k8s.io/kubernetes v1.27.0
131-
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230411170423-1b4df30b3cdf
132-
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230411170423-1b4df30b3cdf
133-
k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230411170423-1b4df30b3cdf
134-
k8s.io/pod-security-admission => k8s.io/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230411170423-1b4df30b3cdf
135-
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230411170423-1b4df30b3cdf
111+
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20230706183303-d02d8ba635c5
112+
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230706183303-d02d8ba635c5
113+
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230706183303-d02d8ba635c5
114+
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230706183303-d02d8ba635c5
115+
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230706183303-d02d8ba635c5
116+
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230706183303-d02d8ba635c5
117+
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230706183303-d02d8ba635c5
118+
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230706183303-d02d8ba635c5
119+
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230706183303-d02d8ba635c5
120+
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230706183303-d02d8ba635c5
121+
k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230706183303-d02d8ba635c5
122+
k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230706183303-d02d8ba635c5
123+
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230706183303-d02d8ba635c5
124+
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230706183303-d02d8ba635c5
125+
k8s.io/dynamic-resource-allocation => k8s.io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230706183303-d02d8ba635c5
126+
k8s.io/kms => k8s.io/kubernetes/staging/src/k8s.io/kms v0.0.0-20230706183303-d02d8ba635c5
127+
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230706183303-d02d8ba635c5
128+
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230706183303-d02d8ba635c5
129+
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230706183303-d02d8ba635c5
130+
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230706183303-d02d8ba635c5
131+
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230706183303-d02d8ba635c5
132+
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230706183303-d02d8ba635c5
133+
k8s.io/kubernetes => k8s.io/kubernetes v1.28.0-alpha.4
134+
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230706183303-d02d8ba635c5
135+
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230706183303-d02d8ba635c5
136+
k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230706183303-d02d8ba635c5
137+
k8s.io/pod-security-admission => k8s.io/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230706183303-d02d8ba635c5
138+
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230706183303-d02d8ba635c5
136139
)

0 commit comments

Comments
 (0)