Merge pull request #81754 from apelisse/version-fields

Add FieldsType field to ManagedFields to track content format

api/api-rules/apiextensions_violation_exceptions.list

@@ -9,7 +9,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVe
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Fields,Raw
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,List,Items
@@ -18,7 +18,6 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Objec
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PartialObjectMetadataList,Items
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ProtoFields,Raw
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions

api/api-rules/codegen_violation_exceptions.list

@@ -8,7 +8,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVe
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Fields,Raw
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,List,Items
@@ -17,7 +17,6 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Objec
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PartialObjectMetadataList,Items
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ProtoFields,Raw
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions

api/api-rules/sample_apiserver_violation_exceptions.list

@@ -8,7 +8,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVe
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Fields,Raw
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,List,Items
@@ -17,7 +17,6 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Objec
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PartialObjectMetadataList,Items
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ProtoFields,Raw
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions

api/api-rules/violation_exceptions.list

@@ -401,7 +401,7 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVe
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Fields,Raw
+API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,List,Items
@@ -410,7 +410,6 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Objec
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PartialObjectMetadataList,Items
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ProtoFields,Raw
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes
 API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions

api/openapi-spec/swagger.json

@@ -18844,8 +18844,8 @@
         }
       ]
     },
-    "io.k8s.apimachinery.pkg.apis.meta.v1.Fields": {
-      "description": "Fields stores a set of fields in a data structure like a Trie.\n\nEach key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:<name>', where <name> is the name of a field in a struct, or key in a map 'v:<value>', where <value> is the exact json formatted value of a list item 'i:<index>', where <index> is position of a item in a list 'k:<keys>', where <keys> is a map of  a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.\n\nThe exact format is defined in sigs.k8s.io/structured-merge-diff",
+    "io.k8s.apimachinery.pkg.apis.meta.v1.FieldsV1": {
+      "description": "FieldsV1 stores a set of fields in a data structure like a Trie, in JSON format.\n\nEach key is either a '.' representing the field itself, and will always map to an empty set, or a string representing a sub-field or item. The string will follow one of these four formats: 'f:<name>', where <name> is the name of a field in a struct, or key in a map 'v:<value>', where <value> is the exact json formatted value of a list item 'i:<index>', where <index> is position of a item in a list 'k:<keys>', where <keys> is a map of  a list item's key fields to their unique values If a key maps to an empty Fields value, the field that key represents is part of the set.\n\nThe exact format is defined in sigs.k8s.io/structured-merge-diff",
       "type": "object"
     },
     "io.k8s.apimachinery.pkg.apis.meta.v1.GroupVersionForDiscovery": {
@@ -18943,9 +18943,13 @@
           "description": "APIVersion defines the version of this resource that this field set applies to. The format is \"group/version\" just like the top-level APIVersion field. It is necessary to track the version of a field set because it cannot be automatically converted.",
           "type": "string"
         },
-        "fields": {
-          "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Fields",
-          "description": "Fields identifies a set of fields."
+        "fieldsType": {
+          "description": "FieldsType is the discriminator for the different fields format and version. There is currently only one possible value: \"FieldsV1\"",
+          "type": "string"
+        },
+        "fieldsV1": {
+          "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.FieldsV1",
+          "description": "FieldsV1 holds the first JSON version format as described in the \"FieldsV1\" type."
         },
         "manager": {
           "description": "Manager is an identifier of the workflow managing these fields.",

staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.json

@@ -35,19 +35,20 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "webhooks": [
     {
-      "name": "18",
+      "name": "19",
       "clientConfig": {
-        "url": "19",
+        "url": "20",
         "service": {
-          "namespace": "20",
-          "name": "21",
-          "path": "22",
+          "namespace": "21",
+          "name": "22",
+          "path": "23",
           "port": -1971381490
         },
         "caBundle": "IQ=="
@@ -58,14 +59,14 @@
             "8衍`Ĩɘ.蘯"
           ],
           "apiGroups": [
-            "23"
-          ],
-          "apiVersions": [
             "24"
           ],
-          "resources": [
+          "apiVersions": [
             "25"
           ],
+          "resources": [
+            "26"
+          ],
           "scope": "昍řČ扷5ƗǸƢ6/"
         }
       ],
@@ -99,7 +100,7 @@
       "sideEffects": "Ɵ)Ù",
       "timeoutSeconds": 1132918207,
       "admissionReviewVersions": [
-        "38"
+        "39"
       ],
       "reinvocationPolicy": "錯ƶ"
     }

staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,18 +31,18 @@ metadata:
   uid: "7"
 webhooks:
 - admissionReviewVersions:
-  - "38"
+  - "39"
   clientConfig:
     caBundle: IQ==
     service:
-      name: "21"
-      namespace: "20"
-      path: "22"
+      name: "22"
+      namespace: "21"
+      path: "23"
       port: -1971381490
-    url: "19"
+    url: "20"
   failurePolicy: VŚ(ĿȊ甞谐颋
   matchPolicy: SǡƏ
-  name: "18"
+  name: "19"
   namespaceSelector:
     matchExpressions:
     - key: 2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--n1-5
@@ -59,13 +60,13 @@ webhooks:
   reinvocationPolicy: 錯ƶ
   rules:
   - apiGroups:
-    - "23"
-    apiVersions:
     - "24"
+    apiVersions:
+    - "25"
     operations:
     - 8衍`Ĩɘ.蘯
     resources:
-    - "25"
+    - "26"
     scope: 昍řČ扷5ƗǸƢ6/
   sideEffects: Ɵ)Ù
   timeoutSeconds: 1132918207

staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.json

@@ -35,19 +35,20 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "webhooks": [
     {
-      "name": "18",
+      "name": "19",
       "clientConfig": {
-        "url": "19",
+        "url": "20",
         "service": {
-          "namespace": "20",
-          "name": "21",
-          "path": "22",
+          "namespace": "21",
+          "name": "22",
+          "path": "23",
           "port": -1971381490
         },
         "caBundle": "IQ=="
@@ -58,14 +59,14 @@
             "8衍`Ĩɘ.蘯"
           ],
           "apiGroups": [
-            "23"
-          ],
-          "apiVersions": [
             "24"
           ],
-          "resources": [
+          "apiVersions": [
             "25"
           ],
+          "resources": [
+            "26"
+          ],
           "scope": "昍řČ扷5ƗǸƢ6/"
         }
       ],
@@ -99,7 +100,7 @@
       "sideEffects": "Ɵ)Ù",
       "timeoutSeconds": 1132918207,
       "admissionReviewVersions": [
-        "38"
+        "39"
       ]
     }
   ]

staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,18 +31,18 @@ metadata:
   uid: "7"
 webhooks:
 - admissionReviewVersions:
-  - "38"
+  - "39"
   clientConfig:
     caBundle: IQ==
     service:
-      name: "21"
-      namespace: "20"
-      path: "22"
+      name: "22"
+      namespace: "21"
+      path: "23"
       port: -1971381490
-    url: "19"
+    url: "20"
   failurePolicy: VŚ(ĿȊ甞谐颋
   matchPolicy: SǡƏ
-  name: "18"
+  name: "19"
   namespaceSelector:
     matchExpressions:
     - key: 2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--n1-5
@@ -58,13 +59,13 @@ webhooks:
       7p_w.e6._.pj5t_k-_v.-6b6.N_-u.---.8-L: k-U.v.4
   rules:
   - apiGroups:
-    - "23"
-    apiVersions:
     - "24"
+    apiVersions:
+    - "25"
     operations:
     - 8衍`Ĩɘ.蘯
     resources:
-    - "25"
+    - "26"
     scope: 昍řČ扷5ƗǸƢ6/
   sideEffects: Ɵ)Ù
   timeoutSeconds: 1132918207

staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.json

@@ -35,19 +35,20 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "webhooks": [
     {
-      "name": "18",
+      "name": "19",
       "clientConfig": {
-        "url": "19",
+        "url": "20",
         "service": {
-          "namespace": "20",
-          "name": "21",
-          "path": "22",
+          "namespace": "21",
+          "name": "22",
+          "path": "23",
           "port": -1971381490
         },
         "caBundle": "IQ=="
@@ -58,14 +59,14 @@
             "8衍`Ĩɘ.蘯"
           ],
           "apiGroups": [
-            "23"
-          ],
-          "apiVersions": [
             "24"
           ],
