kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrates GCE sdk from v0.beta to v1

This commit is contained in:
eric-hole 2020-04-24 10:27:54 -07:00
parent c727fab83f
commit f25b26ff07
28 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/nodeidentity/gce/BUILD.bazel
View File

@ -8,7 +8,7 @@ go_library(
deps = [
"//pkg/nodeidentity:go_default_library",
"//vendor/cloud.google.com/go/compute/metadata:go_default_library",
"//vendor/google.golang.org/api/compute/v0.beta:go_default_library",
"//vendor/google.golang.org/api/compute/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],

2
pkg/nodeidentity/gce/identify.go
View File

@ -24,7 +24,7 @@ import (
"strings"
"cloud.google.com/go/compute/metadata"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/kops/pkg/nodeidentity"

2
pkg/resources/gce/BUILD.bazel
View File

@ -13,7 +13,7 @@ go_library(
"//pkg/resources:go_default_library",
"//upup/pkg/fi:go_default_library",
"//upup/pkg/fi/cloudup/gce:go_default_library",
"//vendor/google.golang.org/api/compute/v0.beta:go_default_library",
"//vendor/google.golang.org/api/compute/v1:go_default_library",
"//vendor/google.golang.org/api/dns/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/klog:go_default_library",

2
pkg/resources/gce/dump.go
View File

@ -21,7 +21,7 @@ import (
"fmt"
"sync"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/pkg/resources"
gce "k8s.io/kops/upup/pkg/fi/cloudup/gce"

2
pkg/resources/gce/gce.go
View File

@ -21,7 +21,7 @@ import (
"fmt"
"strings"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
clouddns "google.golang.org/api/dns/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/klog"

2
protokube/pkg/gossip/gce/BUILD.bazel
View File

@ -7,7 +7,7 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//protokube/pkg/gossip:go_default_library",
"//vendor/google.golang.org/api/compute/v0.beta:go_default_library",
"//vendor/google.golang.org/api/compute/v1:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],
)

2
protokube/pkg/gossip/gce/seeds.go
View File

@ -20,7 +20,7 @@ import (
"fmt"
"strings"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/protokube/pkg/gossip"
)

2
protokube/pkg/protokube/BUILD.bazel
View File

@ -61,7 +61,7 @@ go_library(
"//vendor/github.com/digitalocean/godo:go_default_library",
"//vendor/github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes:go_default_library",
"//vendor/github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/volumeattach:go_default_library",
"//vendor/google.golang.org/api/compute/v0.beta:go_default_library",
"//vendor/google.golang.org/api/compute/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/rbac/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",

2
protokube/pkg/protokube/gce_volume.go
View File

@ -24,7 +24,7 @@ import (
"strings"
"cloud.google.com/go/compute/metadata"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/protokube/pkg/etcd"
"k8s.io/kops/protokube/pkg/gossip"

2
upup/pkg/fi/cloudup/gce/BUILD.bazel
View File

@ -25,7 +25,7 @@ go_library(
"//protokube/pkg/etcd:go_default_library",
"//upup/pkg/fi:go_default_library",
"//vendor/golang.org/x/oauth2/google:go_default_library",
"//vendor/google.golang.org/api/compute/v0.beta:go_default_library",
"//vendor/google.golang.org/api/compute/v1:go_default_library",
"//vendor/google.golang.org/api/dns/v1:go_default_library",
"//vendor/google.golang.org/api/googleapi:go_default_library",
"//vendor/google.golang.org/api/iam/v1:go_default_library",

2
upup/pkg/fi/cloudup/gce/gce_cloud.go
View File

@ -25,7 +25,7 @@ import (
"strings"
"golang.org/x/oauth2/google"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/dns/v1"
"google.golang.org/api/iam/v1"
oauth2 "google.golang.org/api/oauth2/v2"

2
upup/pkg/fi/cloudup/gce/instancegroups.go
View File

@ -23,7 +23,7 @@ import (
"hash/fnv"
"strings"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/kops/pkg/apis/kops"

2
upup/pkg/fi/cloudup/gce/mock_gce_cloud.go
View File

@ -19,7 +19,7 @@ package gce
import (
"fmt"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/dns/v1"
"google.golang.org/api/iam/v1"
"google.golang.org/api/storage/v1"

2
upup/pkg/fi/cloudup/gce/network.go
View File

@ -22,7 +22,7 @@ import (
"fmt"
"net"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi"

2
upup/pkg/fi/cloudup/gce/op.go
View File

@ -23,7 +23,7 @@ import (
"fmt"
"time"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog"

2
upup/pkg/fi/cloudup/gce/status.go
View File

@ -21,7 +21,7 @@ import (
"fmt"
"strings"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/protokube/pkg/etcd"

2
upup/pkg/fi/cloudup/gce/wrappers.go
View File

@ -20,7 +20,7 @@ import (
"context"
"fmt"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
)

2
upup/pkg/fi/cloudup/gcetasks/BUILD.bazel
View File

@ -38,7 +38,7 @@ go_library(
"//upup/pkg/fi:go_default_library",
"//upup/pkg/fi/cloudup/gce:go_default_library",
"//upup/pkg/fi/cloudup/terraform:go_default_library",
"//vendor/google.golang.org/api/compute/v0.beta:go_default_library",
"//vendor/google.golang.org/api/compute/v1:go_default_library",
"//vendor/google.golang.org/api/storage/v1:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],

2
upup/pkg/fi/cloudup/gcetasks/address.go
View File

@ -19,7 +19,7 @@ package gcetasks
import (
"fmt"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gce"

2
upup/pkg/fi/cloudup/gcetasks/disk.go
View File

@ -20,7 +20,7 @@ import (
"fmt"
"reflect"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gce"

2
upup/pkg/fi/cloudup/gcetasks/firewallrule.go
View File

@ -20,7 +20,7 @@ import (
"fmt"
"strings"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gce"
"k8s.io/kops/upup/pkg/fi/cloudup/terraform"

2
upup/pkg/fi/cloudup/gcetasks/forwardingrule.go
View File

@ -19,7 +19,7 @@ package gcetasks
import (
"fmt"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gce"

2
upup/pkg/fi/cloudup/gcetasks/instance.go
View File

@ -21,7 +21,7 @@ import (
"reflect"
"strings"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gce"

12
upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go
View File

@ -20,7 +20,7 @@ import (
"fmt"
"reflect"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gce"
"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
@ -151,13 +151,11 @@ func (_ *InstanceGroupManager) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Ins
}
if changes.TargetSize != nil {
request := &compute.InstanceGroupManagersResizeAdvancedRequest{
TargetSize: i.TargetSize,
newSize := int64(0)
if i.TargetSize != 0 {
newSize = int64(i.TargetSize)
}
if i.TargetSize == 0 {
request.ForceSendFields = append(request.ForceSendFields, "TargetSize")
}
op, err := t.Cloud.Compute().InstanceGroupManagers.ResizeAdvanced(t.Cloud.Project(), *e.Zone, i.Name, request).Do()
op, err := t.Cloud.Compute().InstanceGroupManagers.Resize(t.Cloud.Project(), *e.Zone, i.Name, newSize).Do()
if err != nil {
return fmt.Errorf("error resizing InstanceGroupManager: %v", err)
}

2
upup/pkg/fi/cloudup/gcetasks/instancetemplate.go
View File

@ -24,7 +24,7 @@ import (
"strings"
"time"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/pkg/diff"
"k8s.io/kops/upup/pkg/fi"

2
upup/pkg/fi/cloudup/gcetasks/network.go
View File

@ -20,7 +20,7 @@ import (
"fmt"
"reflect"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gce"

2
upup/pkg/fi/cloudup/gcetasks/subnet.go
View File

@ -20,7 +20,7 @@ import (
"fmt"
"reflect"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gce"

2
upup/pkg/fi/cloudup/gcetasks/targetpool.go
View File

@ -19,7 +19,7 @@ package gcetasks
import (
"fmt"
compute "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
"k8s.io/klog"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gce"