From a51d4c1fee7e802103416b6bb323c785917eca5c Mon Sep 17 00:00:00 2001
From: Alexander Zielenski <351783+alexzielenski@users.noreply.github.com>
Date: Tue, 26 Jul 2022 11:05:46 -0700
Subject: [PATCH] update conformance

x-preserve-unknown-fields becomes x-kubernetes-preserve-unknown-fields
---
 test/conformance/testdata/conformance.yaml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml
index db7e5cf97eb..55970941509 100755
--- a/test/conformance/testdata/conformance.yaml
+++ b/test/conformance/testdata/conformance.yaml
@@ -246,20 +246,21 @@
     update to reflect the rename.
   release: v1.16
   file: test/e2e/apimachinery/crd_publish_openapi.go
-- testname: Custom Resource OpenAPI Publish, with x-preserve-unknown-fields at root
+- testname: Custom Resource OpenAPI Publish, with x-kubernetes-preserve-unknown-fields
+    at root
   codename: '[sig-api-machinery] CustomResourcePublishOpenAPI [Privileged:ClusterAdmin]
     works for CRD preserving unknown fields at the schema root [Conformance]'
-  description: Register a custom resource definition with x-preserve-unknown-fields
+  description: Register a custom resource definition with x-kubernetes-preserve-unknown-fields
     in the schema root. Attempt to create and apply a change a custom resource, via
     kubectl; kubectl validation MUST accept unknown properties. Attempt kubectl explain;
     the output MUST show the custom resource KIND.
   release: v1.16
   file: test/e2e/apimachinery/crd_publish_openapi.go
-- testname: Custom Resource OpenAPI Publish, with x-preserve-unknown-fields in embedded
-    object
+- testname: Custom Resource OpenAPI Publish, with x-kubernetes-preserve-unknown-fields
+    in embedded object
   codename: '[sig-api-machinery] CustomResourcePublishOpenAPI [Privileged:ClusterAdmin]
     works for CRD preserving unknown fields in an embedded object [Conformance]'
-  description: Register a custom resource definition with x-preserve-unknown-fields
+  description: Register a custom resource definition with x-kubernetes-preserve-unknown-fields
     in an embedded object. Attempt to create and apply a change a custom resource,
     via kubectl; kubectl validation MUST accept unknown properties. Attempt kubectl
     explain; the output MUST show that x-preserve-unknown-properties is used on the
@@ -279,10 +280,11 @@
     validation should be the same.
   release: v1.16
   file: test/e2e/apimachinery/crd_publish_openapi.go
-- testname: Custom Resource OpenAPI Publish, with x-preserve-unknown-fields in object
+- testname: Custom Resource OpenAPI Publish, with x-kubernetes-preserve-unknown-fields
+    in object
   codename: '[sig-api-machinery] CustomResourcePublishOpenAPI [Privileged:ClusterAdmin]
     works for CRD without validation schema [Conformance]'
-  description: Register a custom resource definition with x-preserve-unknown-fields
+  description: Register a custom resource definition with x-kubernetes-preserve-unknown-fields
     in the top level object. Attempt to create and apply a change a custom resource,
     via kubectl; kubectl validation MUST accept unknown properties. Attempt kubectl
     explain; the output MUST contain a valid DESCRIPTION stanza.