From 56186c31c5d1c3b24cb3a39837059352801c8a3c Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@tobru.ch>
Date: Mon, 29 Jun 2020 20:33:59 +0200
Subject: [PATCH] use v1 crds for vpa

---
 .../{vpa-beta2-crd.yaml => vpa-v1-crd.yaml}   | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)
 rename kube-system/vertical-pod-autoscaler/{vpa-beta2-crd.yaml => vpa-v1-crd.yaml} (64%)

diff --git a/kube-system/vertical-pod-autoscaler/vpa-beta2-crd.yaml b/kube-system/vertical-pod-autoscaler/vpa-v1-crd.yaml
similarity index 64%
rename from kube-system/vertical-pod-autoscaler/vpa-beta2-crd.yaml
rename to kube-system/vertical-pod-autoscaler/vpa-v1-crd.yaml
index 7add6cc..560b9b0 100644
--- a/kube-system/vertical-pod-autoscaler/vpa-beta2-crd.yaml
+++ b/kube-system/vertical-pod-autoscaler/vpa-v1-crd.yaml
@@ -3,6 +3,8 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: verticalpodautoscalers.autoscaling.k8s.io
+  annotations:
+    "api-approved.kubernetes.io": "https://github.com/kubernetes/kubernetes/pull/63797"
 spec:
   group: autoscaling.k8s.io
   scope: Namespaced
@@ -15,11 +17,14 @@ spec:
   version: v1beta1
   versions:
     - name: v1beta1
-      served: true
+      served: false
       storage: false
     - name: v1beta2
       served: true
       storage: true
+    - name: v1
+      served: true
+      storage: false
   validation:
     # openAPIV3Schema is the schema for validating custom objects.
     openAPIV3Schema:
@@ -43,11 +48,28 @@ spec:
                   type: array
                   items:
                     type: object
+                    properties:
+                      containerName:
+                        type: string
+                      mode:
+                        type: string
+                        enum: ["Auto", "Off"]
+                      minAllowed:
+                        type: object
+                      maxAllowed:
+                        type: object
+                      controlledResources:
+                        type: array
+                        items:
+                          type: string
+                          enum: ["cpu", "memory"]
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: verticalpodautoscalercheckpoints.autoscaling.k8s.io
+  annotations:
+    "api-approved.kubernetes.io": "https://github.com/kubernetes/kubernetes/pull/63797"
 spec:
   group: autoscaling.k8s.io
   scope: Namespaced
@@ -60,8 +82,11 @@ spec:
   version: v1beta1
   versions:
     - name: v1beta1
-      served: true
+      served: false
       storage: false
     - name: v1beta2
       served: true
       storage: true
+    - name: v1
+      served: true
+      storage: false