Skip to content

Commit

Permalink
Merge pull request #22 from DockToFuture/fix/update-go-version
Browse files Browse the repository at this point in the history
Update go version to 1.14
  • Loading branch information
DockToFuture authored Sep 7, 2020
2 parents fad7959 + c2581ea commit d7b4ce6
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############# builder
FROM golang:1.13.4 AS builder
FROM golang:1.14.2 AS builder

WORKDIR /go/src/github.com/gardener/gardener-extension-networking-cilium
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/gardener/gardener-extension-networking-cilium

go 1.13
go 1.14

require (
github.com/ahmetb/gen-crd-api-reference-docs v0.1.5
Expand Down
4 changes: 4 additions & 0 deletions hack/update-codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

set -o errexit
set -o nounset
set -o pipefail

rm -f $GOPATH/bin/*-gen

PROJECT_ROOT=$(dirname $0)/..
Expand Down
27 changes: 27 additions & 0 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ github.com/PuerkitoBio/purell
# github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578
github.com/PuerkitoBio/urlesc
# github.com/ahmetb/gen-crd-api-reference-docs v0.1.5
## explicit
github.com/ahmetb/gen-crd-api-reference-docs
# github.com/beorn7/perks v1.0.1
github.com/beorn7/perks/quantile
Expand Down Expand Up @@ -53,6 +54,7 @@ github.com/gardener/external-dns-management/pkg/apis/dns
github.com/gardener/external-dns-management/pkg/apis/dns/v1alpha1
github.com/gardener/external-dns-management/pkg/client/dns/clientset/versioned/scheme
# github.com/gardener/gardener v1.10.0
## explicit
github.com/gardener/gardener/extensions/pkg/controller
github.com/gardener/gardener/extensions/pkg/controller/cmd
github.com/gardener/gardener/extensions/pkg/controller/error
Expand Down Expand Up @@ -128,6 +130,7 @@ github.com/gardener/gardener/test/framework
github.com/gardener/gardener/test/framework/config
github.com/gardener/gardener/test/framework/reporter
# github.com/gardener/gardener-resource-manager v0.13.1
## explicit
github.com/gardener/gardener-resource-manager/pkg/apis/resources
github.com/gardener/gardener-resource-manager/pkg/apis/resources/v1alpha1
github.com/gardener/gardener-resource-manager/pkg/apis/resources/v1alpha1/helper
Expand All @@ -140,6 +143,7 @@ github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1
# github.com/ghodss/yaml v1.0.0
github.com/ghodss/yaml
# github.com/go-logr/logr v0.1.0
## explicit
github.com/go-logr/logr
# github.com/go-logr/zapr v0.1.1
github.com/go-logr/zapr
Expand All @@ -159,6 +163,7 @@ github.com/gobuffalo/logger
github.com/gobuffalo/packd
github.com/gobuffalo/packd/internal/takeon/github.com/markbates/errx
# github.com/gobuffalo/packr/v2 v2.5.1
## explicit
github.com/gobuffalo/packr/v2
github.com/gobuffalo/packr/v2/file
github.com/gobuffalo/packr/v2/file/resolver
Expand Down Expand Up @@ -212,6 +217,7 @@ github.com/gogo/protobuf/vanity/command
# github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7
github.com/golang/groupcache/lru
# github.com/golang/mock v1.4.4-0.20200731163441-8734ec565a4d
## explicit
github.com/golang/mock/gomock
github.com/golang/mock/mockgen
github.com/golang/mock/mockgen/model
Expand Down Expand Up @@ -298,6 +304,7 @@ github.com/nxadm/tail/util
github.com/nxadm/tail/watch
github.com/nxadm/tail/winfile
# github.com/onsi/ginkgo v1.12.1
## explicit
github.com/onsi/ginkgo
github.com/onsi/ginkgo/config
github.com/onsi/ginkgo/ginkgo
Expand All @@ -324,6 +331,7 @@ github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable
github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty
github.com/onsi/ginkgo/types
# github.com/onsi/gomega v1.10.1
## explicit
github.com/onsi/gomega
github.com/onsi/gomega/format
github.com/onsi/gomega/internal/assertion
Expand All @@ -342,6 +350,7 @@ github.com/pelletier/go-toml
github.com/pierrec/lz4
github.com/pierrec/lz4/internal/xxh32
# github.com/pkg/errors v0.9.1
## explicit
github.com/pkg/errors
# github.com/prometheus/client_golang v1.3.0
github.com/prometheus/client_golang/prometheus
Expand Down Expand Up @@ -373,10 +382,12 @@ github.com/spf13/afero/mem
# github.com/spf13/cast v1.3.0
github.com/spf13/cast
# github.com/spf13/cobra v0.0.6
## explicit
github.com/spf13/cobra
# github.com/spf13/jwalterweatherman v1.0.0
github.com/spf13/jwalterweatherman
# github.com/spf13/pflag v1.0.5
## explicit
github.com/spf13/pflag
# github.com/spf13/viper v1.6.1
github.com/spf13/viper
Expand Down Expand Up @@ -603,6 +614,7 @@ honnef.co/go/tools/stylecheck
honnef.co/go/tools/unused
honnef.co/go/tools/version
# k8s.io/api v0.17.11 => k8s.io/api v0.17.11
## explicit
k8s.io/api/admission/v1beta1
k8s.io/api/admissionregistration/v1
k8s.io/api/admissionregistration/v1beta1
Expand Down Expand Up @@ -653,6 +665,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
# k8s.io/apimachinery v0.17.11 => k8s.io/apimachinery v0.17.11
## explicit
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/api/meta
Expand Down Expand Up @@ -707,6 +720,7 @@ k8s.io/apiserver/pkg/authentication/user
# k8s.io/autoscaler v0.0.0-20190805135949-100e91ba756e
k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1beta2
# k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible => k8s.io/client-go v0.17.11
## explicit
k8s.io/client-go/discovery
k8s.io/client-go/dynamic
k8s.io/client-go/kubernetes
Expand Down Expand Up @@ -788,6 +802,7 @@ k8s.io/client-go/util/workqueue
k8s.io/cluster-bootstrap/token/api
k8s.io/cluster-bootstrap/token/util
# k8s.io/code-generator v0.17.11 => k8s.io/code-generator v0.17.11
## explicit
k8s.io/code-generator
k8s.io/code-generator/cmd/client-gen
k8s.io/code-generator/cmd/client-gen/args
Expand Down Expand Up @@ -823,6 +838,7 @@ k8s.io/code-generator/pkg/namer
k8s.io/code-generator/pkg/util
k8s.io/code-generator/third_party/forked/golang/reflect
# k8s.io/component-base v0.17.11 => k8s.io/component-base v0.17.11
## explicit
k8s.io/component-base/config
k8s.io/component-base/config/v1alpha1
# k8s.io/gengo v0.0.0-20190826232639-a874a240740c
Expand Down Expand Up @@ -889,6 +905,7 @@ k8s.io/utils/integer
k8s.io/utils/pointer
k8s.io/utils/trace
# sigs.k8s.io/controller-runtime v0.5.10
## explicit
sigs.k8s.io/controller-runtime
sigs.k8s.io/controller-runtime/pkg/builder
sigs.k8s.io/controller-runtime/pkg/cache
Expand Down Expand Up @@ -927,3 +944,13 @@ sigs.k8s.io/controller-runtime/pkg/webhook/internal/certwatcher
sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics
# sigs.k8s.io/yaml v1.1.0
sigs.k8s.io/yaml
# k8s.io/api => k8s.io/api v0.17.11
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.11
# k8s.io/apimachinery => k8s.io/apimachinery v0.17.11
# k8s.io/apiserver => k8s.io/apiserver v0.17.11
# k8s.io/client-go => k8s.io/client-go v0.17.11
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.11
# k8s.io/code-generator => k8s.io/code-generator v0.17.11
# k8s.io/component-base => k8s.io/component-base v0.17.11
# k8s.io/helm => k8s.io/helm v2.13.1+incompatible
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.11

0 comments on commit d7b4ce6

Please sign in to comment.