Merge pull request #165 from dmage/new-branch-4.0

Bump k8s and OpenShift, use new docker-distribution branch

Author: openshift-merge-robot

glide.lock

@@ -3,27 +3,27 @@ import:
 
 # docker first
 - package: github.com/docker/distribution
-  version: image-registry-3.11
+  version: image-registry-4.0-distribution-16128bb
   repo: [email protected]:openshift/docker-distribution
 
 # kube second
 - package: k8s.io/apimachinery
-  version: origin-3.11-kubernetes-1.11.1
+  version: origin-4.0-kubernetes-1.12.4
   repo: [email protected]:openshift/kubernetes-apimachinery
 - package: k8s.io/client-go
-  version: origin-3.11-kubernetes-1.11.1
+  version: origin-4.0-kubernetes-1.12.4
   repo: [email protected]:openshift/kubernetes-client-go
 - package: k8s.io/metrics
-  version: origin-3.11-kubernetes-1.11.1
+  version: origin-4.0-kubernetes-1.12.4
   repo: [email protected]:openshift/kubernetes-metrics
 - package: k8s.io/apiserver
-  version: origin-3.11-kubernetes-1.11.1
+  version: origin-4.0-kubernetes-1.12.4
   repo: [email protected]:openshift/kubernetes-apiserver
 - package: k8s.io/api
-  version: origin-3.11-kubernetes-1.11.1
+  version: origin-4.0-kubernetes-1.12.4
   repo: [email protected]:openshift/kubernetes-api
 - package: k8s.io/apiextensions-apiserver
-  version: origin-3.11-kubernetes-1.11.1
+  version: origin-4.0-kubernetes-1.12.4
   repo: [email protected]:openshift/kubernetes-apiextensions-apiserver
 
 # openshift third
@@ -34,9 +34,7 @@ import:
 - package: github.com/openshift/library-go
   version: master
 
-
 # everything else last
-#
 - package: github.com/google/certificate-transparency
   repo: [email protected]:openshift/google-certificate-transparency
 - package: github.com/google/cadvisor
@@ -64,3 +62,23 @@ import:
   version: 16.2.1
 - package: github.com/gorilla/mux
   version: 1.4.0
+
+# pin the latest tested version so you can `glide up -v` to bump only one package
+- package: github.com/docker/go-metrics
+  version: 399ea8c73916000c64c2c76e8da00ca82f8387ab
+- package: github.com/docker/go-units
+  version: 47565b4f722fb6ceae66b95f853feed578a4a51c
+- package: github.com/go-ini/ini
+  version: fa25069db393aecc09b71267d0489b357781c860
+- package: github.com/Microsoft/go-winio
+  version: 97e4973ce50b2ff5f09635a57e2b88a037aae829
+- package: github.com/opencontainers/go-digest
+  version: c9281466c8b2f606084ac71339773efd177436e7
+- package: github.com/opencontainers/image-spec
+  version: 7b1e489870acb042978a3935d2fb76f8a79aff81
+- package: github.com/opencontainers/runc
+  version: 00dc70017d222b178a002ed30e9321b12647af2d
+- package: github.com/pkg/profile
+  version: 057bc52a47ec3c79498dda63f4a6f8298725e976
+- package: github.com/satori/go.uuid
+  version: 36e9d2ebbde5e3f13ab2e25625fd453271d6522e