-          "resources": [
+          "apiVersions": [
             "25"
           ],
+          "resources": [
+            "26"
+          ],
           "scope": "昍řČ扷5ƗǸƢ6/"
         }
       ],
@@ -99,7 +100,7 @@
       "sideEffects": "Ɵ)Ù",
       "timeoutSeconds": 1132918207,
       "admissionReviewVersions": [
-        "38"
+        "39"
       ],
       "reinvocationPolicy": "錯ƶ"
     }

staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,18 +31,18 @@ metadata:
   uid: "7"
 webhooks:
 - admissionReviewVersions:
-  - "38"
+  - "39"
   clientConfig:
     caBundle: IQ==
     service:
-      name: "21"
-      namespace: "20"
-      path: "22"
+      name: "22"
+      namespace: "21"
+      path: "23"
       port: -1971381490
-    url: "19"
+    url: "20"
   failurePolicy: VŚ(ĿȊ甞谐颋
   matchPolicy: SǡƏ
-  name: "18"
+  name: "19"
   namespaceSelector:
     matchExpressions:
     - key: 2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--n1-5
@@ -59,13 +60,13 @@ webhooks:
   reinvocationPolicy: 錯ƶ
   rules:
   - apiGroups:
-    - "23"
-    apiVersions:
     - "24"
+    apiVersions:
+    - "25"
     operations:
     - 8衍`Ĩɘ.蘯
     resources:
-    - "25"
+    - "26"
     scope: 昍řČ扷5ƗǸƢ6/
   sideEffects: Ɵ)Ù
   timeoutSeconds: 1132918207

staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.json

@@ -35,19 +35,20 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "webhooks": [
     {
-      "name": "18",
+      "name": "19",
       "clientConfig": {
-        "url": "19",
+        "url": "20",
         "service": {
-          "namespace": "20",
-          "name": "21",
-          "path": "22",
+          "namespace": "21",
+          "name": "22",
+          "path": "23",
           "port": -1971381490
         },
         "caBundle": "IQ=="
@@ -58,14 +59,14 @@
             "8衍`Ĩɘ.蘯"
           ],
           "apiGroups": [
-            "23"
-          ],
-          "apiVersions": [
             "24"
           ],
-          "resources": [
+          "apiVersions": [
             "25"
           ],
+          "resources": [
+            "26"
+          ],
           "scope": "昍řČ扷5ƗǸƢ6/"
         }
       ],
@@ -99,7 +100,7 @@
       "sideEffects": "Ɵ)Ù",
       "timeoutSeconds": 1132918207,
       "admissionReviewVersions": [
-        "38"
+        "39"
       ]
     }
   ]

staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,18 +31,18 @@ metadata:
   uid: "7"
 webhooks:
 - admissionReviewVersions:
-  - "38"
+  - "39"
   clientConfig:
     caBundle: IQ==
     service:
-      name: "21"
-      namespace: "20"
-      path: "22"
+      name: "22"
+      namespace: "21"
+      path: "23"
       port: -1971381490
