Skip to content

Commit

Permalink
Update go.mod and go.sum
Browse files Browse the repository at this point in the history
This commit bumps up go version from 1.19 to 1.22

This commit also bumps up several dependencies to the latest version as of
March 2024.

k8s.io/api v0.29.2
k8s.io/apiextensions-apiserver v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/client-go v0.29.2
k8s.io/klog/v2 v2.120.1
openshift/api -> v0.0.0-20240124164020-e2ce40831f2e
openshift/library-go -> v0.0.0-20240124134907-4dfbf6bc7b11
ramendr/ramen/api -> v0.0.0-20240117171503-e11c56eac24d
red-hat-storage/ocs-operator -> v0.4.13
rook/rook/pkg/apis -> v0.0.0-20231204200402-5287527732f7 (New module for rook)
open-cluster-management.io/addon-framework -> v0.9.0
open-cluster-management.io/api -> v0.13.0
sigs.k8s.io/controller-runtime -> v0.15.3 (Replaces 0.17.2 currently due to several changes)

Signed-off-by: vbadrina <[email protected]>
  • Loading branch information
vbnrh committed Mar 21, 2024
1 parent 8cb7129 commit 875f306
Show file tree
Hide file tree
Showing 6 changed files with 444 additions and 274 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
<<<<<<< Updated upstream
go: [ '1.19' ]
=======
go: [ '1.21' ]
>>>>>>> Stashed changes
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/publish-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
<<<<<<< Updated upstream
go: [ '1.19' ]
=======
go: [ '1.21' ]
>>>>>>> Stashed changes
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Checkout source
Expand Down Expand Up @@ -49,7 +53,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
<<<<<<< Updated upstream
go: [ '1.19' ]
=======
go: [ '1.21' ]
>>>>>>> Stashed changes
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Checkout source
Expand Down Expand Up @@ -79,7 +87,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
<<<<<<< Updated upstream
go: [ '1.19' ]
=======
go: [ '1.21' ]
>>>>>>> Stashed changes
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Checkout source
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/test-and-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
<<<<<<< Updated upstream
go: [ '1.19' ]
=======
go: [ '1.21' ]
>>>>>>> Stashed changes
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand All @@ -35,7 +39,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
<<<<<<< Updated upstream
go: [ '1.19' ]
=======
go: [ '1.21' ]
>>>>>>> Stashed changes
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand All @@ -54,7 +62,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
<<<<<<< Updated upstream
go: [ '1.19' ]
=======
go: [ '1.21' ]
>>>>>>> Stashed changes
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand All @@ -73,7 +85,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
<<<<<<< Updated upstream
go: [ '1.19' ]
=======
go: [ '1.21' ]
>>>>>>> Stashed changes
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand All @@ -92,7 +108,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
<<<<<<< Updated upstream
go: [ '1.19' ]
=======
go: [ '1.21' ]
>>>>>>> Stashed changes
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand All @@ -111,7 +131,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
<<<<<<< Updated upstream
go: [ '1.19' ]
=======
go: [ '1.21' ]
>>>>>>> Stashed changes
steps:
- name: Checkout source
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.19 as builder
FROM golang:1.22 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
167 changes: 86 additions & 81 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,126 +1,127 @@
module github.com/red-hat-storage/odf-multicluster-orchestrator

go 1.19
go 1.21.6

toolchain go1.22.0

