Skip to content

Commit

Permalink
Update dependencies and fix API changes
Browse files Browse the repository at this point in the history
- Upgrade `sigs.k8s.io/controller-runtime` to v0.19.0
- Upgrade Kubernetes modules to v0.31.0:
  - `k8s.io/api` v0.31.0
  - `k8s.io/apimachinery` v0.31.0
  - `k8s.io/client-go` v0.31.0
  - `k8s.io/apiextensions-apiserver` v0.31.0
- Update other dependencies to compatible versions
- Modify `Mirroring` field in `ocsv1.StorageClusterSpec` to use a pointer (`*ocsv1.MirroringSpec`)
- Update tests in:
  - `addons/agent_mirrorpeer_controller_test.go`
  - `addons/green_secret_controller_test.go`
- Run `go mod tidy` to clean up `go.mod` and `go.sum`
- Fix build errors due to mismatched dependencies and API changes

Signed-off-by: vbadrina <[email protected]>
  • Loading branch information
vbnrh committed Oct 3, 2024
1 parent ebdb0b3 commit b4e0f4f
Show file tree
Hide file tree
Showing 4 changed files with 140 additions and 149 deletions.
4 changes: 2 additions & 2 deletions addons/agent_mirrorpeer_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func TestMirrorPeerReconcile(t *testing.T) {
Namespace: pr.StorageClusterRef.Namespace,
},
Spec: ocsv1.StorageClusterSpec{
Mirroring: ocsv1.MirroringSpec{
Mirroring: &ocsv1.MirroringSpec{
Enabled: false,
PeerSecretNames: secretNames,
},
Expand Down Expand Up @@ -219,7 +219,7 @@ func TestDisableMirroring(t *testing.T) {
Namespace: pr.StorageClusterRef.Namespace,
},
Spec: ocsv1.StorageClusterSpec{
Mirroring: ocsv1.MirroringSpec{
Mirroring: &ocsv1.MirroringSpec{
Enabled: true,
},
},
Expand Down
2 changes: 1 addition & 1 deletion addons/green_secret_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var (
Namespace: "openshift-storage",
},
Spec: ocsv1.StorageClusterSpec{
Mirroring: ocsv1.MirroringSpec{
Mirroring: &ocsv1.MirroringSpec{
PeerSecretNames: []string{},
},
},
Expand Down
90 changes: 44 additions & 46 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,45 @@ require (
github.com/google/uuid v1.6.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.32.0
github.com/openshift/api v0.0.0-20240701145226-44d00ee80f5e
github.com/onsi/gomega v1.34.1
github.com/openshift/api v0.0.0-20240828125535-01b3675ba7b3
github.com/openshift/library-go v0.0.0-20240124134907-4dfbf6bc7b11
github.com/ramendr/ramen/api v0.0.0-20240409201920-10024cae3bfd
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20240723180620-bb238df8306b
github.com/rook/rook/pkg/apis v0.0.0-20240701212738-8e25300ad55a
github.com/spf13/cobra v1.8.0
github.com/ramendr/ramen/api v0.0.0-20241001141243-29d6f22ad237
github.com/red-hat-storage/ocs-operator/api/v4 v4.0.0-20241001184356-b1c7177e28a6
github.com/rook/rook/pkg/apis v0.0.0-20240828225153-88eab510dd2b
github.com/spf13/cobra v1.8.1
github.com/stolostron/multicloud-operators-foundation v0.0.0-20220824091202-e9cd9710d009
github.com/stretchr/testify v1.9.0
go.uber.org/zap v1.27.0
go.uber.org/zap/exp v0.2.0
golang.org/x/sync v0.7.0
golang.org/x/sync v0.8.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.30.2
k8s.io/apiextensions-apiserver v0.29.2
k8s.io/apimachinery v0.30.2
k8s.io/client-go v0.29.5
k8s.io/klog/v2 v2.120.1
k8s.io/api v0.31.0
k8s.io/apiextensions-apiserver v0.31.0
k8s.io/apimachinery v0.31.0
k8s.io/client-go v0.31.0
k8s.io/klog/v2 v2.130.1
open-cluster-management.io/addon-framework v0.6.1
open-cluster-management.io/api v0.13.0
sigs.k8s.io/controller-runtime v0.17.2
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/Masterminds/semver/v3 v3.2.1 // indirect
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/containernetworking/cni v1.2.0-rc1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containernetworking/cni v1.2.3 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 // indirect
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
Expand All @@ -66,55 +66,53 @@ require (
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.14.0 // indirect
github.com/hashicorp/vault/api/auth/approle v0.6.0 // indirect
github.com/hashicorp/vault/api/auth/kubernetes v0.6.0 // indirect
github.com/hashicorp/vault/api/auth/approle v0.7.0 // indirect
github.com/hashicorp/vault/api/auth/kubernetes v0.7.0 // 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/k8snetworkplumbingwg/network-attachment-definition-client v1.7.0 // indirect
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.1 // indirect
github.com/libopenstorage/secrets v0.0.0-20240416031220-a17cf7f72c6c // indirect
github.com/mailru/easyjson v0.7.7 // 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-20240625102417-4d63b956e6e6 // indirect
github.com/noobaa/noobaa-operator/v5 v5.0.0-20240827070548-002966de315a // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo/v2 v2.17.1 // indirect
github.com/openshift/custom-resource-status v1.1.2 // indirect
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 // 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.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/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/ryanuber/go-glob v1.0.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.20230828200208-cd3c119a7fa0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.6.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.29.2 // indirect
k8s.io/component-base v0.29.2 // indirect
k8s.io/apiserver v0.31.0 // indirect
k8s.io/component-base v0.31.0 // indirect
k8s.io/kube-aggregator v0.29.2 // indirect
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // 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
Expand Down
Loading

0 comments on commit b4e0f4f

Please sign in to comment.