Skip to content

Automated cherry pick of #1666: migrate hyperdisk/chd/storagepools to GCE v1 disk API #1667: remove support for GCE Alpha Disks #1669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Automated cherry pick of #1666: migrate hyperdisk/chd/storagepools to GCE v1 disk API #1667: remove support for GCE Alpha Disks #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b36763d
migrate hyperdisk/chd/storagepools to GCE v1 disk API
amacaskill Apr 13, 2024
a11bdd6
remove support for GCE Alpha Disks
amacaskill Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ require (
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.24.0
github.com/container-storage-interface/spec v1.6.0
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.5.0
github.com/google/uuid v1.6.0
github.com/kubernetes-csi/csi-proxy/client v1.1.3
github.com/kubernetes-csi/csi-test/v4 v4.4.0
github.com/onsi/ginkgo/v2 v2.14.0
github.com/onsi/gomega v1.30.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
go.opentelemetry.io/otel v1.21.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
go.opentelemetry.io/otel/sdk v1.21.0
golang.org/x/oauth2 v0.16.0
golang.org/x/sys v0.16.0
google.golang.org/api v0.156.0
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0
google.golang.org/grpc v1.60.1
golang.org/x/oauth2 v0.18.0
golang.org/x/sys v0.18.0
google.golang.org/api v0.172.0
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80
google.golang.org/grpc v1.62.1
google.golang.org/protobuf v1.33.0
gopkg.in/gcfg.v1 v1.2.3
k8s.io/api v0.24.1
Expand All @@ -37,7 +37,7 @@ require (
)

require (
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute v1.23.4 // indirect
cloud.google.com/go/iam v1.1.5 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
Expand All @@ -50,7 +50,7 @@ require (
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.19.6 // indirect
Expand All @@ -65,7 +65,7 @@ require (
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
Expand All @@ -88,22 +88,22 @@ require (
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/term v0.16.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.16.1 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand Down
82 changes: 40 additions & 42 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

57 changes: 5 additions & 52 deletions pkg/gce-cloud-provider/compute/cloud-disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@ import (
"strings"

"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
computealpha "google.golang.org/api/compute/v0.alpha"
computebeta "google.golang.org/api/compute/v0.beta"
computev1 "google.golang.org/api/compute/v1"
)

type CloudDisk struct {
disk *computev1.Disk
betaDisk *computebeta.Disk
alphaDisk *computealpha.Disk
disk *computev1.Disk
betaDisk *computebeta.Disk
}

type CloudDiskType string
Expand All @@ -43,12 +41,6 @@ func CloudDiskFromBeta(disk *computebeta.Disk) *CloudDisk {
}
}

func CloudDiskFromAlpha(disk *computealpha.Disk) *CloudDisk {
return &CloudDisk{
alphaDisk: disk,
}
}

func (d *CloudDisk) LocationType() meta.KeyType {
var zone, region string
switch {
Expand All @@ -58,9 +50,6 @@ func (d *CloudDisk) LocationType() meta.KeyType {
case d.betaDisk != nil:
zone = d.betaDisk.Zone
region = d.betaDisk.Region
case d.alphaDisk != nil:
zone = d.alphaDisk.Zone
region = d.alphaDisk.Region
}
switch {
case zone != "":
Expand All @@ -78,8 +67,6 @@ func (d *CloudDisk) GetUsers() []string {
return d.disk.Users
case d.betaDisk != nil:
return d.betaDisk.Users
case d.alphaDisk != nil:
return d.alphaDisk.Users
default:
return nil
}
Expand All @@ -91,8 +78,6 @@ func (d *CloudDisk) GetName() string {
return d.disk.Name
case d.betaDisk != nil:
return d.betaDisk.Name
case d.alphaDisk != nil:
return d.alphaDisk.Name
default:
return ""
}
Expand All @@ -104,8 +89,6 @@ func (d *CloudDisk) GetKind() string {
return d.disk.Kind
case d.betaDisk != nil:
return d.betaDisk.Kind
case d.alphaDisk != nil:
return d.alphaDisk.Kind
default:
return ""
}
Expand All @@ -117,8 +100,6 @@ func (d *CloudDisk) GetStatus() string {
return d.disk.Status
case d.betaDisk != nil:
return d.betaDisk.Status
case d.alphaDisk != nil:
return d.alphaDisk.Status
default:
return "Unknown"
}
Expand All @@ -134,8 +115,6 @@ func (d *CloudDisk) GetPDType() string {
pdType = d.disk.Type
case d.betaDisk != nil:
pdType = d.betaDisk.Type
case d.alphaDisk != nil:
pdType = d.alphaDisk.Type
default:
return ""
}
Expand All @@ -149,8 +128,6 @@ func (d *CloudDisk) GetSelfLink() string {
return d.disk.SelfLink
case d.betaDisk != nil:
return d.betaDisk.SelfLink
case d.alphaDisk != nil:
return d.alphaDisk.SelfLink
default:
return ""
}
Expand All @@ -162,8 +139,6 @@ func (d *CloudDisk) GetSizeGb() int64 {
return d.disk.SizeGb
case d.betaDisk != nil:
return d.betaDisk.SizeGb
case d.alphaDisk != nil:
return d.alphaDisk.SizeGb
default:
return -1
}
Expand All @@ -177,8 +152,6 @@ func (d *CloudDisk) setSizeGb(size int64) {
d.disk.SizeGb = size
case d.betaDisk != nil:
d.betaDisk.SizeGb = size
case d.alphaDisk != nil:
d.alphaDisk.SizeGb = size
}
}

Expand All @@ -188,8 +161,6 @@ func (d *CloudDisk) GetZone() string {
return d.disk.Zone
case d.betaDisk != nil:
return d.betaDisk.Zone
case d.alphaDisk != nil:
return d.alphaDisk.Zone
default:
return ""
}
Expand All @@ -201,8 +172,6 @@ func (d *CloudDisk) GetSnapshotId() string {
return d.disk.SourceSnapshotId
case d.betaDisk != nil:
return d.betaDisk.SourceSnapshotId
case d.alphaDisk != nil:
return d.alphaDisk.SourceSnapshotId
default:
return ""
}
Expand All @@ -214,8 +183,6 @@ func (d *CloudDisk) GetSourceDiskId() string {
return d.disk.SourceDiskId
case d.betaDisk != nil:
return d.betaDisk.SourceDiskId
case d.alphaDisk != nil:
return d.alphaDisk.SourceDiskId
default:
return ""
}
Expand All @@ -227,8 +194,6 @@ func (d *CloudDisk) GetImageId() string {
return d.disk.SourceImageId
case d.betaDisk != nil:
return d.betaDisk.SourceImageId
case d.alphaDisk != nil:
return d.alphaDisk.SourceImageId
default:
return ""
}
Expand All @@ -244,10 +209,6 @@ func (d *CloudDisk) GetKMSKeyName() string {
if dek := d.betaDisk.DiskEncryptionKey; dek != nil {
return dek.KmsKeyName
}
case d.alphaDisk != nil:
if dek := d.alphaDisk.DiskEncryptionKey; dek != nil {
return dek.KmsKeyName
}
}
return ""
}
Expand All @@ -258,8 +219,6 @@ func (d *CloudDisk) GetMultiWriter() bool {
return false
case d.betaDisk != nil:
return d.betaDisk.MultiWriter
case d.alphaDisk != nil:
return d.alphaDisk.MultiWriter
default:
return false
}
Expand All @@ -268,11 +227,9 @@ func (d *CloudDisk) GetMultiWriter() bool {
func (d *CloudDisk) GetEnableConfidentialCompute() bool {
switch {
case d.disk != nil:
return false
return d.disk.EnableConfidentialCompute
case d.betaDisk != nil:
return d.betaDisk.EnableConfidentialCompute
case d.alphaDisk != nil:
return d.alphaDisk.EnableConfidentialCompute
default:
return false
}
Expand All @@ -281,11 +238,9 @@ func (d *CloudDisk) GetEnableConfidentialCompute() bool {
func (d *CloudDisk) GetEnableStoragePools() bool {
switch {
case d.disk != nil:
return false
return d.disk.StoragePool != ""
case d.betaDisk != nil:
return false
case d.alphaDisk != nil:
return d.alphaDisk.StoragePool != ""
return d.betaDisk.StoragePool != ""
default:
return false
}
Expand All @@ -297,8 +252,6 @@ func (d *CloudDisk) GetLabels() map[string]string {
return d.disk.Labels
case d.betaDisk != nil:
return d.betaDisk.Labels
case d.alphaDisk != nil:
return d.alphaDisk.Labels
default:
return nil
}
Expand Down
26 changes: 0 additions & 26 deletions pkg/gce-cloud-provider/compute/cloud-disk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
computealpha "google.golang.org/api/compute/v0.alpha"
computebeta "google.golang.org/api/compute/v0.beta"
computev1 "google.golang.org/api/compute/v1"
)
Expand Down Expand Up @@ -100,22 +99,6 @@ func TestGetEnableStoragePools(t *testing.T) {
},
expectedEnableStoragePools: false,
},
{
name: "alpha disk without storage pool returns false",
cloudDisk: &CloudDisk{
alphaDisk: &computealpha.Disk{},
},
expectedEnableStoragePools: false,
},
{
name: "alpha disk with storage pool returns true",
cloudDisk: &CloudDisk{
alphaDisk: &computealpha.Disk{
StoragePool: "projects/my-project/zones/us-central1-a/storagePools/storagePool-1",
},
},
expectedEnableStoragePools: true,
},
}

for _, tc := range testCases {
Expand Down Expand Up @@ -155,15 +138,6 @@ func TestGetLabels(t *testing.T) {
},
wantLabels: map[string]string{"bar": "beta", "goog-gke-multi-zone": "true"},
},
{
name: "alpha disk without storage pool returns false",
cloudDisk: &CloudDisk{
alphaDisk: &computealpha.Disk{
Labels: map[string]string{"baz": "alpha", "goog-gke-multi-zone": "true"},
},
},
wantLabels: map[string]string{"baz": "alpha", "goog-gke-multi-zone": "true"},
},
}

for _, tc := range testCases {
Expand Down
2 changes: 1 addition & 1 deletion pkg/gce-cloud-provider/compute/fake-gce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func (cloud *FakeCloudProvider) InsertDisk(ctx context.Context, project string,
}

if containsBetaDiskType(hyperdiskTypes, params.DiskType) {
betaDisk := convertV1DiskToBetaDisk(computeDisk, params.ProvisionedThroughputOnCreate)
betaDisk := convertV1DiskToBetaDisk(computeDisk)
betaDisk.EnableConfidentialCompute = params.EnableConfidentialCompute
cloud.disks[volKey.Name] = CloudDiskFromBeta(betaDisk)
} else {
Expand Down
Loading