Deprecate v1beta1 for CRD eniconfig (#1534)

* Deprecate v1beta1 for CRD eniconfig * Also need update API version in jsonnet
aws · Aug 31, 2021 · 037d73f · 037d73f
1 parent ea4471c
commit 037d73f
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 17 deletions.
diff --git a/charts/aws-vpc-cni/templates/customresourcedefinition.yaml b/charts/aws-vpc-cni/templates/customresourcedefinition.yaml
@@ -8,6 +8,7 @@ metadata:
 spec:
   scope: Cluster
   group: crd.k8s.amazonaws.com
+  preserveUnknownFields: false
   versions:
     - name: v1alpha1
       served: true

diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml
@@ -51,7 +51,7 @@
   - "list"
   - "watch"
 ---
-"apiVersion": "apiextensions.k8s.io/v1beta1"
+"apiVersion": "apiextensions.k8s.io/v1"
 "kind": "CustomResourceDefinition"
 "metadata":
   "name": "eniconfigs.crd.k8s.amazonaws.com"
@@ -62,10 +62,15 @@
     "plural": "eniconfigs"
     "singular": "eniconfig"
   "scope": "Cluster"
+  "preserveUnknownFields": false
   "versions":
-  - "name": "v1alpha1"
-    "served": true
-    "storage": true
+    - "name": "v1alpha1"
+      "served": true
+      "storage": true
+      "schema":
+        "openAPIV3Schema":
+          "type": object
+          "x-kubernetes-preserve-unknown-fields": true
 ---
 "apiVersion": "apps/v1"
 "kind": "DaemonSet"

diff --git a/config/master/aws-k8s-cni-us-gov-east-1.yaml b/config/master/aws-k8s-cni-us-gov-east-1.yaml
@@ -51,7 +51,7 @@
   - "list"
   - "watch"
 ---
-"apiVersion": "apiextensions.k8s.io/v1beta1"
+"apiVersion": "apiextensions.k8s.io/v1"
 "kind": "CustomResourceDefinition"
 "metadata":
   "name": "eniconfigs.crd.k8s.amazonaws.com"
@@ -62,10 +62,15 @@
     "plural": "eniconfigs"
     "singular": "eniconfig"
   "scope": "Cluster"
+  "preserveUnknownFields": false
   "versions":
-  - "name": "v1alpha1"
-    "served": true
-    "storage": true
+    - "name": "v1alpha1"
+      "served": true
+      "storage": true
+      "schema":
+        "openAPIV3Schema":
+          "type": object
+          "x-kubernetes-preserve-unknown-fields": true
 ---
 "apiVersion": "apps/v1"
 "kind": "DaemonSet"

diff --git a/config/master/aws-k8s-cni-us-gov-west-1.yaml b/config/master/aws-k8s-cni-us-gov-west-1.yaml
@@ -51,7 +51,7 @@
   - "list"
   - "watch"
 ---
-"apiVersion": "apiextensions.k8s.io/v1beta1"
+"apiVersion": "apiextensions.k8s.io/v1"
 "kind": "CustomResourceDefinition"
 "metadata":
   "name": "eniconfigs.crd.k8s.amazonaws.com"
@@ -62,10 +62,15 @@
     "plural": "eniconfigs"
     "singular": "eniconfig"
   "scope": "Cluster"
+  "preserveUnknownFields": false
   "versions":
-  - "name": "v1alpha1"
-    "served": true
-    "storage": true
+    - "name": "v1alpha1"
+      "served": true
+      "storage": true
+      "schema":
+        "openAPIV3Schema":
+          "type": object
+          "x-kubernetes-preserve-unknown-fields": true
 ---
 "apiVersion": "apps/v1"
 "kind": "DaemonSet"

diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml
@@ -51,7 +51,7 @@
   - "list"
   - "watch"
 ---
-"apiVersion": "apiextensions.k8s.io/v1beta1"
+"apiVersion": "apiextensions.k8s.io/v1"
 "kind": "CustomResourceDefinition"
 "metadata":
   "name": "eniconfigs.crd.k8s.amazonaws.com"
@@ -62,10 +62,15 @@
     "plural": "eniconfigs"
     "singular": "eniconfig"
   "scope": "Cluster"
+  "preserveUnknownFields": false
   "versions":
-  - "name": "v1alpha1"
-    "served": true
-    "storage": true
+    - "name": "v1alpha1"
+      "served": true
+      "storage": true
+      "schema":
+        "openAPIV3Schema":
+          "type": object
+          "x-kubernetes-preserve-unknown-fields": true
 ---
 "apiVersion": "apps/v1"
 "kind": "DaemonSet"

diff --git a/config/master/manifests.jsonnet b/config/master/manifests.jsonnet
@@ -249,18 +249,24 @@ local awsnode = {
   },
 
   crd: {
-    apiVersion: "apiextensions.k8s.io/v1beta1",
+    apiVersion: "apiextensions.k8s.io/v1",
     kind: "CustomResourceDefinition",
     metadata: {
       name: "eniconfigs.crd.k8s.amazonaws.com",
     },
     spec: {
       scope: "Cluster",
       group: "crd.k8s.amazonaws.com",
+      preserveUnknownFields: false,
       versions: [{
         name: "v1alpha1",
         served: true,
         storage: true,
+        schema: {
+            openAPIV3Schema: {
+              type: "object",
+              "x-kubernetes-preserve-unknown-fields": true,
+            }},
       }],
       names: {
         plural: "eniconfigs",