Skip to content

Commit cfe53f7

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1669 from amacaskill/automated-cherry-pick-of-#1666-#1667-upstream-release-1.13
Automated cherry pick of #1666: migrate hyperdisk/chd/storagepools to GCE v1 disk API #1667: remove support for GCE Alpha Disks
2 parents d76a333 + a11bdd6 commit cfe53f7

File tree

183 files changed

+149664
-109307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+149664
-109307
lines changed

‎go.mod

+19-19
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ require (
88
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.24.0
99
github.com/container-storage-interface/spec v1.6.0
1010
github.com/google/go-cmp v0.6.0
11-
github.com/google/uuid v1.5.0
11+
github.com/google/uuid v1.6.0
1212
github.com/kubernetes-csi/csi-proxy/client v1.1.3
1313
github.com/kubernetes-csi/csi-test/v4 v4.4.0
1414
github.com/onsi/ginkgo/v2 v2.14.0
1515
github.com/onsi/gomega v1.30.0
16-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
17-
go.opentelemetry.io/otel v1.21.0
16+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0
17+
go.opentelemetry.io/otel v1.24.0
1818
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0
1919
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
2020
go.opentelemetry.io/otel/sdk v1.21.0
21-
golang.org/x/oauth2 v0.16.0
22-
golang.org/x/sys v0.16.0
23-
google.golang.org/api v0.156.0
24-
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0
25-
google.golang.org/grpc v1.60.1
21+
golang.org/x/oauth2 v0.18.0
22+
golang.org/x/sys v0.18.0
23+
google.golang.org/api v0.172.0
24+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80
25+
google.golang.org/grpc v1.62.1
2626
google.golang.org/protobuf v1.33.0
2727
gopkg.in/gcfg.v1 v1.2.3
2828
k8s.io/api v0.24.1
@@ -37,7 +37,7 @@ require (
3737
)
3838

3939
require (
40-
cloud.google.com/go/compute v1.23.3 // indirect
40+
cloud.google.com/go/compute v1.23.4 // indirect
4141
cloud.google.com/go/iam v1.1.5 // indirect
4242
github.com/Microsoft/go-winio v0.6.1 // indirect
4343
github.com/PuerkitoBio/purell v1.1.1 // indirect
@@ -50,7 +50,7 @@ require (
5050
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
5151
github.com/felixge/httpsnoop v1.0.4 // indirect
5252
github.com/fsnotify/fsnotify v1.5.4 // indirect
53-
github.com/go-logr/logr v1.3.0 // indirect
53+
github.com/go-logr/logr v1.4.1 // indirect
5454
github.com/go-logr/stdr v1.2.2 // indirect
5555
github.com/go-openapi/jsonpointer v0.20.0 // indirect
5656
github.com/go-openapi/jsonreference v0.19.6 // indirect
@@ -65,7 +65,7 @@ require (
6565
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
6666
github.com/google/s2a-go v0.1.7 // indirect
6767
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
68-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
68+
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
6969
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
7070
github.com/hashicorp/errwrap v1.0.0 // indirect
7171
github.com/hashicorp/go-multierror v1.1.0 // indirect
@@ -88,22 +88,22 @@ require (
8888
github.com/sirupsen/logrus v1.9.0 // indirect
8989
github.com/spf13/pflag v1.0.5 // indirect
9090
go.opencensus.io v0.24.0 // indirect
91-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
92-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
93-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
91+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
92+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
93+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
9494
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
9595
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
96-
golang.org/x/crypto v0.18.0 // indirect
96+
golang.org/x/crypto v0.21.0 // indirect
9797
golang.org/x/mod v0.14.0 // indirect
98-
golang.org/x/net v0.20.0 // indirect
98+
golang.org/x/net v0.22.0 // indirect
9999
golang.org/x/sync v0.6.0 // indirect
100-
golang.org/x/term v0.16.0 // indirect
100+
golang.org/x/term v0.18.0 // indirect
101101
golang.org/x/text v0.14.0 // indirect
102102
golang.org/x/time v0.5.0 // indirect
103103
golang.org/x/tools v0.16.1 // indirect
104104
google.golang.org/appengine v1.6.8 // indirect
105-
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
106-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
105+
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
106+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
107107
gopkg.in/inf.v0 v0.9.1 // indirect
108108
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
109109
gopkg.in/warnings.v0 v0.1.2 // indirect

‎go.sum

+40-42
Large diffs are not rendered by default.

‎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/fake-gce.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func (cloud *FakeCloudProvider) InsertDisk(ctx context.Context, project string,
249249
}
250250

251251
if containsBetaDiskType(hyperdiskTypes, params.DiskType) {
252-
betaDisk := convertV1DiskToBetaDisk(computeDisk, params.ProvisionedThroughputOnCreate)
252+
betaDisk := convertV1DiskToBetaDisk(computeDisk)
253253
betaDisk.EnableConfidentialCompute = params.EnableConfidentialCompute
254254
cloud.disks[volKey.Name] = CloudDiskFromBeta(betaDisk)
255255
} else {

0 commit comments

Comments
 (0)