diff --git a/Dockerfile b/Dockerfile index 91e0dbdc2a..4ea62bf08f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder +FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 AS builder WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws COPY . . # VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own RUN unset VERSION \ - && GOPROXY=off NO_DOCKER=1 make build + && GOPROXY=off NO_DOCKER=1 make build FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-aws/bin/machine-controller-manager / diff --git a/Makefile b/Makefile index 64151cb533..c2d8353e07 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ ifeq ($(NO_DOCKER), 1) IMAGE_BUILD_CMD = imagebuilder CGO_ENABLED = 1 else - DOCKER_CMD := docker run --rm -e CGO_ENABLED=1 -v "$(PWD)":/go/src/sigs.k8s.io/cluster-api-provider-aws:Z -w /go/src/sigs.k8s.io/cluster-api-provider-aws openshift/origin-release:golang-1.13 + DOCKER_CMD := docker run --rm -e CGO_ENABLED=1 -v "$(PWD)":/go/src/sigs.k8s.io/cluster-api-provider-aws:Z -w /go/src/sigs.k8s.io/cluster-api-provider-aws openshift/origin-release:golang-1.15 IMAGE_BUILD_CMD = docker build endif diff --git a/go.mod b/go.mod index add34a7c55..e1552e21e1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/cluster-api-provider-aws -go 1.13 +go 1.15 require ( github.com/aws/aws-sdk-go v1.35.20 diff --git a/go.sum b/go.sum index 9b3efbfdf2..3ee5d8bbea 100644 --- a/go.sum +++ b/go.sum @@ -56,8 +56,6 @@ github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:l github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.15.66 h1:c2ScQzjFUoD1pK+6GQzX8yMXwppIjP5Oy8ljMRr2cbo= github.com/aws/aws-sdk-go v1.15.66/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= -github.com/aws/aws-sdk-go v1.21.10 h1:lTRdgyxraKbnNhx7kWeoW/Uow1TKnSNDpQGTtEXJQgk= -github.com/aws/aws-sdk-go v1.21.10/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.35.20 h1:Hs7x9Czh+MMPnZLQqHhsuZKeNFA3Vuf7pdy2r5QlVb0= github.com/aws/aws-sdk-go v1.35.20/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -319,10 +317,9 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= diff --git a/hack/go-fmt.sh b/hack/go-fmt.sh index bc9a1c70dd..6ae96550fd 100755 --- a/hack/go-fmt.sh +++ b/hack/go-fmt.sh @@ -14,6 +14,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/sigs.k8s.io/${REPO_NAME}:z" \ --workdir "/go/src/sigs.k8s.io/${REPO_NAME}" \ - openshift/origin-release:golang-1.13 \ + openshift/origin-release:golang-1.15 \ ./hack/go-fmt.sh "${@}" fi diff --git a/hack/go-lint.sh b/hack/go-lint.sh index 231056a3b8..515f264e60 100755 --- a/hack/go-lint.sh +++ b/hack/go-lint.sh @@ -12,6 +12,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/sigs.k8s.io/${REPO_NAME}:z" \ --workdir "/go/src/sigs.k8s.io/${REPO_NAME}" \ - openshift/origin-release:golang-1.13 \ + openshift/origin-release:golang-1.15 \ ./hack/go-lint.sh "${@}" fi diff --git a/hack/go-vet.sh b/hack/go-vet.sh index b18bf3a18e..c5bf6ed198 100755 --- a/hack/go-vet.sh +++ b/hack/go-vet.sh @@ -10,6 +10,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/sigs.k8s.io/${REPO_NAME}:z" \ --workdir "/go/src/sigs.k8s.io/${REPO_NAME}" \ - openshift/origin-release:golang-1.13 \ + openshift/origin-release:golang-1.15 \ ./hack/go-vet.sh "${@}" fi; diff --git a/hack/goimports.sh b/hack/goimports.sh index fa49b9785f..2bc3122cc5 100755 --- a/hack/goimports.sh +++ b/hack/goimports.sh @@ -10,6 +10,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/sigs.k8s.io/${REPO_NAME}:z" \ --workdir "/go/src/sigs.k8s.io/${REPO_NAME}" \ - openshift/origin-release:golang-1.13 \ + openshift/origin-release:golang-1.15 \ ./hack/goimports.sh "${@}" fi diff --git a/vendor/modules.txt b/vendor/modules.txt index 5580dd301e..4a3b671f8a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -10,6 +10,7 @@ github.com/PuerkitoBio/purell # github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 github.com/PuerkitoBio/urlesc # github.com/aws/aws-sdk-go v1.35.20 +## explicit github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/awserr github.com/aws/aws-sdk-go/aws/awsutil @@ -55,6 +56,7 @@ github.com/aws/aws-sdk-go/service/sts/stsiface # github.com/beorn7/perks v1.0.1 github.com/beorn7/perks/quantile # github.com/blang/semver v3.5.1+incompatible +## explicit github.com/blang/semver # github.com/cespare/xxhash/v2 v2.1.1 github.com/cespare/xxhash/v2 @@ -77,6 +79,7 @@ github.com/fsnotify/fsnotify # github.com/ghodss/yaml v1.0.0 github.com/ghodss/yaml # github.com/go-logr/logr v0.2.1 +## explicit github.com/go-logr/logr # github.com/go-openapi/jsonpointer v0.19.3 github.com/go-openapi/jsonpointer @@ -94,6 +97,7 @@ github.com/gogo/protobuf/sortkeys # github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 github.com/golang/groupcache/lru # github.com/golang/mock v1.3.1 +## explicit github.com/golang/mock/gomock github.com/golang/mock/mockgen github.com/golang/mock/mockgen/model @@ -163,6 +167,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/extensions/table @@ -183,6 +188,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/gbytes @@ -198,6 +204,7 @@ github.com/onsi/gomega/matchers/support/goraph/node github.com/onsi/gomega/matchers/support/goraph/util github.com/onsi/gomega/types # github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971 +## explicit github.com/openshift/api/config/v1 # github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5 github.com/openshift/client-go/config/clientset/versioned @@ -206,6 +213,7 @@ github.com/openshift/client-go/config/clientset/versioned/typed/config/v1 # github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20201002065957-9854f7420570 github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1 # github.com/openshift/machine-api-operator v0.2.1-0.20201002104344-6abfb5440597 +## explicit github.com/openshift/machine-api-operator/pkg/apis/machine github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1 github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider/v1beta1 @@ -360,6 +368,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966 gopkg.in/yaml.v3 # k8s.io/api v0.19.0 +## explicit k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 k8s.io/api/admissionregistration/v1 @@ -413,6 +422,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.19.0 +## explicit k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -480,6 +490,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.19.0 +## explicit k8s.io/client-go/discovery k8s.io/client-go/discovery/cached/disk k8s.io/client-go/dynamic @@ -572,6 +583,7 @@ k8s.io/client-go/util/workqueue # k8s.io/component-base v0.19.0 k8s.io/component-base/version # k8s.io/klog/v2 v2.3.0 +## explicit k8s.io/klog/v2 k8s.io/klog/v2/klogr # k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 @@ -589,6 +601,7 @@ k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation # k8s.io/utils v0.0.0-20200729134348-d5654de09c73 +## explicit k8s.io/utils/buffer k8s.io/utils/exec k8s.io/utils/integer @@ -597,6 +610,7 @@ k8s.io/utils/trace # sigs.k8s.io/cluster-api-provider-azure v0.0.0-00010101000000-000000000000 => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20200618001858-af08a66b92de sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1beta1 # sigs.k8s.io/controller-runtime v0.6.2 +## explicit sigs.k8s.io/controller-runtime sigs.k8s.io/controller-runtime/pkg/builder sigs.k8s.io/controller-runtime/pkg/cache @@ -640,6 +654,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.3.0 +## explicit sigs.k8s.io/controller-tools/cmd/controller-gen sigs.k8s.io/controller-tools/pkg/crd sigs.k8s.io/controller-tools/pkg/crd/markers @@ -680,4 +695,7 @@ sigs.k8s.io/kustomize/pkg/types # sigs.k8s.io/structured-merge-diff/v4 v4.0.1 sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 +## explicit sigs.k8s.io/yaml +# sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20200618031251-e16dd65fdd85 +# sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20200618001858-af08a66b92de