Skip to content

Commit e21451c

Browse files
Dean-Coakleypleshakov
authored andcommitted
Update Go version to 1.14
1 parent 09d2a2e commit e21451c

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sudo: required
33
services:
44
- docker
55
go:
6-
- "1.13"
6+
- "1.14"
77
script:
88
- echo "Building ingress controller commit:${TRAVIS_COMMIT}"
99
- make container BUILD_IN_CONTAINER=0 DOCKER_BUILDKIT=0;

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ VERSION = 1.7.0-rc1
44
TAG = $(VERSION)
55
PREFIX = nginx/nginx-ingress
66

7-
GOLANG_CONTAINER = golang:1.13
7+
GOLANG_CONTAINER = golang:1.14
88
GOFLAGS ?= -mod=vendor
99
DOCKERFILEPATH = build
1010
DOCKERFILE = Dockerfile # note, this can be overwritten e.g. can be DOCKERFILE=DockerFileForPlus

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/nginxinc/kubernetes-ingress
22

3-
go 1.13
3+
go 1.14
44

55
require (
66
github.com/evanphx/json-patch v4.5.0+incompatible // indirect

vendor/modules.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@ github.com/cespare/xxhash/v2
55
# github.com/davecgh/go-spew v1.1.1
66
github.com/davecgh/go-spew/spew
77
# github.com/evanphx/json-patch v4.5.0+incompatible
8+
## explicit
89
github.com/evanphx/json-patch
910
# github.com/gogo/protobuf v1.3.1
1011
github.com/gogo/protobuf/proto
1112
github.com/gogo/protobuf/sortkeys
1213
# github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
14+
## explicit
1315
github.com/golang/glog
1416
# github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9
17+
## explicit
1518
github.com/golang/groupcache/lru
1619
# github.com/golang/protobuf v1.4.0
20+
## explicit
1721
github.com/golang/protobuf/proto
1822
github.com/golang/protobuf/ptypes
1923
github.com/golang/protobuf/ptypes/any
@@ -28,13 +32,16 @@ github.com/google/go-cmp/cmp/internal/value
2832
# github.com/google/gofuzz v1.1.0
2933
github.com/google/gofuzz
3034
# github.com/googleapis/gnostic v0.3.1
35+
## explicit
3136
github.com/googleapis/gnostic/OpenAPIv2
3237
github.com/googleapis/gnostic/compiler
3338
github.com/googleapis/gnostic/extensions
3439
# github.com/hashicorp/golang-lru v0.5.3
40+
## explicit
3541
github.com/hashicorp/golang-lru
3642
github.com/hashicorp/golang-lru/simplelru
3743
# github.com/imdario/mergo v0.3.8
44+
## explicit
3845
github.com/imdario/mergo
3946
# github.com/json-iterator/go v1.1.9
4047
github.com/json-iterator/go
@@ -45,13 +52,16 @@ github.com/modern-go/concurrent
4552
# github.com/modern-go/reflect2 v1.0.1
4653
github.com/modern-go/reflect2
4754
# github.com/nginxinc/nginx-plus-go-client v0.6.0
55+
## explicit
4856
github.com/nginxinc/nginx-plus-go-client/client
4957
# github.com/nginxinc/nginx-prometheus-exporter v0.7.0
58+
## explicit
5059
github.com/nginxinc/nginx-prometheus-exporter/client
5160
github.com/nginxinc/nginx-prometheus-exporter/collector
5261
# github.com/pkg/errors v0.8.1
5362
github.com/pkg/errors
5463
# github.com/prometheus/client_golang v1.5.1
64+
## explicit
5565
github.com/prometheus/client_golang/prometheus
5666
github.com/prometheus/client_golang/prometheus/internal
5767
github.com/prometheus/client_golang/prometheus/promhttp
@@ -62,6 +72,7 @@ github.com/prometheus/common/expfmt
6272
github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
6373
github.com/prometheus/common/model
6474
# github.com/prometheus/procfs v0.0.11
75+
## explicit
6576
github.com/prometheus/procfs
6677
github.com/prometheus/procfs/internal/fs
6778
github.com/prometheus/procfs/internal/util
@@ -73,6 +84,7 @@ golang.org/x/crypto/ssh/terminal
7384
golang.org/x/mod/module
7485
golang.org/x/mod/semver
7586
# golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
87+
## explicit
7688
golang.org/x/net/context
7789
golang.org/x/net/context/ctxhttp
7890
golang.org/x/net/http/httpguts
@@ -83,6 +95,7 @@ golang.org/x/net/idna
8395
golang.org/x/oauth2
8496
golang.org/x/oauth2/internal
8597
# golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f
98+
## explicit
8699
golang.org/x/sys/unix
87100
golang.org/x/sys/windows
88101
# golang.org/x/text v0.3.2
@@ -91,8 +104,10 @@ golang.org/x/text/transform
91104
golang.org/x/text/unicode/bidi
92105
golang.org/x/text/unicode/norm
93106
# golang.org/x/time v0.0.0-20191024005414-555d28b269f0
107+
## explicit
94108
golang.org/x/time/rate
95109
# golang.org/x/tools v0.0.0-20200325203130-f53864d0dba1
110+
## explicit
96111
golang.org/x/tools/go/ast/astutil
97112
golang.org/x/tools/imports
98113
golang.org/x/tools/internal/fastwalk
@@ -103,6 +118,7 @@ golang.org/x/tools/internal/imports
103118
golang.org/x/xerrors
104119
golang.org/x/xerrors/internal
105120
# google.golang.org/appengine v1.6.5
121+
## explicit
106122
google.golang.org/appengine/internal
107123
google.golang.org/appengine/internal/base
108124
google.golang.org/appengine/internal/datastore
@@ -146,6 +162,7 @@ gopkg.in/inf.v0
146162
# gopkg.in/yaml.v2 v2.2.8
147163
gopkg.in/yaml.v2
148164
# k8s.io/api v0.18.0
165+
## explicit
149166
k8s.io/api/admissionregistration/v1
150167
k8s.io/api/admissionregistration/v1beta1
151168
k8s.io/api/apps/v1
@@ -187,6 +204,7 @@ k8s.io/api/storage/v1
187204
k8s.io/api/storage/v1alpha1
188205
k8s.io/api/storage/v1beta1
189206
# k8s.io/apimachinery v0.18.1-beta.0
207+
## explicit
190208
k8s.io/apimachinery/pkg/api/errors
191209
k8s.io/apimachinery/pkg/api/meta
192210
k8s.io/apimachinery/pkg/api/resource
@@ -230,6 +248,7 @@ k8s.io/apimachinery/pkg/watch
230248
k8s.io/apimachinery/third_party/forked/golang/json
231249
k8s.io/apimachinery/third_party/forked/golang/reflect
232250
# k8s.io/client-go v0.18.0
251+
## explicit
233252
k8s.io/client-go/discovery
234253
k8s.io/client-go/discovery/fake
235254
k8s.io/client-go/kubernetes
@@ -344,6 +363,7 @@ k8s.io/client-go/util/homedir
344363
k8s.io/client-go/util/keyutil
345364
k8s.io/client-go/util/workqueue
346365
# k8s.io/code-generator v0.18.1-beta.0
366+
## explicit
347367
k8s.io/code-generator/cmd/client-gen
348368
k8s.io/code-generator/cmd/client-gen/args
349369
k8s.io/code-generator/cmd/client-gen/generators
@@ -365,6 +385,7 @@ k8s.io/code-generator/cmd/lister-gen/generators
365385
k8s.io/code-generator/pkg/namer
366386
k8s.io/code-generator/pkg/util
367387
# k8s.io/gengo v0.0.0-20200205140755-e0e292d8aa12
388+
## explicit
368389
k8s.io/gengo/args
369390
k8s.io/gengo/examples/deepcopy-gen/generators
370391
k8s.io/gengo/examples/defaulter-gen/generators
@@ -376,6 +397,7 @@ k8s.io/gengo/types
376397
# k8s.io/klog v1.0.0
377398
k8s.io/klog
378399
# k8s.io/kube-openapi v0.0.0-20200204173128-addea2498afe
400+
## explicit
379401
k8s.io/kube-openapi/pkg/util/proto
380402
# k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
381403
k8s.io/utils/buffer

0 commit comments

Comments
 (0)