Skip to content

Commit 590b1f5

Browse files
amacaskillamacaskill
committed
remove support for GCE Alpha Disks
1 parent f038ec0 commit 590b1f5

File tree

5 files changed

+19
-190
lines changed

5 files changed

+19
-190
lines changed

‎pkg/gce-cloud-provider/compute/cloud-disk.go

+5-52
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ import (
1818
"strings"
1919

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

2625
type CloudDisk struct {
27-
disk *computev1.Disk
28-
betaDisk *computebeta.Disk
29-
alphaDisk *computealpha.Disk
26+
disk *computev1.Disk
27+
betaDisk *computebeta.Disk
3028
}
3129

3230
type CloudDiskType string
@@ -43,12 +41,6 @@ func CloudDiskFromBeta(disk *computebeta.Disk) *CloudDisk {
4341
}
4442
}
4543

46-
func CloudDiskFromAlpha(disk *computealpha.Disk) *CloudDisk {
47-
return &CloudDisk{
48-
alphaDisk: disk,
49-
}
50-
}
51-
5244
func (d *CloudDisk) LocationType() meta.KeyType {
5345
var zone, region string
5446
switch {
@@ -58,9 +50,6 @@ func (d *CloudDisk) LocationType() meta.KeyType {
5850
case d.betaDisk != nil:
5951
zone = d.betaDisk.Zone
6052
region = d.betaDisk.Region
61-
case d.alphaDisk != nil:
62-
zone = d.alphaDisk.Zone
63-
region = d.alphaDisk.Region
6453
}
6554
switch {
6655
case zone != "":
@@ -78,8 +67,6 @@ func (d *CloudDisk) GetUsers() []string {
7867
return d.disk.Users
7968
case d.betaDisk != nil:
8069
return d.betaDisk.Users
81-
case d.alphaDisk != nil:
82-
return d.alphaDisk.Users
8370
default:
8471
return nil
8572
}
@@ -91,8 +78,6 @@ func (d *CloudDisk) GetName() string {
9178
return d.disk.Name
9279
case d.betaDisk != nil:
9380
return d.betaDisk.Name
94-
case d.alphaDisk != nil:
95-
return d.alphaDisk.Name
9681
default:
9782
return ""
9883
}
@@ -104,8 +89,6 @@ func (d *CloudDisk) GetKind() string {
10489
return d.disk.Kind
10590
case d.betaDisk != nil:
10691
return d.betaDisk.Kind
107-
case d.alphaDisk != nil:
108-
return d.alphaDisk.Kind
10992
default:
11093
return ""
11194
}
@@ -117,8 +100,6 @@ func (d *CloudDisk) GetStatus() string {
117100
return d.disk.Status
118101
case d.betaDisk != nil:
119102
return d.betaDisk.Status
120-
case d.alphaDisk != nil:
121-
return d.alphaDisk.Status
122103
default:
123104
return "Unknown"
124105
}
@@ -134,8 +115,6 @@ func (d *CloudDisk) GetPDType() string {
134115
pdType = d.disk.Type
135116
case d.betaDisk != nil:
136117
pdType = d.betaDisk.Type
137-
case d.alphaDisk != nil:
138-
pdType = d.alphaDisk.Type
139118
default:
140119
return ""
141120
}
@@ -149,8 +128,6 @@ func (d *CloudDisk) GetSelfLink() string {
149128
return d.disk.SelfLink
150129
case d.betaDisk != nil:
151130
return d.betaDisk.SelfLink
152-
case d.alphaDisk != nil:
153-
return d.alphaDisk.SelfLink
154131
default:
155132
return ""
156133
}
@@ -162,8 +139,6 @@ func (d *CloudDisk) GetSizeGb() int64 {
162139
return d.disk.SizeGb
163140
case d.betaDisk != nil:
164141
return d.betaDisk.SizeGb
165-
case d.alphaDisk != nil:
166-
return d.alphaDisk.SizeGb
167142
default:
168143
return -1
169144
}
@@ -177,8 +152,6 @@ func (d *CloudDisk) setSizeGb(size int64) {
177152
d.disk.SizeGb = size
178153
case d.betaDisk != nil:
179154
d.betaDisk.SizeGb = size
180-
case d.alphaDisk != nil:
181-
d.alphaDisk.SizeGb = size
182155
}
183156
}
184157

@@ -188,8 +161,6 @@ func (d *CloudDisk) GetZone() string {
188161
return d.disk.Zone
189162
case d.betaDisk != nil:
190163
return d.betaDisk.Zone
191-
case d.alphaDisk != nil:
192-
return d.alphaDisk.Zone
193164
default:
194165
return ""
195166
}
@@ -201,8 +172,6 @@ func (d *CloudDisk) GetSnapshotId() string {
201172
return d.disk.SourceSnapshotId
202173
case d.betaDisk != nil:
203174
return d.betaDisk.SourceSnapshotId
204-
case d.alphaDisk != nil:
205-
return d.alphaDisk.SourceSnapshotId
206175
default:
207176
return ""
208177
}
@@ -214,8 +183,6 @@ func (d *CloudDisk) GetSourceDiskId() string {
214183
return d.disk.SourceDiskId
215184
case d.betaDisk != nil:
216185
return d.betaDisk.SourceDiskId
217-
case d.alphaDisk != nil:
218-
return d.alphaDisk.SourceDiskId
219186
default:
220187
return ""
221188
}
@@ -227,8 +194,6 @@ func (d *CloudDisk) GetImageId() string {
227194
return d.disk.SourceImageId
228195
case d.betaDisk != nil:
229196
return d.betaDisk.SourceImageId
230-
case d.alphaDisk != nil:
231-
return d.alphaDisk.SourceImageId
232197
default:
233198
return ""
234199
}
@@ -244,10 +209,6 @@ func (d *CloudDisk) GetKMSKeyName() string {
244209
if dek := d.betaDisk.DiskEncryptionKey; dek != nil {
245210
return dek.KmsKeyName
246211
}
247-
case d.alphaDisk != nil:
248-
if dek := d.alphaDisk.DiskEncryptionKey; dek != nil {
249-
return dek.KmsKeyName
250-
}
251212
}
252213
return ""
253214
}
@@ -258,8 +219,6 @@ func (d *CloudDisk) GetMultiWriter() bool {
258219
return false
259220
case d.betaDisk != nil:
260221
return d.betaDisk.MultiWriter
261-
case d.alphaDisk != nil:
262-
return d.alphaDisk.MultiWriter
263222
default:
264223
return false
265224
}
@@ -268,11 +227,9 @@ func (d *CloudDisk) GetMultiWriter() bool {
268227
func (d *CloudDisk) GetEnableConfidentialCompute() bool {
269228
switch {
270229
case d.disk != nil:
271-
return false
230+
return d.disk.EnableConfidentialCompute
272231
case d.betaDisk != nil:
273232
return d.betaDisk.EnableConfidentialCompute
274-
case d.alphaDisk != nil:
275-
return d.alphaDisk.EnableConfidentialCompute
276233
default:
277234
return false
278235
}
@@ -281,11 +238,9 @@ func (d *CloudDisk) GetEnableConfidentialCompute() bool {
281238
func (d *CloudDisk) GetEnableStoragePools() bool {
282239
switch {
283240
case d.disk != nil:
284-
return false
241+
return d.disk.StoragePool != ""
285242
case d.betaDisk != nil:
286-
return false
287-
case d.alphaDisk != nil:
288-
return d.alphaDisk.StoragePool != ""
243+
return d.betaDisk.StoragePool != ""
289244
default:
290245
return false
291246
}
@@ -297,8 +252,6 @@ func (d *CloudDisk) GetLabels() map[string]string {
297252
return d.disk.Labels
298253
case d.betaDisk != nil:
299254
return d.betaDisk.Labels
300-
case d.alphaDisk != nil:
301-
return d.alphaDisk.Labels
302255
default:
303256
return nil
304257
}

‎pkg/gce-cloud-provider/compute/cloud-disk_test.go

-26
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"testing"
2222

2323
"github.com/google/go-cmp/cmp"
24-
computealpha "google.golang.org/api/compute/v0.alpha"
2524
computebeta "google.golang.org/api/compute/v0.beta"
2625
computev1 "google.golang.org/api/compute/v1"
2726
)
@@ -100,22 +99,6 @@ func TestGetEnableStoragePools(t *testing.T) {
10099
},
101100
expectedEnableStoragePools: false,
102101
},
103-
{
104-
name: "alpha disk without storage pool returns false",
105-
cloudDisk: &CloudDisk{
106-
alphaDisk: &computealpha.Disk{},
107-
},
108-
expectedEnableStoragePools: false,
109-
},
110-
{
111-
name: "alpha disk with storage pool returns true",
112-
cloudDisk: &CloudDisk{
113-
alphaDisk: &computealpha.Disk{
114-
StoragePool: "projects/my-project/zones/us-central1-a/storagePools/storagePool-1",
115-
},
116-
},
117-
expectedEnableStoragePools: true,
118-
},
119102
}
120103

121104
for _, tc := range testCases {
@@ -155,15 +138,6 @@ func TestGetLabels(t *testing.T) {
155138
},
156139
wantLabels: map[string]string{"bar": "beta", "goog-gke-multi-zone": "true"},
157140
},
158-
{
159-
name: "alpha disk without storage pool returns false",
160-
cloudDisk: &CloudDisk{
161-
alphaDisk: &computealpha.Disk{
162-
Labels: map[string]string{"baz": "alpha", "goog-gke-multi-zone": "true"},
163-
},
164-
},
165-
wantLabels: map[string]string{"baz": "alpha", "goog-gke-multi-zone": "true"},
166-
},
167141
}
168142

169143
for _, tc := range testCases {

‎pkg/gce-cloud-provider/compute/gce-compute.go

-61
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424

2525
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
2626
csi "github.com/container-storage-interface/spec/lib/go/csi"
27-
computealpha "google.golang.org/api/compute/v0.alpha"
2827
computebeta "google.golang.org/api/compute/v0.beta"
2928
computev1 "google.golang.org/api/compute/v1"
3029
"google.golang.org/grpc/codes"
@@ -54,8 +53,6 @@ const (
5453
GCEAPIVersionV1 GCEAPIVersion = "v1"
5554
// Beta key type
5655
GCEAPIVersionBeta GCEAPIVersion = "beta"
57-
// Alpha key type
58-
GCEAPIVersionAlpha GCEAPIVersion = "alpha"
5956
)
6057

6158
// AttachDiskBackoff is backoff used to wait for AttachDisk to complete.
@@ -269,9 +266,6 @@ func (cloud *CloudProvider) GetDisk(ctx context.Context, project string, key *me
269266
if gceAPIVersion == GCEAPIVersionBeta {
270267
disk, err := cloud.getZonalBetaDiskOrError(ctx, project, key.Zone, key.Name)
271268
return CloudDiskFromBeta(disk), err
272-
} else if gceAPIVersion == GCEAPIVersionAlpha {
273-
disk, err := cloud.getZonalAlphaDiskOrError(ctx, project, key.Zone, key.Name)
274-
return CloudDiskFromAlpha(disk), err
275269
} else {
276270
disk, err := cloud.getZonalDiskOrError(ctx, project, key.Zone, key.Name)
277271
return CloudDiskFromV1(disk), err
@@ -305,14 +299,6 @@ func (cloud *CloudProvider) getRegionalDiskOrError(ctx context.Context, project,
305299
return disk, nil
306300
}
307301

308-
func (cloud *CloudProvider) getZonalAlphaDiskOrError(ctx context.Context, project, volumeZone, volumeName string) (*computealpha.Disk, error) {
309-
disk, err := cloud.alphaService.Disks.Get(project, volumeZone, volumeName).Context(ctx).Do()
310-
if err != nil {
311-
return nil, err
312-
}
313-
return disk, nil
314-
}
315-
316302
func (cloud *CloudProvider) getZonalBetaDiskOrError(ctx context.Context, project, volumeZone, volumeName string) (*computebeta.Disk, error) {
317303
disk, err := cloud.betaService.Disks.Get(project, volumeZone, volumeName).Context(ctx).Do()
318304
if err != nil {
@@ -459,37 +445,6 @@ func convertV1DiskToBetaDisk(v1Disk *computev1.Disk) *computebeta.Disk {
459445
return betaDisk
460446
}
461447

462-
func convertV1DiskToAlphaDisk(v1Disk *computev1.Disk, provisionedThroughputOnCreate int64, storagePool *common.StoragePool) *computealpha.Disk {
463-
// Note: this is an incomplete list. It only includes the fields we use for disk creation.
464-
alphaDisk := &computealpha.Disk{
465-
Name: v1Disk.Name,
466-
SizeGb: v1Disk.SizeGb,
467-
Description: v1Disk.Description,
468-
Type: v1Disk.Type,
469-
SourceSnapshot: v1Disk.SourceSnapshot,
470-
SourceImage: v1Disk.SourceImage,
471-
SourceImageId: v1Disk.SourceImageId,
472-
SourceSnapshotId: v1Disk.SourceSnapshotId,
473-
SourceDisk: v1Disk.SourceDisk,
474-
ReplicaZones: v1Disk.ReplicaZones,
475-
Zone: v1Disk.Zone,
476-
Region: v1Disk.Region,
477-
Status: v1Disk.Status,
478-
SelfLink: v1Disk.SelfLink,
479-
}
480-
if v1Disk.ProvisionedIops > 0 {
481-
alphaDisk.ProvisionedIops = v1Disk.ProvisionedIops
482-
}
483-
if provisionedThroughputOnCreate > 0 {
484-
alphaDisk.ProvisionedThroughput = provisionedThroughputOnCreate
485-
}
486-
if storagePool != nil {
487-
alphaDisk.StoragePool = storagePool.ResourceName
488-
}
489-
490-
return alphaDisk
491-
}
492-
493448
func (cloud *CloudProvider) insertRegionalDisk(
494449
ctx context.Context,
495450
project string,
@@ -684,22 +639,6 @@ func (cloud *CloudProvider) insertZonalDisk(
684639
if insertOp != nil {
685640
opName = insertOp.Name
686641
}
687-
} else if gceAPIVersion == GCEAPIVersionAlpha {
688-
var insertOp *computealpha.Operation
689-
var storagePool *common.StoragePool
690-
if params.StoragePools != nil {
691-
storagePool = common.StoragePoolInZone(params.StoragePools, volKey.Zone)
692-
if storagePool == nil {
693-
return status.Errorf(codes.InvalidArgument, "cannot create disk in zone %q: no Storage Pools exist in zone", volKey.Zone)
694-
}
695-
}
696-
alphaDiskToCreate := convertV1DiskToAlphaDisk(diskToCreate, params.ProvisionedThroughputOnCreate, storagePool)
697-
alphaDiskToCreate.MultiWriter = multiWriter
698-
alphaDiskToCreate.EnableConfidentialCompute = params.EnableConfidentialCompute
699-
insertOp, err = cloud.alphaService.Disks.Insert(project, volKey.Zone, alphaDiskToCreate).Context(ctx).Do()
700-
if insertOp != nil {
701-
opName = insertOp.Name
702-
}
703642
} else {
704643
var insertOp *computev1.Operation
705644
insertOp, err = cloud.service.Disks.Insert(project, volKey.Zone, diskToCreate).Context(ctx).Do()

0 commit comments

Comments
 (0)