Skip to content

Commit

Permalink
Update deps to Kubernetes 1.13.1
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanprodan committed Apr 18, 2019
1 parent c7539f6 commit 0c68983
Show file tree
Hide file tree
Showing 653 changed files with 44,330 additions and 24,497 deletions.
160 changes: 82 additions & 78 deletions Gopkg.lock

Large diffs are not rendered by default.

22 changes: 12 additions & 10 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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)
Expand Down
9 changes: 5 additions & 4 deletions cmd/flagger/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 (
Expand Down
20 changes: 11 additions & 9 deletions pkg/client/clientset/versioned/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 11 additions & 9 deletions pkg/client/clientset/versioned/scheme/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions pkg/client/clientset/versioned/typed/appmesh/v1beta1/mesh.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0c68983

Please sign in to comment.