require (
github.com/csi-addons/kubernetes-csi-addons v0.6.1-0.20230623115848-1712b738d6c8
github.com/csi-addons/kubernetes-csi-addons v0.8.0
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20221122204822-d1a8c34382f1
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.8
github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
github.com/openshift/library-go v0.0.0-20230127195720-edf819b079cf
github.com/ramendr/ramen v0.0.0-20230718102451-5751b2a8ffbc
github.com/red-hat-storage/ocs-operator v0.0.1-master.0.20230417124524-f67100d2dde1
github.com/rook/rook v1.11.4
github.com/spf13/cobra v1.6.1
github.com/onsi/gomega v1.31.1
github.com/openshift/api v0.0.0-20240124164020-e2ce40831f2e
github.com/openshift/library-go v0.0.0-20240124134907-4dfbf6bc7b11
github.com/ramendr/ramen/api v0.0.0-20240117171503-e11c56eac24d
github.com/red-hat-storage/ocs-operator v0.4.13
github.com/rook/rook/pkg/apis v0.0.0-20231204200402-5287527732f7
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.8.4
github.com/submariner-io/submariner-operator v0.14.3
golang.org/x/sync v0.2.0
k8s.io/api v0.26.4
k8s.io/apiextensions-apiserver v0.26.2
k8s.io/apimachinery v0.26.4
k8s.io/client-go v0.26.4
k8s.io/klog/v2 v2.100.1
open-cluster-management.io/addon-framework v0.6.1
open-cluster-management.io/api v0.10.1
sigs.k8s.io/controller-runtime v0.14.6
sigs.k8s.io/yaml v1.3.0
github.com/submariner-io/submariner-operator v0.17.0
golang.org/x/sync v0.5.0
k8s.io/api v0.29.2
k8s.io/apiextensions-apiserver v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/client-go v0.29.2
k8s.io/klog/v2 v2.120.1
open-cluster-management.io/addon-framework v0.9.0
open-cluster-management.io/api v0.13.0
sigs.k8s.io/controller-runtime v0.17.2
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/coreos/pkg v0.0.0-20230327231512-ba87abf18a23 // indirect
github.com/containernetworking/cni v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 // indirect
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/swag v0.22.4 // 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.3 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/hashicorp/vault/api v1.10.0 // indirect
github.com/hashicorp/vault/api/auth/approle v0.5.0 // indirect
github.com/hashicorp/vault/api/auth/kubernetes v0.5.0 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/libopenstorage/secrets v0.0.0-20230320082403-aead94776c13 // indirect
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0 // indirect
github.com/libopenstorage/secrets v0.0.0-20231011182615-5f4b25ceede1 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/noobaa/noobaa-operator/v5 v5.0.0-20230306134341-1874f52f83dd // indirect
github.com/noobaa/noobaa-operator/v5 v5.0.0-20231213124549-5d7b0417716d // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/openshift/custom-resource-status v1.1.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stolostron/multicloud-operators-placementrule v1.2.4-1-20220311-8eedb3f.0.20220411162042-3de0a2f908f1 // indirect
github.com/submariner-io/admiral v0.14.3 // indirect
github.com/submariner-io/submariner v0.14.3 // indirect
go.uber.org/atomic v1.10.0 // indirect
github.com/stolostron/multicloud-operators-placementrule v1.2.4-1-20220311-8eedb3f.0.20230828200208-cd3c119a7fa0 // indirect
github.com/submariner-io/admiral v0.17.0 // indirect
github.com/submariner-io/submariner v0.17.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.26.3 // indirect
k8s.io/component-base v0.26.3 // indirect
k8s.io/kube-aggregator v0.26.1 // indirect
k8s.io/kube-openapi v0.0.0-20230217203603-ff9a8e8fa21d // indirect
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect
k8s.io/apiserver v0.29.2 // indirect
k8s.io/component-base v0.29.2 // indirect
k8s.io/kube-aggregator v0.29.2 // indirect
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
open-cluster-management.io/sdk-go v0.13.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace (
Expand All @@ -133,8 +134,7 @@ replace (
github.com/metal3-io/baremetal-operator/apis => github.com/openshift/baremetal-operator/apis v0.0.0-20211201170610-92ffa60c683d
github.com/metal3-io/baremetal-operator/pkg/hardwareutils => github.com/openshift/baremetal-operator/pkg/hardwareutils v0.0.0-20211201170610-92ffa60c683d
github.com/noobaa/noobaa-operator/v5 => github.com/noobaa/noobaa-operator/v5 v5.0.0-20220412093540-8972af85cac4
github.com/open-cluster-management-io/api => open-cluster-management.io/api v0.10.0
github.com/openshift/api => github.com/openshift/api v0.0.0-20230217170555-ab002e9c06da
github.com/open-cluster-management-io/api => open-cluster-management.io/api v0.12.0
github.com/openshift/hive => github.com/openshift/hive v1.1.17-0.20220223000051-b1c8fa5853b1
github.com/openshift/hive/apis => github.com/openshift/hive/apis v0.0.0-20220221165319-b389a65758da
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
Expand All @@ -143,35 +143,40 @@ replace (
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210121023454-5ffc5f422a80
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210626224711-5d94c794092f
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20211111204942-611d320170af
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.15.3
)

exclude (
// This tag doesn't exist, but is imported by github.com/portworx/sched-ops.
github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc2
github.com/noobaa/noobaa-operator/v5 v5.0.0-20210912161037-7eb9969404e4
github.com/noobaa/noobaa-operator/v5 v5.10.1
github.com/noobaa/noobaa-operator/v5 v5.9.0
github.com/noobaa/noobaa-operator/v5 v5.10.1
github.com/openshift/api v3.9.0+incompatible
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
// Exclude pre-go-mod kubernetes tags, because they are older
// than v0.x releases but are picked when updating dependencies.
k8s.io/client-go v1.4.0
k8s.io/client-go v1.5.0
k8s.io/client-go v1.5.1
k8s.io/client-go v1.5.2
k8s.io/client-go v10.0.0+incompatible
k8s.io/client-go v11.0.0+incompatible
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/client-go v12.0.0+incompatible
k8s.io/client-go v2.0.0+incompatible
k8s.io/client-go v2.0.0-alpha.1+incompatible
k8s.io/client-go v3.0.0+incompatible
k8s.io/client-go v2.0.0+incompatible
k8s.io/client-go v3.0.0-beta.0+incompatible
k8s.io/client-go v4.0.0+incompatible
k8s.io/client-go v3.0.0+incompatible
k8s.io/client-go v4.0.0-beta.0+incompatible
k8s.io/client-go v4.0.0+incompatible
k8s.io/client-go v5.0.0+incompatible
k8s.io/client-go v5.0.1+incompatible
k8s.io/client-go v6.0.0+incompatible
k8s.io/client-go v7.0.0+incompatible
k8s.io/client-go v8.0.0+incompatible
k8s.io/client-go v9.0.0+incompatible
k8s.io/client-go v9.0.0-invalid+incompatible
k8s.io/client-go v9.0.0+incompatible
k8s.io/client-go v10.0.0+incompatible
k8s.io/client-go v11.0.0+incompatible
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/client-go v12.0.0+incompatible

)
Loading

0 comments on commit 875f306

Please sign in to comment.