diff --git a/pkg/nodeidentity/gce/BUILD.bazel b/pkg/nodeidentity/gce/BUILD.bazel index dda0458b39..8c3f6b1a2d 100644 --- a/pkg/nodeidentity/gce/BUILD.bazel +++ b/pkg/nodeidentity/gce/BUILD.bazel @@ -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", ], diff --git a/pkg/nodeidentity/gce/identify.go b/pkg/nodeidentity/gce/identify.go index 139ee43805..4c8850f444 100644 --- a/pkg/nodeidentity/gce/identify.go +++ b/pkg/nodeidentity/gce/identify.go @@ -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" diff --git a/pkg/resources/gce/BUILD.bazel b/pkg/resources/gce/BUILD.bazel index 3453df0d18..ef6da93d92 100644 --- a/pkg/resources/gce/BUILD.bazel +++ b/pkg/resources/gce/BUILD.bazel @@ -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", diff --git a/pkg/resources/gce/dump.go b/pkg/resources/gce/dump.go index 4cfe034f09..19f785fab3 100644 --- a/pkg/resources/gce/dump.go +++ b/pkg/resources/gce/dump.go @@ -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" diff --git a/pkg/resources/gce/gce.go b/pkg/resources/gce/gce.go index f63842f061..3b3d9005f8 100644 --- a/pkg/resources/gce/gce.go +++ b/pkg/resources/gce/gce.go @@ -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" diff --git a/protokube/pkg/gossip/gce/BUILD.bazel b/protokube/pkg/gossip/gce/BUILD.bazel index fdf686ff0e..22a92eb235 100644 --- a/protokube/pkg/gossip/gce/BUILD.bazel +++ b/protokube/pkg/gossip/gce/BUILD.bazel @@ -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", ], ) diff --git a/protokube/pkg/gossip/gce/seeds.go b/protokube/pkg/gossip/gce/seeds.go index dc2c2a68a5..c4011dd5ea 100644 --- a/protokube/pkg/gossip/gce/seeds.go +++ b/protokube/pkg/gossip/gce/seeds.go @@ -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" ) diff --git a/protokube/pkg/protokube/BUILD.bazel b/protokube/pkg/protokube/BUILD.bazel index 78e7e7f9d1..3c982f971f 100644 --- a/protokube/pkg/protokube/BUILD.bazel +++ b/protokube/pkg/protokube/BUILD.bazel @@ -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", diff --git a/protokube/pkg/protokube/gce_volume.go b/protokube/pkg/protokube/gce_volume.go index d1bd47bf2a..247452e721 100644 --- a/protokube/pkg/protokube/gce_volume.go +++ b/protokube/pkg/protokube/gce_volume.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gce/BUILD.bazel b/upup/pkg/fi/cloudup/gce/BUILD.bazel index 1c3a7266f4..fab899a15b 100644 --- a/upup/pkg/fi/cloudup/gce/BUILD.bazel +++ b/upup/pkg/fi/cloudup/gce/BUILD.bazel @@ -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", diff --git a/upup/pkg/fi/cloudup/gce/gce_cloud.go b/upup/pkg/fi/cloudup/gce/gce_cloud.go index 06ccb38a31..31444c04af 100644 --- a/upup/pkg/fi/cloudup/gce/gce_cloud.go +++ b/upup/pkg/fi/cloudup/gce/gce_cloud.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gce/instancegroups.go b/upup/pkg/fi/cloudup/gce/instancegroups.go index 7d66734f48..84ab437822 100644 --- a/upup/pkg/fi/cloudup/gce/instancegroups.go +++ b/upup/pkg/fi/cloudup/gce/instancegroups.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gce/mock_gce_cloud.go b/upup/pkg/fi/cloudup/gce/mock_gce_cloud.go index c525222aa2..d812b93e72 100644 --- a/upup/pkg/fi/cloudup/gce/mock_gce_cloud.go +++ b/upup/pkg/fi/cloudup/gce/mock_gce_cloud.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gce/network.go b/upup/pkg/fi/cloudup/gce/network.go index a6a78d83bc..5503ba4cfa 100644 --- a/upup/pkg/fi/cloudup/gce/network.go +++ b/upup/pkg/fi/cloudup/gce/network.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gce/op.go b/upup/pkg/fi/cloudup/gce/op.go index 49ecc0d68e..5ae300ab89 100644 --- a/upup/pkg/fi/cloudup/gce/op.go +++ b/upup/pkg/fi/cloudup/gce/op.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gce/status.go b/upup/pkg/fi/cloudup/gce/status.go index 04fc2d97c5..1a9bdd7029 100644 --- a/upup/pkg/fi/cloudup/gce/status.go +++ b/upup/pkg/fi/cloudup/gce/status.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gce/wrappers.go b/upup/pkg/fi/cloudup/gce/wrappers.go index 9bf91af0e5..e6c90e7852 100644 --- a/upup/pkg/fi/cloudup/gce/wrappers.go +++ b/upup/pkg/fi/cloudup/gce/wrappers.go @@ -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" ) diff --git a/upup/pkg/fi/cloudup/gcetasks/BUILD.bazel b/upup/pkg/fi/cloudup/gcetasks/BUILD.bazel index 211b3fd389..c12f62d561 100644 --- a/upup/pkg/fi/cloudup/gcetasks/BUILD.bazel +++ b/upup/pkg/fi/cloudup/gcetasks/BUILD.bazel @@ -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", ], diff --git a/upup/pkg/fi/cloudup/gcetasks/address.go b/upup/pkg/fi/cloudup/gcetasks/address.go index c5330654f1..9203a466e0 100644 --- a/upup/pkg/fi/cloudup/gcetasks/address.go +++ b/upup/pkg/fi/cloudup/gcetasks/address.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gcetasks/disk.go b/upup/pkg/fi/cloudup/gcetasks/disk.go index a8a5319204..8dc21cc306 100644 --- a/upup/pkg/fi/cloudup/gcetasks/disk.go +++ b/upup/pkg/fi/cloudup/gcetasks/disk.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gcetasks/firewallrule.go b/upup/pkg/fi/cloudup/gcetasks/firewallrule.go index 5c78debc83..12a18f7efd 100644 --- a/upup/pkg/fi/cloudup/gcetasks/firewallrule.go +++ b/upup/pkg/fi/cloudup/gcetasks/firewallrule.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go b/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go index 0003848c25..ea58737c54 100644 --- a/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go +++ b/upup/pkg/fi/cloudup/gcetasks/forwardingrule.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gcetasks/instance.go b/upup/pkg/fi/cloudup/gcetasks/instance.go index e0134b0200..802c7b42b7 100644 --- a/upup/pkg/fi/cloudup/gcetasks/instance.go +++ b/upup/pkg/fi/cloudup/gcetasks/instance.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go b/upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go index dc21fd46f7..d93906f767 100644 --- a/upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go +++ b/upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go @@ -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) } diff --git a/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go b/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go index 2105c22331..91fabd1b13 100644 --- a/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go +++ b/upup/pkg/fi/cloudup/gcetasks/instancetemplate.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gcetasks/network.go b/upup/pkg/fi/cloudup/gcetasks/network.go index b9aa58d88b..db9475a901 100644 --- a/upup/pkg/fi/cloudup/gcetasks/network.go +++ b/upup/pkg/fi/cloudup/gcetasks/network.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gcetasks/subnet.go b/upup/pkg/fi/cloudup/gcetasks/subnet.go index 2ee800241f..dd2202db80 100644 --- a/upup/pkg/fi/cloudup/gcetasks/subnet.go +++ b/upup/pkg/fi/cloudup/gcetasks/subnet.go @@ -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" diff --git a/upup/pkg/fi/cloudup/gcetasks/targetpool.go b/upup/pkg/fi/cloudup/gcetasks/targetpool.go index c305259549..0fc3b8f96d 100644 --- a/upup/pkg/fi/cloudup/gcetasks/targetpool.go +++ b/upup/pkg/fi/cloudup/gcetasks/targetpool.go @@ -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"