diff --git a/charts/aws-vpc-cni/templates/customresourcedefinition.yaml b/charts/aws-vpc-cni/templates/customresourcedefinition.yaml index 2385fb3a7c..bda35b9edc 100644 --- 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 index 991b450433..0e6b8432ab 100644 --- 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 index e4bb3be561..bf54445991 100644 --- 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 index e20b337dfc..bd62cab4b6 100644 --- 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 index 1e5c98e129..e5859a1b18 100644 --- 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 index 4fd6f095d0..ee323655e2 100644 --- a/config/master/manifests.jsonnet +++ b/config/master/manifests.jsonnet @@ -249,7 +249,7 @@ local awsnode = { }, crd: { - apiVersion: "apiextensions.k8s.io/v1beta1", + apiVersion: "apiextensions.k8s.io/v1", kind: "CustomResourceDefinition", metadata: { name: "eniconfigs.crd.k8s.amazonaws.com", @@ -257,10 +257,16 @@ local awsnode = { 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",