Skip to content

Commit 8044930

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #532 from openSUSE/kubernetes-1.16
Vendor Kubernetes 1.16.0-rc.2
2 parents f3a668a + ec38542 commit 8044930

File tree

242 files changed

+64857
-37117
lines changed

Some content is hidden

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

242 files changed

+64857
-37117
lines changed

‎cmd/crictl/exec.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
restclient "k8s.io/client-go/rest"
2828
remoteclient "k8s.io/client-go/tools/remotecommand"
2929
pb "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
30-
"k8s.io/kubernetes/pkg/kubectl/util/term"
30+
"k8s.io/kubectl/pkg/util/term"
3131
)
3232

3333
const (

‎cmd/crictl/sandbox.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,10 @@ func PodSandboxStatus(client pb.RuntimeServiceClient, ID, output string, quiet b
423423
fmt.Printf("Created: %v\n", ctm)
424424

425425
if r.Status.Network != nil {
426-
fmt.Printf("IP Address: %v\n", r.Status.Network.Ip)
426+
fmt.Printf("IP Addresses: %v\n", r.Status.Network.Ip)
427+
for _, ip := range r.Status.Network.AdditionalIps {
428+
fmt.Printf("Additional IP: %v\n", ip.Ip)
429+
}
427430
}
428431
if r.Status.Labels != nil {
429432
fmt.Println("Labels:")

‎go.mod‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/kubernetes-sigs/cri-tools
33
go 1.12
44

55
require (
6-
github.com/docker/distribution v0.0.0-20190711223531-1fb7fffdb266
6+
github.com/docker/distribution v2.7.1+incompatible
77
github.com/docker/docker v0.7.3-0.20190731001754-589f1dad8dad
88
github.com/docker/go-units v0.4.0
99
github.com/ghodss/yaml v1.0.0
@@ -17,38 +17,39 @@ require (
1717
github.com/pborman/uuid v1.2.0
1818
github.com/sirupsen/logrus v1.4.2
1919
github.com/urfave/cli v1.21.0
20-
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
20+
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
2121
golang.org/x/sys v0.0.0-20190730183949-1393eb018365
2222
google.golang.org/grpc v1.23.0
2323
gopkg.in/yaml.v2 v2.2.2
2424
k8s.io/api v0.0.0
2525
k8s.io/apimachinery v0.0.0
2626
k8s.io/client-go v11.0.0+incompatible
2727
k8s.io/cri-api v0.0.0
28+
k8s.io/kubectl v0.0.0
2829
k8s.io/kubernetes v0.0.0
2930
)
3031

3132
replace (
32-
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190710032638-4485c6f18cee
33-
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190710032638-4485c6f18cee
34-
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190710032638-4485c6f18cee
35-
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190710032638-4485c6f18cee
36-
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190710032638-4485c6f18cee
37-
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190710032638-4485c6f18cee
38-
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190710032638-4485c6f18cee
39-
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190710032638-4485c6f18cee
40-
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190710032638-4485c6f18cee
41-
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190710032638-4485c6f18cee
42-
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190710032638-4485c6f18cee
43-
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190710032638-4485c6f18cee
44-
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190710032638-4485c6f18cee
45-
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190710032638-4485c6f18cee
46-
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190710032638-4485c6f18cee
47-
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190710032638-4485c6f18cee
48-
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190710032638-4485c6f18cee
49-
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190710032638-4485c6f18cee
50-
k8s.io/kubernetes => k8s.io/kubernetes v1.15.1
51-
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190710032638-4485c6f18cee
52-
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190710032638-4485c6f18cee
53-
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190710032638-4485c6f18cee
33+
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190913073433-4cb51f0d2d83
34+
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190913073433-4cb51f0d2d83
35+
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190913073433-4cb51f0d2d83
36+
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190913073433-4cb51f0d2d83
37+
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190913073433-4cb51f0d2d83
38+
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190913073433-4cb51f0d2d83
39+
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190913073433-4cb51f0d2d83
40+
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190913073433-4cb51f0d2d83
41+
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190913073433-4cb51f0d2d83
42+
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190913073433-4cb51f0d2d83
43+
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190913073433-4cb51f0d2d83
44+
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190913073433-4cb51f0d2d83
45+
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190913073433-4cb51f0d2d83
46+
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190913073433-4cb51f0d2d83
47+
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190913073433-4cb51f0d2d83
48+
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190913073433-4cb51f0d2d83
49+
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190913073433-4cb51f0d2d83
50+
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190913073433-4cb51f0d2d83
51+
k8s.io/kubernetes => k8s.io/kubernetes v1.16.0-rc.2
52+
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190913073433-4cb51f0d2d83
53+
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190913073433-4cb51f0d2d83
54+
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190913073433-4cb51f0d2d83
5455
)

0 commit comments

Comments
 (0)