Merge pull request #153 from weaveworks/dep-update

Update Kubernetes packages to 1.13.1

Gopkg.toml

@@ -21,25 +21,27 @@ required = [
 
 [[override]]
   name = "k8s.io/api"
-  version = "kubernetes-1.11.0"
+  version = "kubernetes-1.13.1"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.11.0"
+  version = "kubernetes-1.13.1"
 
 [[override]]
   name = "k8s.io/code-generator"
-  version = "kubernetes-1.11.0"
+  version = "kubernetes-1.13.1"
 
 [[override]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.11.0"
+  version = "kubernetes-1.13.1"
 
 [[override]]
-  name = "github.com/json-iterator/go"
-  # This is the commit at which k8s depends on this in 1.11
-  # It seems to be broken at HEAD.
-  revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682"
+  name = "k8s.io/apiextensions-apiserver"
+  version = "kubernetes-1.13.1"
+
+[[override]]
+  name = "k8s.io/apiserver"
+  version = "kubernetes-1.13.1"
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"
@@ -50,8 +52,8 @@ required = [
   version = "v0.2.0"
 
 [[override]]
-  name = "github.com/golang/glog"
-  source = "github.com/istio/glog"
+  name = "k8s.io/klog"
+  source = "github.com/stefanprodan/klog"
 
 [prune]
   go-tests = true

Makefile

@@ -4,6 +4,7 @@ VERSION_MINOR:=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4
 PATCH:=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4 }' | tr -d '"' | awk -F. '{print $$NF}')
 SOURCE_DIRS = cmd pkg/apis pkg/controller pkg/server pkg/logging pkg/version
 LT_VERSION?=$(shell grep 'VERSION' cmd/loadtester/main.go | awk '{ print $$4 }' | tr -d '"' | head -n1)
+TS=$(shell date +%Y-%m-%d_%H-%M-%S)
 
 run:
 	go run cmd/flagger/* -kubeconfig=$$HOME/.kube/config -log-level=info \
@@ -21,8 +22,8 @@ build:
 	docker build -t weaveworks/flagger:$(TAG) . -f Dockerfile
 
 push:
-	docker tag weaveworks/flagger:$(TAG) quay.io/weaveworks/flagger:$(VERSION)
-	docker push quay.io/weaveworks/flagger:$(VERSION)
+	docker tag weaveworks/flagger:$(TAG) weaveworks/flagger:$(VERSION)
+	docker push weaveworks/flagger:$(VERSION)
 
 fmt:
 	gofmt -l -s -w $(SOURCE_DIRS)

cmd/flagger/main.go

@@ -2,7 +2,11 @@ package main
 
 import (
 	"flag"
-	_ "github.com/istio/glog"
+	"log"
+	"strings"
+	"time"
+
+	_ "github.com/stefanprodan/klog"
 	clientset "github.com/weaveworks/flagger/pkg/client/clientset/versioned"
 	informers "github.com/weaveworks/flagger/pkg/client/informers/externalversions"
 	"github.com/weaveworks/flagger/pkg/controller"
@@ -17,9 +21,6 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
-	"log"
-	"strings"
-	"time"
 )
 
 var (