From 99a4a7a66f58939c37a52b7092b57e261d5b9d93 Mon Sep 17 00:00:00 2001
From: "Beata Lach (Skiba)" <bskiba@google.com>
Date: Tue, 12 Jan 2021 17:47:21 +0100
Subject: [PATCH 1/2] Change vpa storage version to v1

---
 vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1/types.go | 2 ++
 .../pkg/apis/autoscaling.k8s.io/v1beta2/types.go                | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1/types.go b/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1/types.go
index fe5e3bf3e4dd..e45d1cb5c33c 100644
--- a/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1/types.go
+++ b/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1/types.go
@@ -38,6 +38,7 @@ type VerticalPodAutoscalerList struct {
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:storageversion
 // +kubebuilder:resource:shortName=vpa
 
 // VerticalPodAutoscaler is the configuration for a vertical pod
@@ -288,6 +289,7 @@ type VerticalPodAutoscalerCondition struct {
 // +genclient
 // +genclient:noStatus
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:storageversion
 // +kubebuilder:resource:shortName=vpacheckpoint
 
 // VerticalPodAutoscalerCheckpoint is the checkpoint of the internal state of VPA that
diff --git a/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1beta2/types.go b/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1beta2/types.go
index 46d86329e431..1b1d0e90c622 100644
--- a/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1beta2/types.go
+++ b/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1beta2/types.go
@@ -39,7 +39,6 @@ type VerticalPodAutoscalerList struct {
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:shortName=vpa
-// +kubebuilder:storageversion
 
 // VerticalPodAutoscaler is the configuration for a vertical pod
 // autoscaler, which automatically manages pod resources based on historical and
@@ -267,7 +266,6 @@ type VerticalPodAutoscalerCondition struct {
 // +genclient
 // +genclient:noStatus
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:storageversion
 // +kubebuilder:resource:shortName=vpacheckpoint
 
 // VerticalPodAutoscalerCheckpoint is the checkpoint of the internal state of VPA that

From 25f8f4374c64dd3177b93cc30146f526e0887ad3 Mon Sep 17 00:00:00 2001
From: "Beata Lach (Skiba)" <bskiba@google.com>
Date: Tue, 12 Jan 2021 17:47:42 +0100
Subject: [PATCH 2/2] Regenerate VPA api

---
 vertical-pod-autoscaler/deploy/vpa-v1-crd-gen.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vertical-pod-autoscaler/deploy/vpa-v1-crd-gen.yaml b/vertical-pod-autoscaler/deploy/vpa-v1-crd-gen.yaml
index f4262d83efb5..7b404de8797d 100644
--- a/vertical-pod-autoscaler/deploy/vpa-v1-crd-gen.yaml
+++ b/vertical-pod-autoscaler/deploy/vpa-v1-crd-gen.yaml
@@ -109,7 +109,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
+    storage: true
   - name: v1beta2
     schema:
       openAPIV3Schema:
@@ -202,7 +202,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: false
 status:
   acceptedNames:
     kind: ""
@@ -476,7 +476,7 @@ spec:
         - spec
         type: object
     served: true
-    storage: false
+    storage: true
   - name: v1beta2
     schema:
       openAPIV3Schema:
@@ -707,7 +707,7 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
 status:
   acceptedNames:
     kind: ""