Skip to content

Commit

Permalink
Vendor Kubernetes 1.16.0-rc.1
Browse files Browse the repository at this point in the history 
Signed-off-by: Sascha Grunert <[email protected]>
  • Loading branch information
@saschagrunert
saschagrunert committed Sep 11, 2019
1 parent f7b5e7c commit 4b2a75c
Show file tree
Hide file tree
Showing 247 changed files with 64,860 additions and 37,114 deletions.
2 changes: 1 addition & 1 deletion cmd/crictl/exec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
restclient "k8s.io/client-go/rest"
remoteclient "k8s.io/client-go/tools/remotecommand"
pb "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubectl/util/term"
"k8s.io/kubectl/pkg/util/term"
)

const (
Expand Down
5 changes: 4 additions & 1 deletion cmd/crictl/sandbox.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,10 @@ func PodSandboxStatus(client pb.RuntimeServiceClient, ID, output string, quiet b
fmt.Printf("Created: %v\n", ctm)

if r.Status.Network != nil {
fmt.Printf("IP Address: %v\n", r.Status.Network.Ip)
fmt.Printf("IP Addresses: %v\n", r.Status.Network.Ip)
for _, ip := range r.Status.Network.AdditionalIps {
fmt.Printf("Additional IP: %v\n", ip.Ip)
}
}
if r.Status.Labels != nil {
fmt.Println("Labels:")
Expand Down
49 changes: 25 additions & 24 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/kubernetes-sigs/cri-tools
go 1.12

require (
github.com/docker/distribution v0.0.0-20190711223531-1fb7fffdb266
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v0.7.3-0.20190731001754-589f1dad8dad
github.com/docker/go-units v0.4.0
github.com/ghodss/yaml v1.0.0
Expand All @@ -17,38 +17,39 @@ require (
github.com/pborman/uuid v1.2.0
github.com/sirupsen/logrus v1.4.2
github.com/urfave/cli v1.21.0
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
golang.org/x/sys v0.0.0-20190730183949-1393eb018365
google.golang.org/grpc v1.23.0
gopkg.in/yaml.v2 v2.2.2
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v11.0.0+incompatible
k8s.io/cri-api v0.0.0
k8s.io/kubectl v0.0.0
k8s.io/kubernetes v0.0.0
)

replace (
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190710032638-4485c6f18cee
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190710032638-4485c6f18cee
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190710032638-4485c6f18cee
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190710032638-4485c6f18cee
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190710032638-4485c6f18cee
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190710032638-4485c6f18cee
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190710032638-4485c6f18cee
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190710032638-4485c6f18cee
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190710032638-4485c6f18cee
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190710032638-4485c6f18cee
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190710032638-4485c6f18cee
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190710032638-4485c6f18cee
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190710032638-4485c6f18cee
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190710032638-4485c6f18cee
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190710032638-4485c6f18cee
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190710032638-4485c6f18cee
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190710032638-4485c6f18cee
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190710032638-4485c6f18cee
k8s.io/kubernetes => k8s.io/kubernetes v1.15.1
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190710032638-4485c6f18cee
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190710032638-4485c6f18cee
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190710032638-4485c6f18cee
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190910034738-d17cd2356993
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190910034738-d17cd2356993
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190910034738-d17cd2356993
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190910034738-d17cd2356993
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190910034738-d17cd2356993
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190910034738-d17cd2356993
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190910034738-d17cd2356993
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190910034738-d17cd2356993
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190910034738-d17cd2356993
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190910034738-d17cd2356993
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190910034738-d17cd2356993
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190910034738-d17cd2356993
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190910034738-d17cd2356993
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190910034738-d17cd2356993
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190910034738-d17cd2356993
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190910034738-d17cd2356993
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190910034738-d17cd2356993
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190910034738-d17cd2356993
k8s.io/kubernetes => k8s.io/kubernetes v1.16.0-rc.1
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190910034738-d17cd2356993
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190910034738-d17cd2356993
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190910034738-d17cd2356993
)
Loading

0 comments on commit 4b2a75c

Please sign in to comment.