From cf54a4ea5407c6bdafc166cff2f99c2cc5fe6e52 Mon Sep 17 00:00:00 2001 From: carlory Date: Wed, 30 Apr 2025 17:35:21 +0800 Subject: [PATCH] Promoted API `VolumeAttributesClass` and `VolumeAttributesClassList` to `storage.k8s.io/v1`. Promoted feature-gate `VolumeAttributesClass` to GA (on by default) Signed-off-by: carlory Kubernetes-commit: 94bf8fc8a9d1d6c989eddad07996be0ca4dd3448 --- pkg/describe/describe.go | 7 +++---- pkg/describe/describe_test.go | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/describe/describe.go b/pkg/describe/describe.go index 6b86b33c2..aa2322378 100644 --- a/pkg/describe/describe.go +++ b/pkg/describe/describe.go @@ -53,7 +53,6 @@ import ( rbacv1 "k8s.io/api/rbac/v1" schedulingv1 "k8s.io/api/scheduling/v1" storagev1 "k8s.io/api/storage/v1" - storagev1beta1 "k8s.io/api/storage/v1beta1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/resource" @@ -231,7 +230,7 @@ func describerMap(clientConfig *rest.Config) (map[schema.GroupKind]ResourceDescr {Group: certificatesv1beta1.GroupName, Kind: "CertificateSigningRequest"}: &CertificateSigningRequestDescriber{c}, {Group: storagev1.GroupName, Kind: "StorageClass"}: &StorageClassDescriber{c}, {Group: storagev1.GroupName, Kind: "CSINode"}: &CSINodeDescriber{c}, - {Group: storagev1beta1.GroupName, Kind: "VolumeAttributesClass"}: &VolumeAttributesClassDescriber{c}, + {Group: storagev1.GroupName, Kind: "VolumeAttributesClass"}: &VolumeAttributesClassDescriber{c}, {Group: policyv1beta1.GroupName, Kind: "PodDisruptionBudget"}: &PodDisruptionBudgetDescriber{c}, {Group: policyv1.GroupName, Kind: "PodDisruptionBudget"}: &PodDisruptionBudgetDescriber{c}, {Group: rbacv1.GroupName, Kind: "Role"}: &RoleDescriber{c}, @@ -4824,7 +4823,7 @@ type VolumeAttributesClassDescriber struct { } func (d *VolumeAttributesClassDescriber) Describe(namespace, name string, describerSettings DescriberSettings) (string, error) { - vac, err := d.StorageV1beta1().VolumeAttributesClasses().Get(context.TODO(), name, metav1.GetOptions{}) + vac, err := d.StorageV1().VolumeAttributesClasses().Get(context.TODO(), name, metav1.GetOptions{}) if err != nil { return "", err } @@ -4837,7 +4836,7 @@ func (d *VolumeAttributesClassDescriber) Describe(namespace, name string, descri return describeVolumeAttributesClass(vac, events) } -func describeVolumeAttributesClass(vac *storagev1beta1.VolumeAttributesClass, events *corev1.EventList) (string, error) { +func describeVolumeAttributesClass(vac *storagev1.VolumeAttributesClass, events *corev1.EventList) (string, error) { return tabbedString(func(out io.Writer) error { w := NewPrefixWriter(out) w.Write(LEVEL_0, "Name:\t%s\n", vac.Name) diff --git a/pkg/describe/describe_test.go b/pkg/describe/describe_test.go index 49c7d6e36..e11ea7367 100644 --- a/pkg/describe/describe_test.go +++ b/pkg/describe/describe_test.go @@ -43,7 +43,6 @@ import ( policyv1beta1 "k8s.io/api/policy/v1beta1" schedulingv1 "k8s.io/api/scheduling/v1" storagev1 "k8s.io/api/storage/v1" - storagev1beta1 "k8s.io/api/storage/v1beta1" apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -4032,7 +4031,7 @@ Parameters: param1=value1,param2=value2 Events: ` - f := fake.NewSimpleClientset(&storagev1beta1.VolumeAttributesClass{ + f := fake.NewSimpleClientset(&storagev1.VolumeAttributesClass{ ObjectMeta: metav1.ObjectMeta{ Name: "foo", ResourceVersion: "4",