From fd95794740a525f3b76dd9700743e3ab536c544d Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Wed, 17 Feb 2021 21:55:52 -0500 Subject: [PATCH] bump go to 1.15 --- base.Dockerfile | 2 +- go.mod | 2 +- upstream.Dockerfile | 2 +- vendor/modules.txt | 63 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 3 deletions(-) diff --git a/base.Dockerfile b/base.Dockerfile index 06fcab1d277..13f2aee4a37 100644 --- a/base.Dockerfile +++ b/base.Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM openshift/origin-release:golang-1.13 +FROM openshift/origin-release:golang-1.15 # Install test dependencies RUN yum install -y skopeo && \ diff --git a/go.mod b/go.mod index 646b3b7766a..1d9f9dfc43b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/operator-framework/operator-lifecycle-manager -go 1.13 +go 1.15 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/upstream.Dockerfile b/upstream.Dockerfile index 76a0bf0431e..ec1699b8049 100644 --- a/upstream.Dockerfile +++ b/upstream.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13-alpine as builder +FROM golang:1.15-alpine as builder LABEL stage=builder WORKDIR /build diff --git a/vendor/modules.txt b/vendor/modules.txt index 0a6c4d2111a..668fef9de69 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -68,7 +68,10 @@ github.com/beorn7/perks/quantile # github.com/blang/semver v3.5.1+incompatible github.com/blang/semver # github.com/blang/semver/v4 v4.0.0 +## explicit github.com/blang/semver/v4 +# github.com/bshuster-repo/logrus-logstash-hook v1.0.0 +## explicit # github.com/cespare/xxhash/v2 v2.1.1 github.com/cespare/xxhash/v2 # github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f @@ -105,6 +108,7 @@ github.com/containerd/continuity/sysx # github.com/containerd/ttrpc v1.0.1 github.com/containerd/ttrpc # github.com/coreos/go-semver v0.3.0 +## explicit github.com/coreos/go-semver/semver # github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e github.com/coreos/go-systemd/daemon @@ -116,6 +120,7 @@ github.com/cpuguy83/go-md2man/v2/md2man # github.com/cyphar/filepath-securejoin v0.2.2 github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 +## explicit github.com/davecgh/go-spew/spew # github.com/deislabs/oras v0.8.1 github.com/deislabs/oras/pkg/artifact @@ -191,13 +196,17 @@ github.com/fatih/color # github.com/form3tech-oss/jwt-go v3.2.2+incompatible github.com/form3tech-oss/jwt-go # github.com/fsnotify/fsnotify v1.4.9 +## explicit github.com/fsnotify/fsnotify # github.com/ghodss/yaml v1.0.0 +## explicit github.com/ghodss/yaml # github.com/go-bindata/go-bindata/v3 v3.1.3 +## explicit github.com/go-bindata/go-bindata/v3 github.com/go-bindata/go-bindata/v3/go-bindata/ # github.com/go-logr/logr v0.3.0 +## explicit github.com/go-logr/logr # github.com/go-logr/zapr v0.2.0 github.com/go-logr/zapr @@ -206,6 +215,7 @@ github.com/go-openapi/jsonpointer # github.com/go-openapi/jsonreference v0.19.3 github.com/go-openapi/jsonreference # github.com/go-openapi/spec v0.19.4 +## explicit github.com/go-openapi/spec # github.com/go-openapi/swag v0.19.5 github.com/go-openapi/swag @@ -240,6 +250,7 @@ github.com/golang-migrate/migrate/v4/source/file # github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e github.com/golang/groupcache/lru # github.com/golang/mock v1.4.1 +## explicit github.com/golang/mock/gomock github.com/golang/mock/mockgen github.com/golang/mock/mockgen/model @@ -252,6 +263,7 @@ github.com/golang/protobuf/ptypes/timestamp # github.com/google/btree v1.0.0 github.com/google/btree # github.com/google/go-cmp v0.5.2 +## explicit github.com/google/go-cmp/cmp github.com/google/go-cmp/cmp/internal/diff github.com/google/go-cmp/cmp/internal/flags @@ -262,6 +274,7 @@ github.com/google/gofuzz # github.com/google/uuid v1.1.2 github.com/google/uuid # github.com/googleapis/gnostic v0.5.1 => github.com/googleapis/gnostic v0.4.1 +## explicit github.com/googleapis/gnostic github.com/googleapis/gnostic/compiler github.com/googleapis/gnostic/discovery @@ -293,6 +306,7 @@ github.com/imdario/mergo # github.com/inconshreveable/mousetrap v1.0.0 github.com/inconshreveable/mousetrap # github.com/irifrance/gini v1.0.1 +## explicit github.com/irifrance/gini github.com/irifrance/gini/dimacs github.com/irifrance/gini/inter @@ -302,6 +316,7 @@ github.com/irifrance/gini/z # github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645 github.com/itchyny/astgen-go # github.com/itchyny/gojq v0.11.0 +## explicit github.com/itchyny/gojq # github.com/jmoiron/sqlx v1.2.0 github.com/jmoiron/sqlx @@ -340,11 +355,13 @@ github.com/mattn/go-sqlite3 # github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 github.com/matttproud/golang_protobuf_extensions/pbutil # github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2 +## explicit github.com/maxbrunsfeld/counterfeiter/v6 github.com/maxbrunsfeld/counterfeiter/v6/arguments github.com/maxbrunsfeld/counterfeiter/v6/command github.com/maxbrunsfeld/counterfeiter/v6/generator # github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37 +## explicit github.com/mikefarah/yq/v3 github.com/mikefarah/yq/v3/cmd github.com/mikefarah/yq/v3/pkg/yqlib @@ -353,12 +370,15 @@ github.com/mitchellh/copystructure # github.com/mitchellh/go-wordwrap v1.0.0 github.com/mitchellh/go-wordwrap # github.com/mitchellh/hashstructure v1.0.0 +## explicit github.com/mitchellh/hashstructure # github.com/mitchellh/mapstructure v1.1.2 +## explicit github.com/mitchellh/mapstructure # github.com/mitchellh/reflectwalk v1.0.0 github.com/mitchellh/reflectwalk # github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 +## explicit github.com/moby/term github.com/moby/term/windows # github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd @@ -376,6 +396,7 @@ github.com/nxadm/tail/util github.com/nxadm/tail/watch github.com/nxadm/tail/winfile # github.com/onsi/ginkgo v1.14.1 +## explicit github.com/onsi/ginkgo github.com/onsi/ginkgo/config github.com/onsi/ginkgo/extensions/table @@ -404,6 +425,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.2 +## explicit github.com/onsi/gomega github.com/onsi/gomega/format github.com/onsi/gomega/gbytes @@ -427,8 +449,10 @@ github.com/opencontainers/image-spec/specs-go/v1 # github.com/opencontainers/runc v0.1.1 github.com/opencontainers/runc/libcontainer/system # github.com/openshift/api v0.0.0-20200331152225-585af27e34fd => github.com/openshift/api v0.0.0-20200331152225-585af27e34fd +## explicit github.com/openshift/api/config/v1 # github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 +## explicit github.com/openshift/client-go/config/clientset/versioned github.com/openshift/client-go/config/clientset/versioned/fake github.com/openshift/client-go/config/clientset/versioned/scheme @@ -440,6 +464,7 @@ github.com/openshift/client-go/config/informers/externalversions/config/v1 github.com/openshift/client-go/config/informers/externalversions/internalinterfaces github.com/openshift/client-go/config/listers/config/v1 # github.com/operator-framework/api v0.5.1 => github.com/joelanford/api v0.0.0-20210216180012-67617936c73e +## explicit github.com/operator-framework/api/crds github.com/operator-framework/api/pkg/lib/version github.com/operator-framework/api/pkg/manifests @@ -454,6 +479,7 @@ github.com/operator-framework/api/pkg/validation/errors github.com/operator-framework/api/pkg/validation/interfaces github.com/operator-framework/api/pkg/validation/internal # github.com/operator-framework/operator-registry v1.13.6 +## explicit github.com/operator-framework/operator-registry/pkg/api github.com/operator-framework/operator-registry/pkg/api/grpc_health_v1 github.com/operator-framework/operator-registry/pkg/client @@ -469,6 +495,7 @@ github.com/operator-framework/operator-registry/pkg/server github.com/operator-framework/operator-registry/pkg/sqlite github.com/operator-framework/operator-registry/pkg/sqlite/migrations # github.com/otiai10/copy v1.2.0 +## explicit github.com/otiai10/copy # github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 github.com/pbnjay/strptime @@ -477,18 +504,22 @@ github.com/pelletier/go-toml # github.com/peterbourgon/diskv v2.0.1+incompatible github.com/peterbourgon/diskv # github.com/pkg/errors v0.9.1 +## explicit github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib/difflib # github.com/prometheus/client_golang v1.7.1 +## explicit github.com/prometheus/client_golang/prometheus github.com/prometheus/client_golang/prometheus/internal github.com/prometheus/client_golang/prometheus/promhttp github.com/prometheus/client_golang/prometheus/testutil github.com/prometheus/client_golang/prometheus/testutil/promlint # github.com/prometheus/client_model v0.2.0 +## explicit github.com/prometheus/client_model/go # github.com/prometheus/common v0.10.0 +## explicit github.com/prometheus/common/expfmt github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg github.com/prometheus/common/model @@ -508,16 +539,20 @@ github.com/shopspring/decimal # github.com/shurcooL/sanitized_anchor_name v1.0.0 github.com/shurcooL/sanitized_anchor_name # github.com/sirupsen/logrus v1.7.0 +## explicit github.com/sirupsen/logrus github.com/sirupsen/logrus/hooks/test # github.com/spf13/cast v1.3.1 github.com/spf13/cast # github.com/spf13/cobra v1.1.1 +## explicit github.com/spf13/cobra github.com/spf13/cobra/doc # github.com/spf13/pflag v1.0.5 +## explicit github.com/spf13/pflag # github.com/stretchr/testify v1.6.1 +## explicit github.com/stretchr/testify/assert github.com/stretchr/testify/require # github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f @@ -646,6 +681,7 @@ golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm golang.org/x/text/width # golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e +## explicit golang.org/x/time/rate # golang.org/x/tools v0.0.0-20200616195046-dc31b401abb5 golang.org/x/tools/go/ast/astutil @@ -684,6 +720,7 @@ google.golang.org/appengine/urlfetch # google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a google.golang.org/genproto/googleapis/rpc/status # google.golang.org/grpc v1.30.0 => google.golang.org/grpc v1.27.0 +## explicit google.golang.org/grpc google.golang.org/grpc/attributes google.golang.org/grpc/backoff @@ -763,10 +800,12 @@ gopkg.in/op/go-logging.v1 # gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 gopkg.in/tomb.v1 # gopkg.in/yaml.v2 v2.3.0 +## explicit gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 gopkg.in/yaml.v3 # helm.sh/helm/v3 v3.1.0-rc.1.0.20201215141456-e71d38b414eb +## explicit helm.sh/helm/v3/cmd/helm helm.sh/helm/v3/cmd/helm/require helm.sh/helm/v3/cmd/helm/search @@ -812,6 +851,7 @@ helm.sh/helm/v3/pkg/storage/driver helm.sh/helm/v3/pkg/strvals helm.sh/helm/v3/pkg/time # k8s.io/api v0.20.1 +## explicit k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 k8s.io/api/admissionregistration/v1 @@ -859,6 +899,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 # k8s.io/apiextensions-apiserver v0.20.1 +## explicit k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install @@ -885,6 +926,7 @@ k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalint k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1 # k8s.io/apimachinery v0.20.1 +## explicit k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -945,6 +987,7 @@ k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect # k8s.io/apiserver v0.20.1 => k8s.io/apiserver v0.0.0-20210107211418-525d1e3c959d +## explicit k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration k8s.io/apiserver/pkg/admission/initializer @@ -1082,6 +1125,7 @@ k8s.io/cli-runtime/pkg/kustomize/k8sdeps/validator k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource # k8s.io/client-go v0.20.1 +## explicit k8s.io/client-go/discovery k8s.io/client-go/discovery/cached/disk k8s.io/client-go/discovery/cached/memory @@ -1328,6 +1372,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue # k8s.io/code-generator v0.20.1 +## explicit k8s.io/code-generator k8s.io/code-generator/cmd/client-gen k8s.io/code-generator/cmd/client-gen/args @@ -1362,6 +1407,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.20.1 +## explicit k8s.io/component-base/cli/flag k8s.io/component-base/config k8s.io/component-base/config/v1alpha1 @@ -1387,10 +1433,12 @@ k8s.io/gengo/namer k8s.io/gengo/parser k8s.io/gengo/types # k8s.io/klog v1.0.0 +## explicit k8s.io/klog # k8s.io/klog/v2 v2.4.0 k8s.io/klog/v2 # k8s.io/kube-aggregator v0.20.0 +## explicit k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/v1 k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1 @@ -1409,6 +1457,7 @@ k8s.io/kube-aggregator/pkg/client/informers/externalversions/internalinterfaces k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1 k8s.io/kube-aggregator/pkg/client/listers/apiregistration/v1beta1 # k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd +## explicit k8s.io/kube-openapi/cmd/openapi-gen k8s.io/kube-openapi/cmd/openapi-gen/args k8s.io/kube-openapi/pkg/builder @@ -1443,10 +1492,13 @@ k8s.io/utils/net k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/trace +# rsc.io/letsencrypt v0.0.3 +## explicit # sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14 sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client # sigs.k8s.io/controller-runtime v0.8.0 +## explicit sigs.k8s.io/controller-runtime sigs.k8s.io/controller-runtime/pkg/builder sigs.k8s.io/controller-runtime/pkg/cache @@ -1494,6 +1546,7 @@ sigs.k8s.io/controller-runtime/pkg/webhook/conversion sigs.k8s.io/controller-runtime/pkg/webhook/internal/certwatcher sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics # sigs.k8s.io/controller-tools v0.4.1 +## explicit sigs.k8s.io/controller-tools/cmd/controller-gen sigs.k8s.io/controller-tools/pkg/crd sigs.k8s.io/controller-tools/pkg/crd/markers @@ -1509,6 +1562,7 @@ sigs.k8s.io/controller-tools/pkg/schemapatcher/internal/yaml sigs.k8s.io/controller-tools/pkg/version sigs.k8s.io/controller-tools/pkg/webhook # sigs.k8s.io/kind v0.7.0 +## explicit sigs.k8s.io/kind/pkg/apis/config/defaults sigs.k8s.io/kind/pkg/apis/config/v1alpha3 sigs.k8s.io/kind/pkg/apis/config/v1alpha4 @@ -1574,3 +1628,12 @@ sigs.k8s.io/structured-merge-diff/v4/typed sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml +# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1 +# github.com/openshift/api => github.com/openshift/api v0.0.0-20200331152225-585af27e34fd +# github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 +# github.com/operator-framework/api => github.com/joelanford/api v0.0.0-20210216180012-67617936c73e +# go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200520232829-54ba9589114f +# google.golang.org/grpc => google.golang.org/grpc v1.27.0 +# google.golang.org/grpc/examples => google.golang.org/grpc/examples v0.0.0-20200709232328-d8193ee9cc3e +# k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210107211418-525d1e3c959d +# sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06