Skip to content
This repository has been archived by the owner on Jun 11, 2021. It is now read-only.

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Xabier Larrakoetxea <slok69@gmail.com>
  • Loading branch information
slok committed Oct 24, 2019
1 parent 687790a commit f061512
Show file tree
Hide file tree
Showing 21 changed files with 272 additions and 160 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ FAKE_CMD := $(DEV_CMD) --fake
K8S_CODE_GEN_CMD := ./hack/scripts/k8scodegen.sh
OPENAPI_CODE_GEN_CMD := ./hack/scripts/openapicodegen.sh
DEPS_CMD := GO111MODULE=on go mod tidy && GO111MODULE=on go mod vendor
K8S_VERSION := 1.11.3
K8S_VERSION := 1.13.12
SET_K8S_DEPS_CMD := GO111MODULE=on go mod edit \
-require=k8s.io/apiextensions-apiserver@kubernetes-${K8S_VERSION} \
-require=k8s.io/client-go@kubernetes-${K8S_VERSION} \
Expand Down
2 changes: 1 addition & 1 deletion docker/dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.11-alpine
FROM golang:1.13-alpine

RUN apk --no-cache add \
bash \
Expand Down
8 changes: 4 additions & 4 deletions docker/prod/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM golang:1.11-alpine AS build-stage
FROM golang:1.13-alpine AS build-stage

RUN apk --no-cache add \
g++ \
git \
make
g++ \
git \
make

ARG VERSION
ENV VERSION=${VERSION}
Expand Down
26 changes: 15 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
module github.com/spotahome/service-level-operator

require (
github.com/emicklei/go-restful v2.8.0+incompatible // indirect
github.com/go-openapi/spec v0.17.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/oklog/run v1.0.0
github.com/prometheus/client_golang v0.9.0-pre1.0.20181001174001-0a8115f42e03
github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e
github.com/sirupsen/logrus v1.2.0
github.com/spotahome/kooper v0.5.0
github.com/stretchr/testify v1.2.2
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
k8s.io/apiextensions-apiserver v0.0.0-20180910084140-b05d9bb7cc74
k8s.io/apimachinery v0.0.0-20180904193909-def12e63c512
k8s.io/client-go v2.0.0-alpha.0.0.20180910083459-2cefa64ff137+incompatible
k8s.io/kube-openapi v0.0.0-20180928202339-9dfdf9be683f
github.com/prometheus/client_golang v1.2.1
github.com/prometheus/common v0.7.0
github.com/sirupsen/logrus v1.4.2
github.com/spotahome/kooper v0.6.1-0.20190926114429-1c6a0cfab9a5
github.com/stretchr/testify v1.4.0
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6
k8s.io/api v0.0.0-20191004102255-dacd7df5a50b // indirect
k8s.io/apiextensions-apiserver v0.0.0-20191004105443-a7d558db75c6
k8s.io/apimachinery v0.0.0-20191004074956-01f8b7d1121a
k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
)

replace k8s.io/client-go@v2.0.0-alpha.0.0.20180910083459-2cefa64ff137+incompatible => k8s.io/client-go v1.11.3

go 1.13
282 changes: 189 additions & 93 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hack/scripts/k8scodegen.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env sh

CODE_GENERATOR_IMAGE=quay.io/slok/kube-code-generator:v1.10.0
CODE_GENERATOR_IMAGE=quay.io/slok/kube-code-generator:v1.13.5
DIRECTORY=${PWD}
CODE_GENERATOR_PACKAGE=github.com/spotahome/service-level-operator

Expand Down
18 changes: 5 additions & 13 deletions pkg/apis/monitoring/v1alpha1/zz_generated.deepcopy.go

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

4 changes: 1 addition & 3 deletions pkg/k8sautogen/client/clientset/versioned/clientset.go

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

2 changes: 1 addition & 1 deletion pkg/k8sautogen/client/clientset/versioned/doc.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.

2 changes: 1 addition & 1 deletion pkg/k8sautogen/client/clientset/versioned/fake/doc.go

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

18 changes: 10 additions & 8 deletions pkg/k8sautogen/client/clientset/versioned/fake/register.go

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

2 changes: 1 addition & 1 deletion pkg/k8sautogen/client/clientset/versioned/scheme/doc.go

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

18 changes: 10 additions & 8 deletions pkg/k8sautogen/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.

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.

0 comments on commit f061512

Please sign in to comment.