ceph: updating the dependencies for operator SDK v1.0.0

Updating the dependencies' versions to match with the newer Operator SDK
version v1.x

Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>
This commit is contained in:
Arun Kumar Mohan committed 2020-11-18 21:03:40 +05:30
1 parent 4545ddc11f
commit 421f340c1c
4 files changed
+322 -400

No files matched your search

+41 -44
View File
@@ -3,7 +3,7 @@ module github.com/rook/rook
go 1.13
require (
github.com/aws/aws-sdk-go v1.25.41
github.com/aws/aws-sdk-go v1.28.2
github.com/banzaicloud/k8s-objectmatcher v1.1.0
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
github.com/coreos/prometheus-operator v0.34.0
@@ -11,73 +11,70 @@ require (
github.com/davecgh/go-spew v1.1.1
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-ini/ini v1.51.1
github.com/go-logr/logr v0.3.0 // indirect
github.com/go-sql-driver/mysql v1.4.1
github.com/google/go-cmp v0.5.0
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.1
github.com/hashicorp/vault/api v1.0.5-0.20200902155336-f9d5ce5a171a
github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428
github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20200401090632-ee27f62faef8
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.0
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20200610144127-e2eec875d6d1
github.com/libopenstorage/secrets v0.0.0-20201006135900-af310b01fe47
github.com/miekg/dns v1.1.34 // indirect
github.com/openshift/cluster-api v0.0.0-20191129101638-b09907ac6668
github.com/openshift/machine-api-operator v0.2.1-0.20190903202259-474e14e4965a
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.5.0 // indirect
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
github.com/stretchr/testify v1.5.1
github.com/yanniszark/go-nodetool v0.0.0-20191206125106-cd8f91fa16be
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/text v0.3.3 // indirect
golang.org/x/tools v0.0.0-20200319210407-521f4a0cd458 // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/ini.v1 v1.51.1
k8s.io/api v0.17.2
k8s.io/apiextensions-apiserver v0.17.2
k8s.io/apimachinery v0.17.2
k8s.io/apiserver v0.17.2
k8s.io/api v0.19.3
k8s.io/apiextensions-apiserver v0.19.3
k8s.io/apimachinery v0.19.3
k8s.io/apiserver v0.19.3
k8s.io/client-go v12.0.0+incompatible
k8s.io/code-generator v0.17.2
k8s.io/kube-controller-manager v0.17.2
k8s.io/kubernetes v1.17.2
k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab
sigs.k8s.io/controller-runtime v0.5.2
k8s.io/cloud-provider v0.19.3
k8s.io/code-generator v0.19.3
k8s.io/kube-controller-manager v0.19.3
k8s.io/kubernetes v1.19.3
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
sigs.k8s.io/controller-runtime v0.6.3
sigs.k8s.io/kustomize/kyaml v0.2.0
sigs.k8s.io/sig-storage-lib-external-provisioner v4.1.0+incompatible
sigs.k8s.io/yaml v1.2.0 // indirect
)
// This looks "horrible", but is due to the Rook including k8s.io/kubernetes directly which is not recommended,
// ee https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505725449
replace (
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
golang.org/x/text => golang.org/x/text v0.3.3
google.golang.org/grpc => google.golang.org/grpc v1.26.0
k8s.io/api => k8s.io/api v0.17.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.2
k8s.io/apimachinery => k8s.io/apimachinery v0.17.2
k8s.io/apiserver => k8s.io/apiserver v0.17.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.2
k8s.io/client-go => k8s.io/client-go v0.17.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.2
k8s.io/code-generator => k8s.io/code-generator v0.17.2
k8s.io/component-base => k8s.io/component-base v0.17.2
k8s.io/cri-api => k8s.io/cri-api v0.17.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.2
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // forces sigs.k8s.io/structured-merge-diff to v1 and not v3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.2
k8s.io/kubectl => k8s.io/kubectl v0.17.2
k8s.io/kubelet => k8s.io/kubelet v0.17.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.2
k8s.io/metrics => k8s.io/metrics v0.17.2
k8s.io/node-api => k8s.io/node-api v0.17.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.2
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.2
k8s.io/sample-controller => k8s.io/sample-controller v0.17.2
k8s.io/api => k8s.io/api v0.19.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.3
k8s.io/apimachinery => k8s.io/apimachinery v0.19.3
k8s.io/apiserver => k8s.io/apiserver v0.19.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.3
k8s.io/client-go => k8s.io/client-go v0.19.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.3
k8s.io/code-generator => k8s.io/code-generator v0.19.3
k8s.io/component-base => k8s.io/component-base v0.19.3
k8s.io/cri-api => k8s.io/cri-api v0.19.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.3
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20201106092651-fd18780d1fff
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.3
k8s.io/kubectl => k8s.io/kubectl v0.19.3
k8s.io/kubelet => k8s.io/kubelet v0.19.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.3
k8s.io/metrics => k8s.io/metrics v0.19.3
k8s.io/node-api => k8s.io/node-api v0.19.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.3
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.3
k8s.io/sample-controller => k8s.io/sample-controller v0.19.3
)
+276 -352
View File
File diff suppressed because it is too large. Load diff
+3 -3
View File
@@ -18,7 +18,7 @@ package k8sutil
import (
v1 "k8s.io/api/core/v1"
scheduler "k8s.io/kubernetes/pkg/scheduler/api"
cloudproviderapi "k8s.io/cloud-provider/api"
)
// WellKnownTaints is a list of well-known taint keys in the Kubernetes code base. Kubernetes may
@@ -36,8 +36,8 @@ var WellKnownTaints = []string{
v1.TaintNodeDiskPressure,
v1.TaintNodeNetworkUnavailable,
v1.TaintNodePIDPressure,
scheduler.TaintExternalCloudProvider,
scheduler.TaintNodeShutdown,
cloudproviderapi.TaintExternalCloudProvider,
cloudproviderapi.TaintNodeShutdown,
}
// TaintIsWellKnown returns true if the taint's key is in the WellKnownTaints list. False otherwise.
+2 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package test
import (
"context"
"fmt"
"testing"
@@ -48,7 +49,7 @@ func New(t *testing.T, nodes int) *fake.Clientset {
},
},
}
_, err := clientset.CoreV1().Nodes().Create(n)
_, err := clientset.CoreV1().Nodes().Create(context.TODO(), n, metav1.CreateOptions{})
assert.Nil(t, err)
}
return clientset