mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 21:47:07 +00:00
swtich to use Beta
This commit is contained in:
parent
469ac167c1
commit
3248fa2a89
@ -20,7 +20,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
computealpha "google.golang.org/api/compute/v0.alpha"
|
computebeta "google.golang.org/api/compute/v0.beta"
|
||||||
|
|
||||||
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud"
|
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud"
|
||||||
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter"
|
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter"
|
||||||
@ -28,44 +28,43 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
NEGLoadBalancerType = "LOAD_BALANCING"
|
|
||||||
NEGIPPortNetworkEndpointType = "GCE_VM_IP_PORT"
|
NEGIPPortNetworkEndpointType = "GCE_VM_IP_PORT"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newNetworkEndpointGroupMetricContext(request string, zone string) *metricContext {
|
func newNetworkEndpointGroupMetricContext(request string, zone string) *metricContext {
|
||||||
return newGenericMetricContext("networkendpointgroup_", request, unusedMetricLabel, zone, computeAlphaVersion)
|
return newGenericMetricContext("networkendpointgroup_", request, unusedMetricLabel, zone, computeBetaVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (gce *GCECloud) GetNetworkEndpointGroup(name string, zone string) (*computealpha.NetworkEndpointGroup, error) {
|
func (gce *GCECloud) GetNetworkEndpointGroup(name string, zone string) (*computebeta.NetworkEndpointGroup, error) {
|
||||||
ctx, cancel := cloud.ContextWithCallTimeout()
|
ctx, cancel := cloud.ContextWithCallTimeout()
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
mc := newNetworkEndpointGroupMetricContext("get", zone)
|
mc := newNetworkEndpointGroupMetricContext("get", zone)
|
||||||
v, err := gce.c.AlphaNetworkEndpointGroups().Get(ctx, meta.ZonalKey(name, zone))
|
v, err := gce.c.BetaNetworkEndpointGroups().Get(ctx, meta.ZonalKey(name, zone))
|
||||||
return v, mc.Observe(err)
|
return v, mc.Observe(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (gce *GCECloud) ListNetworkEndpointGroup(zone string) ([]*computealpha.NetworkEndpointGroup, error) {
|
func (gce *GCECloud) ListNetworkEndpointGroup(zone string) ([]*computebeta.NetworkEndpointGroup, error) {
|
||||||
ctx, cancel := cloud.ContextWithCallTimeout()
|
ctx, cancel := cloud.ContextWithCallTimeout()
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
mc := newNetworkEndpointGroupMetricContext("list", zone)
|
mc := newNetworkEndpointGroupMetricContext("list", zone)
|
||||||
negs, err := gce.c.AlphaNetworkEndpointGroups().List(ctx, zone, filter.None)
|
negs, err := gce.c.BetaNetworkEndpointGroups().List(ctx, zone, filter.None)
|
||||||
return negs, mc.Observe(err)
|
return negs, mc.Observe(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// AggregatedListNetworkEndpointGroup returns a map of zone -> endpoint group.
|
// AggregatedListNetworkEndpointGroup returns a map of zone -> endpoint group.
|
||||||
func (gce *GCECloud) AggregatedListNetworkEndpointGroup() (map[string][]*computealpha.NetworkEndpointGroup, error) {
|
func (gce *GCECloud) AggregatedListNetworkEndpointGroup() (map[string][]*computebeta.NetworkEndpointGroup, error) {
|
||||||
ctx, cancel := cloud.ContextWithCallTimeout()
|
ctx, cancel := cloud.ContextWithCallTimeout()
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
mc := newNetworkEndpointGroupMetricContext("aggregated_list", "")
|
mc := newNetworkEndpointGroupMetricContext("aggregated_list", "")
|
||||||
// TODO: filter for the region the cluster is in.
|
// TODO: filter for the region the cluster is in.
|
||||||
all, err := gce.c.AlphaNetworkEndpointGroups().AggregatedList(ctx, filter.None)
|
all, err := gce.c.BetaNetworkEndpointGroups().AggregatedList(ctx, filter.None)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, mc.Observe(err)
|
return nil, mc.Observe(err)
|
||||||
}
|
}
|
||||||
ret := map[string][]*computealpha.NetworkEndpointGroup{}
|
ret := map[string][]*computebeta.NetworkEndpointGroup{}
|
||||||
for key, byZone := range all {
|
for key, byZone := range all {
|
||||||
// key is "zones/<zone name>"
|
// key is "zones/<zone name>"
|
||||||
parts := strings.Split(key, "/")
|
parts := strings.Split(key, "/")
|
||||||
@ -78,12 +77,12 @@ func (gce *GCECloud) AggregatedListNetworkEndpointGroup() (map[string][]*compute
|
|||||||
return ret, mc.Observe(nil)
|
return ret, mc.Observe(nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (gce *GCECloud) CreateNetworkEndpointGroup(neg *computealpha.NetworkEndpointGroup, zone string) error {
|
func (gce *GCECloud) CreateNetworkEndpointGroup(neg *computebeta.NetworkEndpointGroup, zone string) error {
|
||||||
ctx, cancel := cloud.ContextWithCallTimeout()
|
ctx, cancel := cloud.ContextWithCallTimeout()
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
mc := newNetworkEndpointGroupMetricContext("create", zone)
|
mc := newNetworkEndpointGroupMetricContext("create", zone)
|
||||||
return mc.Observe(gce.c.AlphaNetworkEndpointGroups().Insert(ctx, meta.ZonalKey(neg.Name, zone), neg))
|
return mc.Observe(gce.c.BetaNetworkEndpointGroups().Insert(ctx, meta.ZonalKey(neg.Name, zone), neg))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (gce *GCECloud) DeleteNetworkEndpointGroup(name string, zone string) error {
|
func (gce *GCECloud) DeleteNetworkEndpointGroup(name string, zone string) error {
|
||||||
@ -91,32 +90,32 @@ func (gce *GCECloud) DeleteNetworkEndpointGroup(name string, zone string) error
|
|||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
mc := newNetworkEndpointGroupMetricContext("delete", zone)
|
mc := newNetworkEndpointGroupMetricContext("delete", zone)
|
||||||
return mc.Observe(gce.c.AlphaNetworkEndpointGroups().Delete(ctx, meta.ZonalKey(name, zone)))
|
return mc.Observe(gce.c.BetaNetworkEndpointGroups().Delete(ctx, meta.ZonalKey(name, zone)))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (gce *GCECloud) AttachNetworkEndpoints(name, zone string, endpoints []*computealpha.NetworkEndpoint) error {
|
func (gce *GCECloud) AttachNetworkEndpoints(name, zone string, endpoints []*computebeta.NetworkEndpoint) error {
|
||||||
ctx, cancel := cloud.ContextWithCallTimeout()
|
ctx, cancel := cloud.ContextWithCallTimeout()
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
mc := newNetworkEndpointGroupMetricContext("attach", zone)
|
mc := newNetworkEndpointGroupMetricContext("attach", zone)
|
||||||
req := &computealpha.NetworkEndpointGroupsAttachEndpointsRequest{
|
req := &computebeta.NetworkEndpointGroupsAttachEndpointsRequest{
|
||||||
NetworkEndpoints: endpoints,
|
NetworkEndpoints: endpoints,
|
||||||
}
|
}
|
||||||
return mc.Observe(gce.c.AlphaNetworkEndpointGroups().AttachNetworkEndpoints(ctx, meta.ZonalKey(name, zone), req))
|
return mc.Observe(gce.c.BetaNetworkEndpointGroups().AttachNetworkEndpoints(ctx, meta.ZonalKey(name, zone), req))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (gce *GCECloud) DetachNetworkEndpoints(name, zone string, endpoints []*computealpha.NetworkEndpoint) error {
|
func (gce *GCECloud) DetachNetworkEndpoints(name, zone string, endpoints []*computebeta.NetworkEndpoint) error {
|
||||||
ctx, cancel := cloud.ContextWithCallTimeout()
|
ctx, cancel := cloud.ContextWithCallTimeout()
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
mc := newNetworkEndpointGroupMetricContext("detach", zone)
|
mc := newNetworkEndpointGroupMetricContext("detach", zone)
|
||||||
req := &computealpha.NetworkEndpointGroupsDetachEndpointsRequest{
|
req := &computebeta.NetworkEndpointGroupsDetachEndpointsRequest{
|
||||||
NetworkEndpoints: endpoints,
|
NetworkEndpoints: endpoints,
|
||||||
}
|
}
|
||||||
return mc.Observe(gce.c.AlphaNetworkEndpointGroups().DetachNetworkEndpoints(ctx, meta.ZonalKey(name, zone), req))
|
return mc.Observe(gce.c.BetaNetworkEndpointGroups().DetachNetworkEndpoints(ctx, meta.ZonalKey(name, zone), req))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (gce *GCECloud) ListNetworkEndpoints(name, zone string, showHealthStatus bool) ([]*computealpha.NetworkEndpointWithHealthStatus, error) {
|
func (gce *GCECloud) ListNetworkEndpoints(name, zone string, showHealthStatus bool) ([]*computebeta.NetworkEndpointWithHealthStatus, error) {
|
||||||
ctx, cancel := cloud.ContextWithCallTimeout()
|
ctx, cancel := cloud.ContextWithCallTimeout()
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
@ -125,9 +124,9 @@ func (gce *GCECloud) ListNetworkEndpoints(name, zone string, showHealthStatus bo
|
|||||||
if showHealthStatus {
|
if showHealthStatus {
|
||||||
healthStatus = "SHOW"
|
healthStatus = "SHOW"
|
||||||
}
|
}
|
||||||
req := &computealpha.NetworkEndpointGroupsListEndpointsRequest{
|
req := &computebeta.NetworkEndpointGroupsListEndpointsRequest{
|
||||||
HealthStatus: healthStatus,
|
HealthStatus: healthStatus,
|
||||||
}
|
}
|
||||||
l, err := gce.c.AlphaNetworkEndpointGroups().ListNetworkEndpoints(ctx, meta.ZonalKey(name, zone), req, filter.None)
|
l, err := gce.c.BetaNetworkEndpointGroups().ListNetworkEndpoints(ctx, meta.ZonalKey(name, zone), req, filter.None)
|
||||||
return l, mc.Observe(err)
|
return l, mc.Observe(err)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user