Skip to content

Commit

Permalink
Merge pull request #352 from s-urbaniak/bump-1.20
Browse files Browse the repository at this point in the history
bump to k8s 1.20, go 1.15
  • Loading branch information
s-urbaniak authored Dec 14, 2020
2 parents be35274 + 96cdc4d commit aa77eca
Show file tree
Hide file tree
Showing 673 changed files with 58,665 additions and 19,606 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- '1.13'
- '1.15'

# blech, Travis downloads with capitals in DirectXMan12, which confuses go
go_import_path: github.com/directxman12/k8s-prometheus-adapter
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ OUT_DIR?=$(PWD)/_output
OPENAPI_PATH=./vendor/k8s.io/kube-openapi

VERSION?=latest
GOIMAGE=golang:1.13
GOIMAGE=golang:1.15
GO111MODULE=on
export GO111MODULE

Expand Down
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ require (
github.com/onsi/gomega v1.7.0
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/common v0.10.0
github.com/spf13/cobra v1.0.0
github.com/spf13/cobra v1.1.1
github.com/stretchr/testify v1.6.1
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.19.3
k8s.io/apimachinery v0.19.3
k8s.io/apiserver v0.19.3
k8s.io/client-go v0.19.3
k8s.io/component-base v0.19.3
k8s.io/klog/v2 v2.3.0
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
k8s.io/metrics v0.19.3
k8s.io/sample-apiserver v0.18.5
k8s.io/api v0.20.0
k8s.io/apimachinery v0.20.0
k8s.io/apiserver v0.20.0
k8s.io/client-go v0.20.0
k8s.io/component-base v0.20.0
k8s.io/klog/v2 v2.4.0
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
k8s.io/metrics v0.20.0
k8s.io/sample-apiserver v0.20.0
sigs.k8s.io/metrics-server v0.4.1-0.20201126131427-ebfc64a74ae4
)

Expand Down
254 changes: 191 additions & 63 deletions go.sum

Large diffs are not rendered by default.

Loading

0 comments on commit aa77eca

Please sign in to comment.