Skip to content

Commit 65630b6

Browse files
committed
godeps: update ocs-operator API
Storage Cluster API in the odf-operator does not have some of the newly added fields because of which while updating from odf-operator it is removing those fields from the k8s API server. eg. Spec.MultiCloudGateway.DbStorageClassName Signed-off-by: Nitin Goyal <[email protected]>
1 parent 767d492 commit 65630b6

File tree

2 files changed

+279
-548
lines changed

2 files changed

+279
-548
lines changed

go.mod

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
module github.com/red-hat-data-services/odf-operator
22

3-
go 1.15
3+
go 1.16
44

55
require (
66
github.com/IBM/ibm-storage-odf-operator v1.0.0
77
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
88
github.com/go-logr/logr v0.4.0
9-
github.com/onsi/ginkgo v1.14.1
10-
github.com/onsi/gomega v1.10.2
9+
github.com/onsi/ginkgo v1.16.4
10+
github.com/onsi/gomega v1.14.0
1111
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
1212
github.com/openshift/custom-resource-status v1.1.0
13-
github.com/openshift/ocs-operator v0.0.1-alpha1.0.20210624174129-a8164b1085f6
14-
github.com/operator-framework/api v0.9.2
15-
github.com/prometheus/client_golang v1.8.0
16-
github.com/stretchr/testify v1.6.1
17-
go.uber.org/multierr v1.5.0
18-
k8s.io/api v0.21.0-rc.0
19-
k8s.io/apiextensions-apiserver v0.20.2
20-
k8s.io/apimachinery v0.21.0-rc.0
13+
github.com/openshift/ocs-operator v0.0.1-master
14+
github.com/operator-framework/api v0.10.0
15+
github.com/prometheus/client_golang v1.11.0
16+
github.com/stretchr/testify v1.7.0
17+
go.uber.org/multierr v1.6.0
18+
k8s.io/api v0.21.3
19+
k8s.io/apiextensions-apiserver v0.21.3
20+
k8s.io/apimachinery v0.21.3
2121
k8s.io/client-go v12.0.0+incompatible
22-
sigs.k8s.io/controller-runtime v0.8.3
22+
sigs.k8s.io/controller-runtime v0.9.5
2323
)
2424

2525
replace (
26+
github.com/kubernetes-incubator/external-storage => github.com/libopenstorage/external-storage v0.20.4-openstorage-rc3 // required by rook v1.7
2627
github.com/openshift/api => github.com/openshift/api v0.0.0-20210430163505-eeaa94b80043
27-
k8s.io/api => k8s.io/api v0.20.2
28+
github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3 // required by rook v1.7
29+
k8s.io/api => k8s.io/api v0.21.3
2830
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
29-
k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
31+
k8s.io/apimachinery => k8s.io/apimachinery v0.21.3
3032
k8s.io/apiserver => k8s.io/apiserver v0.20.2
3133
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
32-
k8s.io/client-go => k8s.io/client-go v0.20.2
34+
k8s.io/client-go => k8s.io/client-go v0.21.3
3335
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
3436
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
3537
k8s.io/code-generator => k8s.io/code-generator v0.20.2
@@ -49,3 +51,6 @@ replace (
4951
k8s.io/mount-utils => k8s.io/mount-utils v0.20.2
5052
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
5153
)
54+
55+
// This tag doesn't exist, but is imported by github.com/portworx/sched-ops.
56+
exclude github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc2

0 commit comments

Comments
 (0)