From 2b1f29d0c07b6dc2079cb78b77c75e701ca8a73d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Artur=20=C5=BByli=C5=84ski?= Date: Tue, 7 Nov 2023 12:28:01 +0100 Subject: [PATCH] Cleanup: Remove deprecated github.com/golang/protobuf usage - Regenerate cloudprovider/externalgrpc proto - go mod tidy --- .../cloudprovider/externalgrpc/README.md | 4 +- .../externalgrpc/protos/externalgrpc.pb.go | 43 ++++--- .../protos/externalgrpc_grpc.pb.go | 111 ++++++++++-------- cluster-autoscaler/go.mod | 2 +- hack/boilerplate/boilerplate.py | 1 + 5 files changed, 89 insertions(+), 72 deletions(-) diff --git a/cluster-autoscaler/cloudprovider/externalgrpc/README.md b/cluster-autoscaler/cloudprovider/externalgrpc/README.md index f5630b5ee4ab..a1dea505755c 100644 --- a/cluster-autoscaler/cloudprovider/externalgrpc/README.md +++ b/cluster-autoscaler/cloudprovider/externalgrpc/README.md @@ -56,8 +56,8 @@ To regenerate the gRPC code: 1. install `protoc` and `protoc-gen-go-grpc`: ```bash -go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 -go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 +go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31 +go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3 ``` 2. generate gRPC client and server code: diff --git a/cluster-autoscaler/cloudprovider/externalgrpc/protos/externalgrpc.pb.go b/cluster-autoscaler/cloudprovider/externalgrpc/protos/externalgrpc.pb.go index 297de066468b..6bc0ceb3667c 100644 --- a/cluster-autoscaler/cloudprovider/externalgrpc/protos/externalgrpc.pb.go +++ b/cluster-autoscaler/cloudprovider/externalgrpc/protos/externalgrpc.pb.go @@ -1,32 +1,31 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// +//Copyright 2022 The Kubernetes Authors. +// +//Licensed under the Apache License, Version 2.0 (the "License"); +//you may not use this file except in compliance with the License. +//You may obtain a copy of the License at +// +//http://www.apache.org/licenses/LICENSE-2.0 +// +//Unless required by applicable law or agreed to in writing, software +//distributed under the License is distributed on an "AS IS" BASIS, +//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +//See the License for the specific language governing permissions and +//limitations under the License. // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.12.4 +// protoc-gen-go v1.31.0 +// protoc v3.21.12 // source: cloudprovider/externalgrpc/protos/externalgrpc.proto package protos import ( - _ "github.com/golang/protobuf/protoc-gen-go/descriptor" - any1 "github.com/golang/protobuf/ptypes/any" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/descriptorpb" + anypb "google.golang.org/protobuf/types/known/anypb" v11 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" reflect "reflect" @@ -786,7 +785,7 @@ type GetAvailableGPUTypesResponse struct { unknownFields protoimpl.UnknownFields // GPU types passed in as opaque key-value pairs. - GpuTypes map[string]*any1.Any `protobuf:"bytes,1,rep,name=gpuTypes,proto3" json:"gpuTypes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + GpuTypes map[string]*anypb.Any `protobuf:"bytes,1,rep,name=gpuTypes,proto3" json:"gpuTypes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *GetAvailableGPUTypesResponse) Reset() { @@ -821,7 +820,7 @@ func (*GetAvailableGPUTypesResponse) Descriptor() ([]byte, []int) { return file_cloudprovider_externalgrpc_protos_externalgrpc_proto_rawDescGZIP(), []int{13} } -func (x *GetAvailableGPUTypesResponse) GetGpuTypes() map[string]*any1.Any { +func (x *GetAvailableGPUTypesResponse) GetGpuTypes() map[string]*anypb.Any { if x != nil { return x.GpuTypes } @@ -2433,7 +2432,7 @@ var file_cloudprovider_externalgrpc_protos_externalgrpc_proto_goTypes = []interf (*v11.Pod)(nil), // 41: k8s.io.api.core.v1.Pod (*v11.Node)(nil), // 42: k8s.io.api.core.v1.Node (*v1.Duration)(nil), // 43: k8s.io.apimachinery.pkg.apis.meta.v1.Duration - (*any1.Any)(nil), // 44: google.protobuf.Any + (*anypb.Any)(nil), // 44: google.protobuf.Any } var file_cloudprovider_externalgrpc_protos_externalgrpc_proto_depIdxs = []int32{ 37, // 0: clusterautoscaler.cloudprovider.v1.externalgrpc.ExternalGrpcNode.labels:type_name -> clusterautoscaler.cloudprovider.v1.externalgrpc.ExternalGrpcNode.LabelsEntry diff --git a/cluster-autoscaler/cloudprovider/externalgrpc/protos/externalgrpc_grpc.pb.go b/cluster-autoscaler/cloudprovider/externalgrpc/protos/externalgrpc_grpc.pb.go index 17bac781d8d2..1b2b4f38a37e 100644 --- a/cluster-autoscaler/cloudprovider/externalgrpc/protos/externalgrpc_grpc.pb.go +++ b/cluster-autoscaler/cloudprovider/externalgrpc/protos/externalgrpc_grpc.pb.go @@ -1,23 +1,22 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// +//Copyright 2022 The Kubernetes Authors. +// +//Licensed under the Apache License, Version 2.0 (the "License"); +//you may not use this file except in compliance with the License. +//You may obtain a copy of the License at +// +//http://www.apache.org/licenses/LICENSE-2.0 +// +//Unless required by applicable law or agreed to in writing, software +//distributed under the License is distributed on an "AS IS" BASIS, +//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +//See the License for the specific language governing permissions and +//limitations under the License. // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.12.4 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v3.21.12 // source: cloudprovider/externalgrpc/protos/externalgrpc.proto package protos @@ -34,6 +33,24 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + CloudProvider_NodeGroups_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroups" + CloudProvider_NodeGroupForNode_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupForNode" + CloudProvider_PricingNodePrice_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/PricingNodePrice" + CloudProvider_PricingPodPrice_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/PricingPodPrice" + CloudProvider_GPULabel_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/GPULabel" + CloudProvider_GetAvailableGPUTypes_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/GetAvailableGPUTypes" + CloudProvider_Cleanup_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/Cleanup" + CloudProvider_Refresh_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/Refresh" + CloudProvider_NodeGroupTargetSize_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupTargetSize" + CloudProvider_NodeGroupIncreaseSize_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupIncreaseSize" + CloudProvider_NodeGroupDeleteNodes_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupDeleteNodes" + CloudProvider_NodeGroupDecreaseTargetSize_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupDecreaseTargetSize" + CloudProvider_NodeGroupNodes_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupNodes" + CloudProvider_NodeGroupTemplateNodeInfo_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupTemplateNodeInfo" + CloudProvider_NodeGroupGetOptions_FullMethodName = "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupGetOptions" +) + // CloudProviderClient is the client API for CloudProvider service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -102,7 +119,7 @@ func NewCloudProviderClient(cc grpc.ClientConnInterface) CloudProviderClient { func (c *cloudProviderClient) NodeGroups(ctx context.Context, in *NodeGroupsRequest, opts ...grpc.CallOption) (*NodeGroupsResponse, error) { out := new(NodeGroupsResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroups", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_NodeGroups_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -111,7 +128,7 @@ func (c *cloudProviderClient) NodeGroups(ctx context.Context, in *NodeGroupsRequ func (c *cloudProviderClient) NodeGroupForNode(ctx context.Context, in *NodeGroupForNodeRequest, opts ...grpc.CallOption) (*NodeGroupForNodeResponse, error) { out := new(NodeGroupForNodeResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupForNode", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_NodeGroupForNode_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -120,7 +137,7 @@ func (c *cloudProviderClient) NodeGroupForNode(ctx context.Context, in *NodeGrou func (c *cloudProviderClient) PricingNodePrice(ctx context.Context, in *PricingNodePriceRequest, opts ...grpc.CallOption) (*PricingNodePriceResponse, error) { out := new(PricingNodePriceResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/PricingNodePrice", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_PricingNodePrice_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -129,7 +146,7 @@ func (c *cloudProviderClient) PricingNodePrice(ctx context.Context, in *PricingN func (c *cloudProviderClient) PricingPodPrice(ctx context.Context, in *PricingPodPriceRequest, opts ...grpc.CallOption) (*PricingPodPriceResponse, error) { out := new(PricingPodPriceResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/PricingPodPrice", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_PricingPodPrice_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -138,7 +155,7 @@ func (c *cloudProviderClient) PricingPodPrice(ctx context.Context, in *PricingPo func (c *cloudProviderClient) GPULabel(ctx context.Context, in *GPULabelRequest, opts ...grpc.CallOption) (*GPULabelResponse, error) { out := new(GPULabelResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/GPULabel", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_GPULabel_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -147,7 +164,7 @@ func (c *cloudProviderClient) GPULabel(ctx context.Context, in *GPULabelRequest, func (c *cloudProviderClient) GetAvailableGPUTypes(ctx context.Context, in *GetAvailableGPUTypesRequest, opts ...grpc.CallOption) (*GetAvailableGPUTypesResponse, error) { out := new(GetAvailableGPUTypesResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/GetAvailableGPUTypes", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_GetAvailableGPUTypes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -156,7 +173,7 @@ func (c *cloudProviderClient) GetAvailableGPUTypes(ctx context.Context, in *GetA func (c *cloudProviderClient) Cleanup(ctx context.Context, in *CleanupRequest, opts ...grpc.CallOption) (*CleanupResponse, error) { out := new(CleanupResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/Cleanup", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_Cleanup_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -165,7 +182,7 @@ func (c *cloudProviderClient) Cleanup(ctx context.Context, in *CleanupRequest, o func (c *cloudProviderClient) Refresh(ctx context.Context, in *RefreshRequest, opts ...grpc.CallOption) (*RefreshResponse, error) { out := new(RefreshResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/Refresh", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_Refresh_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -174,7 +191,7 @@ func (c *cloudProviderClient) Refresh(ctx context.Context, in *RefreshRequest, o func (c *cloudProviderClient) NodeGroupTargetSize(ctx context.Context, in *NodeGroupTargetSizeRequest, opts ...grpc.CallOption) (*NodeGroupTargetSizeResponse, error) { out := new(NodeGroupTargetSizeResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupTargetSize", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_NodeGroupTargetSize_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -183,7 +200,7 @@ func (c *cloudProviderClient) NodeGroupTargetSize(ctx context.Context, in *NodeG func (c *cloudProviderClient) NodeGroupIncreaseSize(ctx context.Context, in *NodeGroupIncreaseSizeRequest, opts ...grpc.CallOption) (*NodeGroupIncreaseSizeResponse, error) { out := new(NodeGroupIncreaseSizeResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupIncreaseSize", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_NodeGroupIncreaseSize_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -192,7 +209,7 @@ func (c *cloudProviderClient) NodeGroupIncreaseSize(ctx context.Context, in *Nod func (c *cloudProviderClient) NodeGroupDeleteNodes(ctx context.Context, in *NodeGroupDeleteNodesRequest, opts ...grpc.CallOption) (*NodeGroupDeleteNodesResponse, error) { out := new(NodeGroupDeleteNodesResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupDeleteNodes", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_NodeGroupDeleteNodes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -201,7 +218,7 @@ func (c *cloudProviderClient) NodeGroupDeleteNodes(ctx context.Context, in *Node func (c *cloudProviderClient) NodeGroupDecreaseTargetSize(ctx context.Context, in *NodeGroupDecreaseTargetSizeRequest, opts ...grpc.CallOption) (*NodeGroupDecreaseTargetSizeResponse, error) { out := new(NodeGroupDecreaseTargetSizeResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupDecreaseTargetSize", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_NodeGroupDecreaseTargetSize_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -210,7 +227,7 @@ func (c *cloudProviderClient) NodeGroupDecreaseTargetSize(ctx context.Context, i func (c *cloudProviderClient) NodeGroupNodes(ctx context.Context, in *NodeGroupNodesRequest, opts ...grpc.CallOption) (*NodeGroupNodesResponse, error) { out := new(NodeGroupNodesResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupNodes", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_NodeGroupNodes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -219,7 +236,7 @@ func (c *cloudProviderClient) NodeGroupNodes(ctx context.Context, in *NodeGroupN func (c *cloudProviderClient) NodeGroupTemplateNodeInfo(ctx context.Context, in *NodeGroupTemplateNodeInfoRequest, opts ...grpc.CallOption) (*NodeGroupTemplateNodeInfoResponse, error) { out := new(NodeGroupTemplateNodeInfoResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupTemplateNodeInfo", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_NodeGroupTemplateNodeInfo_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -228,7 +245,7 @@ func (c *cloudProviderClient) NodeGroupTemplateNodeInfo(ctx context.Context, in func (c *cloudProviderClient) NodeGroupGetOptions(ctx context.Context, in *NodeGroupAutoscalingOptionsRequest, opts ...grpc.CallOption) (*NodeGroupAutoscalingOptionsResponse, error) { out := new(NodeGroupAutoscalingOptionsResponse) - err := c.cc.Invoke(ctx, "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupGetOptions", in, out, opts...) + err := c.cc.Invoke(ctx, CloudProvider_NodeGroupGetOptions_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -366,7 +383,7 @@ func _CloudProvider_NodeGroups_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroups", + FullMethod: CloudProvider_NodeGroups_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).NodeGroups(ctx, req.(*NodeGroupsRequest)) @@ -384,7 +401,7 @@ func _CloudProvider_NodeGroupForNode_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupForNode", + FullMethod: CloudProvider_NodeGroupForNode_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).NodeGroupForNode(ctx, req.(*NodeGroupForNodeRequest)) @@ -402,7 +419,7 @@ func _CloudProvider_PricingNodePrice_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/PricingNodePrice", + FullMethod: CloudProvider_PricingNodePrice_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).PricingNodePrice(ctx, req.(*PricingNodePriceRequest)) @@ -420,7 +437,7 @@ func _CloudProvider_PricingPodPrice_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/PricingPodPrice", + FullMethod: CloudProvider_PricingPodPrice_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).PricingPodPrice(ctx, req.(*PricingPodPriceRequest)) @@ -438,7 +455,7 @@ func _CloudProvider_GPULabel_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/GPULabel", + FullMethod: CloudProvider_GPULabel_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).GPULabel(ctx, req.(*GPULabelRequest)) @@ -456,7 +473,7 @@ func _CloudProvider_GetAvailableGPUTypes_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/GetAvailableGPUTypes", + FullMethod: CloudProvider_GetAvailableGPUTypes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).GetAvailableGPUTypes(ctx, req.(*GetAvailableGPUTypesRequest)) @@ -474,7 +491,7 @@ func _CloudProvider_Cleanup_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/Cleanup", + FullMethod: CloudProvider_Cleanup_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).Cleanup(ctx, req.(*CleanupRequest)) @@ -492,7 +509,7 @@ func _CloudProvider_Refresh_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/Refresh", + FullMethod: CloudProvider_Refresh_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).Refresh(ctx, req.(*RefreshRequest)) @@ -510,7 +527,7 @@ func _CloudProvider_NodeGroupTargetSize_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupTargetSize", + FullMethod: CloudProvider_NodeGroupTargetSize_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).NodeGroupTargetSize(ctx, req.(*NodeGroupTargetSizeRequest)) @@ -528,7 +545,7 @@ func _CloudProvider_NodeGroupIncreaseSize_Handler(srv interface{}, ctx context.C } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupIncreaseSize", + FullMethod: CloudProvider_NodeGroupIncreaseSize_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).NodeGroupIncreaseSize(ctx, req.(*NodeGroupIncreaseSizeRequest)) @@ -546,7 +563,7 @@ func _CloudProvider_NodeGroupDeleteNodes_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupDeleteNodes", + FullMethod: CloudProvider_NodeGroupDeleteNodes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).NodeGroupDeleteNodes(ctx, req.(*NodeGroupDeleteNodesRequest)) @@ -564,7 +581,7 @@ func _CloudProvider_NodeGroupDecreaseTargetSize_Handler(srv interface{}, ctx con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupDecreaseTargetSize", + FullMethod: CloudProvider_NodeGroupDecreaseTargetSize_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).NodeGroupDecreaseTargetSize(ctx, req.(*NodeGroupDecreaseTargetSizeRequest)) @@ -582,7 +599,7 @@ func _CloudProvider_NodeGroupNodes_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupNodes", + FullMethod: CloudProvider_NodeGroupNodes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).NodeGroupNodes(ctx, req.(*NodeGroupNodesRequest)) @@ -600,7 +617,7 @@ func _CloudProvider_NodeGroupTemplateNodeInfo_Handler(srv interface{}, ctx conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupTemplateNodeInfo", + FullMethod: CloudProvider_NodeGroupTemplateNodeInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).NodeGroupTemplateNodeInfo(ctx, req.(*NodeGroupTemplateNodeInfoRequest)) @@ -618,7 +635,7 @@ func _CloudProvider_NodeGroupGetOptions_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/clusterautoscaler.cloudprovider.v1.externalgrpc.CloudProvider/NodeGroupGetOptions", + FullMethod: CloudProvider_NodeGroupGetOptions_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CloudProviderServer).NodeGroupGetOptions(ctx, req.(*NodeGroupAutoscalingOptionsRequest)) diff --git a/cluster-autoscaler/go.mod b/cluster-autoscaler/go.mod index 7c7e0201a7fc..35e0cb8e2ae7 100644 --- a/cluster-autoscaler/go.mod +++ b/cluster-autoscaler/go.mod @@ -17,7 +17,6 @@ require ( github.com/gofrs/uuid v4.4.0+incompatible github.com/gogo/protobuf v1.3.2 github.com/golang/mock v1.6.0 - github.com/golang/protobuf v1.5.3 github.com/google/go-cmp v0.6.0 github.com/google/go-querystring v1.0.0 github.com/google/uuid v1.3.0 @@ -105,6 +104,7 @@ require ( github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/google/cadvisor v0.48.1 // indirect github.com/google/cel-go v0.17.7 // indirect github.com/google/gnostic-models v0.6.8 // indirect diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py index 3ab25f1a6e04..3736a8328b64 100755 --- a/hack/boilerplate/boilerplate.py +++ b/hack/boilerplate/boilerplate.py @@ -156,6 +156,7 @@ def file_extension(filename): "cluster-autoscaler/cloudprovider/brightbox/linkheader", "cluster-autoscaler/cloudprovider/brightbox/go-cache", "cluster-autoscaler/cloudprovider/digitalocean/godo", + "cluster-autoscaler/cloudprovider/externalgrpc/protos", "cluster-autoscaler/cloudprovider/magnum/gophercloud", "cluster-autoscaler/cloudprovider/ionoscloud/ionos-cloud-sdk-go", "cluster-autoscaler/cloudprovider/hetzner/hcloud-go",