diff --git a/Dockerfile b/Dockerfile index 3fca6f2e0e..a390c23db4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder +FROM registry.ci.openshift.org/openshift/release:golang-1.15 AS builder WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack COPY . . RUN go build -o ./machine-controller-manager ./cmd/manager -FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base +FROM registry.ci.openshift.org/openshift/origin-v4.7:base COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-openstack/machine-controller-manager / diff --git a/Dockerfile.rhel b/Dockerfile.rhel index da31947327..50a9e5d620 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,10 +1,10 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack COPY . . RUN go build -o ./machine-controller-manager ./cmd/manager -FROM registry.svc.ci.openshift.org/ocp/4.7:base +FROM registry.ci.openshift.org/ocp/4.7:base RUN INSTALL_PKGS=" \ openssh \ " && \ diff --git a/go.mod b/go.mod index 77babddc44..f88e55727e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/cluster-api-provider-openstack -go 1.13 +go 1.15 require ( github.com/ajeddeloh/go-json v0.0.0-20170920214419-6a2fe990e083 // indirect diff --git a/vendor/modules.txt b/vendor/modules.txt index 61e0405f09..dd982ede1d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -8,16 +8,20 @@ github.com/PuerkitoBio/purell # github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 github.com/PuerkitoBio/urlesc # github.com/ajeddeloh/go-json v0.0.0-20170920214419-6a2fe990e083 +## explicit github.com/ajeddeloh/go-json # github.com/ajeddeloh/yaml v0.0.0-20170912190910-6b94386aeefd +## explicit github.com/ajeddeloh/yaml # github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d +## explicit github.com/alecthomas/units # github.com/beorn7/perks v1.0.1 github.com/beorn7/perks/quantile # github.com/cespare/xxhash/v2 v2.1.1 github.com/cespare/xxhash/v2 # github.com/coreos/container-linux-config-transpiler v0.9.0 +## explicit github.com/coreos/container-linux-config-transpiler/config github.com/coreos/container-linux-config-transpiler/config/astyaml github.com/coreos/container-linux-config-transpiler/config/platform @@ -28,8 +32,10 @@ github.com/coreos/container-linux-config-transpiler/internal/util # github.com/coreos/go-semver v0.3.0 github.com/coreos/go-semver/semver # github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a +## explicit github.com/coreos/go-systemd/unit # github.com/coreos/ignition v0.33.0 +## explicit github.com/coreos/ignition/config/shared/errors github.com/coreos/ignition/config/shared/validations github.com/coreos/ignition/config/v2_2/types @@ -54,6 +60,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 @@ -91,6 +98,7 @@ github.com/googleapis/gnostic/compiler github.com/googleapis/gnostic/extensions github.com/googleapis/gnostic/openapiv2 # github.com/gophercloud/gophercloud v0.14.0 +## explicit github.com/gophercloud/gophercloud github.com/gophercloud/gophercloud/internal github.com/gophercloud/gophercloud/openstack @@ -123,6 +131,7 @@ github.com/gophercloud/gophercloud/openstack/networking/v2/subnets github.com/gophercloud/gophercloud/openstack/utils github.com/gophercloud/gophercloud/pagination # github.com/gophercloud/utils v0.0.0-20201221031838-d93cf4b3fa50 +## explicit github.com/gophercloud/utils/env github.com/gophercloud/utils/gnocchi github.com/gophercloud/utils/internal @@ -167,6 +176,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 @@ -188,6 +198,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 @@ -203,14 +214,17 @@ 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-20201019163320-c6a5ec25f267 +## explicit github.com/openshift/api/config/v1 # github.com/openshift/client-go v0.0.0-20201020074620-f8fd44879f7c +## explicit github.com/openshift/client-go/config/clientset/versioned github.com/openshift/client-go/config/clientset/versioned/scheme github.com/openshift/client-go/config/clientset/versioned/typed/config/v1 # github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20201201000827-1117a4fc438c github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1 # github.com/openshift/machine-api-operator v0.2.1-0.20201203125141-79567cb3368e +## 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 @@ -226,6 +240,7 @@ github.com/openshift/machine-api-operator/pkg/util # 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/prometheus/client_golang v1.7.1 github.com/prometheus/client_golang/prometheus @@ -248,8 +263,10 @@ github.com/spf13/cobra # github.com/spf13/pflag v1.0.5 github.com/spf13/pflag # github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb +## explicit github.com/vincent-petithory/dataurl # go4.org v0.0.0-20191010144846-132d2879e1e9 +## explicit go4.org/errorutil # golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 golang.org/x/crypto/ssh/terminal @@ -342,8 +359,10 @@ gopkg.in/inf.v0 # 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 # k8s.io/api v0.19.2 +## explicit k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 k8s.io/api/admissionregistration/v1 @@ -397,6 +416,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.2 +## explicit k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -463,6 +483,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.2 +## explicit k8s.io/client-go/discovery k8s.io/client-go/discovery/cached/disk k8s.io/client-go/dynamic @@ -551,14 +572,17 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue # k8s.io/cluster-bootstrap v0.0.0-20190202014938-c9acc0c1bea2 +## explicit k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/util # k8s.io/component-base v0.19.2 k8s.io/component-base/version # k8s.io/klog v1.0.0 +## explicit k8s.io/klog k8s.io/klog/klogr # k8s.io/klog/v2 v2.3.0 +## explicit k8s.io/klog/v2 # k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 k8s.io/kube-openapi/pkg/common @@ -585,6 +609,7 @@ sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1beta1 # 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.20201130182513-88b90230f2a4 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 @@ -652,4 +677,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.20201125052318-b85a18cbf338 +# sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20201130182513-88b90230f2a4