Skip to content

Commit

Permalink
Bump Go to 1.13 and dependencies for Kubernetes 1.18.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ironcladlou committed Mar 24, 2020
1 parent 1f3fbf4 commit 34b876c
Show file tree
Hide file tree
Showing 769 changed files with 53,731 additions and 20,450 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
WORKDIR /ingress-operator
COPY . .
RUN make build
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.rhel7
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder
WORKDIR /ingress-operator
COPY . .
RUN make build
Expand Down
34 changes: 20 additions & 14 deletions go.mod
@@ -1,39 +1,45 @@
module github.com/openshift/cluster-ingress-operator

go 1.12
go 1.13

require (
github.com/Azure/azure-sdk-for-go v30.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.9.0
github.com/Azure/go-autorest/autorest/adal v0.5.0
github.com/Azure/go-autorest/autorest/to v0.2.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.1.0 // indirect

github.com/aws/aws-sdk-go v1.15.72
github.com/davecgh/go-spew v1.1.1
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v0.1.0
github.com/go-logr/zapr v0.1.1
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
github.com/google/go-cmp v0.3.0
github.com/imdario/mergo v0.3.7 // indirect
github.com/google/go-cmp v0.3.1
github.com/kevinburke/go-bindata v3.11.0+incompatible
github.com/openshift/api v0.0.0-20200217161739-c99157bc6492
github.com/openshift/library-go v0.0.0-20190927184318-c355e2019bb3

github.com/openshift/api v0.0.0-20200324173355-9b3bdf846ea1
github.com/openshift/library-go v0.0.0-20200324092245-db2a8546af81

github.com/pkg/errors v0.8.1
github.com/spf13/cobra v0.0.5
go.uber.org/zap v1.9.1
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
go.uber.org/zap v1.10.0
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
google.golang.org/api v0.4.0
gopkg.in/fsnotify.v1 v1.4.7
gopkg.in/yaml.v2 v2.2.4
gopkg.in/yaml.v2 v2.2.8

// kubernetes-1.16.0
k8s.io/api v0.17.1
k8s.io/apimachinery v0.17.1
k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
k8s.io/api v0.18.0-rc.1
k8s.io/apimachinery v0.18.0-rc.1
k8s.io/apiserver v0.18.0-rc.1
k8s.io/client-go v0.18.0-rc.1

sigs.k8s.io/controller-runtime v0.3.1-0.20191011155846-b2bc3490f2e3
sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a
)

replace (
// Remove when https://github.com/kubernetes-sigs/controller-runtime/pull/836 merges.
sigs.k8s.io/controller-runtime => github.com/munnerz/controller-runtime v0.1.8-0.20200318092001-e22ac1073450
// Remove when https://github.com/kubernetes-sigs/controller-tools/pull/424 merges.
sigs.k8s.io/controller-tools => github.com/munnerz/controller-tools v0.1.10-0.20200323145043-a2d268fbf03d
)
262 changes: 176 additions & 86 deletions go.sum

Large diffs are not rendered by default.

36 changes: 0 additions & 36 deletions vendor/github.com/gobuffalo/flect/.travis.yml

This file was deleted.

6 changes: 5 additions & 1 deletion vendor/github.com/gobuffalo/flect/humanize.go

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

0 comments on commit 34b876c

Please sign in to comment.