-    url: "19"
+    url: "20"
   failurePolicy: VŚ(ĿȊ甞谐颋
   matchPolicy: SǡƏ
-  name: "18"
+  name: "19"
   namespaceSelector:
     matchExpressions:
     - key: 2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--n1-5
@@ -58,13 +59,13 @@ webhooks:
       7p_w.e6._.pj5t_k-_v.-6b6.N_-u.---.8-L: k-U.v.4
   rules:
   - apiGroups:
-    - "23"
-    apiVersions:
     - "24"
+    apiVersions:
+    - "25"
     operations:
     - 8衍`Ĩɘ.蘯
     resources:
-    - "25"
+    - "26"
     scope: 昍řČ扷5ƗǸƢ6/
   sideEffects: Ɵ)Ù
   timeoutSeconds: 1132918207

staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.json

@@ -35,7 +35,8 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },

staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.yaml

@@ -21,6 +21,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.json

@@ -35,7 +35,8 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.yaml

@@ -21,6 +21,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.json

@@ -35,7 +35,8 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
@@ -45,8 +46,8 @@
   "status": {
     "replicas": 70007838,
     "selector": {
-      "18": "19"
+      "19": "20"
     },
-    "targetSelector": "20"
+    "targetSelector": "21"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -33,5 +34,5 @@ spec:
 status:
   replicas: 70007838
   selector:
-    "18": "19"
-  targetSelector: "20"
+    "19": "20"
+  targetSelector: "21"

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.json

@@ -35,7 +35,8 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.yaml

@@ -21,6 +21,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.json

@@ -35,7 +35,8 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
@@ -45,8 +46,8 @@
   "status": {
     "replicas": 70007838,
     "selector": {
-      "18": "19"
+      "19": "20"
     },
-    "targetSelector": "20"
+    "targetSelector": "21"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -33,5 +34,5 @@ spec:
 status:
   replicas: 70007838
   selector:
-    "18": "19"
-  targetSelector: "20"
+    "19": "20"
+  targetSelector: "21"

staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.json

@@ -35,24 +35,25 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
     "audiences": [
-      "18"
+      "19"
     ],
     "expirationSeconds": 3850803321873644574,
     "boundObjectRef": {
-      "kind": "19",
-      "apiVersion": "20",
-      "name": "21",
+      "kind": "20",
+      "apiVersion": "21",
+      "name": "22",
       "uid": "r鯹)晿\u003co,c鮽ort昍řČ扷5ƗǸ"
     }
   },
   "status": {
-    "token": "22",
+    "token": "23",
     "expirationTimestamp": "1999-07-03T22:31:10Z"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,13 +31,13 @@ metadata:
   uid: "7"
 spec:
   audiences:
-  - "18"
+  - "19"
   boundObjectRef:
-    apiVersion: "20"
-    kind: "19"
-    name: "21"
+    apiVersion: "21"
+    kind: "20"
+    name: "22"
     uid: r鯹)晿<o,c鮽ort昍řČ扷5ƗǸ
   expirationSeconds: 3850803321873644574
 status:
   expirationTimestamp: "1999-07-03T22:31:10Z"
-  token: "22"
+  token: "23"

staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenReview.json

@@ -35,32 +35,33 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
-    "token": "18",
+    "token": "19",
     "audiences": [
-      "19"
+      "20"
     ]
   },
   "status": {
     "user": {
-      "username": "20",
-      "uid": "21",
+      "username": "21",
+      "uid": "22",
       "groups": [
-        "22"
+        "23"
       ],
       "extra": {
-        "23": [
-  "24"
+        "24": [
+  "25"
 ]
       }
     },
     "audiences": [
-      "25"
+      "26"
     ],
-    "error": "26"
+    "error": "27"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenReview.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,17 +31,17 @@ metadata:
   uid: "7"
 spec:
   audiences:
-  - "19"
-  token: "18"
+  - "20"
+  token: "19"
 status:
   audiences:
-  - "25"
-  error: "26"
+  - "26"
+  error: "27"
   user:
     extra:
-      "23":
-      - "24"
+      "24":
+      - "25"
     groups:
-    - "22"
-    uid: "21"
-    username: "20"
+    - "23"
+    uid: "22"
+    username: "21"

staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1beta1.TokenReview.json

@@ -35,32 +35,33 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
-    "token": "18",
+    "token": "19",
     "audiences": [
-      "19"
+      "20"
     ]
   },
   "status": {
     "user": {
-      "username": "20",
-      "uid": "21",
+      "username": "21",
+      "uid": "22",
       "groups": [
-        "22"
+        "23"
       ],
       "extra": {
-        "23": [
-  "24"
+        "24": [
+  "25"
 ]
       }
     },
     "audiences": [
-      "25"
+      "26"
     ],
-    "error": "26"
+    "error": "27"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1beta1.TokenReview.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,17 +31,17 @@ metadata:
   uid: "7"
 spec:
   audiences:
-  - "19"
-  token: "18"
+  - "20"
+  token: "19"
 status:
   audiences:
-  - "25"
-  error: "26"
+  - "26"
+  error: "27"
   user:
     extra:
-      "23":
-      - "24"
+      "24":
+      - "25"
     groups:
-    - "22"
-    uid: "21"
-    username: "20"
+    - "23"
+    uid: "22"
+    username: "21"

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1.LocalSubjectAccessReview.json

@@ -35,38 +35,39 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
     "resourceAttributes": {
-      "namespace": "18",
-      "verb": "19",
-      "group": "20",
-      "version": "21",
-      "resource": "22",
-      "subresource": "23",
-      "name": "24"
+      "namespace": "19",
+      "verb": "20",
+      "group": "21",
+      "version": "22",
+      "resource": "23",
+      "subresource": "24",
+      "name": "25"
     },
     "nonResourceAttributes": {
-      "path": "25",
-      "verb": "26"
+      "path": "26",
+      "verb": "27"
     },
-    "user": "27",
+    "user": "28",
     "groups": [
-      "28"
+      "29"
     ],
     "extra": {
-      "29": [
-  "30"
+      "30": [
+  "31"
 ]
     },
-    "uid": "31"
+    "uid": "32"
   },
   "status": {
     "allowed": false,
-    "reason": "32",
-    "evaluationError": "33"
+    "reason": "33",
+    "evaluationError": "34"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1.LocalSubjectAccessReview.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,24 +31,24 @@ metadata:
   uid: "7"
 spec:
   extra:
-    "29":
-    - "30"
+    "30":
+    - "31"
   groups:
-  - "28"
+  - "29"
   nonResourceAttributes:
-    path: "25"
-    verb: "26"
+    path: "26"
+    verb: "27"
   resourceAttributes:
-    group: "20"
-    name: "24"
-    namespace: "18"
-    resource: "22"
-    subresource: "23"
-    verb: "19"
-    version: "21"
-  uid: "31"
-  user: "27"
+    group: "21"
+    name: "25"
+    namespace: "19"
+    resource: "23"
+    subresource: "24"
+    verb: "20"
+    version: "22"
+  uid: "32"
+  user: "28"
 status:
   allowed: false
-  evaluationError: "33"
-  reason: "32"
+  evaluationError: "34"
+  reason: "33"

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1.SelfSubjectAccessReview.json

@@ -35,28 +35,29 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
     "resourceAttributes": {
-      "namespace": "18",
-      "verb": "19",
-      "group": "20",
-      "version": "21",
-      "resource": "22",
-      "subresource": "23",
-      "name": "24"
+      "namespace": "19",
+      "verb": "20",
+      "group": "21",
+      "version": "22",
+      "resource": "23",
+      "subresource": "24",
+      "name": "25"
     },
     "nonResourceAttributes": {
-      "path": "25",
-      "verb": "26"
+      "path": "26",
+      "verb": "27"
     }
   },
   "status": {
     "allowed": true,
-    "reason": "27",
-    "evaluationError": "28"
+    "reason": "28",
+    "evaluationError": "29"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1.SelfSubjectAccessReview.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,17 +31,17 @@ metadata:
   uid: "7"
 spec:
   nonResourceAttributes:
-    path: "25"
-    verb: "26"
+    path: "26"
+    verb: "27"
   resourceAttributes:
-    group: "20"
-    name: "24"
-    namespace: "18"
-    resource: "22"
-    subresource: "23"
-    verb: "19"
-    version: "21"
+    group: "21"
+    name: "25"
+    namespace: "19"
+    resource: "23"
+    subresource: "24"
+    verb: "20"
+    version: "22"
 status:
   allowed: true
-  evaluationError: "28"
-  reason: "27"
+  evaluationError: "29"
+  reason: "28"

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1.SelfSubjectRulesReview.json

@@ -35,41 +35,42 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
-    "namespace": "18"
+    "namespace": "19"
   },
   "status": {
     "resourceRules": [
       {
         "verbs": [
-          "19"
-        ],
-        "apiGroups": [
           "20"
         ],
-        "resources": [
+        "apiGroups": [
           "21"
         ],
-        "resourceNames": [
+        "resources": [
           "22"
+        ],
+        "resourceNames": [
+          "23"
         ]
       }
     ],
     "nonResourceRules": [
       {
         "verbs": [
-          "23"
+          "24"
         ],
         "nonResourceURLs": [
-          "24"
+          "25"
         ]
       }
     ],
     "incomplete": true,
-    "evaluationError": "25"
+    "evaluationError": "26"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1.SelfSubjectRulesReview.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -29,21 +30,21 @@ metadata:
   selfLink: "5"
   uid: "7"
 spec:
-  namespace: "18"
+  namespace: "19"
 status:
-  evaluationError: "25"
+  evaluationError: "26"
   incomplete: true
   nonResourceRules:
   - nonResourceURLs:
-    - "24"
+    - "25"
     verbs:
-    - "23"
+    - "24"
   resourceRules:
   - apiGroups:
-    - "20"
-    resourceNames:
-    - "22"
-    resources:
     - "21"
+    resourceNames:
+    - "23"
+    resources:
+    - "22"
     verbs:
-    - "19"
+    - "20"

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1.SubjectAccessReview.json

@@ -35,38 +35,39 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
     "resourceAttributes": {
-      "namespace": "18",
-      "verb": "19",
-      "group": "20",
-      "version": "21",
-      "resource": "22",
-      "subresource": "23",
-      "name": "24"
+      "namespace": "19",
+      "verb": "20",
+      "group": "21",
+      "version": "22",
+      "resource": "23",
+      "subresource": "24",
+      "name": "25"
     },
     "nonResourceAttributes": {
-      "path": "25",
-      "verb": "26"
+      "path": "26",
+      "verb": "27"
     },
-    "user": "27",
+    "user": "28",
     "groups": [
-      "28"
+      "29"
     ],
     "extra": {
-      "29": [
-  "30"
+      "30": [
+  "31"
 ]
     },
-    "uid": "31"
+    "uid": "32"
   },
   "status": {
     "allowed": false,
-    "reason": "32",
-    "evaluationError": "33"
+    "reason": "33",
+    "evaluationError": "34"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1.SubjectAccessReview.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,24 +31,24 @@ metadata:
   uid: "7"
 spec:
   extra:
-    "29":
-    - "30"
+    "30":
+    - "31"
   groups:
-  - "28"
+  - "29"
   nonResourceAttributes:
-    path: "25"
-    verb: "26"
+    path: "26"
+    verb: "27"
   resourceAttributes:
-    group: "20"
-    name: "24"
-    namespace: "18"
-    resource: "22"
-    subresource: "23"
-    verb: "19"
-    version: "21"
-  uid: "31"
-  user: "27"
+    group: "21"
+    name: "25"
+    namespace: "19"
+    resource: "23"
+    subresource: "24"
+    verb: "20"
+    version: "22"
+  uid: "32"
+  user: "28"
 status:
   allowed: false
-  evaluationError: "33"
-  reason: "32"
+  evaluationError: "34"
+  reason: "33"

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1beta1.LocalSubjectAccessReview.json

@@ -35,38 +35,39 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
     "resourceAttributes": {
-      "namespace": "18",
-      "verb": "19",
-      "group": "20",
-      "version": "21",
-      "resource": "22",
-      "subresource": "23",
-      "name": "24"
+      "namespace": "19",
+      "verb": "20",
+      "group": "21",
+      "version": "22",
+      "resource": "23",
+      "subresource": "24",
+      "name": "25"
     },
     "nonResourceAttributes": {
-      "path": "25",
-      "verb": "26"
+      "path": "26",
+      "verb": "27"
     },
-    "user": "27",
+    "user": "28",
     "group": [
-      "28"
+      "29"
     ],
     "extra": {
-      "29": [
-  "30"
+      "30": [
+  "31"
 ]
     },
-    "uid": "31"
+    "uid": "32"
   },
   "status": {
     "allowed": false,
-    "reason": "32",
-    "evaluationError": "33"
+    "reason": "33",
+    "evaluationError": "34"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1beta1.LocalSubjectAccessReview.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,24 +31,24 @@ metadata:
   uid: "7"
 spec:
   extra:
-    "29":
-    - "30"
+    "30":
+    - "31"
   group:
-  - "28"
+  - "29"
   nonResourceAttributes:
-    path: "25"
-    verb: "26"
+    path: "26"
+    verb: "27"
   resourceAttributes:
-    group: "20"
-    name: "24"
-    namespace: "18"
-    resource: "22"
-    subresource: "23"
-    verb: "19"
-    version: "21"
-  uid: "31"
-  user: "27"
+    group: "21"
+    name: "25"
+    namespace: "19"
+    resource: "23"
+    subresource: "24"
+    verb: "20"
+    version: "22"
+  uid: "32"
+  user: "28"
 status:
   allowed: false
-  evaluationError: "33"
-  reason: "32"
+  evaluationError: "34"
+  reason: "33"

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1beta1.SelfSubjectAccessReview.json

@@ -35,28 +35,29 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
     "resourceAttributes": {
-      "namespace": "18",
-      "verb": "19",
-      "group": "20",
-      "version": "21",
-      "resource": "22",
-      "subresource": "23",
-      "name": "24"
+      "namespace": "19",
+      "verb": "20",
+      "group": "21",
+      "version": "22",
+      "resource": "23",
+      "subresource": "24",
+      "name": "25"
     },
     "nonResourceAttributes": {
-      "path": "25",
-      "verb": "26"
+      "path": "26",
+      "verb": "27"
     }
   },
   "status": {
     "allowed": true,
-    "reason": "27",
-    "evaluationError": "28"
+    "reason": "28",
+    "evaluationError": "29"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1beta1.SelfSubjectAccessReview.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,17 +31,17 @@ metadata:
   uid: "7"
 spec:
   nonResourceAttributes:
-    path: "25"
-    verb: "26"
+    path: "26"
+    verb: "27"
   resourceAttributes:
-    group: "20"
-    name: "24"
-    namespace: "18"
-    resource: "22"
-    subresource: "23"
-    verb: "19"
-    version: "21"
+    group: "21"
+    name: "25"
+    namespace: "19"
+    resource: "23"
+    subresource: "24"
+    verb: "20"
+    version: "22"
 status:
   allowed: true
-  evaluationError: "28"
-  reason: "27"
+  evaluationError: "29"
+  reason: "28"

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1beta1.SelfSubjectRulesReview.json

@@ -35,41 +35,42 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
-    "namespace": "18"
+    "namespace": "19"
   },
   "status": {
     "resourceRules": [
       {
         "verbs": [
-          "19"
-        ],
-        "apiGroups": [
           "20"
         ],
-        "resources": [
+        "apiGroups": [
           "21"
         ],
-        "resourceNames": [
+        "resources": [
           "22"
+        ],
+        "resourceNames": [
+          "23"
         ]
       }
     ],
     "nonResourceRules": [
       {
         "verbs": [
-          "23"
+          "24"
         ],
         "nonResourceURLs": [
-          "24"
+          "25"
         ]
       }
     ],
     "incomplete": true,
-    "evaluationError": "25"
+    "evaluationError": "26"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1beta1.SelfSubjectRulesReview.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -29,21 +30,21 @@ metadata:
   selfLink: "5"
   uid: "7"
 spec:
-  namespace: "18"
+  namespace: "19"
 status:
-  evaluationError: "25"
+  evaluationError: "26"
   incomplete: true
   nonResourceRules:
   - nonResourceURLs:
-    - "24"
+    - "25"
     verbs:
-    - "23"
+    - "24"
   resourceRules:
   - apiGroups:
-    - "20"
-    resourceNames:
-    - "22"
-    resources:
     - "21"
+    resourceNames:
+    - "23"
+    resources:
+    - "22"
     verbs:
-    - "19"
+    - "20"

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1beta1.SubjectAccessReview.json

@@ -35,38 +35,39 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
     "resourceAttributes": {
-      "namespace": "18",
-      "verb": "19",
-      "group": "20",
-      "version": "21",
-      "resource": "22",
-      "subresource": "23",
-      "name": "24"
+      "namespace": "19",
+      "verb": "20",
+      "group": "21",
+      "version": "22",
+      "resource": "23",
+      "subresource": "24",
+      "name": "25"
     },
     "nonResourceAttributes": {
-      "path": "25",
-      "verb": "26"
+      "path": "26",
+      "verb": "27"
     },
-    "user": "27",
+    "user": "28",
     "group": [
-      "28"
+      "29"
     ],
     "extra": {
-      "29": [
-  "30"
+      "30": [
+  "31"
 ]
     },
-    "uid": "31"
+    "uid": "32"
   },
   "status": {
     "allowed": false,
-    "reason": "32",
-    "evaluationError": "33"
+    "reason": "33",
+    "evaluationError": "34"
   }
 }

staging/src/k8s.io/api/testdata/HEAD/authorization.k8s.io.v1beta1.SubjectAccessReview.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -30,24 +31,24 @@ metadata:
   uid: "7"
 spec:
   extra:
-    "29":
-    - "30"
+    "30":
+    - "31"
   group:
-  - "28"
+  - "29"
   nonResourceAttributes:
-    path: "25"
-    verb: "26"
+    path: "26"
+    verb: "27"
   resourceAttributes:
-    group: "20"
-    name: "24"
-    namespace: "18"
-    resource: "22"
-    subresource: "23"
-    verb: "19"
-    version: "21"
-  uid: "31"
-  user: "27"
+    group: "21"
+    name: "25"
+    namespace: "19"
+    resource: "23"
+    subresource: "24"
+    verb: "20"
+    version: "22"
+  uid: "32"
+  user: "28"
 status:
   allowed: false
-  evaluationError: "33"
-  reason: "32"
+  evaluationError: "34"
+  reason: "33"

staging/src/k8s.io/api/testdata/HEAD/autoscaling.v1.HorizontalPodAutoscaler.json

@@ -35,15 +35,16 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
   "spec": {
     "scaleTargetRef": {
-      "kind": "18",
-      "name": "19",
-      "apiVersion": "20"
+      "kind": "19",
+      "name": "20",
+      "apiVersion": "21"
     },
     "minReplicas": 896585016,
     "maxReplicas": -1971381490,

staging/src/k8s.io/api/testdata/HEAD/autoscaling.v1.HorizontalPodAutoscaler.yaml

@@ -14,6 +14,7 @@ metadata:
     "7": "8"
   managedFields:
   - apiVersion: "17"
+    fieldsType: "18"
     manager: "16"
     operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
   name: "2"
@@ -32,9 +33,9 @@ spec:
   maxReplicas: -1971381490
   minReplicas: 896585016
   scaleTargetRef:
-    apiVersion: "20"
-    kind: "18"
-    name: "19"
+    apiVersion: "21"
+    kind: "19"
+    name: "20"
   targetCPUUtilizationPercentage: -1300313567
 status:
   currentCPUUtilizationPercentage: 757808475

staging/src/k8s.io/api/testdata/HEAD/autoscaling.v1.Scale.json

@@ -35,7 +35,8 @@
       {
         "manager": "16",
         "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
-        "apiVersion": "17"
+        "apiVersion": "17",
+        "fieldsType": "18"
       }
     ]
   },
@@ -44,6 +45,6 @@
   },
   "status": {
     "replicas": 70007838,
-    "selector": "18"
+    "selector": "19"
   }
 }