From 30fb74647ade7b12cf213e13b6841973e85a3723 Mon Sep 17 00:00:00 2001 From: Dan Gillespie Date: Sun, 3 Apr 2016 10:46:12 -0700 Subject: [PATCH 1/3] upgraded to kube v1.2.1 --- Godeps/Godeps.json | 1432 ++++++++--------- .../kubernetes/pkg/apis/extensions/types.go | 9 +- .../pkg/apis/extensions/v1beta1/types.go | 7 +- .../v1beta1/types_swagger_doc_generated.go | 2 +- .../apis/extensions/validation/validation.go | 10 +- .../kubernetes/pkg/apiserver/resthandler.go | 4 +- .../pkg/cloudprovider/providers/aws/aws.go | 41 +- .../pkg/cloudprovider/providers/gce/gce.go | 56 +- .../pkg/controller/daemon/controller.go | 26 +- .../deployment/deployment_controller.go | 52 +- .../endpoint/endpoints_controller.go | 17 + .../k8s.io/kubernetes/pkg/kubectl/describe.go | 6 +- .../k8s.io/kubernetes/pkg/kubectl/kubectl.go | 10 +- .../kubernetes/pkg/kubelet/config/config.go | 11 +- .../pkg/kubelet/dockertools/docker.go | 8 +- .../k8s.io/kubernetes/pkg/kubelet/kubelet.go | 6 +- vendor/k8s.io/kubernetes/pkg/master/master.go | 4 + .../k8s.io/kubernetes/pkg/master/tunneler.go | 11 + vendor/k8s.io/kubernetes/pkg/version/base.go | 2 +- .../pkg/volume/host_path/host_path.go | 26 +- 20 files changed, 925 insertions(+), 815 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index dea23d5e..1468f030 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1605,1793 +1605,1793 @@ }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-apiserver/app", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-apiserver/app/options", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-controller-manager/app", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-controller-manager/app/options", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-proxy/app", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-proxy/app/options", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/cmd/kubelet/app", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/cmd/kubelet/app/options", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/admission", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/endpoints", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/errors", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/errors/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/install", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/meta", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/pod", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/resource", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/rest", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/service", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/unversioned", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/unversioned/validation", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/util", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/v1", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/validation", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apimachinery", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apimachinery/registered", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac/latest", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac/v0", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac/v1beta1", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization/install", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization/v1beta1", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/install", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/v1", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/validation", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/install", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/v1", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig/install", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/install", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/v1beta1", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/validation", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/metrics", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/metrics/install", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/metrics/v1alpha1", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver/authenticator", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver/metrics", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authenticator", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authorizer", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authorizer/abac", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authorizer/union", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/handlers", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/user", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/capabilities", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/cache", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/chaosclient", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/leaderelection", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/metrics", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/record", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/restclient", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/transport", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/typed/discovery", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/typed/dynamic", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/auth", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/latest", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/remotecommand", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/aws", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/gce", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/mesos", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/ovirt", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/rackspace", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/daemon", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/deployment", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/endpoint", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/framework", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/gc", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/job", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/namespace", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/node", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/persistentvolume", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/podautoscaler", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/replicaset", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/replication", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/resourcequota", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/route", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/service", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/serviceaccount", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/conversion", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/conversion/queryparams", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/credentialprovider", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/credentialprovider/aws", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/credentialprovider/gcp", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/fieldpath", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/fields", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/healthz", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/httplog", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubectl", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubectl/cmd/config", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubectl/cmd/util", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubectl/resource", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/cadvisor", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/client", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/cm", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/config", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/container", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/custommetrics", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/dockertools", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/envvars", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/leaky", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/lifecycle", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/metrics", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/cni", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/exec", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/hairpin", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/kubenet", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/pleg", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/pod", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/prober", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/prober/results", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/qos", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/qos/util", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/rkt", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server/portforward", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server/stats", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/status", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/types", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/format", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/queue", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/labels", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/master", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/master/ports", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe/exec", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe/http", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe/tcp", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/config", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/iptables", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/userspace", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota/evaluator/core", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota/generic", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota/install", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/cachesize", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/componentstatus", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/configmap", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/configmap/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/controller", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/controller/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/daemonset", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/daemonset/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/deployment", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/deployment/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/endpoint", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/endpoint/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/event", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/event/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/experimental/controller/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/generic", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/generic/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/generic/rest", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/ingress", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/ingress/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/job", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/job/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/limitrange", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/limitrange/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/namespace", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/namespace/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/node", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/node/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/node/rest", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/persistentvolume", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/persistentvolume/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/pod", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/pod/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/pod/rest", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/podsecuritypolicy", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/podsecuritypolicy/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/podtemplate", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/podtemplate/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/replicaset", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/replicaset/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/resourcequota", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/resourcequota/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/secret", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/secret/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/allocator", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/allocator/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/ipallocator", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/ipallocator/controller", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/portallocator", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/portallocator/controller", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/serviceaccount", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/serviceaccount/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/thirdpartyresource", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/thirdpartyresource/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/json", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/recognizer", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/versioning", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/securitycontext", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/serviceaccount", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/ssh", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd/metrics", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd/util", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/types", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/ui", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/ui/data/swagger", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/atomic", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/bandwidth", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/chmod", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/chown", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/config", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/configz", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/dbus", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/deployment", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/errors", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/exec", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/flock", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/flushwriter", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/hash", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/httpstream", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/httpstream/spdy", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/integer", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/intstr", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/io", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/iptables", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/jsonpath", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/keymutex", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/labels", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/limitwriter", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/mount", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/net", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/net/sets", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/node", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/oom", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/parsers", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/pod", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/procfs", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/proxy", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/rand", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/replicaset", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/runtime", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/selinux", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/sets", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/slice", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/strategicpatch", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/strings", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/sysctl", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/validation", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/validation/field", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/wait", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/workqueue", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/wsstream", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/yaml", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/version", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/aws_ebs", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/azure_file", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/cephfs", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/cinder", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/configmap", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/downwardapi", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/empty_dir", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/fc", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/flexvolume", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/flocker", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/gce_pd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/git_repo", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/glusterfs", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/host_path", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/iscsi", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/nfs", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/persistent_claim", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/rbd", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/secret", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/watch", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/pkg/watch/json", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/admit", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/deny", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/exec", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/initialresources", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/limitranger", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/namespace/exists", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/resourcequota", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/passwordfile", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/basicauth", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/keystone", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authorizer/webhook", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api/v1", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api/validation", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/factory", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/metrics", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/json", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/reflect", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/third_party/golang/expansion", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/third_party/golang/netutil", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "k8s.io/kubernetes/third_party/golang/template", - "Comment": "v1.2.0", - "Rev": "5cb86ee022267586db386f62781338b0483733b3" + "Comment": "v1.2.1-beta.0-43-g5080910", + "Rev": "50809107cd47a1f62da362bccefdd9e6f7076145" }, { "ImportPath": "speter.net/go/exp/math/dec/inf", diff --git a/vendor/k8s.io/kubernetes/pkg/apis/extensions/types.go b/vendor/k8s.io/kubernetes/pkg/apis/extensions/types.go index f8a736bd..3383d7d2 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/extensions/types.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/extensions/types.go @@ -658,10 +658,11 @@ type IngressSpec struct { // specify a global default. Backend *IngressBackend `json:"backend,omitempty"` - // TLS is the TLS configuration. Currently the Ingress only supports a single TLS - // port, 443, and assumes TLS termination. If multiple members of this - // list specify different hosts, they will be multiplexed on the same - // port according to the hostname specified through the SNI TLS extension. + // TLS configuration. Currently the Ingress only supports a single TLS + // port, 443. If multiple members of this list specify different hosts, they + // will be multiplexed on the same port according to the hostname specified + // through the SNI TLS extension, if the ingress controller fulfilling the + // ingress supports SNI. TLS []IngressTLS `json:"tls,omitempty"` // A list of host rules used to configure the Ingress. If unspecified, or diff --git a/vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/types.go b/vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/types.go index 1a67438b..0af3a087 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/types.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/types.go @@ -670,9 +670,10 @@ type IngressSpec struct { Backend *IngressBackend `json:"backend,omitempty"` // TLS configuration. Currently the Ingress only supports a single TLS - // port, 443, and assumes TLS termination. If multiple members of this - // list specify different hosts, they will be multiplexed on the same - // port according to the hostname specified through the SNI TLS extension. + // port, 443. If multiple members of this list specify different hosts, they + // will be multiplexed on the same port according to the hostname specified + // through the SNI TLS extension, if the ingress controller fulfilling the + // ingress supports SNI. TLS []IngressTLS `json:"tls,omitempty"` // A list of host rules used to configure the Ingress. If unspecified, or diff --git a/vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go b/vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go index 44e44621..8780d7ad 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go @@ -323,7 +323,7 @@ func (IngressRuleValue) SwaggerDoc() map[string]string { var map_IngressSpec = map[string]string{ "": "IngressSpec describes the Ingress the user wishes to exist.", "backend": "A default backend capable of servicing requests that don't match any rule. At least one of 'backend' or 'rules' must be specified. This field is optional to allow the loadbalancer controller or defaulting logic to specify a global default.", - "tls": "TLS configuration. Currently the Ingress only supports a single TLS port, 443, and assumes TLS termination. If multiple members of this list specify different hosts, they will be multiplexed on the same port according to the hostname specified through the SNI TLS extension.", + "tls": "TLS configuration. Currently the Ingress only supports a single TLS port, 443. If multiple members of this list specify different hosts, they will be multiplexed on the same port according to the hostname specified through the SNI TLS extension, if the ingress controller fulfilling the ingress supports SNI.", "rules": "A list of host rules used to configure the Ingress. If unspecified, or no rule matches, all traffic is sent to the default backend.", } diff --git a/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go b/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go index b87bff21..2bed2dd9 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go @@ -201,6 +201,9 @@ func ValidateDaemonSetSpec(spec *extensions.DaemonSetSpec, fldPath *field.Path) if err == nil && !selector.Matches(labels.Set(spec.Template.Labels)) { allErrs = append(allErrs, field.Invalid(fldPath.Child("template", "metadata", "labels"), spec.Template.Labels, "`selector` does not match template `labels`")) } + if spec.Selector != nil && len(spec.Selector.MatchLabels)+len(spec.Selector.MatchExpressions) == 0 { + allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), spec.Selector, "empty selector is not valid for daemonset.")) + } allErrs = append(allErrs, apivalidation.ValidatePodTemplateSpec(&spec.Template, fldPath.Child("template"))...) // Daemons typically run on more than one node, so mark Read-Write persistent disks as invalid. @@ -523,13 +526,6 @@ func ValidateIngressName(name string, prefix bool) (bool, string) { func validateIngressTLS(spec *extensions.IngressSpec, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} - // Currently the Ingress only supports HTTP(S), so a secretName is required. - // This will not be the case if we support SSL routing at L4 via SNI. - for i, t := range spec.TLS { - if t.SecretName == "" { - allErrs = append(allErrs, field.Required(fldPath.Index(i).Child("secretName"), spec.TLS[i].SecretName)) - } - } // TODO: Perform a more thorough validation of spec.TLS.Hosts that takes // the wildcard spec from RFC 6125 into account. return allErrs diff --git a/vendor/k8s.io/kubernetes/pkg/apiserver/resthandler.go b/vendor/k8s.io/kubernetes/pkg/apiserver/resthandler.go index fd24f1f8..6f615b3f 100644 --- a/vendor/k8s.io/kubernetes/pkg/apiserver/resthandler.go +++ b/vendor/k8s.io/kubernetes/pkg/apiserver/resthandler.go @@ -567,11 +567,11 @@ func patchResource(ctx api.Context, admit updateAdmissionFunc, timeout time.Dura return nil, err } - currentPatch, err := strategicpatch.CreateStrategicMergePatch(originalObjJS, currentObjectJS, patcher.New()) + currentPatch, err := strategicpatch.CreateStrategicMergePatch(originalObjJS, currentObjectJS, versionedObj) if err != nil { return nil, err } - originalPatch, err := strategicpatch.CreateStrategicMergePatch(originalObjJS, originalPatchedObjJS, patcher.New()) + originalPatch, err := strategicpatch.CreateStrategicMergePatch(originalObjJS, originalPatchedObjJS, versionedObj) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go index 15d74e9f..25f8c0e5 100644 --- a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go +++ b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go @@ -2286,37 +2286,42 @@ func toStatus(lb *elb.LoadBalancerDescription) *api.LoadBalancerStatus { // Otherwise we will return an error. func findSecurityGroupForInstance(instance *ec2.Instance, taggedSecurityGroups map[string]*ec2.SecurityGroup) (*ec2.GroupIdentifier, error) { instanceID := aws.StringValue(instance.InstanceId) - var best *ec2.GroupIdentifier + + var tagged []*ec2.GroupIdentifier + var untagged []*ec2.GroupIdentifier for _, group := range instance.SecurityGroups { groupID := aws.StringValue(group.GroupId) if groupID == "" { glog.Warningf("Ignoring security group without id for instance %q: %v", instanceID, group) continue } - if best == nil { - best = group - continue + _, isTagged := taggedSecurityGroups[groupID] + if isTagged { + tagged = append(tagged, group) + } else { + untagged = append(untagged, group) } + } - _, bestIsTagged := taggedSecurityGroups[*best.GroupId] - _, groupIsTagged := taggedSecurityGroups[groupID] - - if bestIsTagged && !groupIsTagged { - // best is still best - } else if groupIsTagged && !bestIsTagged { - best = group - } else { - // We create instances with one SG - // If users create multiple SGs, they must tag one of them as being k8s owned - return nil, fmt.Errorf("Multiple security groups found for instance (%s); ensure the k8s security group is tagged", instanceID) + if len(tagged) > 0 { + // We create instances with one SG + // If users create multiple SGs, they must tag one of them as being k8s owned + if len(tagged) != 1 { + return nil, fmt.Errorf("Multiple tagged security groups found for instance %s; ensure only the k8s security group is tagged", instanceID) } + return tagged[0], nil } - if best == nil { - glog.Warning("No security group found for instance ", instanceID) + if len(untagged) > 0 { + // For back-compat, we will allow a single untagged SG + if len(untagged) != 1 { + return nil, fmt.Errorf("Multiple untagged security groups found for instance %s; ensure the k8s security group is tagged", instanceID) + } + return untagged[0], nil } - return best, nil + glog.Warningf("No security group found for instance %q", instanceID) + return nil, nil } // Return all the security groups that are tagged as being part of our cluster diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go index bf458ce8..53f89f81 100644 --- a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go +++ b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/gce/gce.go @@ -34,6 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" utilerrors "k8s.io/kubernetes/pkg/util/errors" netsets "k8s.io/kubernetes/pkg/util/net/sets" "k8s.io/kubernetes/pkg/util/sets" @@ -72,14 +73,15 @@ const ( // GCECloud is an implementation of Interface, LoadBalancer and Instances for Google Compute Engine. type GCECloud struct { - service *compute.Service - containerService *container.Service - projectID string - region string - localZone string // The zone in which we are running - managedZones []string // List of zones we are spanning (for Ubernetes-Lite, primarily when running on master) - networkURL string - useMetadataServer bool + service *compute.Service + containerService *container.Service + projectID string + region string + localZone string // The zone in which we are running + managedZones []string // List of zones we are spanning (for Ubernetes-Lite, primarily when running on master) + networkURL string + useMetadataServer bool + operationPollRateLimiter util.RateLimiter } type Config struct { @@ -296,15 +298,18 @@ func CreateGCECloud(projectID, region, zone string, managedZones []string, netwo glog.Infof("managing multiple zones: %v", managedZones) } + operationPollRateLimiter := util.NewTokenBucketRateLimiter(10, 100) // 10 qps, 100 bucket size. + return &GCECloud{ - service: svc, - containerService: containerSvc, - projectID: projectID, - region: region, - localZone: zone, - managedZones: managedZones, - networkURL: networkURL, - useMetadataServer: useMetadataServer, + service: svc, + containerService: containerSvc, + projectID: projectID, + region: region, + localZone: zone, + managedZones: managedZones, + networkURL: networkURL, + useMetadataServer: useMetadataServer, + operationPollRateLimiter: operationPollRateLimiter, }, nil } @@ -373,7 +378,7 @@ func (gce *GCECloud) targetPoolURL(name, region string) string { return fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/targetPools/%s", gce.projectID, region, name) } -func waitForOp(op *compute.Operation, getOperation func(operationName string) (*compute.Operation, error)) error { +func (gce *GCECloud) waitForOp(op *compute.Operation, getOperation func(operationName string) (*compute.Operation, error)) error { if op == nil { return fmt.Errorf("operation must not be nil") } @@ -384,9 +389,15 @@ func waitForOp(op *compute.Operation, getOperation func(operationName string) (* opName := op.Name return wait.Poll(operationPollInterval, operationPollTimeoutDuration, func() (bool, error) { + start := time.Now() + gce.operationPollRateLimiter.Accept() + duration := time.Now().Sub(start) + if duration > 5*time.Second { + glog.Infof("pollOperation: waited %v for %v", duration, opName) + } pollOp, err := getOperation(opName) if err != nil { - glog.Warningf("GCE poll operation failed: %v", err) + glog.Warningf("GCE poll operation %s failed: pollOp: [%v] err: [%v] getErrorFromOp: [%v]", opName, pollOp, err, getErrorFromOp(pollOp)) } return opIsDone(pollOp), getErrorFromOp(pollOp) }) @@ -410,19 +421,19 @@ func getErrorFromOp(op *compute.Operation) error { } func (gce *GCECloud) waitForGlobalOp(op *compute.Operation) error { - return waitForOp(op, func(operationName string) (*compute.Operation, error) { + return gce.waitForOp(op, func(operationName string) (*compute.Operation, error) { return gce.service.GlobalOperations.Get(gce.projectID, operationName).Do() }) } func (gce *GCECloud) waitForRegionOp(op *compute.Operation, region string) error { - return waitForOp(op, func(operationName string) (*compute.Operation, error) { + return gce.waitForOp(op, func(operationName string) (*compute.Operation, error) { return gce.service.RegionOperations.Get(gce.projectID, region, operationName).Do() }) } func (gce *GCECloud) waitForZoneOp(op *compute.Operation, zone string) error { - return waitForOp(op, func(operationName string) (*compute.Operation, error) { + return gce.waitForOp(op, func(operationName string) (*compute.Operation, error) { return gce.service.ZoneOperations.Get(gce.projectID, zone, operationName).Do() }) } @@ -2366,7 +2377,7 @@ func (gce *GCECloud) getInstanceByName(name string) (*gceInstance, error) { zone := gce.managedZones[0] res, err := gce.service.Instances.Get(gce.projectID, zone, name).Do() if err != nil { - glog.Errorf("Failed to retrieve TargetInstance resource for instance: %s", name) + glog.Errorf("getInstanceByName/single-zone: failed to get instance %s; err: %v", name, err) if isHTTPErrorCode(err, http.StatusNotFound) { return nil, cloudprovider.InstanceNotFound } @@ -2383,6 +2394,7 @@ func (gce *GCECloud) getInstanceByName(name string) (*gceInstance, error) { instances, err := gce.getInstancesByNames([]string{name}) if err != nil { + glog.Errorf("getInstanceByName/multiple-zones: failed to get instance %s; err: %v", name, err) return nil, err } if len(instances) != 1 || instances[0] == nil { diff --git a/vendor/k8s.io/kubernetes/pkg/controller/daemon/controller.go b/vendor/k8s.io/kubernetes/pkg/controller/daemon/controller.go index 96c10514..83e4970e 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/daemon/controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/daemon/controller.go @@ -65,8 +65,9 @@ const ( // DaemonSetsController is responsible for synchronizing DaemonSet objects stored // in the system with actual running pods. type DaemonSetsController struct { - kubeClient clientset.Interface - podControl controller.PodControlInterface + kubeClient clientset.Interface + eventRecorder record.EventRecorder + podControl controller.PodControlInterface // An dsc is temporarily suspended after creating/deleting these many replicas. // It resumes normal action after observing the watch events for them. @@ -105,7 +106,8 @@ func NewDaemonSetsController(kubeClient clientset.Interface, resyncPeriod contro eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{kubeClient.Core().Events("")}) dsc := &DaemonSetsController{ - kubeClient: kubeClient, + kubeClient: kubeClient, + eventRecorder: eventBroadcaster.NewRecorder(api.EventSource{Component: "daemonset-controller"}), podControl: controller.RealPodControl{ KubeClient: kubeClient, Recorder: eventBroadcaster.NewRecorder(api.EventSource{Component: "daemon-set"}), @@ -131,7 +133,7 @@ func NewDaemonSetsController(kubeClient clientset.Interface, resyncPeriod contro AddFunc: func(obj interface{}) { ds := obj.(*extensions.DaemonSet) glog.V(4).Infof("Adding daemon set %s", ds.Name) - dsc.enqueueDaemonSet(obj) + dsc.enqueueDaemonSet(ds) }, UpdateFunc: func(old, cur interface{}) { oldDS := old.(*extensions.DaemonSet) @@ -152,12 +154,12 @@ func NewDaemonSetsController(kubeClient clientset.Interface, resyncPeriod contro } glog.V(4).Infof("Updating daemon set %s", oldDS.Name) - dsc.enqueueDaemonSet(cur) + dsc.enqueueDaemonSet(curDS) }, DeleteFunc: func(obj interface{}) { ds := obj.(*extensions.DaemonSet) glog.V(4).Infof("Deleting daemon set %s", ds.Name) - dsc.enqueueDaemonSet(obj) + dsc.enqueueDaemonSet(ds) }, }, ) @@ -246,10 +248,10 @@ func (dsc *DaemonSetsController) enqueueAllDaemonSets() { } } -func (dsc *DaemonSetsController) enqueueDaemonSet(obj interface{}) { - key, err := controller.KeyFunc(obj) +func (dsc *DaemonSetsController) enqueueDaemonSet(ds *extensions.DaemonSet) { + key, err := controller.KeyFunc(ds) if err != nil { - glog.Errorf("Couldn't get key for object %+v: %v", obj, err) + glog.Errorf("Couldn't get key for object %+v: %v", ds, err) return } @@ -623,6 +625,12 @@ func (dsc *DaemonSetsController) syncDaemonSet(key string) error { } ds := obj.(*extensions.DaemonSet) + everything := unversioned.LabelSelector{} + if reflect.DeepEqual(ds.Spec.Selector, &everything) { + dsc.eventRecorder.Eventf(ds, api.EventTypeWarning, "SelectingAll", "This daemon set is selecting all pods. A non-empty selector is required.") + return nil + } + // Don't process a daemon set until all its creations and deletions have been processed. // For example if daemon set foo asked for 3 new daemon pods in the previous call to manage, // then we do not want to call manage on foo until the daemon pods have been created. diff --git a/vendor/k8s.io/kubernetes/pkg/controller/deployment/deployment_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/deployment/deployment_controller.go index 2c60e40e..281487c0 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/deployment/deployment_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/deployment/deployment_controller.go @@ -426,6 +426,11 @@ func (dc *DeploymentController) syncDeployment(key string) error { } d := obj.(*extensions.Deployment) + everything := unversioned.LabelSelector{} + if reflect.DeepEqual(d.Spec.Selector, &everything) { + dc.eventRecorder.Eventf(d, api.EventTypeWarning, "SelectingAll", "This deployment is selecting all pods. A non-empty selector is required.") + return nil + } if d.Spec.Paused { // TODO: Implement scaling for paused deployments. @@ -898,6 +903,24 @@ func setNewReplicaSetAnnotations(deployment *extensions.Deployment, newRS *exten return annotationChanged } +// skipCopyAnnotation returns true if we should skip copying the annotation with the given annotation key +// TODO: How to decide which annotations should / should not be copied? +// See https://github.com/kubernetes/kubernetes/pull/20035#issuecomment-179558615 +func skipCopyAnnotation(key string) bool { + // Skip apply annotations and revision annotations. + return key == kubectl.LastAppliedConfigAnnotation || key == deploymentutil.RevisionAnnotation +} + +func getSkippedAnnotations(annotations map[string]string) map[string]string { + skippedAnnotations := make(map[string]string) + for k, v := range annotations { + if skipCopyAnnotation(k) { + skippedAnnotations[k] = v + } + } + return skippedAnnotations +} + // copyDeploymentAnnotationsToReplicaSet copies deployment's annotations to replica set's annotations, // and returns true if replica set's annotation is changed. // Note that apply and revision annotations are not copied. @@ -907,13 +930,10 @@ func copyDeploymentAnnotationsToReplicaSet(deployment *extensions.Deployment, rs rs.Annotations = make(map[string]string) } for k, v := range deployment.Annotations { - // TODO: How to decide which annotations should / should not be copied? - // See https://github.com/kubernetes/kubernetes/pull/20035#issuecomment-179558615 - // Skip apply annotations and revision annotations. // newRS revision is updated automatically in getNewReplicaSet, and the deployment's revision number is then updated // by copying its newRS revision number. We should not copy deployment's revision to its newRS, since the update of // deployment revision number may fail (revision becomes stale) and the revision number in newRS is more reliable. - if k == kubectl.LastAppliedConfigAnnotation || k == deploymentutil.RevisionAnnotation || rs.Annotations[k] == v { + if skipCopyAnnotation(k) || rs.Annotations[k] == v { continue } rs.Annotations[k] = v @@ -922,6 +942,18 @@ func copyDeploymentAnnotationsToReplicaSet(deployment *extensions.Deployment, rs return rsAnnotationsChanged } +// setDeploymentAnnotationsTo sets deployment's annotations as given RS's annotations. +// This action should be done if and only if the deployment is rolling back to this rs. +// Note that apply and revision annotations are not changed. +func setDeploymentAnnotationsTo(deployment *extensions.Deployment, rollbackToRS *extensions.ReplicaSet) { + deployment.Annotations = getSkippedAnnotations(deployment.Annotations) + for k, v := range rollbackToRS.Annotations { + if !skipCopyAnnotation(k) { + deployment.Annotations[k] = v + } + } +} + func (dc *DeploymentController) updateDeploymentRevision(deployment *extensions.Deployment, revision string) error { if deployment.Annotations == nil { deployment.Annotations = make(map[string]string) @@ -1227,6 +1259,18 @@ func (dc *DeploymentController) rollbackToTemplate(deployment *extensions.Deploy if !reflect.DeepEqual(deploymentutil.GetNewReplicaSetTemplate(deployment), rs.Spec.Template) { glog.Infof("Rolling back deployment %s to template spec %+v", deployment.Name, rs.Spec.Template.Spec) deploymentutil.SetFromReplicaSetTemplate(deployment, rs.Spec.Template) + // set RS (the old RS we'll rolling back to) annotations back to the deployment; + // otherwise, the deployment's current annotations (should be the same as current new RS) will be copied to the RS after the rollback. + // + // For example, + // A Deployment has old RS1 with annotation {change-cause:create}, and new RS2 {change-cause:edit}. + // Note that both annotations are copied from Deployment, and the Deployment should be annotated {change-cause:edit} as well. + // Now, rollback Deployment to RS1, we should update Deployment's pod-template and also copy annotation from RS1. + // Deployment is now annotated {change-cause:create}, and we have new RS1 {change-cause:create}, old RS2 {change-cause:edit}. + // + // If we don't copy the annotations back from RS to deployment on rollback, the Deployment will stay as {change-cause:edit}, + // and new RS1 becomes {change-cause:edit} (copied from deployment after rollback), old RS2 {change-cause:edit}, which is not correct. + setDeploymentAnnotationsTo(deployment, rs) performedRollback = true } else { glog.V(4).Infof("Rolling back to a revision that contains the same template as current deployment %s, skipping rollback...", deployment.Name) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go index 07491f69..e19c0ce9 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go @@ -47,6 +47,10 @@ const ( // often. Higher numbers = lower CPU/network load; lower numbers = // shorter amount of time before a mistaken endpoint is corrected. FullServiceResyncPeriod = 30 * time.Second + + // We must avoid syncing service until the pod store has synced. If it hasn't synced, to + // avoid a hot loop, we'll wait this long between checks. + PodStoreSyncedPollPeriod = 100 * time.Millisecond ) var ( @@ -98,6 +102,7 @@ func NewEndpointController(client *clientset.Clientset, resyncPeriod controller. DeleteFunc: e.deletePod, }, ) + e.podStoreSynced = e.podController.HasSynced return e } @@ -120,6 +125,9 @@ type EndpointController struct { // controllers. serviceController *framework.Controller podController *framework.Controller + // podStoreSynced returns true if the pod store has been synced at least once. + // Added as a member to the struct to allow injection for testing. + podStoreSynced func() bool } // Runs e; will not return until stopCh is closed. workers determines how many @@ -268,6 +276,15 @@ func (e *EndpointController) syncService(key string) { defer func() { glog.V(4).Infof("Finished syncing service %q endpoints. (%v)", key, time.Now().Sub(startTime)) }() + + if !e.podStoreSynced() { + // Sleep so we give the pod reflector goroutine a chance to run. + time.Sleep(PodStoreSyncedPollPeriod) + glog.Infof("Waiting for pods controller to sync, requeuing rc %v", key) + e.queue.Add(key) + return + } + obj, exists, err := e.serviceStore.Store.GetByKey(key) if err != nil || !exists { // Delete the corresponding endpoint, as the service has been deleted. diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/describe.go b/vendor/k8s.io/kubernetes/pkg/kubectl/describe.go index 0a09b3a0..f0415c08 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/describe.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/describe.go @@ -1263,7 +1263,11 @@ func (i *IngressDescriber) describeIngress(ing *extensions.Ingress) (string, err func describeIngressTLS(out io.Writer, ingTLS []extensions.IngressTLS) { fmt.Fprintf(out, "TLS:\n") for _, t := range ingTLS { - fmt.Fprintf(out, " %v terminates %v\n", t.SecretName, strings.Join(t.Hosts, ",")) + if t.SecretName == "" { + fmt.Fprintf(out, " SNI routes %v\n", strings.Join(t.Hosts, ",")) + } else { + fmt.Fprintf(out, " %v terminates %v\n", t.SecretName, strings.Join(t.Hosts, ",")) + } } return } diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/kubectl.go b/vendor/k8s.io/kubernetes/pkg/kubectl/kubectl.go index 844a5378..39cd1681 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubectl/kubectl.go +++ b/vendor/k8s.io/kubernetes/pkg/kubectl/kubectl.go @@ -28,7 +28,15 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" ) -const kubectlAnnotationPrefix = "kubectl.kubernetes.io/" +const ( + kubectlAnnotationPrefix = "kubectl.kubernetes.io/" + // TODO: auto-generate this + PossibleResourceTypes = `Possible resource types include (case insensitive): pods (po), services (svc), deployments, +replicasets (rs), replicationcontrollers (rc), nodes (no), events (ev), limitranges (limits), +persistentvolumes (pv), persistentvolumeclaims (pvc), resourcequotas (quota), namespaces (ns), +serviceaccounts, ingresses (ing), horizontalpodautoscalers (hpa), daemonsets (ds), configmaps, +componentstatuses (cs), endpoints (ep), and secrets.` +) type NamespaceInfo struct { Namespace string diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/config/config.go b/vendor/k8s.io/kubernetes/pkg/kubelet/config/config.go index 5ecf252e..0d190e01 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/config/config.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/config/config.go @@ -238,16 +238,7 @@ func (s *podStorage) merge(source string, change interface{}) (adds, updates, de } recordFirstSeenTime(ref) pods[name] = ref - // If a pod is not found in the cache, and it's also not in the - // pending phase, it implies that kubelet may have restarted. - // Treat this pod as update so that kubelet wouldn't reject the - // pod in the admission process. - if ref.Status.Phase != api.PodPending { - updatePods = append(updatePods, ref) - } else { - // this is an add - addPods = append(addPods, ref) - } + addPods = append(addPods, ref) } } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker.go b/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker.go index 08f19a7b..da6ebd83 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/dockertools/docker.go @@ -50,7 +50,8 @@ const ( milliCPUToCPU = 1000 // 100000 is equivalent to 100ms - quotaPeriod = 100000 + quotaPeriod = 100000 + minQuotaPerod = 1000 ) // DockerInterface is an abstract interface for testability. It abstracts the interface of docker.Client. @@ -317,6 +318,11 @@ func milliCPUToQuota(milliCPU int64) (quota int64, period int64) { // we then convert your milliCPU to a value normalized over a period quota = (milliCPU * quotaPeriod) / milliCPUToCPU + // quota needs to be a minimum of 1ms. + if quota < minQuotaPerod { + quota = minQuotaPerod + } + return } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go index 2d4338cf..62c772be 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go @@ -405,7 +405,7 @@ func NewMainKubelet( imageBackOff, serializeImagePulls, enableCustomMetrics, - hairpinMode == componentconfig.HairpinVeth, + klet.hairpinMode == componentconfig.HairpinVeth, containerRuntimeOptions..., ) case "rkt": @@ -2386,6 +2386,10 @@ func (kl *Kubelet) syncLoopIteration(updates <-chan kubetypes.PodUpdate, handler switch u.Op { case kubetypes.ADD: glog.V(2).Infof("SyncLoop (ADD, %q): %q", u.Source, format.Pods(u.Pods)) + // After restarting, kubelet will get all existing pods through + // ADD as if they are new pods. These pods will then go through the + // admission process and *may* be rejcted. This can be resolved + // once we have checkpointing. handler.HandlePodAdditions(u.Pods) case kubetypes.UPDATE: glog.V(2).Infof("SyncLoop (UPDATE, %q): %q", u.Source, format.Pods(u.Pods)) diff --git a/vendor/k8s.io/kubernetes/pkg/master/master.go b/vendor/k8s.io/kubernetes/pkg/master/master.go index 332f3ada..d062c570 100644 --- a/vendor/k8s.io/kubernetes/pkg/master/master.go +++ b/vendor/k8s.io/kubernetes/pkg/master/master.go @@ -858,5 +858,9 @@ func (m *Master) IsTunnelSyncHealthy(req *http.Request) error { if lag > 600 { return fmt.Errorf("Tunnel sync is taking to long: %d", lag) } + sshKeyLag := m.tunneler.SecondsSinceSSHKeySync() + if sshKeyLag > 600 { + return fmt.Errorf("SSHKey sync is taking to long: %d", sshKeyLag) + } return nil } diff --git a/vendor/k8s.io/kubernetes/pkg/master/tunneler.go b/vendor/k8s.io/kubernetes/pkg/master/tunneler.go index 8a23ce3f..2da04849 100644 --- a/vendor/k8s.io/kubernetes/pkg/master/tunneler.go +++ b/vendor/k8s.io/kubernetes/pkg/master/tunneler.go @@ -41,6 +41,7 @@ type Tunneler interface { Stop() Dial(net, addr string) (net.Conn, error) SecondsSinceSync() int64 + SecondsSinceSSHKeySync() int64 } type SSHTunneler struct { @@ -51,6 +52,7 @@ type SSHTunneler struct { tunnels *ssh.SSHTunnelList lastSync int64 // Seconds since Epoch + lastSSHKeySync int64 // Seconds since Epoch lastSyncMetric prometheus.GaugeFunc clock util.Clock @@ -101,6 +103,7 @@ func (c *SSHTunneler) Run(getAddresses AddressFunc) { c.tunnels = ssh.NewSSHTunnelList(c.SSHUser, c.SSHKeyfile, c.HealthCheckURL, c.stopChan) // Sync loop to ensure that the SSH key has been installed. + c.lastSSHKeySync = c.clock.Now().Unix() c.installSSHKeySyncLoop(c.SSHUser, publicKeyFile) // Sync tunnelList w/ nodes. c.lastSync = c.clock.Now().Unix() @@ -125,6 +128,12 @@ func (c *SSHTunneler) SecondsSinceSync() int64 { return now - then } +func (c *SSHTunneler) SecondsSinceSSHKeySync() int64 { + now := c.clock.Now().Unix() + then := atomic.LoadInt64(&c.lastSSHKeySync) + return now - then +} + func (c *SSHTunneler) installSSHKeySyncLoop(user, publicKeyfile string) { go wait.Until(func() { if c.InstallSSHKey == nil { @@ -143,7 +152,9 @@ func (c *SSHTunneler) installSSHKeySyncLoop(user, publicKeyfile string) { } if err := c.InstallSSHKey(user, keyData); err != nil { glog.Errorf("Failed to install ssh key: %v", err) + return } + atomic.StoreInt64(&c.lastSSHKeySync, c.clock.Now().Unix()) }, 5*time.Minute, c.stopChan) } diff --git a/vendor/k8s.io/kubernetes/pkg/version/base.go b/vendor/k8s.io/kubernetes/pkg/version/base.go index 0cf19930..c1b0a9c4 100644 --- a/vendor/k8s.io/kubernetes/pkg/version/base.go +++ b/vendor/k8s.io/kubernetes/pkg/version/base.go @@ -51,7 +51,7 @@ var ( // semantic version is a git hash, but the version itself is no // longer the direct output of "git describe", but a slight // translation to be semver compliant. - gitVersion string = "v1.2.0+$Format:%h$" + gitVersion string = "v1.2.1+$Format:%h$" gitCommit string = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" ) diff --git a/vendor/k8s.io/kubernetes/pkg/volume/host_path/host_path.go b/vendor/k8s.io/kubernetes/pkg/volume/host_path/host_path.go index 1dfcec75..48266525 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/host_path/host_path.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/host_path/host_path.go @@ -97,13 +97,13 @@ func (plugin *hostPathPlugin) NewBuilder(spec *volume.Spec, pod *api.Pod, _ volu if spec.Volume != nil && spec.Volume.HostPath != nil { path := spec.Volume.HostPath.Path return &hostPathBuilder{ - hostPath: &hostPath{path: path, MetricsProvider: volume.NewMetricsDu(path)}, + hostPath: &hostPath{path: path}, readOnly: false, }, nil } else { path := spec.PersistentVolume.Spec.HostPath.Path return &hostPathBuilder{ - hostPath: &hostPath{path: path, MetricsProvider: volume.NewMetricsDu(path)}, + hostPath: &hostPath{path: path}, readOnly: spec.ReadOnly, }, nil } @@ -111,8 +111,7 @@ func (plugin *hostPathPlugin) NewBuilder(spec *volume.Spec, pod *api.Pod, _ volu func (plugin *hostPathPlugin) NewCleaner(volName string, podUID types.UID) (volume.Cleaner, error) { return &hostPathCleaner{&hostPath{ - path: "", - MetricsProvider: volume.NewMetricsDu(""), + path: "", }}, nil } @@ -137,12 +136,11 @@ func newRecycler(spec *volume.Spec, host volume.VolumeHost, config volume.Volume } path := spec.PersistentVolume.Spec.HostPath.Path return &hostPathRecycler{ - name: spec.Name(), - path: path, - host: host, - config: config, - timeout: volume.CalculateTimeoutForVolume(config.RecyclerMinimumTimeout, config.RecyclerTimeoutIncrement, spec.PersistentVolume), - MetricsProvider: volume.NewMetricsDu(path), + name: spec.Name(), + path: path, + host: host, + config: config, + timeout: volume.CalculateTimeoutForVolume(config.RecyclerMinimumTimeout, config.RecyclerTimeoutIncrement, spec.PersistentVolume), }, nil } @@ -151,7 +149,7 @@ func newDeleter(spec *volume.Spec, host volume.VolumeHost) (volume.Deleter, erro return nil, fmt.Errorf("spec.PersistentVolumeSource.HostPath is nil") } path := spec.PersistentVolume.Spec.HostPath.Path - return &hostPathDeleter{spec.Name(), path, host, volume.NewMetricsDu(path)}, nil + return &hostPathDeleter{name: spec.Name(), path: path, host: host}, nil } func newProvisioner(options volume.VolumeOptions, host volume.VolumeHost) (volume.Provisioner, error) { @@ -162,7 +160,7 @@ func newProvisioner(options volume.VolumeOptions, host volume.VolumeHost) (volum // The direct at the specified path will be directly exposed to the container. type hostPath struct { path string - volume.MetricsProvider + volume.MetricsNil } func (hp *hostPath) GetPath() string { @@ -222,7 +220,7 @@ type hostPathRecycler struct { host volume.VolumeHost config volume.VolumeConfig timeout int64 - volume.MetricsProvider + volume.MetricsNil } func (r *hostPathRecycler) GetPath() string { @@ -291,7 +289,7 @@ type hostPathDeleter struct { name string path string host volume.VolumeHost - volume.MetricsProvider + volume.MetricsNil } func (r *hostPathDeleter) GetPath() string { From fb362540ec1d491da6247ca588dc2bcb2335ff4c Mon Sep 17 00:00:00 2001 From: Dan Gillespie Date: Sun, 3 Apr 2016 11:17:10 -0700 Subject: [PATCH 2/3] added integration tests --- .travis.yml | 3 +- Makefile | 4 +++ test/mattermost-demo.sh | 61 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100755 test/mattermost-demo.sh diff --git a/.travis.yml b/.travis.yml index 09090e2e..bf29ef17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ before_script: script: - make build + - make integration after_success: # If release then build + push image, if not just build @@ -40,4 +41,4 @@ deploy: secure: t/YDOTLHHts4nDOdhp1nFuPcMSo4J6J6VX7BBdznPEN+VeCw0gYOCuHos/gZ9FghQOMnIzSIsAED7Ab1DG481He4zroWiiVeM0QuR1/AZjnWmuMswg8/KPkokAxbW0nyBsiBldfYL+lV07YA4ARQHBNZVVWZXW/FYmwLDoDvU3LVXXVGE886p4bIL0eqktg1LSj3d4E5S4YS6MKguNMFmoip6IiaqIkMXhhAKyUnQeHiEseEgIz4WxzWRuWUNOdda7BlCQZhlArjQfT62tIykymignOU3S63jXgM4AL6vDyuKG6fgTrtt473SWH5SaDobarE9k1CEb/ZxMNW6hZHrqIuUDqdtrh0liQZOTYN4zb6oHDHT1LZ0f269neaW6gtV/yjUz33kA7p5hrJepEFlupvwZq6BYpLcijVrpEuAwpxRiVBMAFuchGZ2RPKHAL+zOprsqEpmgKPvRM/r/iQbxpuPESr8hqYjxBYsAZVTsFWZ0B54Gnb0AkcNtJCAbN9F576zJMu++Ogb3xrcnApcbBCeuEe/5IE21Zjm3H7ATW54OP9sJQM7pYCKeZwib1+uL0OWc4wv50w+Uwxrp28BN942iazgatQIFf40lnZXcgKv+hqlmY+fJB4y/vWEyK2xaRDvbGsls+wD/weJXdi3Qr3NRQYJqOjwZBi20kep+g= file: ./build/localkube-linux on: - tags: true \ No newline at end of file + tags: true diff --git a/Makefile b/Makefile index 91c00d90..37485a8a 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,10 @@ all: deps clean validate build build-image .PHONY: validate validate: checkgofmt +.PHONY: integration +integration: build-image + ./test/mattermost-demo.sh + .PHONY: build build: build/localkube-$(GOOS) diff --git a/test/mattermost-demo.sh b/test/mattermost-demo.sh new file mode 100755 index 00000000..7a5d00ce --- /dev/null +++ b/test/mattermost-demo.sh @@ -0,0 +1,61 @@ +#!/bin/bash +set -e + +NODE_IP="127.0.0.1" +SLEEP_TIME=10 + +function retry() { + COMMAND=$1 + RETRIES=5 + + # override default if retry count is set + if [ -n "$2" ]; then + RETRIES=$2 + fi + + for i in `seq 1 $RETRIES`; do + PATH="$(pwd)/build:$PATH" eval "$COMMAND" && return + sleep $SLEEP_TIME + done + + echo "Failed to: $1" + return 1 +} + +KUBECTL="./build/kubectl" +SPREAD="./build/spread" +MATTERMOST="./build/mattermost" +export PATH="$(pwd)/build:$PATH" + +if [ ! -f $KUBECTL ]; then + echo "Installing kubectl..." + curl -o $KUBECTL https://storage.googleapis.com/kubernetes-release/release/v1.2.1/bin/linux/amd64/kubectl + chmod +x $KUBECTL +fi + +if [ ! -f $SPREAD ]; then + echo "Installing spread..." + curl -o $SPREAD -L https://github.com/redspread/spread/releases/download/0.1.4/spread_linux_amd64 + chmod +x $SPREAD +fi + +echo "Starting up localkube server" +spread cluster start + +if [ ! -d "$MATTERMOST" ]; then + echo "Cloning mattermost deployment repo" + git clone http://github.com/redspread/kube-mattermost $MATTERMOST +fi + +echo "Deploying demo..." +retry "spread deploy $MATTERMOST" + +echo "Checking if service had been created" +retry "kubectl get services/mattermost-app" + +echo "Getting node port..." +NODE_PORT=$(kubectl get services/mattermost-app --template='{{range .spec.ports}}{{printf "%g" .nodePort}}{{end}}') + +echo "Checking if started app successfully" +echo "waiting up to 100 seconds" +retry "curl --fail http://$NODE_IP:$NODE_PORT" "10" From 7621ffd6afb3deb4f035d40bb110a10f992ea33e Mon Sep 17 00:00:00 2001 From: Dan Gillespie Date: Sun, 3 Apr 2016 11:39:52 -0700 Subject: [PATCH 3/3] added integration to makefile all --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 37485a8a..710ddbc9 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ DOCKER_IMAGE_NAME = "$(ORG)/$(NAME):$(TAG)" DOCKER_DEV_IMAGE ?= "golang:1.6" .PHONY: all -all: deps clean validate build build-image +all: deps clean validate build build-image integration .PHONY: validate validate: checkgofmt