Fix VolumeAttachment API version mismatch: expected v1 but watching v1beta1

Signed-off-by: Benjamin <benjamin@yunify.com>

(cherry picked from commit a2743b6)

Author: Benjamin

internal/store/volumeattachment.go

@@ -17,7 +17,7 @@ limitations under the License.
 package store
 
 import (
-	storagev1beta1 "k8s.io/api/storage/v1beta1"
+	storagev1 "k8s.io/api/storage/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
@@ -37,7 +37,7 @@ var (
 			Name: descVolumeAttachmentLabelsName,
 			Type: metric.Gauge,
 			Help: descVolumeAttachmentLabelsHelp,
-			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1beta1.VolumeAttachment) *metric.Family {
+			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1.VolumeAttachment) *metric.Family {
 				labelKeys, labelValues := kubeLabelsToPrometheusLabels(va.Labels)
 				return &metric.Family{
 					Metrics: []*metric.Metric{
@@ -54,7 +54,7 @@ var (
 			Name: "kube_volumeattachment_info",
 			Type: metric.Gauge,
 			Help: "Information about volumeattachment.",
-			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1beta1.VolumeAttachment) *metric.Family {
+			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1.VolumeAttachment) *metric.Family {
 				return &metric.Family{
 					Metrics: []*metric.Metric{
 						{
@@ -70,7 +70,7 @@ var (
 			Name: "kube_volumeattachment_created",
 			Type: metric.Gauge,
 			Help: "Unix creation timestamp",
-			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1beta1.VolumeAttachment) *metric.Family {
+			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1.VolumeAttachment) *metric.Family {
 				if !va.CreationTimestamp.IsZero() {
 					m := metric.Metric{
 						LabelKeys:   nil,
@@ -86,7 +86,7 @@ var (
 			Name: "kube_volumeattachment_spec_source_persistentvolume",
 			Type: metric.Gauge,
 			Help: "PersistentVolume source reference.",
-			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1beta1.VolumeAttachment) *metric.Family {
+			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1.VolumeAttachment) *metric.Family {
 				if va.Spec.Source.PersistentVolumeName != nil {
 					return &metric.Family{
 						Metrics: []*metric.Metric{
@@ -105,7 +105,7 @@ var (
 			Name: "kube_volumeattachment_status_attached",
 			Type: metric.Gauge,
 			Help: "Information about volumeattachment.",
-			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1beta1.VolumeAttachment) *metric.Family {
+			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1.VolumeAttachment) *metric.Family {
 				return &metric.Family{
 					Metrics: []*metric.Metric{
 						{
@@ -121,7 +121,7 @@ var (
 			Name: "kube_volumeattachment_status_attachment_metadata",
 			Type: metric.Gauge,
 			Help: "volumeattachment metadata.",
-			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1beta1.VolumeAttachment) *metric.Family {
+			GenerateFunc: wrapVolumeAttachmentFunc(func(va *storagev1.VolumeAttachment) *metric.Family {
 				labelKeys, labelValues := mapToPrometheusLabels(va.Status.AttachmentMetadata, "metadata")
 				return &metric.Family{
 					Metrics: []*metric.Metric{
@@ -137,9 +137,9 @@ var (
 	}
 )
 
-func wrapVolumeAttachmentFunc(f func(*storagev1beta1.VolumeAttachment) *metric.Family) func(interface{}) *metric.Family {
+func wrapVolumeAttachmentFunc(f func(*storagev1.VolumeAttachment) *metric.Family) func(interface{}) *metric.Family {
 	return func(obj interface{}) *metric.Family {
-		va := obj.(*storagev1beta1.VolumeAttachment)
+		va := obj.(*storagev1.VolumeAttachment)
 
 		metricFamily := f(va)
 
@@ -155,10 +155,10 @@ func wrapVolumeAttachmentFunc(f func(*storagev1beta1.VolumeAttachment) *metric.F
 func createVolumeAttachmentListWatch(kubeClient clientset.Interface, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			return kubeClient.StorageV1beta1().VolumeAttachments().List(opts)
+			return kubeClient.StorageV1().VolumeAttachments().List(opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			return kubeClient.StorageV1beta1().VolumeAttachments().Watch(opts)
+			return kubeClient.StorageV1().VolumeAttachments().Watch(opts)
 		},
 	}
 }

internal/store/volumeattachment_test.go

@@ -17,11 +17,11 @@ limitations under the License.
 package store
 
 import (
-	storagev1beta1 "k8s.io/api/storage/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"testing"
 
+	storagev1 "k8s.io/api/storage/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"k8s.io/kube-state-metrics/pkg/metric"
 )
 
@@ -45,23 +45,23 @@ func TestVolumeAttachmentStore(t *testing.T) {
 		volumename = "pvc-44f6ff3f-ba9b-49c4-9b95-8b01c4bd4bab"
 		cases      = []generateMetricsTestCase{
 			{
-				Obj: &storagev1beta1.VolumeAttachment{
+				Obj: &storagev1.VolumeAttachment{
 					ObjectMeta: metav1.ObjectMeta{
 						Generation: 2,
 						Name:       "csi-5ff16a1ad085261021e21c6cb3a6defb979a8794f25a4f90f6285664cff37224",
 						Labels: map[string]string{
 							"app": "foobar",
 						},
 					},
-					Spec: storagev1beta1.VolumeAttachmentSpec{
+					Spec: storagev1.VolumeAttachmentSpec{
 						Attacher: "cinder.csi.openstack.org",
 						NodeName: "node1",
-						Source: storagev1beta1.VolumeAttachmentSource{
+						Source: storagev1.VolumeAttachmentSource{
 							PersistentVolumeName: &volumename,
 							InlineVolumeSpec:     nil,
 						},
 					},
-					Status: storagev1beta1.VolumeAttachmentStatus{
+					Status: storagev1.VolumeAttachmentStatus{
 						Attached: true,
 						AttachmentMetadata: map[string]string{
 							"DevicePath": "/dev/sdd",