Skip to content

Commit f114c10

Browse files
authored
Merge pull request kubernetes#133244 from carlory/fix-prerelease-lifecycle
Fix prerelease-lifecycle for volumeattributesclass
2 parents 461ba83 + 0f7cd14 commit f114c10

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

staging/src/k8s.io/api/storage/v1alpha1/types.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,8 @@ type CSIStorageCapacityList struct {
261261
// +genclient
262262
// +genclient:nonNamespaced
263263
// +k8s:prerelease-lifecycle-gen:introduced=1.29
264+
// +k8s:prerelease-lifecycle-gen:deprecated=1.32
265+
// +k8s:prerelease-lifecycle-gen:replacement=storage.k8s.io,v1,VolumeAttributesClass
264266
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
265267

266268
// VolumeAttributesClass represents a specification of mutable volume attributes
@@ -296,7 +298,7 @@ type VolumeAttributesClass struct {
296298

297299
// +k8s:prerelease-lifecycle-gen:introduced=1.29
298300
// +k8s:prerelease-lifecycle-gen:deprecated=1.32
299-
// +k8s:prerelease-lifecycle-gen:replacement=storage.k8s.io,v1,VolumeAttributesClass
301+
// +k8s:prerelease-lifecycle-gen:replacement=storage.k8s.io,v1,VolumeAttributesClassList
300302
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
301303

302304
// VolumeAttributesClassList is a collection of VolumeAttributesClass objects.

staging/src/k8s.io/api/storage/v1alpha1/zz_generated.prerelease-lifecycle.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/storage/v1beta1/types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,8 @@ type VolumeAttributesClass struct {
775775
}
776776

777777
// +k8s:prerelease-lifecycle-gen:introduced=1.31
778+
// +k8s:prerelease-lifecycle-gen:deprecated=1.34
779+
// +k8s:prerelease-lifecycle-gen:replacement=storage.k8s.io,v1,VolumeAttributesClassList
778780
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
779781

780782
// VolumeAttributesClassList is a collection of VolumeAttributesClass objects.

staging/src/k8s.io/api/storage/v1beta1/zz_generated.prerelease-lifecycle.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)