Skip to content

K
k3s
Unverified Commit 2a0ad6b9 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #65120 from freehan/revendor

Automatic merge from submit-queue (batch tested with PRs 64575, 65120, 65463, 65434, 65522). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Revendor GCE Go Client Revendor GCE API go client and switch to use beta neg api in gce cloud provider. ```release-note None ```
parents 75c8b56d 35fee757
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 87 deletions
Godeps/Godeps.json
View file @ 2a0ad6b9
......@@ -3111,47 +3111,47 @@
},
{
"ImportPath": "google.golang.org/api/compute/v0.alpha",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/api/compute/v0.beta",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/api/compute/v1",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/api/container/v1",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/api/gensupport",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/api/googleapi",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/api/googleapi/internal/uritemplates",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/api/logging/v2beta1",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/api/monitoring/v3",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/api/pubsub/v1",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/api/tpu/v1",
"Rev": "8e296ef260056b6323d10727db40512dac6d92d5"
"Rev": "3639d6d93f377f39a1de765fa4ef37b3c7ca8bd9"
},
{
"ImportPath": "google.golang.org/genproto/googleapis/api/annotations",
......
pkg/cloudprovider/providers/gce/cloud/gen.go
View file @ 2a0ad6b9
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/cloudprovider/providers/gce/cloud/gen/main.go
View file @ 2a0ad6b9
......@@ -1207,7 +1207,7 @@ func Test{{.Service}}Group(t *testing.T) {
got[obj.Name] = true
}
if !reflect.DeepEqual(got, want) {
t.Errorf("Alpha{{.Service}}().List(); got %+v, want %+v", got, want)
t.Errorf("Beta{{.Service}}().List(); got %+v, want %+v", got, want)
}
}
}
......@@ -1227,7 +1227,7 @@ func Test{{.Service}}Group(t *testing.T) {
got[obj.Name] = true
}
if !reflect.DeepEqual(got, want) {
t.Errorf("Alpha{{.Service}}().List(); got %+v, want %+v", got, want)
t.Errorf("{{.Service}}().List(); got %+v, want %+v", got, want)
}
}
}
......
pkg/cloudprovider/providers/gce/cloud/meta/meta.go
View file @ 2a0ad6b9
......@@ -225,6 +225,17 @@ var AllServices = []*ServiceInfo{
Object: "HealthCheck",
Service: "HealthChecks",
Resource: "healthChecks",
version: VersionBeta,
keyType: Global,
serviceType: reflect.TypeOf(&beta.HealthChecksService{}),
additionalMethods: []string{
"Update",
},
},
{
Object: "HealthCheck",
Service: "HealthChecks",
Resource: "healthChecks",
version: VersionAlpha,
keyType: Global,
serviceType: reflect.TypeOf(&alpha.HealthChecksService{}),
......@@ -317,6 +328,20 @@ var AllServices = []*ServiceInfo{
options: AggregatedList,
},
{
Object: "NetworkEndpointGroup",
Service: "NetworkEndpointGroups",
Resource: "networkEndpointGroups",
version: VersionBeta,
keyType: Zonal,
serviceType: reflect.TypeOf(&beta.NetworkEndpointGroupsService{}),
additionalMethods: []string{
"AttachNetworkEndpoints",
"DetachNetworkEndpoints",
"ListNetworkEndpoints",
},
options: AggregatedList,
},
{
Object: "Project",
Service: "Projects",
Resource: "projects",
......
pkg/cloudprovider/providers/gce/gce_healthchecks.go
View file @ 2a0ad6b9
......@@ -20,6 +20,7 @@ import (
"github.com/golang/glog"
computealpha "google.golang.org/api/compute/v0.alpha"
computebeta "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/api/core/v1"
......@@ -173,6 +174,16 @@ func (gce *GCECloud) GetAlphaHealthCheck(name string) (*computealpha.HealthCheck
return v, mc.Observe(err)
}
// GetBetaHealthCheck returns the given beta HealthCheck by name.
func (gce *GCECloud) GetBetaHealthCheck(name string) (*computebeta.HealthCheck, error) {
ctx, cancel := cloud.ContextWithCallTimeout()
defer cancel()
mc := newHealthcheckMetricContextWithVersion("get", computeBetaVersion)
v, err := gce.c.BetaHealthChecks().Get(ctx, meta.GlobalKey(name))
return v, mc.Observe(err)
}
// UpdateHealthCheck applies the given HealthCheck as an update.
func (gce *GCECloud) UpdateHealthCheck(hc *compute.HealthCheck) error {
ctx, cancel := cloud.ContextWithCallTimeout()
......@@ -191,6 +202,15 @@ func (gce *GCECloud) UpdateAlphaHealthCheck(hc *computealpha.HealthCheck) error
return mc.Observe(gce.c.AlphaHealthChecks().Update(ctx, meta.GlobalKey(hc.Name), hc))
}
// UpdateBetaHealthCheck applies the given beta HealthCheck as an update.
func (gce *GCECloud) UpdateBetaHealthCheck(hc *computebeta.HealthCheck) error {
ctx, cancel := cloud.ContextWithCallTimeout()
defer cancel()
mc := newHealthcheckMetricContextWithVersion("update", computeBetaVersion)
return mc.Observe(gce.c.BetaHealthChecks().Update(ctx, meta.GlobalKey(hc.Name), hc))
}
// DeleteHealthCheck deletes the given HealthCheck by name.
func (gce *GCECloud) DeleteHealthCheck(name string) error {
ctx, cancel := cloud.ContextWithCallTimeout()
......@@ -218,6 +238,15 @@ func (gce *GCECloud) CreateAlphaHealthCheck(hc *computealpha.HealthCheck) error
return mc.Observe(gce.c.AlphaHealthChecks().Insert(ctx, meta.GlobalKey(hc.Name), hc))
}
// CreateBetaHealthCheck creates the given beta HealthCheck.
func (gce *GCECloud) CreateBetaHealthCheck(hc *computebeta.HealthCheck) error {
ctx, cancel := cloud.ContextWithCallTimeout()
defer cancel()
mc := newHealthcheckMetricContextWithVersion("create", computeBetaVersion)
return mc.Observe(gce.c.BetaHealthChecks().Insert(ctx, meta.GlobalKey(hc.Name), hc))
}
// ListHealthChecks lists all HealthCheck in the project.
func (gce *GCECloud) ListHealthChecks() ([]*compute.HealthCheck, error) {
ctx, cancel := cloud.ContextWithCallTimeout()
......
pkg/cloudprovider/providers/gce/gce_networkendpointgroup.go
View file @ 2a0ad6b9
......@@ -20,7 +20,7 @@ import (
"fmt"
"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/filter"
......@@ -28,44 +28,43 @@ import (
)
const (
NEGLoadBalancerType = "LOAD_BALANCING"
NEGIPPortNetworkEndpointType = "GCE_VM_IP_PORT"
)
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()
defer cancel()
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)
}
func (gce *GCECloud) ListNetworkEndpointGroup(zone string) ([]*computealpha.NetworkEndpointGroup, error) {
func (gce *GCECloud) ListNetworkEndpointGroup(zone string) ([]*computebeta.NetworkEndpointGroup, error) {
ctx, cancel := cloud.ContextWithCallTimeout()
defer cancel()
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)
}
// 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()
defer cancel()
mc := newNetworkEndpointGroupMetricContext("aggregated_list", "")
// 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 {
return nil, mc.Observe(err)
}
ret := map[string][]*computealpha.NetworkEndpointGroup{}
ret := map[string][]*computebeta.NetworkEndpointGroup{}
for key, byZone := range all {
// key is "zones/<zone name>"
parts := strings.Split(key, "/")
......@@ -78,12 +77,12 @@ func (gce *GCECloud) AggregatedListNetworkEndpointGroup() (map[string][]*compute
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()
defer cancel()
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 {
......@@ -91,32 +90,32 @@ func (gce *GCECloud) DeleteNetworkEndpointGroup(name string, zone string) error
defer cancel()
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()
defer cancel()
mc := newNetworkEndpointGroupMetricContext("attach", zone)
req := &computealpha.NetworkEndpointGroupsAttachEndpointsRequest{
req := &computebeta.NetworkEndpointGroupsAttachEndpointsRequest{
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()
defer cancel()
mc := newNetworkEndpointGroupMetricContext("detach", zone)
req := &computealpha.NetworkEndpointGroupsDetachEndpointsRequest{
req := &computebeta.NetworkEndpointGroupsDetachEndpointsRequest{
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()
defer cancel()
......@@ -125,9 +124,9 @@ func (gce *GCECloud) ListNetworkEndpoints(name, zone string, showHealthStatus bo
if showHealthStatus {
healthStatus = "SHOW"
}
req := &computealpha.NetworkEndpointGroupsListEndpointsRequest{
req := &computebeta.NetworkEndpointGroupsListEndpointsRequest{
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)
}
vendor/google.golang.org/api/CONTRIBUTORS
View file @ 2a0ad6b9
......@@ -48,6 +48,7 @@ Kunpei Sakai <namusyaka@gmail.com>
Matthew Whisenhunt <matt.whisenhunt@gmail.com>
Michael McGreevy <mcgreevy@golang.org>
Nick Craig-Wood <nickcw@gmail.com>
Robbie Trencheny <me@robbiet.us>
Ross Light <light@google.com>
Sarah Adams <shadams@google.com>
Scott Van Woudenberg <scottvw@google.com>
......
vendor/google.golang.org/api/compute/v0.beta/compute-gen.go
View file @ 2a0ad6b9
This source diff could not be displayed because it is too large. You can view the blob instead.
vendor/google.golang.org/api/container/v1/container-api.json
View file @ 2a0ad6b9
......@@ -60,11 +60,6 @@
"location": "query",
"type": "string"
},
"bearer_token": {
"description": "OAuth bearer token.",
"location": "query",
"type": "string"
},
"callback": {
"description": "JSONP",
"location": "query",
......@@ -85,12 +80,6 @@
"location": "query",
"type": "string"
},
"pp": {
"default": "true",
"description": "Pretty-print response.",
"location": "query",
"type": "boolean"
},
"prettyPrint": {
"default": "true",
"description": "Returns response with indentations and line breaks.",
......@@ -2372,7 +2361,7 @@
}
}
},
"revision": "20180504",
"revision": "20180607",
"rootUrl": "https://container.googleapis.com/",
"schemas": {
"AcceleratorConfig": {
......
vendor/google.golang.org/api/googleapi/googleapi.go
View file @ 2a0ad6b9
......@@ -270,11 +270,20 @@ func ProcessMediaOptions(opts []MediaOption) *MediaOptions {
func ResolveRelative(basestr, relstr string) string {
u, _ := url.Parse(basestr)
afterColonPath := ""
if i := strings.IndexRune(relstr, ':'); i > 0 {
afterColonPath = relstr[i+1:]
relstr = relstr[:i]
}
rel, _ := url.Parse(relstr)
u = u.ResolveReference(rel)
us := u.String()
if afterColonPath != "" {
us = fmt.Sprintf("%s:%s", us, afterColonPath)
}
us = strings.Replace(us, "%7B", "{", -1)
us = strings.Replace(us, "%7D", "}", -1)
us = strings.Replace(us, "%2A", "*", -1)
return us
}
......
vendor/google.golang.org/api/logging/v2beta1/logging-api.json
View file @ 2a0ad6b9
......@@ -72,11 +72,6 @@
"location": "query",
"type": "string"
},
"bearer_token": {
"description": "OAuth bearer token.",
"location": "query",
"type": "string"
},
"callback": {
"description": "JSONP",
"location": "query",
......@@ -97,12 +92,6 @@
"location": "query",
"type": "string"
},
"pp": {
"default": "true",
"description": "Pretty-print response.",
"location": "query",
"type": "boolean"
},
"prettyPrint": {
"default": "true",
"description": "Returns response with indentations and line breaks.",
......@@ -755,7 +744,7 @@
}
}
},
"revision": "20180424",
"revision": "20180604",
"rootUrl": "https://logging.googleapis.com/",
"schemas": {
"BucketOptions": {
......
vendor/google.golang.org/api/monitoring/v3/monitoring-api.json
View file @ 2a0ad6b9
......@@ -69,11 +69,6 @@
"location": "query",
"type": "string"
},
"bearer_token": {
"description": "OAuth bearer token.",
"location": "query",
"type": "string"
},
"callback": {
"description": "JSONP",
"location": "query",
......@@ -94,12 +89,6 @@
"location": "query",
"type": "string"
},
"pp": {
"default": "true",
"description": "Pretty-print response.",
"location": "query",
"type": "boolean"
},
"prettyPrint": {
"default": "true",
"description": "Returns response with indentations and line breaks.",
......@@ -1463,7 +1452,7 @@
}
}
},
"revision": "20180529",
"revision": "20180603",
"rootUrl": "https://monitoring.googleapis.com/",
"schemas": {
"Aggregation": {
......@@ -1894,7 +1883,7 @@
"type": "string"
},
"exemplars": {
"description": "Must be in increasing order of |value| field. The current requirement enforced by the backend is that at most one Exemplar will fall into any bucket.",
"description": "Must be in increasing order of value field.",
"items": {
"$ref": "Exemplar"
},
......
vendor/google.golang.org/api/monitoring/v3/monitoring-gen.go
View file @ 2a0ad6b9
......@@ -1068,9 +1068,7 @@ type Distribution struct {
// histogram is provided.
Count int64 `json:"count,omitempty,string"`
// Exemplars: Must be in increasing order of |value| field. The current
// requirement enforced by the backend is that at most one Exemplar will
// fall into any bucket.
// Exemplars: Must be in increasing order of value field.
Exemplars []*Exemplar `json:"exemplars,omitempty"`
// Mean: The arithmetic mean of the values in the population. If count
......
vendor/google.golang.org/api/pubsub/v1/pubsub-api.json
View file @ 2a0ad6b9
......@@ -62,11 +62,6 @@
"location": "query",
"type": "string"
},
"bearer_token": {
"description": "OAuth bearer token.",
"location": "query",
"type": "string"
},
"callback": {
"description": "JSONP",
"location": "query",
......@@ -87,12 +82,6 @@
"location": "query",
"type": "string"
},
"pp": {
"default": "true",
"description": "Pretty-print response.",
"location": "query",
"type": "boolean"
},
"prettyPrint": {
"default": "true",
"description": "Returns response with indentations and line breaks.",
......@@ -1056,7 +1045,7 @@
}
}
},
"revision": "20180522",
"revision": "20180604",
"rootUrl": "https://pubsub.googleapis.com/",
"schemas": {
"AcknowledgeRequest": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment