Skip to content

Commit

Permalink
Merge pull request #164 from elmiko/golang1.17
Browse files Browse the repository at this point in the history
Bug 2036993: update repo for golang 1.17
  • Loading branch information
openshift-merge-robot committed Jan 4, 2022
2 parents c2d3ece + 199011a commit 0716ee4
Show file tree
Hide file tree
Showing 67 changed files with 187 additions and 3,896 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.16-openshift-4.10
tag: rhel-8-release-golang-1.17-openshift-4.10
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder
WORKDIR /go/src/github.com/openshift/cluster-api-provider-baremetal
COPY . .
RUN go build --mod=vendor -o machine-controller-manager ./cmd/manager
Expand Down
89 changes: 88 additions & 1 deletion go.mod
@@ -1,6 +1,6 @@
module github.com/openshift/cluster-api-provider-baremetal

go 1.16
go 1.17

require (
github.com/metal3-io/baremetal-operator v0.0.0-00010101000000-000000000000
Expand All @@ -18,6 +18,93 @@ require (
sigs.k8s.io/yaml v1.2.0
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gobuffalo/flect v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/onsi/gomega v1.14.0 // indirect
github.com/openshift/api v0.0.0-20210816181336-8ff39b776da3 // indirect
github.com/openshift/client-go v0.0.0-20210730113412-1811c1b3fc0e // indirect
github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20210615203611-a02074e8d5bb // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/russross/blackfriday v1.5.2 // indirect
github.com/spf13/cobra v1.2.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/tools v0.1.5 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiextensions-apiserver v0.22.0-rc.0 // indirect
k8s.io/cli-runtime v0.22.0 // indirect
k8s.io/code-generator v0.22.0 // indirect
k8s.io/component-base v0.22.0 // indirect
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
k8s.io/kubectl v0.22.0 // indirect
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
sigs.k8s.io/cluster-api-provider-aws v0.0.0-00010101000000-000000000000 // indirect
sigs.k8s.io/cluster-api-provider-azure v0.0.0-00010101000000-000000000000 // indirect
sigs.k8s.io/kustomize/api v0.8.11 // indirect
sigs.k8s.io/kustomize/kyaml v0.11.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
)

replace (
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20210716171745-c9a3f2638544 // Use OpenShift fork
github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20210716171745-c9a3f2638544 // Use OpenShift fork
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/baremetal/v1alpha1/zz_generated.deepcopy.go

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

5 changes: 0 additions & 5 deletions vendor/github.com/Azure/go-ansiterm/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/github.com/Azure/go-ansiterm/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/MakeNowJust/heredoc/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/cespare/xxhash/v2/go.mod

This file was deleted.

Empty file.
8 changes: 0 additions & 8 deletions vendor/github.com/fatih/color/go.mod

This file was deleted.

7 changes: 0 additions & 7 deletions vendor/github.com/fatih/color/go.sum

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/fsnotify/fsnotify/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/github.com/fsnotify/fsnotify/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/go-logr/logr/go.mod

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/github.com/go-openapi/jsonpointer/go.mod

This file was deleted.

24 changes: 0 additions & 24 deletions vendor/github.com/go-openapi/jsonpointer/go.sum

This file was deleted.

12 changes: 0 additions & 12 deletions vendor/github.com/go-openapi/jsonreference/go.mod

This file was deleted.

38 changes: 0 additions & 38 deletions vendor/github.com/go-openapi/jsonreference/go.sum

This file was deleted.

18 changes: 0 additions & 18 deletions vendor/github.com/go-openapi/swag/go.mod

This file was deleted.

29 changes: 0 additions & 29 deletions vendor/github.com/go-openapi/swag/go.sum

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/gobuffalo/flect/go.mod

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/gobuffalo/flect/go.sum

This file was deleted.

17 changes: 0 additions & 17 deletions vendor/github.com/google/btree/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/google/gofuzz/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/google/shlex/go.mod

This file was deleted.

1 change: 0 additions & 1 deletion vendor/github.com/google/uuid/go.mod

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/imdario/mergo/go.mod

This file was deleted.

4 changes: 0 additions & 4 deletions vendor/github.com/imdario/mergo/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/josharian/intern/go.mod

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/json-iterator/go/go.mod

This file was deleted.

0 comments on commit 0716ee4

Please sign in to comment.