diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 809e0ad..1553b76 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -26,6 +26,12 @@ patches: version: v1beta1 kind: CustomResourceDefinition name: cassandrabackups.cassandra.k8ssandra.io +- path: patches/backup_validation_patch.json + target: + group: apiextensions.k8s.io + version: v1beta1 + kind: CustomResourceDefinition + name: cassandrabackups.cassandra.k8ssandra.io # the following config is for teaching kustomize how to do kustomization for CRDs. diff --git a/config/crd/patches/backup_validation_patch.json b/config/crd/patches/backup_validation_patch.json new file mode 100644 index 0000000..c4403d4 --- /dev/null +++ b/config/crd/patches/backup_validation_patch.json @@ -0,0 +1,6 @@ +[ + { + "op": "remove", + "path": "/spec/validation/openAPIV3Schema/properties/status/properties/cassdcTemplateSpec/properties/spec/properties/podTemplateSpec/properties/spec/properties/volumes/items/properties/configMap" + } +] diff --git a/go.mod b/go.mod index 6ca4b3a..85092c7 100644 --- a/go.mod +++ b/go.mod @@ -14,12 +14,13 @@ require ( golang.org/x/text v0.3.4 // indirect google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d // indirect google.golang.org/grpc v1.34.0 + google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect google.golang.org/protobuf v1.25.0 k8s.io/api v0.18.6 k8s.io/apimachinery v0.18.6 k8s.io/client-go v12.0.0+incompatible - sigs.k8s.io/controller-runtime v0.6.2 k8s.io/kubernetes v1.18.6 + sigs.k8s.io/controller-runtime v0.6.2 ) replace ( diff --git a/go.sum b/go.sum index 228ead0..698e524 100644 --- a/go.sum +++ b/go.sum @@ -1342,6 +1342,9 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0 h1:TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/pkg/pb/medusa.pb.go b/pkg/pb/medusa.pb.go index 12fab3b..e51998e 100644 --- a/pkg/pb/medusa.pb.go +++ b/pkg/pb/medusa.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel -// protoc v3.12.1 +// protoc-gen-go v1.25.0 +// protoc v3.12.4 // source: pkg/pb/medusa.proto package pb diff --git a/pkg/pb/medusa_grpc.pb.go b/pkg/pb/medusa_grpc.pb.go index 8ba3850..25d487e 100644 --- a/pkg/pb/medusa_grpc.pb.go +++ b/pkg/pb/medusa_grpc.pb.go @@ -11,6 +11,7 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 // MedusaClient is the client API for Medusa service. @@ -104,7 +105,7 @@ type UnsafeMedusaServer interface { } func RegisterMedusaServer(s grpc.ServiceRegistrar, srv MedusaServer) { - s.RegisterService(&_Medusa_serviceDesc, srv) + s.RegisterService(&Medusa_ServiceDesc, srv) } func _Medusa_Backup_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { @@ -179,7 +180,10 @@ func _Medusa_GetBackups_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } -var _Medusa_serviceDesc = grpc.ServiceDesc{ +// Medusa_ServiceDesc is the grpc.ServiceDesc for Medusa service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var Medusa_ServiceDesc = grpc.ServiceDesc{ ServiceName: "Medusa", HandlerType: (*MedusaServer)(nil), Methods: []grpc.MethodDesc{