diff --git a/api/api-rules/apiextensions_violation_exceptions.list b/api/api-rules/apiextensions_violation_exceptions.list index 5788ea4bc0a..8f86f6bad2a 100644 --- a/api/api-rules/apiextensions_violation_exceptions.list +++ b/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 diff --git a/api/api-rules/codegen_violation_exceptions.list b/api/api-rules/codegen_violation_exceptions.list index a3ce3b689e7..96607faab07 100644 --- a/api/api-rules/codegen_violation_exceptions.list +++ b/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 diff --git a/api/api-rules/sample_apiserver_violation_exceptions.list b/api/api-rules/sample_apiserver_violation_exceptions.list index 96fc7df76ee..14c78653b9c 100644 --- a/api/api-rules/sample_apiserver_violation_exceptions.list +++ b/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 diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list index eafa238c4af..24733bab0b6 100644 --- a/api/api-rules/violation_exceptions.list +++ b/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 diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 89178887cde..cdebed4bb17 100644 --- a/api/openapi-spec/swagger.json +++ b/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:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where 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:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where 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.", diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.json b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.json index 8bdee3b57ce..756c184fa24 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.json +++ b/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": "錯ƶ" } diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.pb b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.pb index deb392b2765..7e5534d0214 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.pb and b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.yaml b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.yaml index 3dfd5b63665..65258078165 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.MutatingWebhookConfiguration.yaml +++ b/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 diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.json b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.json index 399859b09e2..d6fefa46180 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.json +++ b/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" ] } ] diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.pb b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.pb index 3a4a47670a7..cde77cd0547 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.pb and b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.yaml b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.yaml index 1add1f8cee5..8a3ce445e3a 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1.ValidatingWebhookConfiguration.yaml +++ b/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 diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.json b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.json index 7eb128134b5..95d589b3b98 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.json +++ b/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": "錯ƶ" } diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.pb b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.pb index 0e15363c2dd..36f5b65ee71 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.pb and b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.yaml b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.yaml index 140c6366594..47917d2ef36 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.MutatingWebhookConfiguration.yaml +++ b/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 diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.json b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.json index e628f057912..8ae6293a1aa 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.json +++ b/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" ] } ] diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.pb b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.pb index 1d15d9241c0..7577cc2c82b 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.pb and b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.yaml b/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.yaml index c330b811a8b..b44978962ae 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/admissionregistration.k8s.io.v1beta1.ValidatingWebhookConfiguration.yaml +++ b/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 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.json index 8d470dcca0b..b19b05eb4d1 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.json +++ b/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" } ] }, diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.pb index 526690fb213..b43b7d487c2 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.yaml index db2969a87fd..634a51ed2ac 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ControllerRevision.yaml +++ b/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" diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.json index 31b30714d93..dc2751ee14b 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.json +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -56,49 +57,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "TʡȂŏ{sǡƟ", "resourceVersion": "1698285396218902212", "generation": -4139900758039117471, "creationTimestamp": null, "deletionGracePeriodSeconds": 7534629739119643351, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "^", "controller": false, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "ĪȸŹăȲĻ¤Ħʅ芝", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "" }, "emptyDir": { @@ -106,26 +108,26 @@ "sizeLimit": "804" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1318752360 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": -2007808768 }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": 228756891 } ], @@ -133,93 +135,93 @@ "optional": false }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 408756018, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "readOnly": true, "portals": [ - "58" + "60" ], "chapAuthDiscovery": true, "chapAuthSession": true, "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62" + "endpoints": "63", + "path": "64" }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" }, "readOnly": true }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "readOnly": true, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "915" }, "mode": -1768075156 @@ -229,25 +231,25 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": 570501002, - "fsType": "92", + "fsType": "94", "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95", + "secretName": "96", + "shareName": "97", "readOnly": true }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": 2020789772 } ], @@ -255,39 +257,39 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", - "user": "105", - "group": "106", - "tenant": "107" + "registry": "105", + "volume": "106", + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "k ź贩j瀉ǚrǜnh0åȂ", - "fsType": "110", + "fsType": "112", "readOnly": false, "kind": "nj揠8lj黳鈫ʕ禒Ƙá腿ħ缶" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": 675406340 } ], @@ -296,14 +298,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "461" }, "mode": -1618937335 @@ -311,118 +313,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": -1126738259 } ], "optional": true }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": -6345861634934949644, - "path": "125" + "path": "127" } } ], "defaultMode": 480521693 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127" + "volumeID": "128", + "fsType": "129" }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, "sslEnabled": true, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": true, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -1510026905, "containerPort": 437857734, "protocol": "Rƥ贫d飼$俊跾|@?鷅b", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": false }, "secretRef": { - "name": "154", + "name": "156", "optional": false } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "468" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": false }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": true } } @@ -438,40 +440,40 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "卩蝾", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", - "port": "173", - "host": "174", + "path": "174", + "port": "175", + "host": "176", "httpHeaders": [ { - "name": "175", - "value": "176" + "name": "177", + "value": "178" } ] }, "tcpSocket": { - "port": "177", - "host": "178" + "port": "179", + "host": "180" }, "initialDelaySeconds": 1805144649, "timeoutSeconds": -606111218, @@ -482,24 +484,24 @@ "readinessProbe": { "exec": { "command": [ - "179" + "181" ] }, "httpGet": { - "path": "180", - "port": "181", - "host": "182", + "path": "182", + "port": "183", + "host": "184", "scheme": "w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ", "httpHeaders": [ { - "name": "183", - "value": "184" + "name": "185", + "value": "186" } ] }, "tcpSocket": { "port": -337353552, - "host": "185" + "host": "187" }, "initialDelaySeconds": -1724160601, "timeoutSeconds": -1158840571, @@ -511,50 +513,50 @@ "postStart": { "exec": { "command": [ - "186" + "188" ] }, "httpGet": { - "path": "187", - "port": "188", - "host": "189", + "path": "189", + "port": "190", + "host": "191", "httpHeaders": [ { - "name": "190", - "value": "191" + "name": "192", + "value": "193" } ] }, "tcpSocket": { "port": 559781916, - "host": "192" + "host": "194" } }, "preStop": { "exec": { "command": [ - "193" + "195" ] }, "httpGet": { - "path": "194", + "path": "196", "port": 1150375229, - "host": "195", + "host": "197", "scheme": "QÄȻȊ+?ƭ峧Y栲茇竛吲蚛隖\u003cǶ", "httpHeaders": [ { - "name": "196", - "value": "197" + "name": "198", + "value": "199" } ] }, "tcpSocket": { "port": -1696471293, - "host": "198" + "host": "200" } } }, - "terminationMessagePath": "199", + "terminationMessagePath": "201", "terminationMessagePolicy": "£軶ǃ*ʙ嫙\u0026蒒5靇C'ɵK.Q貇", "imagePullPolicy": "Ŵ廷s{Ⱦdz@", "securityContext": { @@ -568,15 +570,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "200", - "role": "201", - "type": "202", - "level": "203" + "user": "202", + "role": "203", + "type": "204", + "level": "205" }, "windowsOptions": { - "gmsaCredentialSpecName": "204", - "gmsaCredentialSpec": "205", - "runAsUserName": "206" + "gmsaCredentialSpecName": "206", + "gmsaCredentialSpec": "207", + "runAsUserName": "208" }, "runAsUser": 4181787587415673530, "runAsGroup": 825262458636305509, @@ -591,59 +593,59 @@ ], "containers": [ { - "name": "207", - "image": "208", + "name": "209", + "image": "210", "command": [ - "209" + "211" ], "args": [ - "210" + "212" ], - "workingDir": "211", + "workingDir": "213", "ports": [ { - "name": "212", + "name": "214", "hostPort": 1385030458, "containerPort": 427196286, "protocol": "o/樝fw[Řż丩Ž", - "hostIP": "213" + "hostIP": "215" } ], "envFrom": [ { - "prefix": "214", + "prefix": "216", "configMapRef": { - "name": "215", + "name": "217", "optional": false }, "secretRef": { - "name": "216", + "name": "218", "optional": true } } ], "env": [ { - "name": "217", - "value": "218", + "name": "219", + "value": "220", "valueFrom": { "fieldRef": { - "apiVersion": "219", - "fieldPath": "220" + "apiVersion": "221", + "fieldPath": "222" }, "resourceFieldRef": { - "containerName": "221", - "resource": "222", + "containerName": "223", + "resource": "224", "divisor": "932" }, "configMapKeyRef": { - "name": "223", - "key": "224", + "name": "225", + "key": "226", "optional": false }, "secretKeyRef": { - "name": "225", - "key": "226", + "name": "227", + "key": "228", "optional": true } } @@ -659,41 +661,41 @@ }, "volumeMounts": [ { - "name": "227", + "name": "229", "readOnly": true, - "mountPath": "228", - "subPath": "229", + "mountPath": "230", + "subPath": "231", "mountPropagation": "奺Ȋ礶惇¸t颟.鵫ǚ", - "subPathExpr": "230" + "subPathExpr": "232" } ], "volumeDevices": [ { - "name": "231", - "devicePath": "232" + "name": "233", + "devicePath": "234" } ], "livenessProbe": { "exec": { "command": [ - "233" + "235" ] }, "httpGet": { - "path": "234", - "port": "235", - "host": "236", + "path": "236", + "port": "237", + "host": "238", "scheme": "Ȥ藠3.", "httpHeaders": [ { - "name": "237", - "value": "238" + "name": "239", + "value": "240" } ] }, "tcpSocket": { - "port": "239", - "host": "240" + "port": "241", + "host": "242" }, "initialDelaySeconds": -1389418722, "timeoutSeconds": 851018015, @@ -704,24 +706,24 @@ "readinessProbe": { "exec": { "command": [ - "241" + "243" ] }, "httpGet": { - "path": "242", - "port": "243", - "host": "244", + "path": "244", + "port": "245", + "host": "246", "scheme": "«丯Ƙ枛牐ɺ皚", "httpHeaders": [ { - "name": "245", - "value": "246" + "name": "247", + "value": "248" } ] }, "tcpSocket": { "port": -1934111455, - "host": "247" + "host": "249" }, "initialDelaySeconds": 766864314, "timeoutSeconds": 1146016612, @@ -733,51 +735,51 @@ "postStart": { "exec": { "command": [ - "248" + "250" ] }, "httpGet": { - "path": "249", - "port": "250", - "host": "251", + "path": "251", + "port": "252", + "host": "253", "scheme": "'", "httpHeaders": [ { - "name": "252", - "value": "253" + "name": "254", + "value": "255" } ] }, "tcpSocket": { "port": -801430937, - "host": "254" + "host": "256" } }, "preStop": { "exec": { "command": [ - "255" + "257" ] }, "httpGet": { - "path": "256", + "path": "258", "port": 1810980158, - "host": "257", + "host": "259", "scheme": "_ƮA攤/ɸɎ R§耶FfBl", "httpHeaders": [ { - "name": "258", - "value": "259" + "name": "260", + "value": "261" } ] }, "tcpSocket": { "port": 1074486306, - "host": "260" + "host": "262" } } }, - "terminationMessagePath": "261", + "terminationMessagePath": "263", "terminationMessagePolicy": "Zɾģ毋Ó6dz娝嘚庎D}埽uʎ", "imagePullPolicy": "Ǖɳɷ9Ì崟¿瘦ɖ緕", "securityContext": { @@ -791,15 +793,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "262", - "role": "263", - "type": "264", - "level": "265" + "user": "264", + "role": "265", + "type": "266", + "level": "267" }, "windowsOptions": { - "gmsaCredentialSpecName": "266", - "gmsaCredentialSpec": "267", - "runAsUserName": "268" + "gmsaCredentialSpecName": "268", + "gmsaCredentialSpec": "269", + "runAsUserName": "270" }, "runAsUser": -6470941481344047265, "runAsGroup": 1373384864388370080, @@ -813,59 +815,59 @@ ], "ephemeralContainers": [ { - "name": "269", - "image": "270", + "name": "271", + "image": "272", "command": [ - "271" + "273" ], "args": [ - "272" + "274" ], - "workingDir": "273", + "workingDir": "275", "ports": [ { - "name": "274", + "name": "276", "hostPort": 2058122084, "containerPort": -379385405, "protocol": "#嬀ơŸ8T 苧yñKJɐ扵Gƚ绤f", - "hostIP": "275" + "hostIP": "277" } ], "envFrom": [ { - "prefix": "276", + "prefix": "278", "configMapRef": { - "name": "277", + "name": "279", "optional": true }, "secretRef": { - "name": "278", + "name": "280", "optional": false } } ], "env": [ { - "name": "279", - "value": "280", + "name": "281", + "value": "282", "valueFrom": { "fieldRef": { - "apiVersion": "281", - "fieldPath": "282" + "apiVersion": "283", + "fieldPath": "284" }, "resourceFieldRef": { - "containerName": "283", - "resource": "284", + "containerName": "285", + "resource": "286", "divisor": "355" }, "configMapKeyRef": { - "name": "285", - "key": "286", + "name": "287", + "key": "288", "optional": false }, "secretKeyRef": { - "name": "287", - "key": "288", + "name": "289", + "key": "290", "optional": true } } @@ -881,40 +883,40 @@ }, "volumeMounts": [ { - "name": "289", - "mountPath": "290", - "subPath": "291", + "name": "291", + "mountPath": "292", + "subPath": "293", "mountPropagation": "簳°Ļǟi\u0026皥贸", - "subPathExpr": "292" + "subPathExpr": "294" } ], "volumeDevices": [ { - "name": "293", - "devicePath": "294" + "name": "295", + "devicePath": "296" } ], "livenessProbe": { "exec": { "command": [ - "295" + "297" ] }, "httpGet": { - "path": "296", - "port": "297", - "host": "298", + "path": "298", + "port": "299", + "host": "300", "scheme": "现葢ŵ橨鬶l獕;跣Hǝcw媀瓄\u0026翜舞拉", "httpHeaders": [ { - "name": "299", - "value": "300" + "name": "301", + "value": "302" } ] }, "tcpSocket": { - "port": "301", - "host": "302" + "port": "303", + "host": "304" }, "initialDelaySeconds": 2066735093, "timeoutSeconds": -190183379, @@ -925,24 +927,24 @@ "readinessProbe": { "exec": { "command": [ - "303" + "305" ] }, "httpGet": { - "path": "304", - "port": "305", - "host": "306", + "path": "306", + "port": "307", + "host": "308", "scheme": "M蘇KŅ/»頸+SÄ蚃ɣľ)酊龨δ", "httpHeaders": [ { - "name": "307", - "value": "308" + "name": "309", + "value": "310" } ] }, "tcpSocket": { "port": 458427807, - "host": "309" + "host": "311" }, "initialDelaySeconds": -1971421078, "timeoutSeconds": 1905181464, @@ -954,51 +956,51 @@ "postStart": { "exec": { "command": [ - "310" + "312" ] }, "httpGet": { - "path": "311", - "port": "312", - "host": "313", + "path": "313", + "port": "314", + "host": "315", "scheme": "鶫:顇ə娯Ȱ囌{屿oiɥ嵐sC", "httpHeaders": [ { - "name": "314", - "value": "315" + "name": "316", + "value": "317" } ] }, "tcpSocket": { - "port": "316", - "host": "317" + "port": "318", + "host": "319" } }, "preStop": { "exec": { "command": [ - "318" + "320" ] }, "httpGet": { - "path": "319", - "port": "320", - "host": "321", + "path": "321", + "port": "322", + "host": "323", "scheme": "鬍熖B芭花ª瘡蟦JBʟ鍏H鯂²", "httpHeaders": [ { - "name": "322", - "value": "323" + "name": "324", + "value": "325" } ] }, "tcpSocket": { "port": -1187301925, - "host": "324" + "host": "326" } } }, - "terminationMessagePath": "325", + "terminationMessagePath": "327", "terminationMessagePolicy": "Őnj汰8ŕ", "imagePullPolicy": "邻爥蹔ŧOǨ繫ʎǑyZ涬P­蜷ɔ幩", "securityContext": { @@ -1012,15 +1014,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "326", - "role": "327", - "type": "328", - "level": "329" + "user": "328", + "role": "329", + "type": "330", + "level": "331" }, "windowsOptions": { - "gmsaCredentialSpecName": "330", - "gmsaCredentialSpec": "331", - "runAsUserName": "332" + "gmsaCredentialSpecName": "332", + "gmsaCredentialSpec": "333", + "runAsUserName": "334" }, "runAsUser": 6726836758549163621, "runAsGroup": 741362943076737213, @@ -1032,7 +1034,7 @@ "stdin": true, "stdinOnce": true, "tty": true, - "targetContainerName": "333" + "targetContainerName": "335" } ], "restartPolicy": "åe躒訙", @@ -1040,25 +1042,25 @@ "activeDeadlineSeconds": 9212087462729867542, "dnsPolicy": "娕uE增猍ǵ xǨŴ壶ƵfȽÃ茓pȓɻ", "nodeSelector": { - "334": "335" + "336": "337" }, - "serviceAccountName": "336", - "serviceAccount": "337", + "serviceAccountName": "338", + "serviceAccount": "339", "automountServiceAccountToken": false, - "nodeName": "338", + "nodeName": "340", "hostPID": true, "shareProcessNamespace": false, "securityContext": { "seLinuxOptions": { - "user": "339", - "role": "340", - "type": "341", - "level": "342" + "user": "341", + "role": "342", + "type": "343", + "level": "344" }, "windowsOptions": { - "gmsaCredentialSpecName": "343", - "gmsaCredentialSpec": "344", - "runAsUserName": "345" + "gmsaCredentialSpecName": "345", + "gmsaCredentialSpec": "346", + "runAsUserName": "347" }, "runAsUser": 7747616967629081728, "runAsGroup": 2548453080315983269, @@ -1069,18 +1071,18 @@ "fsGroup": -7117039988160665426, "sysctls": [ { - "name": "346", - "value": "347" + "name": "348", + "value": "349" } ] }, "imagePullSecrets": [ { - "name": "348" + "name": "350" } ], - "hostname": "349", - "subdomain": "350", + "hostname": "351", + "subdomain": "352", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1088,19 +1090,19 @@ { "matchExpressions": [ { - "key": "351", + "key": "353", "operator": "", "values": [ - "352" + "354" ] } ], "matchFields": [ { - "key": "353", + "key": "355", "operator": "ƽ眝{æ盪泙", "values": [ - "354" + "356" ] } ] @@ -1113,19 +1115,19 @@ "preference": { "matchExpressions": [ { - "key": "355", + "key": "357", "operator": "}Ñ蠂Ü[ƛ^輅9ɛ棕ƈ眽炊", "values": [ - "356" + "358" ] } ], "matchFields": [ { - "key": "357", + "key": "359", "operator": "ʨIk(dŊiɢzĮ蛋I滞", "values": [ - "358" + "360" ] } ] @@ -1148,9 +1150,9 @@ ] }, "namespaces": [ - "365" + "367" ], - "topologyKey": "366" + "topologyKey": "368" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1172,9 +1174,9 @@ ] }, "namespaces": [ - "373" + "375" ], - "topologyKey": "374" + "topologyKey": "376" } } ] @@ -1194,9 +1196,9 @@ ] }, "namespaces": [ - "381" + "383" ], - "topologyKey": "382" + "topologyKey": "384" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1215,45 +1217,45 @@ ] }, "namespaces": [ - "389" + "391" ], - "topologyKey": "390" + "topologyKey": "392" } } ] } }, - "schedulerName": "391", + "schedulerName": "393", "tolerations": [ { - "key": "392", + "key": "394", "operator": "ƹ|", - "value": "393", + "value": "395", "effect": "料ȭzV镜籬ƽ", "tolerationSeconds": 935587338391120947 } ], "hostAliases": [ { - "ip": "394", + "ip": "396", "hostnames": [ - "395" + "397" ] } ], - "priorityClassName": "396", + "priorityClassName": "398", "priority": 1690570439, "dnsConfig": { "nameservers": [ - "397" + "399" ], "searches": [ - "398" + "400" ], "options": [ { - "name": "399", - "value": "400" + "name": "401", + "value": "402" } ] }, @@ -1262,7 +1264,7 @@ "conditionType": "梑ʀŖ鱓;鹡鑓侅闍ŏŃŋŏ}ŀ姳" } ], - "runtimeClassName": "401", + "runtimeClassName": "403", "enableServiceLinks": true, "preemptionPolicy": "eáNRNJ丧鴻Ŀ", "overhead": { @@ -1271,7 +1273,7 @@ "topologySpreadConstraints": [ { "maxSkew": -137402083, - "topologyKey": "402", + "topologyKey": "404", "whenUnsatisfiable": "Ȩç捌聮ŃŻ@ǮJ=礏ƴ磳藷曥", "labelSelector": { "matchLabels": { @@ -1315,8 +1317,8 @@ "type": "", "status": "'ƈoIǢ龞瞯å", "lastTransitionTime": "2469-07-10T03:20:34Z", - "reason": "409", - "message": "410" + "reason": "411", + "message": "412" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.pb index 118d3e128c4..7b05de35acc 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.yaml index e115f1774ac..1191957bf58 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.DaemonSet.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -42,31 +43,32 @@ spec: template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: 7534629739119643351 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -4139900758039117471 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: ĪȸŹăȲĻ¤Ħʅ芝 - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: false - kind: "34" - name: "35" + kind: "35" + name: "36" uid: ^ resourceVersion: "1698285396218902212" - selfLink: "27" + selfLink: "28" uid: TʡȂŏ{sǡƟ spec: activeDeadlineSeconds: 9212087462729867542 @@ -75,28 +77,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "355" + - key: "357" operator: '}Ñ蠂Ü[ƛ^輅9ɛ棕ƈ眽炊' values: - - "356" + - "358" matchFields: - - key: "357" + - key: "359" operator: ʨIk(dŊiɢzĮ蛋I滞 values: - - "358" + - "360" weight: 646133945 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "351" + - key: "353" operator: "" values: - - "352" + - "354" matchFields: - - key: "353" + - key: "355" operator: ƽ眝{æ盪泙 values: - - "354" + - "356" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -109,8 +111,8 @@ spec: matchLabels: w--162-gk2-99v22.g-65m8-1x129-9d8-s7-t7--336-11k9-8609a-e0--1----v8-4--558n1asz5/BD8.TS-jJ.Ys_Mop34_y: f_ZN.-_--r.E__-.8_e_l2.._8s--7_3x_-J5 namespaces: - - "373" - topologyKey: "374" + - "375" + topologyKey: "376" weight: -855547676 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -120,8 +122,8 @@ spec: matchLabels: 3.csh-3--Z1Tvw39FC: rtSY.g._2F7.-_e..Or_-.3OHgt._6 namespaces: - - "365" - topologyKey: "366" + - "367" + topologyKey: "368" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -132,8 +134,8 @@ spec: matchLabels: 3-mLlx...w_t-_.5.40Rw4gD.._.-x6db-L7.-__-G2: CpS__.39g_.--_-_ve5.m_2_--XZx namespaces: - - "389" - topologyKey: "390" + - "391" + topologyKey: "392" weight: 808399187 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -143,119 +145,119 @@ spec: matchLabels: 4-m_0-m-6Sp_N-S..O-BZ..6-1.S-B33: 17ca-_p-y.eQZ9p_1 namespaces: - - "381" - topologyKey: "382" + - "383" + topologyKey: "384" automountServiceAccountToken: false containers: - args: - - "210" + - "212" command: - - "209" + - "211" env: - - name: "217" - value: "218" + - name: "219" + value: "220" valueFrom: configMapKeyRef: - key: "224" - name: "223" - optional: false - fieldRef: - apiVersion: "219" - fieldPath: "220" - resourceFieldRef: - containerName: "221" - divisor: "932" - resource: "222" - secretKeyRef: key: "226" name: "225" + optional: false + fieldRef: + apiVersion: "221" + fieldPath: "222" + resourceFieldRef: + containerName: "223" + divisor: "932" + resource: "224" + secretKeyRef: + key: "228" + name: "227" optional: true envFrom: - configMapRef: - name: "215" + name: "217" optional: false - prefix: "214" + prefix: "216" secretRef: - name: "216" + name: "218" optional: true - image: "208" + image: "210" imagePullPolicy: Ǖɳɷ9Ì崟¿瘦ɖ緕 lifecycle: postStart: exec: command: - - "248" + - "250" httpGet: - host: "251" + host: "253" httpHeaders: - - name: "252" - value: "253" - path: "249" - port: "250" + - name: "254" + value: "255" + path: "251" + port: "252" scheme: '''' tcpSocket: - host: "254" + host: "256" port: -801430937 preStop: exec: command: - - "255" + - "257" httpGet: - host: "257" + host: "259" httpHeaders: - - name: "258" - value: "259" - path: "256" + - name: "260" + value: "261" + path: "258" port: 1810980158 scheme: _ƮA攤/ɸɎ R§耶FfBl tcpSocket: - host: "260" + host: "262" port: 1074486306 livenessProbe: exec: command: - - "233" + - "235" failureThreshold: -161485752 httpGet: - host: "236" + host: "238" httpHeaders: - - name: "237" - value: "238" - path: "234" - port: "235" + - name: "239" + value: "240" + path: "236" + port: "237" scheme: Ȥ藠3. initialDelaySeconds: -1389418722 periodSeconds: 596942561 successThreshold: -1880980172 tcpSocket: - host: "240" - port: "239" + host: "242" + port: "241" timeoutSeconds: 851018015 - name: "207" + name: "209" ports: - containerPort: 427196286 - hostIP: "213" + hostIP: "215" hostPort: 1385030458 - name: "212" + name: "214" protocol: o/樝fw[Řż丩Ž readinessProbe: exec: command: - - "241" + - "243" failureThreshold: 59664438 httpGet: - host: "244" + host: "246" httpHeaders: - - name: "245" - value: "246" - path: "242" - port: "243" + - name: "247" + value: "248" + path: "244" + port: "245" scheme: «丯Ƙ枛牐ɺ皚 initialDelaySeconds: 766864314 periodSeconds: 1495880465 successThreshold: -1032967081 tcpSocket: - host: "247" + host: "249" port: -1934111455 timeoutSeconds: 1146016612 resources: @@ -277,148 +279,148 @@ spec: runAsNonRoot: false runAsUser: -6470941481344047265 seLinuxOptions: - level: "265" - role: "263" - type: "264" - user: "262" + level: "267" + role: "265" + type: "266" + user: "264" windowsOptions: - gmsaCredentialSpec: "267" - gmsaCredentialSpecName: "266" - runAsUserName: "268" - terminationMessagePath: "261" + gmsaCredentialSpec: "269" + gmsaCredentialSpecName: "268" + runAsUserName: "270" + terminationMessagePath: "263" terminationMessagePolicy: Zɾģ毋Ó6dz娝嘚庎D}埽uʎ tty: true volumeDevices: - - devicePath: "232" - name: "231" + - devicePath: "234" + name: "233" volumeMounts: - - mountPath: "228" + - mountPath: "230" mountPropagation: 奺Ȋ礶惇¸t颟.鵫ǚ - name: "227" + name: "229" readOnly: true - subPath: "229" - subPathExpr: "230" - workingDir: "211" + subPath: "231" + subPathExpr: "232" + workingDir: "213" dnsConfig: nameservers: - - "397" + - "399" options: - - name: "399" - value: "400" + - name: "401" + value: "402" searches: - - "398" + - "400" dnsPolicy: 娕uE增猍ǵ xǨŴ壶ƵfȽÃ茓pȓɻ enableServiceLinks: true ephemeralContainers: - args: - - "272" + - "274" command: - - "271" + - "273" env: - - name: "279" - value: "280" + - name: "281" + value: "282" valueFrom: configMapKeyRef: - key: "286" - name: "285" - optional: false - fieldRef: - apiVersion: "281" - fieldPath: "282" - resourceFieldRef: - containerName: "283" - divisor: "355" - resource: "284" - secretKeyRef: key: "288" name: "287" + optional: false + fieldRef: + apiVersion: "283" + fieldPath: "284" + resourceFieldRef: + containerName: "285" + divisor: "355" + resource: "286" + secretKeyRef: + key: "290" + name: "289" optional: true envFrom: - configMapRef: - name: "277" + name: "279" optional: true - prefix: "276" + prefix: "278" secretRef: - name: "278" + name: "280" optional: false - image: "270" + image: "272" imagePullPolicy: 邻爥蹔ŧOǨ繫ʎǑyZ涬P­蜷ɔ幩 lifecycle: postStart: exec: command: - - "310" + - "312" httpGet: - host: "313" + host: "315" httpHeaders: - - name: "314" - value: "315" - path: "311" - port: "312" + - name: "316" + value: "317" + path: "313" + port: "314" scheme: 鶫:顇ə娯Ȱ囌{屿oiɥ嵐sC tcpSocket: - host: "317" - port: "316" + host: "319" + port: "318" preStop: exec: command: - - "318" + - "320" httpGet: - host: "321" + host: "323" httpHeaders: - - name: "322" - value: "323" - path: "319" - port: "320" + - name: "324" + value: "325" + path: "321" + port: "322" scheme: 鬍熖B芭花ª瘡蟦JBʟ鍏H鯂² tcpSocket: - host: "324" + host: "326" port: -1187301925 livenessProbe: exec: command: - - "295" + - "297" failureThreshold: 2030115750 httpGet: - host: "298" + host: "300" httpHeaders: - - name: "299" - value: "300" - path: "296" - port: "297" + - name: "301" + value: "302" + path: "298" + port: "299" scheme: 现葢ŵ橨鬶l獕;跣Hǝcw媀瓄&翜舞拉 initialDelaySeconds: 2066735093 periodSeconds: -940334911 successThreshold: -341287812 tcpSocket: - host: "302" - port: "301" + host: "304" + port: "303" timeoutSeconds: -190183379 - name: "269" + name: "271" ports: - containerPort: -379385405 - hostIP: "275" + hostIP: "277" hostPort: 2058122084 - name: "274" + name: "276" protocol: '#嬀ơŸ8T 苧yñKJɐ扵Gƚ绤f' readinessProbe: exec: command: - - "303" + - "305" failureThreshold: -385597677 httpGet: - host: "306" + host: "308" httpHeaders: - - name: "307" - value: "308" - path: "304" - port: "305" + - name: "309" + value: "310" + path: "306" + port: "307" scheme: M蘇KŅ/»頸+SÄ蚃ɣľ)酊龨δ initialDelaySeconds: -1971421078 periodSeconds: -1730959016 successThreshold: 1272940694 tcpSocket: - host: "309" + host: "311" port: 458427807 timeoutSeconds: 1905181464 resources: @@ -440,146 +442,146 @@ spec: runAsNonRoot: false runAsUser: 6726836758549163621 seLinuxOptions: - level: "329" - role: "327" - type: "328" - user: "326" + level: "331" + role: "329" + type: "330" + user: "328" windowsOptions: - gmsaCredentialSpec: "331" - gmsaCredentialSpecName: "330" - runAsUserName: "332" + gmsaCredentialSpec: "333" + gmsaCredentialSpecName: "332" + runAsUserName: "334" stdin: true stdinOnce: true - targetContainerName: "333" - terminationMessagePath: "325" + targetContainerName: "335" + terminationMessagePath: "327" terminationMessagePolicy: Őnj汰8ŕ tty: true volumeDevices: - - devicePath: "294" - name: "293" + - devicePath: "296" + name: "295" volumeMounts: - - mountPath: "290" + - mountPath: "292" mountPropagation: 簳°Ļǟi&皥贸 - name: "289" - subPath: "291" - subPathExpr: "292" - workingDir: "273" + name: "291" + subPath: "293" + subPathExpr: "294" + workingDir: "275" hostAliases: - hostnames: - - "395" - ip: "394" + - "397" + ip: "396" hostPID: true - hostname: "349" + hostname: "351" imagePullSecrets: - - name: "348" + - name: "350" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "468" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "468" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: true envFrom: - configMapRef: - name: "153" + name: "155" optional: false - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: false - image: "146" + image: "148" imagePullPolicy: Ŵ廷s{Ⱦdz@ lifecycle: postStart: exec: command: - - "186" + - "188" httpGet: - host: "189" + host: "191" httpHeaders: - - name: "190" - value: "191" - path: "187" - port: "188" + - name: "192" + value: "193" + path: "189" + port: "190" tcpSocket: - host: "192" + host: "194" port: 559781916 preStop: exec: command: - - "193" + - "195" httpGet: - host: "195" + host: "197" httpHeaders: - - name: "196" - value: "197" - path: "194" + - name: "198" + value: "199" + path: "196" port: 1150375229 scheme: QÄȻȊ+?ƭ峧Y栲茇竛吲蚛隖<Ƕ tcpSocket: - host: "198" + host: "200" port: -1696471293 livenessProbe: exec: command: - - "171" + - "173" failureThreshold: 1466047181 httpGet: - host: "174" + host: "176" httpHeaders: - - name: "175" - value: "176" - path: "172" - port: "173" + - name: "177" + value: "178" + path: "174" + port: "175" initialDelaySeconds: 1805144649 periodSeconds: 1403721475 successThreshold: 519906483 tcpSocket: - host: "178" - port: "177" + host: "180" + port: "179" timeoutSeconds: -606111218 - name: "145" + name: "147" ports: - containerPort: 437857734 - hostIP: "151" + hostIP: "153" hostPort: -1510026905 - name: "150" + name: "152" protocol: Rƥ贫d飼$俊跾|@?鷅b readinessProbe: exec: command: - - "179" + - "181" failureThreshold: 524249411 httpGet: - host: "182" + host: "184" httpHeaders: - - name: "183" - value: "184" - path: "180" - port: "181" + - name: "185" + value: "186" + path: "182" + port: "183" scheme: w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ initialDelaySeconds: -1724160601 periodSeconds: 1435507444 successThreshold: -1430577593 tcpSocket: - host: "185" + host: "187" port: -337353552 timeoutSeconds: -1158840571 resources: @@ -601,72 +603,72 @@ spec: runAsNonRoot: true runAsUser: 4181787587415673530 seLinuxOptions: - level: "203" - role: "201" - type: "202" - user: "200" + level: "205" + role: "203" + type: "204" + user: "202" windowsOptions: - gmsaCredentialSpec: "205" - gmsaCredentialSpecName: "204" - runAsUserName: "206" + gmsaCredentialSpec: "207" + gmsaCredentialSpecName: "206" + runAsUserName: "208" stdin: true stdinOnce: true - terminationMessagePath: "199" + terminationMessagePath: "201" terminationMessagePolicy: £軶ǃ*ʙ嫙&蒒5靇C'ɵK.Q貇 volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: 卩蝾 - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "338" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "340" nodeSelector: - "334": "335" + "336": "337" overhead: 癜鞤A馱z芀¿l磶Bb偃礳Ȭ痍脉PPö: "607" preemptionPolicy: eáNRNJ丧鴻Ŀ priority: 1690570439 - priorityClassName: "396" + priorityClassName: "398" readinessGates: - conditionType: 梑ʀŖ鱓;鹡鑓侅闍ŏŃŋŏ}ŀ姳 restartPolicy: åe躒訙 - runtimeClassName: "401" - schedulerName: "391" + runtimeClassName: "403" + schedulerName: "393" securityContext: fsGroup: -7117039988160665426 runAsGroup: 2548453080315983269 runAsNonRoot: false runAsUser: 7747616967629081728 seLinuxOptions: - level: "342" - role: "340" - type: "341" - user: "339" + level: "344" + role: "342" + type: "343" + user: "341" supplementalGroups: - -1193643752264108019 sysctls: - - name: "346" - value: "347" + - name: "348" + value: "349" windowsOptions: - gmsaCredentialSpec: "344" - gmsaCredentialSpecName: "343" - runAsUserName: "345" - serviceAccount: "337" - serviceAccountName: "336" + gmsaCredentialSpec: "346" + gmsaCredentialSpecName: "345" + runAsUserName: "347" + serviceAccount: "339" + serviceAccountName: "338" shareProcessNamespace: false - subdomain: "350" + subdomain: "352" terminationGracePeriodSeconds: 6942343986058351509 tolerations: - effect: 料ȭzV镜籬ƽ - key: "392" + key: "394" operator: ƹ| tolerationSeconds: 935587338391120947 - value: "393" + value: "395" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -677,207 +679,207 @@ spec: matchLabels: E--pT751: mV__1-wv3UDf.-4D-r.-F__r.oh..2_uGGP..X maxSkew: -137402083 - topologyKey: "402" + topologyKey: "404" whenUnsatisfiable: Ȩç捌聮ŃŻ@ǮJ=礏ƴ磳藷曥 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: -2007808768 - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: k ź贩j瀉ǚrǜnh0åȂ - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: nj揠8lj黳鈫ʕ禒Ƙá腿ħ缶 readOnly: false azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 952979935 items: - - key: "97" + - key: "99" mode: 2020789772 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: true volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: -868808281 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: -1768075156 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "915" - resource: "90" + resource: "92" emptyDir: medium: ɹ坼É/pȿ sizeLimit: "804" fc: - fsType: "92" + fsType: "94" lun: 570501002 targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" readOnly: true secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1318752360 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" hostPath: - path: "41" + path: "43" type: "" iscsi: chapAuthDiscovery: true chapAuthSession: true - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 408756018 portals: - - "58" + - "60" readOnly: true secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" - volumeID: "126" + fsType: "129" + volumeID: "128" projected: defaultMode: 480521693 sources: - configMap: items: - - key: "122" + - key: "124" mode: -1126738259 - path: "123" - name: "121" + path: "125" + name: "123" optional: true downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: -1618937335 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "461" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: 675406340 - path: "115" - name: "113" + path: "117" + name: "115" optional: false serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: -6345861634934949644 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" readOnly: true secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" + name: "132" sslEnabled: true - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 1233814916 items: - - key: "50" + - key: "52" mode: 228756891 - path: "51" + path: "53" optional: false - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" updateStrategy: rollingUpdate: {} type: 荥ơ'禧ǵŊ)TiD¢ƿ媴h5 @@ -885,8 +887,8 @@ status: collisionCount: -449319810 conditions: - lastTransitionTime: "2469-07-10T03:20:34Z" - message: "410" - reason: "409" + message: "412" + reason: "411" status: '''ƈoIǢ龞瞯å' type: "" currentNumberScheduled: -1979737528 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.json index 871d85ffbe5..d0e0ebe63df 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.json +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -54,49 +55,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "?Qȫş", "resourceVersion": "1736621709629422270", "generation": -8542870036622468681, "creationTimestamp": null, "deletionGracePeriodSeconds": -2575298329142810753, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "ƶȤ^}", "controller": true, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "躢", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱\u003c" }, "emptyDir": { @@ -104,27 +106,27 @@ "sizeLimit": "473" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1188153605 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": 912004803, "readOnly": true }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": -547518679 } ], @@ -132,91 +134,91 @@ "optional": true }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 994527057, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "portals": [ - "58" + "60" ], "chapAuthDiscovery": true, "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62", + "endpoints": "63", + "path": "64", "readOnly": true }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" } }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "readOnly": true, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "660" }, "mode": 1569992019 @@ -226,26 +228,26 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": -1740986684, - "fsType": "92", + "fsType": "94", "readOnly": true, "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95", + "secretName": "96", + "shareName": "97", "readOnly": true }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": 195263908 } ], @@ -253,39 +255,39 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", - "user": "105", - "group": "106", - "tenant": "107" + "registry": "105", + "volume": "106", + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "|@?鷅bȻN", - "fsType": "110", + "fsType": "112", "readOnly": true, "kind": "榱*Gưoɘ檲" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": -323584340 } ], @@ -294,14 +296,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "106" }, "mode": 173030157 @@ -309,118 +311,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": 2063799569 } ], "optional": false }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": 8357931971650847566, - "path": "125" + "path": "127" } } ], "defaultMode": -1334904807 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127", + "volumeID": "128", + "fsType": "129", "readOnly": true }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": false, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -606111218, "containerPort": 1403721475, "protocol": "ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": true }, "secretRef": { - "name": "154", + "name": "156", "optional": true } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "650" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": false }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": true } } @@ -436,41 +438,41 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", + "path": "174", "port": -152585895, - "host": "173", + "host": "175", "scheme": "E@Ȗs«ö", "httpHeaders": [ { - "name": "174", - "value": "175" + "name": "176", + "value": "177" } ] }, "tcpSocket": { "port": 1135182169, - "host": "176" + "host": "178" }, "initialDelaySeconds": 1843758068, "timeoutSeconds": -1967469005, @@ -481,24 +483,24 @@ "readinessProbe": { "exec": { "command": [ - "177" + "179" ] }, "httpGet": { - "path": "178", + "path": "180", "port": 386652373, - "host": "179", + "host": "181", "scheme": "ʙ嫙\u0026", "httpHeaders": [ { - "name": "180", - "value": "181" + "name": "182", + "value": "183" } ] }, "tcpSocket": { - "port": "182", - "host": "183" + "port": "184", + "host": "185" }, "initialDelaySeconds": -802585193, "timeoutSeconds": 1901330124, @@ -510,51 +512,51 @@ "postStart": { "exec": { "command": [ - "184" + "186" ] }, "httpGet": { - "path": "185", - "port": "186", - "host": "187", + "path": "187", + "port": "188", + "host": "189", "scheme": "£ȹ嫰ƹǔw÷nI粛E煹", "httpHeaders": [ { - "name": "188", - "value": "189" + "name": "190", + "value": "191" } ] }, "tcpSocket": { "port": 135036402, - "host": "190" + "host": "192" } }, "preStop": { "exec": { "command": [ - "191" + "193" ] }, "httpGet": { - "path": "192", + "path": "194", "port": -1188430996, - "host": "193", + "host": "195", "scheme": "djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪", "httpHeaders": [ { - "name": "194", - "value": "195" + "name": "196", + "value": "197" } ] }, "tcpSocket": { - "port": "196", - "host": "197" + "port": "198", + "host": "199" } } }, - "terminationMessagePath": "198", + "terminationMessagePath": "200", "terminationMessagePolicy": "ɩC", "securityContext": { "capabilities": { @@ -567,15 +569,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "199", - "role": "200", - "type": "201", - "level": "202" + "user": "201", + "role": "202", + "type": "203", + "level": "204" }, "windowsOptions": { - "gmsaCredentialSpecName": "203", - "gmsaCredentialSpec": "204", - "runAsUserName": "205" + "gmsaCredentialSpecName": "205", + "gmsaCredentialSpec": "206", + "runAsUserName": "207" }, "runAsUser": 7739117973959656085, "runAsGroup": 3747003978559617838, @@ -590,59 +592,59 @@ ], "containers": [ { - "name": "206", - "image": "207", + "name": "208", + "image": "209", "command": [ - "208" + "210" ], "args": [ - "209" + "211" ], - "workingDir": "210", + "workingDir": "212", "ports": [ { - "name": "211", + "name": "213", "hostPort": 474119379, "containerPort": 1923334396, "protocol": "旿@掇lNdǂ\u003e5姣\u003e懔%熷谟þ", - "hostIP": "212" + "hostIP": "214" } ], "envFrom": [ { - "prefix": "213", + "prefix": "215", "configMapRef": { - "name": "214", + "name": "216", "optional": false }, "secretRef": { - "name": "215", + "name": "217", "optional": true } } ], "env": [ { - "name": "216", - "value": "217", + "name": "218", + "value": "219", "valueFrom": { "fieldRef": { - "apiVersion": "218", - "fieldPath": "219" + "apiVersion": "220", + "fieldPath": "221" }, "resourceFieldRef": { - "containerName": "220", - "resource": "221", + "containerName": "222", + "resource": "223", "divisor": "771" }, "configMapKeyRef": { - "name": "222", - "key": "223", + "name": "224", + "key": "225", "optional": false }, "secretKeyRef": { - "name": "224", - "key": "225", + "name": "226", + "key": "227", "optional": true } } @@ -658,41 +660,41 @@ }, "volumeMounts": [ { - "name": "226", + "name": "228", "readOnly": true, - "mountPath": "227", - "subPath": "228", + "mountPath": "229", + "subPath": "230", "mountPropagation": "0矀Kʝ瘴I\\p[ħsĨɆâĺɗŹ倗S", - "subPathExpr": "229" + "subPathExpr": "231" } ], "volumeDevices": [ { - "name": "230", - "devicePath": "231" + "name": "232", + "devicePath": "233" } ], "livenessProbe": { "exec": { "command": [ - "232" + "234" ] }, "httpGet": { - "path": "233", + "path": "235", "port": -1285424066, - "host": "234", + "host": "236", "scheme": "ni酛3ƁÀ", "httpHeaders": [ { - "name": "235", - "value": "236" + "name": "237", + "value": "238" } ] }, "tcpSocket": { - "port": "237", - "host": "238" + "port": "239", + "host": "240" }, "initialDelaySeconds": -2036074491, "timeoutSeconds": -148216266, @@ -703,24 +705,24 @@ "readinessProbe": { "exec": { "command": [ - "239" + "241" ] }, "httpGet": { - "path": "240", - "port": "241", - "host": "242", + "path": "242", + "port": "243", + "host": "244", "scheme": "3!Zɾģ毋Ó6", "httpHeaders": [ { - "name": "243", - "value": "244" + "name": "245", + "value": "246" } ] }, "tcpSocket": { "port": -832805508, - "host": "245" + "host": "247" }, "initialDelaySeconds": -228822833, "timeoutSeconds": -970312425, @@ -732,51 +734,51 @@ "postStart": { "exec": { "command": [ - "246" + "248" ] }, "httpGet": { - "path": "247", + "path": "249", "port": -2013568185, - "host": "248", + "host": "250", "scheme": "#yV'WKw(ğ儴Ůĺ}", "httpHeaders": [ { - "name": "249", - "value": "250" + "name": "251", + "value": "252" } ] }, "tcpSocket": { "port": -20130017, - "host": "251" + "host": "253" } }, "preStop": { "exec": { "command": [ - "252" + "254" ] }, "httpGet": { - "path": "253", + "path": "255", "port": -661937776, - "host": "254", + "host": "256", "scheme": "ØœȠƬQg鄠[颐o", "httpHeaders": [ { - "name": "255", - "value": "256" + "name": "257", + "value": "258" } ] }, "tcpSocket": { "port": 461585849, - "host": "257" + "host": "259" } } }, - "terminationMessagePath": "258", + "terminationMessagePath": "260", "terminationMessagePolicy": "ɇ卷荙JLĹ]佱¿\u003e犵殇ŕ-Ɂ", "imagePullPolicy": "ƙt叀碧闳ȩr嚧ʣq埄趛屡", "securityContext": { @@ -790,15 +792,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "259", - "role": "260", - "type": "261", - "level": "262" + "user": "261", + "role": "262", + "type": "263", + "level": "264" }, "windowsOptions": { - "gmsaCredentialSpecName": "263", - "gmsaCredentialSpec": "264", - "runAsUserName": "265" + "gmsaCredentialSpecName": "265", + "gmsaCredentialSpec": "266", + "runAsUserName": "267" }, "runAsUser": -5835415947553716289, "runAsGroup": 2540215688947167763, @@ -812,59 +814,59 @@ ], "ephemeralContainers": [ { - "name": "266", - "image": "267", + "name": "268", + "image": "269", "command": [ - "268" + "270" ], "args": [ - "269" + "271" ], - "workingDir": "270", + "workingDir": "272", "ports": [ { - "name": "271", + "name": "273", "hostPort": -552281772, "containerPort": -677617960, "protocol": "ŕ翑0展}", - "hostIP": "272" + "hostIP": "274" } ], "envFrom": [ { - "prefix": "273", + "prefix": "275", "configMapRef": { - "name": "274", + "name": "276", "optional": false }, "secretRef": { - "name": "275", + "name": "277", "optional": false } } ], "env": [ { - "name": "276", - "value": "277", + "name": "278", + "value": "279", "valueFrom": { "fieldRef": { - "apiVersion": "278", - "fieldPath": "279" + "apiVersion": "280", + "fieldPath": "281" }, "resourceFieldRef": { - "containerName": "280", - "resource": "281", + "containerName": "282", + "resource": "283", "divisor": "185" }, "configMapKeyRef": { - "name": "282", - "key": "283", + "name": "284", + "key": "285", "optional": true }, "secretKeyRef": { - "name": "284", - "key": "285", + "name": "286", + "key": "287", "optional": false } } @@ -880,40 +882,40 @@ }, "volumeMounts": [ { - "name": "286", - "mountPath": "287", - "subPath": "288", + "name": "288", + "mountPath": "289", + "subPath": "290", "mountPropagation": "", - "subPathExpr": "289" + "subPathExpr": "291" } ], "volumeDevices": [ { - "name": "290", - "devicePath": "291" + "name": "292", + "devicePath": "293" } ], "livenessProbe": { "exec": { "command": [ - "292" + "294" ] }, "httpGet": { - "path": "293", - "port": "294", - "host": "295", + "path": "295", + "port": "296", + "host": "297", "scheme": "頸", "httpHeaders": [ { - "name": "296", - "value": "297" + "name": "298", + "value": "299" } ] }, "tcpSocket": { "port": 1315054653, - "host": "298" + "host": "300" }, "initialDelaySeconds": 711020087, "timeoutSeconds": 1103049140, @@ -924,24 +926,24 @@ "readinessProbe": { "exec": { "command": [ - "299" + "301" ] }, "httpGet": { - "path": "300", - "port": "301", - "host": "302", + "path": "302", + "port": "303", + "host": "304", "scheme": "ƿ頀\"冓鍓贯澔 ", "httpHeaders": [ { - "name": "303", - "value": "304" + "name": "305", + "value": "306" } ] }, "tcpSocket": { - "port": "305", - "host": "306" + "port": "307", + "host": "308" }, "initialDelaySeconds": 1058960779, "timeoutSeconds": -2133441986, @@ -953,51 +955,51 @@ "postStart": { "exec": { "command": [ - "307" + "309" ] }, "httpGet": { - "path": "308", + "path": "310", "port": -934378634, - "host": "309", + "host": "311", "scheme": "ɐ鰥", "httpHeaders": [ { - "name": "310", - "value": "311" + "name": "312", + "value": "313" } ] }, "tcpSocket": { "port": 630140708, - "host": "312" + "host": "314" } }, "preStop": { "exec": { "command": [ - "313" + "315" ] }, "httpGet": { - "path": "314", - "port": "315", - "host": "316", + "path": "316", + "port": "317", + "host": "318", "scheme": "8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録²", "httpHeaders": [ { - "name": "317", - "value": "318" + "name": "319", + "value": "320" } ] }, "tcpSocket": { "port": 2080874371, - "host": "319" + "host": "321" } } }, - "terminationMessagePath": "320", + "terminationMessagePath": "322", "terminationMessagePolicy": "灩聋3趐囨鏻砅邻", "imagePullPolicy": "騎C\"6x$1sȣ±p鋄", "securityContext": { @@ -1011,15 +1013,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "321", - "role": "322", - "type": "323", - "level": "324" + "user": "323", + "role": "324", + "type": "325", + "level": "326" }, "windowsOptions": { - "gmsaCredentialSpecName": "325", - "gmsaCredentialSpec": "326", - "runAsUserName": "327" + "gmsaCredentialSpecName": "327", + "gmsaCredentialSpec": "328", + "runAsUserName": "329" }, "runAsUser": 4288903380102217677, "runAsGroup": 6618112330449141397, @@ -1030,7 +1032,7 @@ }, "stdinOnce": true, "tty": true, - "targetContainerName": "328" + "targetContainerName": "330" } ], "restartPolicy": "w妕眵笭/9崍h趭(娕", @@ -1038,25 +1040,25 @@ "activeDeadlineSeconds": -3214891994203952546, "dnsPolicy": "晲T[irȎ3Ĕ\\", "nodeSelector": { - "329": "330" + "331": "332" }, - "serviceAccountName": "331", - "serviceAccount": "332", + "serviceAccountName": "333", + "serviceAccount": "334", "automountServiceAccountToken": true, - "nodeName": "333", + "nodeName": "335", "hostIPC": true, "shareProcessNamespace": true, "securityContext": { "seLinuxOptions": { - "user": "334", - "role": "335", - "type": "336", - "level": "337" + "user": "336", + "role": "337", + "type": "338", + "level": "339" }, "windowsOptions": { - "gmsaCredentialSpecName": "338", - "gmsaCredentialSpec": "339", - "runAsUserName": "340" + "gmsaCredentialSpecName": "340", + "gmsaCredentialSpec": "341", + "runAsUserName": "342" }, "runAsUser": 4430285638700927057, "runAsGroup": 7461098988156705429, @@ -1067,18 +1069,18 @@ "fsGroup": 7747616967629081728, "sysctls": [ { - "name": "341", - "value": "342" + "name": "343", + "value": "344" } ] }, "imagePullSecrets": [ { - "name": "343" + "name": "345" } ], - "hostname": "344", - "subdomain": "345", + "hostname": "346", + "subdomain": "347", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1086,19 +1088,19 @@ { "matchExpressions": [ { - "key": "346", + "key": "348", "operator": "Ǚ(", "values": [ - "347" + "349" ] } ], "matchFields": [ { - "key": "348", + "key": "350", "operator": "瘍Nʊ輔3璾ėȜv1b繐汚", "values": [ - "349" + "351" ] } ] @@ -1111,19 +1113,19 @@ "preference": { "matchExpressions": [ { - "key": "350", + "key": "352", "operator": "n覦灲閈誹ʅ蕉", "values": [ - "351" + "353" ] } ], "matchFields": [ { - "key": "352", + "key": "354", "operator": "", "values": [ - "353" + "355" ] } ] @@ -1146,9 +1148,9 @@ ] }, "namespaces": [ - "360" + "362" ], - "topologyKey": "361" + "topologyKey": "363" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1170,9 +1172,9 @@ ] }, "namespaces": [ - "368" + "370" ], - "topologyKey": "369" + "topologyKey": "371" } } ] @@ -1195,9 +1197,9 @@ ] }, "namespaces": [ - "376" + "378" ], - "topologyKey": "377" + "topologyKey": "379" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1219,45 +1221,45 @@ ] }, "namespaces": [ - "384" + "386" ], - "topologyKey": "385" + "topologyKey": "387" } } ] } }, - "schedulerName": "386", + "schedulerName": "388", "tolerations": [ { - "key": "387", + "key": "389", "operator": "抄3昞财Î嘝zʄ!ć", - "value": "388", + "value": "390", "effect": "緍k¢茤", "tolerationSeconds": 4096844323391966153 } ], "hostAliases": [ { - "ip": "389", + "ip": "391", "hostnames": [ - "390" + "392" ] } ], - "priorityClassName": "391", + "priorityClassName": "393", "priority": -1331113536, "dnsConfig": { "nameservers": [ - "392" + "394" ], "searches": [ - "393" + "395" ], "options": [ { - "name": "394", - "value": "395" + "name": "396", + "value": "397" } ] }, @@ -1266,7 +1268,7 @@ "conditionType": "mō6µɑ`ȗ\u003c8^翜" } ], - "runtimeClassName": "396", + "runtimeClassName": "398", "enableServiceLinks": false, "preemptionPolicy": "ý筞X", "overhead": { @@ -1275,7 +1277,7 @@ "topologySpreadConstraints": [ { "maxSkew": 1956797678, - "topologyKey": "397", + "topologyKey": "399", "whenUnsatisfiable": "ƀ+瑏eCmAȥ睙", "labelSelector": { "matchLabels": { @@ -1314,8 +1316,8 @@ "status": "ZÕW肤 ", "lastUpdateTime": "2674-04-10T12:16:26Z", "lastTransitionTime": "2674-07-14T13:22:49Z", - "reason": "404", - "message": "405" + "reason": "406", + "message": "407" } ], "collisionCount": 1658632493 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.pb index 3e84e01eb0b..de20f657135 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.yaml index 572c4b3c2fd..68cc942ba5a 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.Deployment.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -44,31 +45,32 @@ spec: template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: -2575298329142810753 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -8542870036622468681 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: 躢 - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: true - kind: "34" - name: "35" + kind: "35" + name: "36" uid: ƶȤ^} resourceVersion: "1736621709629422270" - selfLink: "27" + selfLink: "28" uid: ?Qȫş spec: activeDeadlineSeconds: -3214891994203952546 @@ -77,28 +79,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "350" + - key: "352" operator: n覦灲閈誹ʅ蕉 values: - - "351" + - "353" matchFields: - - key: "352" + - key: "354" operator: "" values: - - "353" + - "355" weight: 702968201 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "346" + - key: "348" operator: Ǚ( values: - - "347" + - "349" matchFields: - - key: "348" + - key: "350" operator: 瘍Nʊ輔3璾ėȜv1b繐汚 values: - - "349" + - "351" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -111,8 +113,8 @@ spec: matchLabels: Bk.j._g-G-7--p9.-_0R.-_-3_L_2--_v2.5p_..Y-.wg_-b8a_68: Q4_.84.K_-_0_..u.F.pq..--Q namespaces: - - "368" - topologyKey: "369" + - "370" + topologyKey: "371" weight: 1195176401 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -122,8 +124,8 @@ spec: matchLabels: lm-e46-r-g63--gt1--6mx-r-927--m6-k8-c2---2etfh41ca-z-g/0p_3_J_SA995IKCR.s--f.-f.-zv._._.5-H.T.-.-.d: b_9_1o.w_aI._31-_I-A-_3bz._8M0U1_-__.71-_-9_._X-D---k..1Q7._l.I namespaces: - - "360" - topologyKey: "361" + - "362" + topologyKey: "363" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -136,8 +138,8 @@ spec: matchLabels: 3--rgvf3q-z-5z80n--t5--9-4-d2-22--i--40wv--in-870w--it6k47-7y1.h72n-cnp-75/c10KkQ-R_R.-.--4_IT_O__3.5h_XC0_-3: 20_._.-_L-__bf_9_-C-PfNx__-U_.Pn-W23-_.z_.._s--_F-BR-.h_-2-.F namespaces: - - "384" - topologyKey: "385" + - "386" + topologyKey: "387" weight: -1508769491 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -149,119 +151,119 @@ spec: matchLabels: H__V.Vz_6.Hz_V_.r_v_._e_-78o_6Z..11_7pX_.-mLlx...w_j: 35.40Rw4gD.._.-x6db-L7.-__-G_2kCpS_1 namespaces: - - "376" - topologyKey: "377" + - "378" + topologyKey: "379" automountServiceAccountToken: true containers: - args: - - "209" + - "211" command: - - "208" + - "210" env: - - name: "216" - value: "217" + - name: "218" + value: "219" valueFrom: configMapKeyRef: - key: "223" - name: "222" - optional: false - fieldRef: - apiVersion: "218" - fieldPath: "219" - resourceFieldRef: - containerName: "220" - divisor: "771" - resource: "221" - secretKeyRef: key: "225" name: "224" + optional: false + fieldRef: + apiVersion: "220" + fieldPath: "221" + resourceFieldRef: + containerName: "222" + divisor: "771" + resource: "223" + secretKeyRef: + key: "227" + name: "226" optional: true envFrom: - configMapRef: - name: "214" + name: "216" optional: false - prefix: "213" + prefix: "215" secretRef: - name: "215" + name: "217" optional: true - image: "207" + image: "209" imagePullPolicy: ƙt叀碧闳ȩr嚧ʣq埄趛屡 lifecycle: postStart: exec: command: - - "246" + - "248" httpGet: - host: "248" + host: "250" httpHeaders: - - name: "249" - value: "250" - path: "247" + - name: "251" + value: "252" + path: "249" port: -2013568185 scheme: '#yV''WKw(ğ儴Ůĺ}' tcpSocket: - host: "251" + host: "253" port: -20130017 preStop: exec: command: - - "252" + - "254" httpGet: - host: "254" + host: "256" httpHeaders: - - name: "255" - value: "256" - path: "253" + - name: "257" + value: "258" + path: "255" port: -661937776 scheme: ØœȠƬQg鄠[颐o tcpSocket: - host: "257" + host: "259" port: 461585849 livenessProbe: exec: command: - - "232" + - "234" failureThreshold: -93157681 httpGet: - host: "234" + host: "236" httpHeaders: - - name: "235" - value: "236" - path: "233" + - name: "237" + value: "238" + path: "235" port: -1285424066 scheme: ni酛3ƁÀ initialDelaySeconds: -2036074491 periodSeconds: 165047920 successThreshold: -393291312 tcpSocket: - host: "238" - port: "237" + host: "240" + port: "239" timeoutSeconds: -148216266 - name: "206" + name: "208" ports: - containerPort: 1923334396 - hostIP: "212" + hostIP: "214" hostPort: 474119379 - name: "211" + name: "213" protocol: 旿@掇lNdǂ>5姣>懔%熷谟þ readinessProbe: exec: command: - - "239" + - "241" failureThreshold: 267768240 httpGet: - host: "242" + host: "244" httpHeaders: - - name: "243" - value: "244" - path: "240" - port: "241" + - name: "245" + value: "246" + path: "242" + port: "243" scheme: 3!Zɾģ毋Ó6 initialDelaySeconds: -228822833 periodSeconds: -1213051101 successThreshold: 1451056156 tcpSocket: - host: "245" + host: "247" port: -832805508 timeoutSeconds: -970312425 resources: @@ -283,149 +285,149 @@ spec: runAsNonRoot: false runAsUser: -5835415947553716289 seLinuxOptions: - level: "262" - role: "260" - type: "261" - user: "259" + level: "264" + role: "262" + type: "263" + user: "261" windowsOptions: - gmsaCredentialSpec: "264" - gmsaCredentialSpecName: "263" - runAsUserName: "265" - terminationMessagePath: "258" + gmsaCredentialSpec: "266" + gmsaCredentialSpecName: "265" + runAsUserName: "267" + terminationMessagePath: "260" terminationMessagePolicy: ɇ卷荙JLĹ]佱¿>犵殇ŕ-Ɂ tty: true volumeDevices: - - devicePath: "231" - name: "230" + - devicePath: "233" + name: "232" volumeMounts: - - mountPath: "227" + - mountPath: "229" mountPropagation: 0矀Kʝ瘴I\p[ħsĨɆâĺɗŹ倗S - name: "226" + name: "228" readOnly: true - subPath: "228" - subPathExpr: "229" - workingDir: "210" + subPath: "230" + subPathExpr: "231" + workingDir: "212" dnsConfig: nameservers: - - "392" + - "394" options: - - name: "394" - value: "395" + - name: "396" + value: "397" searches: - - "393" + - "395" dnsPolicy: 晲T[irȎ3Ĕ\ enableServiceLinks: false ephemeralContainers: - args: - - "269" + - "271" command: - - "268" + - "270" env: - - name: "276" - value: "277" + - name: "278" + value: "279" valueFrom: configMapKeyRef: - key: "283" - name: "282" - optional: true - fieldRef: - apiVersion: "278" - fieldPath: "279" - resourceFieldRef: - containerName: "280" - divisor: "185" - resource: "281" - secretKeyRef: key: "285" name: "284" + optional: true + fieldRef: + apiVersion: "280" + fieldPath: "281" + resourceFieldRef: + containerName: "282" + divisor: "185" + resource: "283" + secretKeyRef: + key: "287" + name: "286" optional: false envFrom: - configMapRef: - name: "274" + name: "276" optional: false - prefix: "273" + prefix: "275" secretRef: - name: "275" + name: "277" optional: false - image: "267" + image: "269" imagePullPolicy: 騎C"6x$1sȣ±p鋄 lifecycle: postStart: exec: command: - - "307" + - "309" httpGet: - host: "309" + host: "311" httpHeaders: - - name: "310" - value: "311" - path: "308" + - name: "312" + value: "313" + path: "310" port: -934378634 scheme: ɐ鰥 tcpSocket: - host: "312" + host: "314" port: 630140708 preStop: exec: command: - - "313" + - "315" httpGet: - host: "316" + host: "318" httpHeaders: - - name: "317" - value: "318" - path: "314" - port: "315" + - name: "319" + value: "320" + path: "316" + port: "317" scheme: 8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録² tcpSocket: - host: "319" + host: "321" port: 2080874371 livenessProbe: exec: command: - - "292" + - "294" failureThreshold: 1993268896 httpGet: - host: "295" + host: "297" httpHeaders: - - name: "296" - value: "297" - path: "293" - port: "294" + - name: "298" + value: "299" + path: "295" + port: "296" scheme: 頸 initialDelaySeconds: 711020087 periodSeconds: -1965247100 successThreshold: 218453478 tcpSocket: - host: "298" + host: "300" port: 1315054653 timeoutSeconds: 1103049140 - name: "266" + name: "268" ports: - containerPort: -677617960 - hostIP: "272" + hostIP: "274" hostPort: -552281772 - name: "271" + name: "273" protocol: ŕ翑0展} readinessProbe: exec: command: - - "299" + - "301" failureThreshold: -1250314365 httpGet: - host: "302" + host: "304" httpHeaders: - - name: "303" - value: "304" - path: "300" - port: "301" + - name: "305" + value: "306" + path: "302" + port: "303" scheme: 'ƿ頀"冓鍓贯澔 ' initialDelaySeconds: 1058960779 periodSeconds: 472742933 successThreshold: 50696420 tcpSocket: - host: "306" - port: "305" + host: "308" + port: "307" timeoutSeconds: -2133441986 resources: limits: @@ -446,147 +448,147 @@ spec: runAsNonRoot: false runAsUser: 4288903380102217677 seLinuxOptions: - level: "324" - role: "322" - type: "323" - user: "321" + level: "326" + role: "324" + type: "325" + user: "323" windowsOptions: - gmsaCredentialSpec: "326" - gmsaCredentialSpecName: "325" - runAsUserName: "327" + gmsaCredentialSpec: "328" + gmsaCredentialSpecName: "327" + runAsUserName: "329" stdinOnce: true - targetContainerName: "328" - terminationMessagePath: "320" + targetContainerName: "330" + terminationMessagePath: "322" terminationMessagePolicy: 灩聋3趐囨鏻砅邻 tty: true volumeDevices: - - devicePath: "291" - name: "290" + - devicePath: "293" + name: "292" volumeMounts: - - mountPath: "287" + - mountPath: "289" mountPropagation: "" - name: "286" - subPath: "288" - subPathExpr: "289" - workingDir: "270" + name: "288" + subPath: "290" + subPathExpr: "291" + workingDir: "272" hostAliases: - hostnames: - - "390" - ip: "389" + - "392" + ip: "391" hostIPC: true - hostname: "344" + hostname: "346" imagePullSecrets: - - name: "343" + - name: "345" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "650" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "650" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: true envFrom: - configMapRef: - name: "153" + name: "155" optional: true - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: true - image: "146" + image: "148" lifecycle: postStart: exec: command: - - "184" + - "186" httpGet: - host: "187" + host: "189" httpHeaders: - - name: "188" - value: "189" - path: "185" - port: "186" + - name: "190" + value: "191" + path: "187" + port: "188" scheme: £ȹ嫰ƹǔw÷nI粛E煹 tcpSocket: - host: "190" + host: "192" port: 135036402 preStop: exec: command: - - "191" + - "193" httpGet: - host: "193" + host: "195" httpHeaders: - - name: "194" - value: "195" - path: "192" + - name: "196" + value: "197" + path: "194" port: -1188430996 scheme: djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪 tcpSocket: - host: "197" - port: "196" + host: "199" + port: "198" livenessProbe: exec: command: - - "171" + - "173" failureThreshold: -1113628381 httpGet: - host: "173" + host: "175" httpHeaders: - - name: "174" - value: "175" - path: "172" + - name: "176" + value: "177" + path: "174" port: -152585895 scheme: E@Ȗs«ö initialDelaySeconds: 1843758068 periodSeconds: 1702578303 successThreshold: -1565157256 tcpSocket: - host: "176" + host: "178" port: 1135182169 timeoutSeconds: -1967469005 - name: "145" + name: "147" ports: - containerPort: 1403721475 - hostIP: "151" + hostIP: "153" hostPort: -606111218 - name: "150" + name: "152" protocol: ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳 readinessProbe: exec: command: - - "177" + - "179" failureThreshold: -1167888910 httpGet: - host: "179" + host: "181" httpHeaders: - - name: "180" - value: "181" - path: "178" + - name: "182" + value: "183" + path: "180" port: 386652373 scheme: ʙ嫙& initialDelaySeconds: -802585193 periodSeconds: 1944205014 successThreshold: -2079582559 tcpSocket: - host: "183" - port: "182" + host: "185" + port: "184" timeoutSeconds: 1901330124 resources: limits: @@ -607,72 +609,72 @@ spec: runAsNonRoot: false runAsUser: 7739117973959656085 seLinuxOptions: - level: "202" - role: "200" - type: "201" - user: "199" + level: "204" + role: "202" + type: "203" + user: "201" windowsOptions: - gmsaCredentialSpec: "204" - gmsaCredentialSpecName: "203" - runAsUserName: "205" + gmsaCredentialSpec: "206" + gmsaCredentialSpecName: "205" + runAsUserName: "207" stdin: true stdinOnce: true - terminationMessagePath: "198" + terminationMessagePath: "200" terminationMessagePolicy: ɩC volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: "" - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "333" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "335" nodeSelector: - "329": "330" + "331": "332" overhead: tHǽ÷閂抰^窄CǙķȈ: "97" preemptionPolicy: ý筞X priority: -1331113536 - priorityClassName: "391" + priorityClassName: "393" readinessGates: - conditionType: mō6µɑ`ȗ<8^翜 restartPolicy: w妕眵笭/9崍h趭(娕 - runtimeClassName: "396" - schedulerName: "386" + runtimeClassName: "398" + schedulerName: "388" securityContext: fsGroup: 7747616967629081728 runAsGroup: 7461098988156705429 runAsNonRoot: false runAsUser: 4430285638700927057 seLinuxOptions: - level: "337" - role: "335" - type: "336" - user: "334" + level: "339" + role: "337" + type: "338" + user: "336" supplementalGroups: - 7866826580662861268 sysctls: - - name: "341" - value: "342" + - name: "343" + value: "344" windowsOptions: - gmsaCredentialSpec: "339" - gmsaCredentialSpecName: "338" - runAsUserName: "340" - serviceAccount: "332" - serviceAccountName: "331" + gmsaCredentialSpec: "341" + gmsaCredentialSpecName: "340" + runAsUserName: "342" + serviceAccount: "334" + serviceAccountName: "333" shareProcessNamespace: true - subdomain: "345" + subdomain: "347" terminationGracePeriodSeconds: 6245571390016329382 tolerations: - effect: 緍k¢茤 - key: "387" + key: "389" operator: 抄3昞财Î嘝zʄ!ć tolerationSeconds: 4096844323391966153 - value: "388" + value: "390" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -682,215 +684,215 @@ spec: ? zp22o4a-w----11rqy3eo79p-f4r1--7p--053--suu--98.y1s8-j-6j4uvf1-sdg--132bid-7x0u738--7w-tdt-u-0--v/Ied-0-i_zZsY_o8t5Vl6_..7CY-_dc__G6N-_-0o.0C_gV.9_G5 : x_.4dwFbuvEf55Y2k.F-4 maxSkew: 1956797678 - topologyKey: "397" + topologyKey: "399" whenUnsatisfiable: ƀ+瑏eCmAȥ睙 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: 912004803 readOnly: true - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: '|@?鷅bȻN' - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: 榱*Gưoɘ檲 readOnly: true azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 1593906314 items: - - key: "97" + - key: "99" mode: 195263908 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: false volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: 824682619 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 1569992019 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "660" - resource: "90" + resource: "92" emptyDir: medium: Xŋ朘瑥A徙ɶɊł/擇ɦĽ胚O醔ɍ厶耈 sizeLimit: "473" fc: - fsType: "92" + fsType: "94" lun: -1740986684 readOnly: true targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" readOnly: true secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1188153605 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" readOnly: true hostPath: - path: "41" + path: "43" type: ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱< iscsi: chapAuthDiscovery: true - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 994527057 portals: - - "58" + - "60" secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" + fsType: "129" readOnly: true - volumeID: "126" + volumeID: "128" projected: defaultMode: -1334904807 sources: - configMap: items: - - key: "122" + - key: "124" mode: 2063799569 - path: "123" - name: "121" + path: "125" + name: "123" optional: false downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: 173030157 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "106" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: -323584340 - path: "115" - name: "113" + path: "117" + name: "115" optional: true serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: 8357931971650847566 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + name: "132" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 332383000 items: - - key: "50" + - key: "52" mode: -547518679 - path: "51" + path: "53" optional: true - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" status: availableReplicas: -1734448297 collisionCount: 1658632493 conditions: - lastTransitionTime: "2674-07-14T13:22:49Z" lastUpdateTime: "2674-04-10T12:16:26Z" - message: "405" - reason: "404" + message: "407" + reason: "406" status: ZÕW肤  type: ȷ滣ƆƾȊ(XEfê澙凋B/ü observedGeneration: -1249679108465412698 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.json index cc3d48859e4..962342fe7e9 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.json +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -58,49 +59,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "ʬ", "resourceVersion": "7336814125345800857", "generation": -6617020301190572172, "creationTimestamp": null, "deletionGracePeriodSeconds": -152893758082474859, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "ɖgȏ哙ȍȂ揲ȼDDŽLŬp:", "controller": true, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "ƅS·Õüe0ɔȖ脵鴈Ō", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "6NJPM饣`诫z徃鷢6ȥ啕禗Ǐ2啗塧ȱ" }, "emptyDir": { @@ -108,27 +110,27 @@ "sizeLimit": "115" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1499132872 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": -762366823, "readOnly": true }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": -104666658 } ], @@ -136,90 +138,90 @@ "optional": true }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 1655406148, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "readOnly": true, "portals": [ - "58" + "60" ], "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62" + "endpoints": "63", + "path": "64" }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" }, "readOnly": true }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "457" }, "mode": 1235524154 @@ -229,25 +231,25 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": 441887498, - "fsType": "92", + "fsType": "94", "readOnly": true, "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95" + "secretName": "96", + "shareName": "97" }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": -2039036935 } ], @@ -255,40 +257,40 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", + "registry": "105", + "volume": "106", "readOnly": true, - "user": "105", - "group": "106", - "tenant": "107" + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "HǺƶȤ^}穠", - "fsType": "110", + "fsType": "112", "readOnly": true, "kind": "躢" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": -1399063270 } ], @@ -297,14 +299,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "746" }, "mode": 926891073 @@ -312,118 +314,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": -1694464659 } ], "optional": true }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": -7593824971107985079, - "path": "125" + "path": "127" } } ], "defaultMode": -522879476 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127" + "volumeID": "128", + "fsType": "129" }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "readOnly": true, "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": false, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -1896921306, "containerPort": 715087892, "protocol": "倱\u003c", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": false }, "secretRef": { - "name": "154", + "name": "156", "optional": false } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "455" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": true }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": false } } @@ -439,41 +441,41 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "dʪīT捘ɍi縱ù墴1Rƥ", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", - "port": "173", - "host": "174", + "path": "174", + "port": "175", + "host": "176", "scheme": "ƴy綸_Ú8參遼ūPH炮", "httpHeaders": [ { - "name": "175", - "value": "176" + "name": "177", + "value": "178" } ] }, "tcpSocket": { - "port": "177", - "host": "178" + "port": "179", + "host": "180" }, "initialDelaySeconds": 741871873, "timeoutSeconds": 446829537, @@ -484,24 +486,24 @@ "readinessProbe": { "exec": { "command": [ - "179" + "181" ] }, "httpGet": { - "path": "180", + "path": "182", "port": -1903685915, - "host": "181", + "host": "183", "scheme": "ȓƇ$缔獵偐ę腬瓷碑=ɉ鎷卩蝾H韹寬", "httpHeaders": [ { - "name": "182", - "value": "183" + "name": "184", + "value": "185" } ] }, "tcpSocket": { - "port": "184", - "host": "185" + "port": "186", + "host": "187" }, "initialDelaySeconds": 128019484, "timeoutSeconds": 431781335, @@ -513,51 +515,51 @@ "postStart": { "exec": { "command": [ - "186" + "188" ] }, "httpGet": { - "path": "187", - "port": "188", - "host": "189", + "path": "189", + "port": "190", + "host": "191", "scheme": "w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ", "httpHeaders": [ { - "name": "190", - "value": "191" + "name": "192", + "value": "193" } ] }, "tcpSocket": { "port": -337353552, - "host": "192" + "host": "194" } }, "preStop": { "exec": { "command": [ - "193" + "195" ] }, "httpGet": { - "path": "194", + "path": "196", "port": -374922344, - "host": "195", + "host": "197", "scheme": "緄Ú|dk_瀹鞎sn芞", "httpHeaders": [ { - "name": "196", - "value": "197" + "name": "198", + "value": "199" } ] }, "tcpSocket": { "port": 912103005, - "host": "198" + "host": "200" } } }, - "terminationMessagePath": "199", + "terminationMessagePath": "201", "terminationMessagePolicy": "Ȋ+?ƭ峧Y栲茇竛吲蚛", "imagePullPolicy": "\u003cé瞾", "securityContext": { @@ -571,15 +573,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "200", - "role": "201", - "type": "202", - "level": "203" + "user": "202", + "role": "203", + "type": "204", + "level": "205" }, "windowsOptions": { - "gmsaCredentialSpecName": "204", - "gmsaCredentialSpec": "205", - "runAsUserName": "206" + "gmsaCredentialSpecName": "206", + "gmsaCredentialSpec": "207", + "runAsUserName": "208" }, "runAsUser": -3447077152667955293, "runAsGroup": -6457174729896610090, @@ -593,59 +595,59 @@ ], "containers": [ { - "name": "207", - "image": "208", + "name": "209", + "image": "210", "command": [ - "209" + "211" ], "args": [ - "210" + "212" ], - "workingDir": "211", + "workingDir": "213", "ports": [ { - "name": "212", + "name": "214", "hostPort": 1065976533, "containerPort": -820119398, "protocol": "@ùƸʋŀ樺ȃv", - "hostIP": "213" + "hostIP": "215" } ], "envFrom": [ { - "prefix": "214", + "prefix": "216", "configMapRef": { - "name": "215", + "name": "217", "optional": true }, "secretRef": { - "name": "216", + "name": "218", "optional": true } } ], "env": [ { - "name": "217", - "value": "218", + "name": "219", + "value": "220", "valueFrom": { "fieldRef": { - "apiVersion": "219", - "fieldPath": "220" + "apiVersion": "221", + "fieldPath": "222" }, "resourceFieldRef": { - "containerName": "221", - "resource": "222", + "containerName": "223", + "resource": "224", "divisor": "508" }, "configMapKeyRef": { - "name": "223", - "key": "224", + "name": "225", + "key": "226", "optional": false }, "secretKeyRef": { - "name": "225", - "key": "226", + "name": "227", + "key": "228", "optional": true } } @@ -661,41 +663,41 @@ }, "volumeMounts": [ { - "name": "227", + "name": "229", "readOnly": true, - "mountPath": "228", - "subPath": "229", + "mountPath": "230", + "subPath": "231", "mountPropagation": "", - "subPathExpr": "230" + "subPathExpr": "232" } ], "volumeDevices": [ { - "name": "231", - "devicePath": "232" + "name": "233", + "devicePath": "234" } ], "livenessProbe": { "exec": { "command": [ - "233" + "235" ] }, "httpGet": { - "path": "234", - "port": "235", - "host": "236", + "path": "236", + "port": "237", + "host": "238", "scheme": "ȫ焗捏ĨFħ籘Àǒɿʒ刽", "httpHeaders": [ { - "name": "237", - "value": "238" + "name": "239", + "value": "240" } ] }, "tcpSocket": { "port": 1096174794, - "host": "239" + "host": "241" }, "initialDelaySeconds": 1591029717, "timeoutSeconds": 1255169591, @@ -706,24 +708,24 @@ "readinessProbe": { "exec": { "command": [ - "240" + "242" ] }, "httpGet": { - "path": "241", - "port": "242", - "host": "243", + "path": "243", + "port": "244", + "host": "245", "scheme": "ŽoǠŻʘY賃ɪ鐊瀑Ź9Ǖ", "httpHeaders": [ { - "name": "244", - "value": "245" + "name": "246", + "value": "247" } ] }, "tcpSocket": { - "port": "246", - "host": "247" + "port": "248", + "host": "249" }, "initialDelaySeconds": -394397948, "timeoutSeconds": 2040455355, @@ -735,51 +737,51 @@ "postStart": { "exec": { "command": [ - "248" + "250" ] }, "httpGet": { - "path": "249", - "port": "250", - "host": "251", + "path": "251", + "port": "252", + "host": "253", "scheme": "Ƹ[Ęİ榌U髷裎$MVȟ@7", "httpHeaders": [ { - "name": "252", - "value": "253" + "name": "254", + "value": "255" } ] }, "tcpSocket": { - "port": "254", - "host": "255" + "port": "256", + "host": "257" } }, "preStop": { "exec": { "command": [ - "256" + "258" ] }, "httpGet": { - "path": "257", + "path": "259", "port": -1675041613, - "host": "258", + "host": "260", "scheme": "揆ɘȌ脾嚏吐", "httpHeaders": [ { - "name": "259", - "value": "260" + "name": "261", + "value": "262" } ] }, "tcpSocket": { "port": -194343002, - "host": "261" + "host": "263" } } }, - "terminationMessagePath": "262", + "terminationMessagePath": "264", "terminationMessagePolicy": "Ȥ藠3.", "imagePullPolicy": "t莭琽§ć\\ ïì", "securityContext": { @@ -793,15 +795,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "263", - "role": "264", - "type": "265", - "level": "266" + "user": "265", + "role": "266", + "type": "267", + "level": "268" }, "windowsOptions": { - "gmsaCredentialSpecName": "267", - "gmsaCredentialSpec": "268", - "runAsUserName": "269" + "gmsaCredentialSpecName": "269", + "gmsaCredentialSpec": "270", + "runAsUserName": "271" }, "runAsUser": -2142888785755371163, "runAsGroup": -2879304435996142911, @@ -815,58 +817,58 @@ ], "ephemeralContainers": [ { - "name": "270", - "image": "271", + "name": "272", + "image": "273", "command": [ - "272" + "274" ], "args": [ - "273" + "275" ], - "workingDir": "274", + "workingDir": "276", "ports": [ { - "name": "275", + "name": "277", "hostPort": -1740959124, "containerPort": 158280212, - "hostIP": "276" + "hostIP": "278" } ], "envFrom": [ { - "prefix": "277", + "prefix": "279", "configMapRef": { - "name": "278", + "name": "280", "optional": true }, "secretRef": { - "name": "279", + "name": "281", "optional": true } } ], "env": [ { - "name": "280", - "value": "281", + "name": "282", + "value": "283", "valueFrom": { "fieldRef": { - "apiVersion": "282", - "fieldPath": "283" + "apiVersion": "284", + "fieldPath": "285" }, "resourceFieldRef": { - "containerName": "284", - "resource": "285", + "containerName": "286", + "resource": "287", "divisor": "985" }, "configMapKeyRef": { - "name": "286", - "key": "287", + "name": "288", + "key": "289", "optional": false }, "secretKeyRef": { - "name": "288", - "key": "289", + "name": "290", + "key": "291", "optional": false } } @@ -882,40 +884,40 @@ }, "volumeMounts": [ { - "name": "290", - "mountPath": "291", - "subPath": "292", + "name": "292", + "mountPath": "293", + "subPath": "294", "mountPropagation": "啛更", - "subPathExpr": "293" + "subPathExpr": "295" } ], "volumeDevices": [ { - "name": "294", - "devicePath": "295" + "name": "296", + "devicePath": "297" } ], "livenessProbe": { "exec": { "command": [ - "296" + "298" ] }, "httpGet": { - "path": "297", - "port": "298", - "host": "299", + "path": "299", + "port": "300", + "host": "301", "scheme": "Ů+朷Ǝ膯ljVX1虊", "httpHeaders": [ { - "name": "300", - "value": "301" + "name": "302", + "value": "303" } ] }, "tcpSocket": { "port": -979584143, - "host": "302" + "host": "304" }, "initialDelaySeconds": -1748648882, "timeoutSeconds": -239843014, @@ -926,24 +928,24 @@ "readinessProbe": { "exec": { "command": [ - "303" + "305" ] }, "httpGet": { - "path": "304", - "port": "305", - "host": "306", + "path": "306", + "port": "307", + "host": "308", "scheme": "铿ʩȂ4ē鐭#嬀ơŸ8T", "httpHeaders": [ { - "name": "307", - "value": "308" + "name": "309", + "value": "310" } ] }, "tcpSocket": { - "port": "309", - "host": "310" + "port": "311", + "host": "312" }, "initialDelaySeconds": 37514563, "timeoutSeconds": -1871050070, @@ -955,51 +957,51 @@ "postStart": { "exec": { "command": [ - "311" + "313" ] }, "httpGet": { - "path": "312", - "port": "313", - "host": "314", + "path": "314", + "port": "315", + "host": "316", "scheme": "绤fʀļ腩墺Ò媁荭g", "httpHeaders": [ { - "name": "315", - "value": "316" + "name": "317", + "value": "318" } ] }, "tcpSocket": { - "port": "317", - "host": "318" + "port": "319", + "host": "320" } }, "preStop": { "exec": { "command": [ - "319" + "321" ] }, "httpGet": { - "path": "320", + "path": "322", "port": -2133054549, - "host": "321", + "host": "323", "scheme": "遰=E", "httpHeaders": [ { - "name": "322", - "value": "323" + "name": "324", + "value": "325" } ] }, "tcpSocket": { - "port": "324", - "host": "325" + "port": "326", + "host": "327" } } }, - "terminationMessagePath": "326", + "terminationMessagePath": "328", "terminationMessagePolicy": "朦 wƯ貾坢'跩", "imagePullPolicy": "簳°Ļǟi\u0026皥贸", "securityContext": { @@ -1013,15 +1015,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "327", - "role": "328", - "type": "329", - "level": "330" + "user": "329", + "role": "330", + "type": "331", + "level": "332" }, "windowsOptions": { - "gmsaCredentialSpecName": "331", - "gmsaCredentialSpec": "332", - "runAsUserName": "333" + "gmsaCredentialSpecName": "333", + "gmsaCredentialSpec": "334", + "runAsUserName": "335" }, "runAsUser": 7933506142593743951, "runAsGroup": -8521633679555431923, @@ -1033,7 +1035,7 @@ "stdin": true, "stdinOnce": true, "tty": true, - "targetContainerName": "334" + "targetContainerName": "336" } ], "restartPolicy": "ȱğ_\u003cǬëJ橈'琕鶫:顇ə", @@ -1041,26 +1043,26 @@ "activeDeadlineSeconds": -499179336506637450, "dnsPolicy": "ɐ鰥", "nodeSelector": { - "335": "336" + "337": "338" }, - "serviceAccountName": "337", - "serviceAccount": "338", + "serviceAccountName": "339", + "serviceAccount": "340", "automountServiceAccountToken": true, - "nodeName": "339", + "nodeName": "341", "hostNetwork": true, "hostPID": true, "shareProcessNamespace": false, "securityContext": { "seLinuxOptions": { - "user": "340", - "role": "341", - "type": "342", - "level": "343" + "user": "342", + "role": "343", + "type": "344", + "level": "345" }, "windowsOptions": { - "gmsaCredentialSpecName": "344", - "gmsaCredentialSpec": "345", - "runAsUserName": "346" + "gmsaCredentialSpecName": "346", + "gmsaCredentialSpec": "347", + "runAsUserName": "348" }, "runAsUser": 3634773701753283428, "runAsGroup": -3042614092601658792, @@ -1071,18 +1073,18 @@ "fsGroup": -1778638259613624198, "sysctls": [ { - "name": "347", - "value": "348" + "name": "349", + "value": "350" } ] }, "imagePullSecrets": [ { - "name": "349" + "name": "351" } ], - "hostname": "350", - "subdomain": "351", + "hostname": "352", + "subdomain": "353", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1090,19 +1092,19 @@ { "matchExpressions": [ { - "key": "352", + "key": "354", "operator": "h亏yƕ丆録²Ŏ)/灩聋3趐囨鏻砅邻", "values": [ - "353" + "355" ] } ], "matchFields": [ { - "key": "354", + "key": "356", "operator": "C\"6x$1s", "values": [ - "355" + "357" ] } ] @@ -1115,19 +1117,19 @@ "preference": { "matchExpressions": [ { - "key": "356", + "key": "358", "operator": "鋄5弢ȹ均", "values": [ - "357" + "359" ] } ], "matchFields": [ { - "key": "358", + "key": "360", "operator": "SvEȤƏ埮p", "values": [ - "359" + "361" ] } ] @@ -1150,9 +1152,9 @@ ] }, "namespaces": [ - "366" + "368" ], - "topologyKey": "367" + "topologyKey": "369" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1174,9 +1176,9 @@ ] }, "namespaces": [ - "374" + "376" ], - "topologyKey": "375" + "topologyKey": "377" } } ] @@ -1199,9 +1201,9 @@ ] }, "namespaces": [ - "382" + "384" ], - "topologyKey": "383" + "topologyKey": "385" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1220,45 +1222,45 @@ ] }, "namespaces": [ - "390" + "392" ], - "topologyKey": "391" + "topologyKey": "393" } } ] } }, - "schedulerName": "392", + "schedulerName": "394", "tolerations": [ { - "key": "393", + "key": "395", "operator": "[L", - "value": "394", + "value": "396", "effect": "Ġ滔xvŗÑ\"虆k遚釾ʼn{朣Jɩɼ", "tolerationSeconds": 4456040724914385859 } ], "hostAliases": [ { - "ip": "395", + "ip": "397", "hostnames": [ - "396" + "398" ] } ], - "priorityClassName": "397", + "priorityClassName": "399", "priority": -1576968453, "dnsConfig": { "nameservers": [ - "398" + "400" ], "searches": [ - "399" + "401" ], "options": [ { - "name": "400", - "value": "401" + "name": "402", + "value": "403" } ] }, @@ -1267,7 +1269,7 @@ "conditionType": "v" } ], - "runtimeClassName": "402", + "runtimeClassName": "404", "enableServiceLinks": false, "preemptionPolicy": "忖p様", "overhead": { @@ -1276,7 +1278,7 @@ "topologySpreadConstraints": [ { "maxSkew": -782776982, - "topologyKey": "403", + "topologyKey": "405", "whenUnsatisfiable": "鈀", "labelSelector": { "matchLabels": { @@ -1305,8 +1307,8 @@ "type": "", "status": "'ƈoIǢ龞瞯å", "lastTransitionTime": "2469-07-10T03:20:34Z", - "reason": "410", - "message": "411" + "reason": "412", + "message": "413" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.pb index 03f357d4a88..962e311e8a2 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.yaml index de5514c4d05..4e0cf655b94 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.ReplicaSet.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -42,31 +43,32 @@ spec: template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: -152893758082474859 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -6617020301190572172 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: ƅS·Õüe0ɔȖ脵鴈Ō - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: true - kind: "34" - name: "35" + kind: "35" + name: "36" uid: 'ɖgȏ哙ȍȂ揲ȼDDŽLŬp:' resourceVersion: "7336814125345800857" - selfLink: "27" + selfLink: "28" uid: ʬ spec: activeDeadlineSeconds: -499179336506637450 @@ -75,28 +77,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "356" + - key: "358" operator: 鋄5弢ȹ均 values: - - "357" + - "359" matchFields: - - key: "358" + - key: "360" operator: SvEȤƏ埮p values: - - "359" + - "361" weight: -1292310438 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "352" + - key: "354" operator: h亏yƕ丆録²Ŏ)/灩聋3趐囨鏻砅邻 values: - - "353" + - "355" matchFields: - - key: "354" + - key: "356" operator: C"6x$1s values: - - "355" + - "357" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -109,8 +111,8 @@ spec: matchLabels: 1/dCv3j._.-_pP__up.2L_s-o7: k-5___-Qq..csh-3--Z1Tvw3F namespaces: - - "374" - topologyKey: "375" + - "376" + topologyKey: "377" weight: -531787516 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -120,8 +122,8 @@ spec: matchLabels: o.6GA2C: s.Nj-s namespaces: - - "366" - topologyKey: "367" + - "368" + topologyKey: "369" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -132,8 +134,8 @@ spec: matchLabels: t-u-4----q-x3w3dn5-1rhm-5y--z---69o-9-69mxv17r--32b-----4-67t.qk5--f4e4--r1k278l-d-8o1-x-1wl-r/a6Sp_N-S..O-BZ..6-1.b: L_gw_-z6 namespaces: - - "390" - topologyKey: "391" + - "392" + topologyKey: "393" weight: -1139477828 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -145,120 +147,120 @@ spec: matchLabels: 4.B.__6m: J1-1.9_.-.Ms7_tP namespaces: - - "382" - topologyKey: "383" + - "384" + topologyKey: "385" automountServiceAccountToken: true containers: - args: - - "210" + - "212" command: - - "209" + - "211" env: - - name: "217" - value: "218" + - name: "219" + value: "220" valueFrom: configMapKeyRef: - key: "224" - name: "223" - optional: false - fieldRef: - apiVersion: "219" - fieldPath: "220" - resourceFieldRef: - containerName: "221" - divisor: "508" - resource: "222" - secretKeyRef: key: "226" name: "225" + optional: false + fieldRef: + apiVersion: "221" + fieldPath: "222" + resourceFieldRef: + containerName: "223" + divisor: "508" + resource: "224" + secretKeyRef: + key: "228" + name: "227" optional: true envFrom: - configMapRef: - name: "215" + name: "217" optional: true - prefix: "214" + prefix: "216" secretRef: - name: "216" + name: "218" optional: true - image: "208" + image: "210" imagePullPolicy: t莭琽§ć\ ïì lifecycle: postStart: exec: command: - - "248" + - "250" httpGet: - host: "251" + host: "253" httpHeaders: - - name: "252" - value: "253" - path: "249" - port: "250" + - name: "254" + value: "255" + path: "251" + port: "252" scheme: Ƹ[Ęİ榌U髷裎$MVȟ@7 tcpSocket: - host: "255" - port: "254" + host: "257" + port: "256" preStop: exec: command: - - "256" + - "258" httpGet: - host: "258" + host: "260" httpHeaders: - - name: "259" - value: "260" - path: "257" + - name: "261" + value: "262" + path: "259" port: -1675041613 scheme: 揆ɘȌ脾嚏吐 tcpSocket: - host: "261" + host: "263" port: -194343002 livenessProbe: exec: command: - - "233" + - "235" failureThreshold: 817152661 httpGet: - host: "236" + host: "238" httpHeaders: - - name: "237" - value: "238" - path: "234" - port: "235" + - name: "239" + value: "240" + path: "236" + port: "237" scheme: ȫ焗捏ĨFħ籘Àǒɿʒ刽 initialDelaySeconds: 1591029717 periodSeconds: 622473257 successThreshold: -966649167 tcpSocket: - host: "239" + host: "241" port: 1096174794 timeoutSeconds: 1255169591 - name: "207" + name: "209" ports: - containerPort: -820119398 - hostIP: "213" + hostIP: "215" hostPort: 1065976533 - name: "212" + name: "214" protocol: '@ùƸʋŀ樺ȃv' readinessProbe: exec: command: - - "240" + - "242" failureThreshold: 1214895765 httpGet: - host: "243" + host: "245" httpHeaders: - - name: "244" - value: "245" - path: "241" - port: "242" + - name: "246" + value: "247" + path: "243" + port: "244" scheme: ŽoǠŻʘY賃ɪ鐊瀑Ź9Ǖ initialDelaySeconds: -394397948 periodSeconds: 1505972335 successThreshold: -26910286 tcpSocket: - host: "247" - port: "246" + host: "249" + port: "248" timeoutSeconds: 2040455355 resources: limits: @@ -279,148 +281,148 @@ spec: runAsNonRoot: false runAsUser: -2142888785755371163 seLinuxOptions: - level: "266" - role: "264" - type: "265" - user: "263" + level: "268" + role: "266" + type: "267" + user: "265" windowsOptions: - gmsaCredentialSpec: "268" - gmsaCredentialSpecName: "267" - runAsUserName: "269" + gmsaCredentialSpec: "270" + gmsaCredentialSpecName: "269" + runAsUserName: "271" stdin: true - terminationMessagePath: "262" + terminationMessagePath: "264" terminationMessagePolicy: Ȥ藠3. volumeDevices: - - devicePath: "232" - name: "231" + - devicePath: "234" + name: "233" volumeMounts: - - mountPath: "228" + - mountPath: "230" mountPropagation: "" - name: "227" + name: "229" readOnly: true - subPath: "229" - subPathExpr: "230" - workingDir: "211" + subPath: "231" + subPathExpr: "232" + workingDir: "213" dnsConfig: nameservers: - - "398" + - "400" options: - - name: "400" - value: "401" + - name: "402" + value: "403" searches: - - "399" + - "401" dnsPolicy: ɐ鰥 enableServiceLinks: false ephemeralContainers: - args: - - "273" + - "275" command: - - "272" + - "274" env: - - name: "280" - value: "281" + - name: "282" + value: "283" valueFrom: configMapKeyRef: - key: "287" - name: "286" - optional: false - fieldRef: - apiVersion: "282" - fieldPath: "283" - resourceFieldRef: - containerName: "284" - divisor: "985" - resource: "285" - secretKeyRef: key: "289" name: "288" optional: false + fieldRef: + apiVersion: "284" + fieldPath: "285" + resourceFieldRef: + containerName: "286" + divisor: "985" + resource: "287" + secretKeyRef: + key: "291" + name: "290" + optional: false envFrom: - configMapRef: - name: "278" + name: "280" optional: true - prefix: "277" + prefix: "279" secretRef: - name: "279" + name: "281" optional: true - image: "271" + image: "273" imagePullPolicy: 簳°Ļǟi&皥贸 lifecycle: postStart: exec: command: - - "311" + - "313" httpGet: - host: "314" + host: "316" httpHeaders: - - name: "315" - value: "316" - path: "312" - port: "313" + - name: "317" + value: "318" + path: "314" + port: "315" scheme: 绤fʀļ腩墺Ò媁荭g tcpSocket: - host: "318" - port: "317" + host: "320" + port: "319" preStop: exec: command: - - "319" + - "321" httpGet: - host: "321" + host: "323" httpHeaders: - - name: "322" - value: "323" - path: "320" + - name: "324" + value: "325" + path: "322" port: -2133054549 scheme: 遰=E tcpSocket: - host: "325" - port: "324" + host: "327" + port: "326" livenessProbe: exec: command: - - "296" + - "298" failureThreshold: -1538905728 httpGet: - host: "299" + host: "301" httpHeaders: - - name: "300" - value: "301" - path: "297" - port: "298" + - name: "302" + value: "303" + path: "299" + port: "300" scheme: Ů+朷Ǝ膯ljVX1虊 initialDelaySeconds: -1748648882 periodSeconds: 1381579966 successThreshold: -1418092595 tcpSocket: - host: "302" + host: "304" port: -979584143 timeoutSeconds: -239843014 - name: "270" + name: "272" ports: - containerPort: 158280212 - hostIP: "276" + hostIP: "278" hostPort: -1740959124 - name: "275" + name: "277" readinessProbe: exec: command: - - "303" + - "305" failureThreshold: 522560228 httpGet: - host: "306" + host: "308" httpHeaders: - - name: "307" - value: "308" - path: "304" - port: "305" + - name: "309" + value: "310" + path: "306" + port: "307" scheme: 铿ʩȂ4ē鐭#嬀ơŸ8T initialDelaySeconds: 37514563 periodSeconds: 474715842 successThreshold: -1620315711 tcpSocket: - host: "310" - port: "309" + host: "312" + port: "311" timeoutSeconds: -1871050070 resources: limits: @@ -441,150 +443,150 @@ spec: runAsNonRoot: true runAsUser: 7933506142593743951 seLinuxOptions: - level: "330" - role: "328" - type: "329" - user: "327" + level: "332" + role: "330" + type: "331" + user: "329" windowsOptions: - gmsaCredentialSpec: "332" - gmsaCredentialSpecName: "331" - runAsUserName: "333" + gmsaCredentialSpec: "334" + gmsaCredentialSpecName: "333" + runAsUserName: "335" stdin: true stdinOnce: true - targetContainerName: "334" - terminationMessagePath: "326" + targetContainerName: "336" + terminationMessagePath: "328" terminationMessagePolicy: 朦 wƯ貾坢'跩 tty: true volumeDevices: - - devicePath: "295" - name: "294" + - devicePath: "297" + name: "296" volumeMounts: - - mountPath: "291" + - mountPath: "293" mountPropagation: 啛更 - name: "290" - subPath: "292" - subPathExpr: "293" - workingDir: "274" + name: "292" + subPath: "294" + subPathExpr: "295" + workingDir: "276" hostAliases: - hostnames: - - "396" - ip: "395" + - "398" + ip: "397" hostNetwork: true hostPID: true - hostname: "350" + hostname: "352" imagePullSecrets: - - name: "349" + - name: "351" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: true - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "455" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: true + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "455" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: false envFrom: - configMapRef: - name: "153" + name: "155" optional: false - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: false - image: "146" + image: "148" imagePullPolicy: <é瞾 lifecycle: postStart: exec: command: - - "186" + - "188" httpGet: - host: "189" + host: "191" httpHeaders: - - name: "190" - value: "191" - path: "187" - port: "188" + - name: "192" + value: "193" + path: "189" + port: "190" scheme: w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ tcpSocket: - host: "192" + host: "194" port: -337353552 preStop: exec: command: - - "193" + - "195" httpGet: - host: "195" + host: "197" httpHeaders: - - name: "196" - value: "197" - path: "194" + - name: "198" + value: "199" + path: "196" port: -374922344 scheme: 緄Ú|dk_瀹鞎sn芞 tcpSocket: - host: "198" + host: "200" port: 912103005 livenessProbe: exec: command: - - "171" + - "173" failureThreshold: 2053960192 httpGet: - host: "174" + host: "176" httpHeaders: - - name: "175" - value: "176" - path: "172" - port: "173" + - name: "177" + value: "178" + path: "174" + port: "175" scheme: ƴy綸_Ú8參遼ūPH炮 initialDelaySeconds: 741871873 periodSeconds: -1987044888 successThreshold: -1638339389 tcpSocket: - host: "178" - port: "177" + host: "180" + port: "179" timeoutSeconds: 446829537 - name: "145" + name: "147" ports: - containerPort: 715087892 - hostIP: "151" + hostIP: "153" hostPort: -1896921306 - name: "150" + name: "152" protocol: 倱< readinessProbe: exec: command: - - "179" + - "181" failureThreshold: -57352147 httpGet: - host: "181" + host: "183" httpHeaders: - - name: "182" - value: "183" - path: "180" + - name: "184" + value: "185" + path: "182" port: -1903685915 scheme: ȓƇ$缔獵偐ę腬瓷碑=ɉ鎷卩蝾H韹寬 initialDelaySeconds: 128019484 periodSeconds: -2130554644 successThreshold: 290736426 tcpSocket: - host: "185" - port: "184" + host: "187" + port: "186" timeoutSeconds: 431781335 resources: limits: @@ -605,71 +607,71 @@ spec: runAsNonRoot: true runAsUser: -3447077152667955293 seLinuxOptions: - level: "203" - role: "201" - type: "202" - user: "200" + level: "205" + role: "203" + type: "204" + user: "202" windowsOptions: - gmsaCredentialSpec: "205" - gmsaCredentialSpecName: "204" - runAsUserName: "206" + gmsaCredentialSpec: "207" + gmsaCredentialSpecName: "206" + runAsUserName: "208" stdinOnce: true - terminationMessagePath: "199" + terminationMessagePath: "201" terminationMessagePolicy: Ȋ+?ƭ峧Y栲茇竛吲蚛 volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: dʪīT捘ɍi縱ù墴1Rƥ - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "339" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "341" nodeSelector: - "335": "336" + "337": "338" overhead: U凮: "684" preemptionPolicy: 忖p様 priority: -1576968453 - priorityClassName: "397" + priorityClassName: "399" readinessGates: - conditionType: v restartPolicy: ȱğ_<ǬëJ橈'琕鶫:顇ə - runtimeClassName: "402" - schedulerName: "392" + runtimeClassName: "404" + schedulerName: "394" securityContext: fsGroup: -1778638259613624198 runAsGroup: -3042614092601658792 runAsNonRoot: false runAsUser: 3634773701753283428 seLinuxOptions: - level: "343" - role: "341" - type: "342" - user: "340" + level: "345" + role: "343" + type: "344" + user: "342" supplementalGroups: - -2125560879532395341 sysctls: - - name: "347" - value: "348" + - name: "349" + value: "350" windowsOptions: - gmsaCredentialSpec: "345" - gmsaCredentialSpecName: "344" - runAsUserName: "346" - serviceAccount: "338" - serviceAccountName: "337" + gmsaCredentialSpec: "347" + gmsaCredentialSpecName: "346" + runAsUserName: "348" + serviceAccount: "340" + serviceAccountName: "339" shareProcessNamespace: false - subdomain: "351" + subdomain: "353" terminationGracePeriodSeconds: 5620818514944490121 tolerations: - effect: Ġ滔xvŗÑ"虆k遚釾ʼn{朣Jɩɼ - key: "393" + key: "395" operator: '[L' tolerationSeconds: 4456040724914385859 - value: "394" + value: "396" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -679,212 +681,212 @@ spec: ? nw0-3i--a7-2--o--u0038mp9c10-k-r---3g7nz4-------385h---0-u73pj.brgvf3q-z-5z80n--t5--9-4-d2-22--i--40wv--in-870w--itk/kCpS__.39g_.--_-_ve5.m_2_--XZ-x.__.Y_2-n_5023Xl-3Pw_-r75--_A : BM.6-.Y_72-_--p7 maxSkew: -782776982 - topologyKey: "403" + topologyKey: "405" whenUnsatisfiable: 鈀 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: -762366823 readOnly: true - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: HǺƶȤ^}穠 - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: 躢 readOnly: true azureFile: - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: -460478410 items: - - key: "97" + - key: "99" mode: -2039036935 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: false volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: -106644772 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 1235524154 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "457" - resource: "90" + resource: "92" emptyDir: medium: 彭聡A3fƻfʣ sizeLimit: "115" fc: - fsType: "92" + fsType: "94" lun: 441887498 readOnly: true targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1499132872 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" hostPath: - path: "41" + path: "43" type: 6NJPM饣`诫z徃鷢6ȥ啕禗Ǐ2啗塧ȱ iscsi: - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 1655406148 portals: - - "58" + - "60" readOnly: true secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" - volumeID: "126" + fsType: "129" + volumeID: "128" projected: defaultMode: -522879476 sources: - configMap: items: - - key: "122" + - key: "124" mode: -1694464659 - path: "123" - name: "121" + path: "125" + name: "123" optional: true downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: 926891073 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "746" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: -1399063270 - path: "115" - name: "113" + path: "117" + name: "115" optional: true serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: -7593824971107985079 - path: "125" + path: "127" quobyte: - group: "106" + group: "108" readOnly: true - registry: "103" - tenant: "107" - user: "105" - volume: "104" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" readOnly: true secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + name: "132" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 372704313 items: - - key: "50" + - key: "52" mode: -104666658 - path: "51" + path: "53" optional: true - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" readOnly: true secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" status: availableReplicas: 740158871 conditions: - lastTransitionTime: "2469-07-10T03:20:34Z" - message: "411" - reason: "410" + message: "413" + reason: "412" status: '''ƈoIǢ龞瞯å' type: "" fullyLabeledReplicas: -929473748 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.json index 56f7d45382e..ea1b66e1833 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.json +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -54,49 +55,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "?Qȫş", "resourceVersion": "1736621709629422270", "generation": -8542870036622468681, "creationTimestamp": null, "deletionGracePeriodSeconds": -2575298329142810753, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "ƶȤ^}", "controller": true, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "躢", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱\u003c" }, "emptyDir": { @@ -104,27 +106,27 @@ "sizeLimit": "473" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1188153605 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": 912004803, "readOnly": true }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": -547518679 } ], @@ -132,91 +134,91 @@ "optional": true }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 994527057, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "portals": [ - "58" + "60" ], "chapAuthDiscovery": true, "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62", + "endpoints": "63", + "path": "64", "readOnly": true }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" } }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "readOnly": true, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "660" }, "mode": 1569992019 @@ -226,26 +228,26 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": -1740986684, - "fsType": "92", + "fsType": "94", "readOnly": true, "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95", + "secretName": "96", + "shareName": "97", "readOnly": true }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": 195263908 } ], @@ -253,39 +255,39 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", - "user": "105", - "group": "106", - "tenant": "107" + "registry": "105", + "volume": "106", + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "|@?鷅bȻN", - "fsType": "110", + "fsType": "112", "readOnly": true, "kind": "榱*Gưoɘ檲" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": -323584340 } ], @@ -294,14 +296,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "106" }, "mode": 173030157 @@ -309,118 +311,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": 2063799569 } ], "optional": false }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": 8357931971650847566, - "path": "125" + "path": "127" } } ], "defaultMode": -1334904807 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127", + "volumeID": "128", + "fsType": "129", "readOnly": true }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": false, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -606111218, "containerPort": 1403721475, "protocol": "ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": true }, "secretRef": { - "name": "154", + "name": "156", "optional": true } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "650" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": false }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": true } } @@ -436,41 +438,41 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", + "path": "174", "port": -152585895, - "host": "173", + "host": "175", "scheme": "E@Ȗs«ö", "httpHeaders": [ { - "name": "174", - "value": "175" + "name": "176", + "value": "177" } ] }, "tcpSocket": { "port": 1135182169, - "host": "176" + "host": "178" }, "initialDelaySeconds": 1843758068, "timeoutSeconds": -1967469005, @@ -481,24 +483,24 @@ "readinessProbe": { "exec": { "command": [ - "177" + "179" ] }, "httpGet": { - "path": "178", + "path": "180", "port": 386652373, - "host": "179", + "host": "181", "scheme": "ʙ嫙\u0026", "httpHeaders": [ { - "name": "180", - "value": "181" + "name": "182", + "value": "183" } ] }, "tcpSocket": { - "port": "182", - "host": "183" + "port": "184", + "host": "185" }, "initialDelaySeconds": -802585193, "timeoutSeconds": 1901330124, @@ -510,51 +512,51 @@ "postStart": { "exec": { "command": [ - "184" + "186" ] }, "httpGet": { - "path": "185", - "port": "186", - "host": "187", + "path": "187", + "port": "188", + "host": "189", "scheme": "£ȹ嫰ƹǔw÷nI粛E煹", "httpHeaders": [ { - "name": "188", - "value": "189" + "name": "190", + "value": "191" } ] }, "tcpSocket": { "port": 135036402, - "host": "190" + "host": "192" } }, "preStop": { "exec": { "command": [ - "191" + "193" ] }, "httpGet": { - "path": "192", + "path": "194", "port": -1188430996, - "host": "193", + "host": "195", "scheme": "djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪", "httpHeaders": [ { - "name": "194", - "value": "195" + "name": "196", + "value": "197" } ] }, "tcpSocket": { - "port": "196", - "host": "197" + "port": "198", + "host": "199" } } }, - "terminationMessagePath": "198", + "terminationMessagePath": "200", "terminationMessagePolicy": "ɩC", "securityContext": { "capabilities": { @@ -567,15 +569,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "199", - "role": "200", - "type": "201", - "level": "202" + "user": "201", + "role": "202", + "type": "203", + "level": "204" }, "windowsOptions": { - "gmsaCredentialSpecName": "203", - "gmsaCredentialSpec": "204", - "runAsUserName": "205" + "gmsaCredentialSpecName": "205", + "gmsaCredentialSpec": "206", + "runAsUserName": "207" }, "runAsUser": 7739117973959656085, "runAsGroup": 3747003978559617838, @@ -590,59 +592,59 @@ ], "containers": [ { - "name": "206", - "image": "207", + "name": "208", + "image": "209", "command": [ - "208" + "210" ], "args": [ - "209" + "211" ], - "workingDir": "210", + "workingDir": "212", "ports": [ { - "name": "211", + "name": "213", "hostPort": 474119379, "containerPort": 1923334396, "protocol": "旿@掇lNdǂ\u003e5姣\u003e懔%熷谟þ", - "hostIP": "212" + "hostIP": "214" } ], "envFrom": [ { - "prefix": "213", + "prefix": "215", "configMapRef": { - "name": "214", + "name": "216", "optional": false }, "secretRef": { - "name": "215", + "name": "217", "optional": true } } ], "env": [ { - "name": "216", - "value": "217", + "name": "218", + "value": "219", "valueFrom": { "fieldRef": { - "apiVersion": "218", - "fieldPath": "219" + "apiVersion": "220", + "fieldPath": "221" }, "resourceFieldRef": { - "containerName": "220", - "resource": "221", + "containerName": "222", + "resource": "223", "divisor": "771" }, "configMapKeyRef": { - "name": "222", - "key": "223", + "name": "224", + "key": "225", "optional": false }, "secretKeyRef": { - "name": "224", - "key": "225", + "name": "226", + "key": "227", "optional": true } } @@ -658,41 +660,41 @@ }, "volumeMounts": [ { - "name": "226", + "name": "228", "readOnly": true, - "mountPath": "227", - "subPath": "228", + "mountPath": "229", + "subPath": "230", "mountPropagation": "0矀Kʝ瘴I\\p[ħsĨɆâĺɗŹ倗S", - "subPathExpr": "229" + "subPathExpr": "231" } ], "volumeDevices": [ { - "name": "230", - "devicePath": "231" + "name": "232", + "devicePath": "233" } ], "livenessProbe": { "exec": { "command": [ - "232" + "234" ] }, "httpGet": { - "path": "233", + "path": "235", "port": -1285424066, - "host": "234", + "host": "236", "scheme": "ni酛3ƁÀ", "httpHeaders": [ { - "name": "235", - "value": "236" + "name": "237", + "value": "238" } ] }, "tcpSocket": { - "port": "237", - "host": "238" + "port": "239", + "host": "240" }, "initialDelaySeconds": -2036074491, "timeoutSeconds": -148216266, @@ -703,24 +705,24 @@ "readinessProbe": { "exec": { "command": [ - "239" + "241" ] }, "httpGet": { - "path": "240", - "port": "241", - "host": "242", + "path": "242", + "port": "243", + "host": "244", "scheme": "3!Zɾģ毋Ó6", "httpHeaders": [ { - "name": "243", - "value": "244" + "name": "245", + "value": "246" } ] }, "tcpSocket": { "port": -832805508, - "host": "245" + "host": "247" }, "initialDelaySeconds": -228822833, "timeoutSeconds": -970312425, @@ -732,51 +734,51 @@ "postStart": { "exec": { "command": [ - "246" + "248" ] }, "httpGet": { - "path": "247", + "path": "249", "port": -2013568185, - "host": "248", + "host": "250", "scheme": "#yV'WKw(ğ儴Ůĺ}", "httpHeaders": [ { - "name": "249", - "value": "250" + "name": "251", + "value": "252" } ] }, "tcpSocket": { "port": -20130017, - "host": "251" + "host": "253" } }, "preStop": { "exec": { "command": [ - "252" + "254" ] }, "httpGet": { - "path": "253", + "path": "255", "port": -661937776, - "host": "254", + "host": "256", "scheme": "ØœȠƬQg鄠[颐o", "httpHeaders": [ { - "name": "255", - "value": "256" + "name": "257", + "value": "258" } ] }, "tcpSocket": { "port": 461585849, - "host": "257" + "host": "259" } } }, - "terminationMessagePath": "258", + "terminationMessagePath": "260", "terminationMessagePolicy": "ɇ卷荙JLĹ]佱¿\u003e犵殇ŕ-Ɂ", "imagePullPolicy": "ƙt叀碧闳ȩr嚧ʣq埄趛屡", "securityContext": { @@ -790,15 +792,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "259", - "role": "260", - "type": "261", - "level": "262" + "user": "261", + "role": "262", + "type": "263", + "level": "264" }, "windowsOptions": { - "gmsaCredentialSpecName": "263", - "gmsaCredentialSpec": "264", - "runAsUserName": "265" + "gmsaCredentialSpecName": "265", + "gmsaCredentialSpec": "266", + "runAsUserName": "267" }, "runAsUser": -5835415947553716289, "runAsGroup": 2540215688947167763, @@ -812,59 +814,59 @@ ], "ephemeralContainers": [ { - "name": "266", - "image": "267", + "name": "268", + "image": "269", "command": [ - "268" + "270" ], "args": [ - "269" + "271" ], - "workingDir": "270", + "workingDir": "272", "ports": [ { - "name": "271", + "name": "273", "hostPort": -552281772, "containerPort": -677617960, "protocol": "ŕ翑0展}", - "hostIP": "272" + "hostIP": "274" } ], "envFrom": [ { - "prefix": "273", + "prefix": "275", "configMapRef": { - "name": "274", + "name": "276", "optional": false }, "secretRef": { - "name": "275", + "name": "277", "optional": false } } ], "env": [ { - "name": "276", - "value": "277", + "name": "278", + "value": "279", "valueFrom": { "fieldRef": { - "apiVersion": "278", - "fieldPath": "279" + "apiVersion": "280", + "fieldPath": "281" }, "resourceFieldRef": { - "containerName": "280", - "resource": "281", + "containerName": "282", + "resource": "283", "divisor": "185" }, "configMapKeyRef": { - "name": "282", - "key": "283", + "name": "284", + "key": "285", "optional": true }, "secretKeyRef": { - "name": "284", - "key": "285", + "name": "286", + "key": "287", "optional": false } } @@ -880,40 +882,40 @@ }, "volumeMounts": [ { - "name": "286", - "mountPath": "287", - "subPath": "288", + "name": "288", + "mountPath": "289", + "subPath": "290", "mountPropagation": "", - "subPathExpr": "289" + "subPathExpr": "291" } ], "volumeDevices": [ { - "name": "290", - "devicePath": "291" + "name": "292", + "devicePath": "293" } ], "livenessProbe": { "exec": { "command": [ - "292" + "294" ] }, "httpGet": { - "path": "293", - "port": "294", - "host": "295", + "path": "295", + "port": "296", + "host": "297", "scheme": "頸", "httpHeaders": [ { - "name": "296", - "value": "297" + "name": "298", + "value": "299" } ] }, "tcpSocket": { "port": 1315054653, - "host": "298" + "host": "300" }, "initialDelaySeconds": 711020087, "timeoutSeconds": 1103049140, @@ -924,24 +926,24 @@ "readinessProbe": { "exec": { "command": [ - "299" + "301" ] }, "httpGet": { - "path": "300", - "port": "301", - "host": "302", + "path": "302", + "port": "303", + "host": "304", "scheme": "ƿ頀\"冓鍓贯澔 ", "httpHeaders": [ { - "name": "303", - "value": "304" + "name": "305", + "value": "306" } ] }, "tcpSocket": { - "port": "305", - "host": "306" + "port": "307", + "host": "308" }, "initialDelaySeconds": 1058960779, "timeoutSeconds": -2133441986, @@ -953,51 +955,51 @@ "postStart": { "exec": { "command": [ - "307" + "309" ] }, "httpGet": { - "path": "308", + "path": "310", "port": -934378634, - "host": "309", + "host": "311", "scheme": "ɐ鰥", "httpHeaders": [ { - "name": "310", - "value": "311" + "name": "312", + "value": "313" } ] }, "tcpSocket": { "port": 630140708, - "host": "312" + "host": "314" } }, "preStop": { "exec": { "command": [ - "313" + "315" ] }, "httpGet": { - "path": "314", - "port": "315", - "host": "316", + "path": "316", + "port": "317", + "host": "318", "scheme": "8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録²", "httpHeaders": [ { - "name": "317", - "value": "318" + "name": "319", + "value": "320" } ] }, "tcpSocket": { "port": 2080874371, - "host": "319" + "host": "321" } } }, - "terminationMessagePath": "320", + "terminationMessagePath": "322", "terminationMessagePolicy": "灩聋3趐囨鏻砅邻", "imagePullPolicy": "騎C\"6x$1sȣ±p鋄", "securityContext": { @@ -1011,15 +1013,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "321", - "role": "322", - "type": "323", - "level": "324" + "user": "323", + "role": "324", + "type": "325", + "level": "326" }, "windowsOptions": { - "gmsaCredentialSpecName": "325", - "gmsaCredentialSpec": "326", - "runAsUserName": "327" + "gmsaCredentialSpecName": "327", + "gmsaCredentialSpec": "328", + "runAsUserName": "329" }, "runAsUser": 4288903380102217677, "runAsGroup": 6618112330449141397, @@ -1030,7 +1032,7 @@ }, "stdinOnce": true, "tty": true, - "targetContainerName": "328" + "targetContainerName": "330" } ], "restartPolicy": "w妕眵笭/9崍h趭(娕", @@ -1038,25 +1040,25 @@ "activeDeadlineSeconds": -3214891994203952546, "dnsPolicy": "晲T[irȎ3Ĕ\\", "nodeSelector": { - "329": "330" + "331": "332" }, - "serviceAccountName": "331", - "serviceAccount": "332", + "serviceAccountName": "333", + "serviceAccount": "334", "automountServiceAccountToken": true, - "nodeName": "333", + "nodeName": "335", "hostIPC": true, "shareProcessNamespace": true, "securityContext": { "seLinuxOptions": { - "user": "334", - "role": "335", - "type": "336", - "level": "337" + "user": "336", + "role": "337", + "type": "338", + "level": "339" }, "windowsOptions": { - "gmsaCredentialSpecName": "338", - "gmsaCredentialSpec": "339", - "runAsUserName": "340" + "gmsaCredentialSpecName": "340", + "gmsaCredentialSpec": "341", + "runAsUserName": "342" }, "runAsUser": 4430285638700927057, "runAsGroup": 7461098988156705429, @@ -1067,18 +1069,18 @@ "fsGroup": 7747616967629081728, "sysctls": [ { - "name": "341", - "value": "342" + "name": "343", + "value": "344" } ] }, "imagePullSecrets": [ { - "name": "343" + "name": "345" } ], - "hostname": "344", - "subdomain": "345", + "hostname": "346", + "subdomain": "347", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1086,19 +1088,19 @@ { "matchExpressions": [ { - "key": "346", + "key": "348", "operator": "Ǚ(", "values": [ - "347" + "349" ] } ], "matchFields": [ { - "key": "348", + "key": "350", "operator": "瘍Nʊ輔3璾ėȜv1b繐汚", "values": [ - "349" + "351" ] } ] @@ -1111,19 +1113,19 @@ "preference": { "matchExpressions": [ { - "key": "350", + "key": "352", "operator": "n覦灲閈誹ʅ蕉", "values": [ - "351" + "353" ] } ], "matchFields": [ { - "key": "352", + "key": "354", "operator": "", "values": [ - "353" + "355" ] } ] @@ -1146,9 +1148,9 @@ ] }, "namespaces": [ - "360" + "362" ], - "topologyKey": "361" + "topologyKey": "363" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1170,9 +1172,9 @@ ] }, "namespaces": [ - "368" + "370" ], - "topologyKey": "369" + "topologyKey": "371" } } ] @@ -1195,9 +1197,9 @@ ] }, "namespaces": [ - "376" + "378" ], - "topologyKey": "377" + "topologyKey": "379" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1219,45 +1221,45 @@ ] }, "namespaces": [ - "384" + "386" ], - "topologyKey": "385" + "topologyKey": "387" } } ] } }, - "schedulerName": "386", + "schedulerName": "388", "tolerations": [ { - "key": "387", + "key": "389", "operator": "抄3昞财Î嘝zʄ!ć", - "value": "388", + "value": "390", "effect": "緍k¢茤", "tolerationSeconds": 4096844323391966153 } ], "hostAliases": [ { - "ip": "389", + "ip": "391", "hostnames": [ - "390" + "392" ] } ], - "priorityClassName": "391", + "priorityClassName": "393", "priority": -1331113536, "dnsConfig": { "nameservers": [ - "392" + "394" ], "searches": [ - "393" + "395" ], "options": [ { - "name": "394", - "value": "395" + "name": "396", + "value": "397" } ] }, @@ -1266,7 +1268,7 @@ "conditionType": "mō6µɑ`ȗ\u003c8^翜" } ], - "runtimeClassName": "396", + "runtimeClassName": "398", "enableServiceLinks": false, "preemptionPolicy": "ý筞X", "overhead": { @@ -1275,7 +1277,7 @@ "topologySpreadConstraints": [ { "maxSkew": 1956797678, - "topologyKey": "397", + "topologyKey": "399", "whenUnsatisfiable": "ƀ+瑏eCmAȥ睙", "labelSelector": { "matchLabels": { @@ -1295,40 +1297,41 @@ "volumeClaimTemplates": [ { "metadata": { - "name": "404", - "generateName": "405", - "namespace": "406", - "selfLink": "407", + "name": "406", + "generateName": "407", + "namespace": "408", + "selfLink": "409", "uid": "鋡浤ɖ緖焿熣", "resourceVersion": "7821588463673401230", "generation": -3408884454087787958, "creationTimestamp": null, "deletionGracePeriodSeconds": -7871971636641833314, "labels": { - "409": "410" + "411": "412" }, "annotations": { - "411": "412" + "413": "414" }, "ownerReferences": [ { - "apiVersion": "413", - "kind": "414", - "name": "415", + "apiVersion": "415", + "kind": "416", + "name": "417", "uid": "9F徵{ɦ!f親ʚ«Ǥ栌Ə侷ŧ", "controller": false, "blockOwnerDeletion": true } ], "finalizers": [ - "416" + "418" ], - "clusterName": "417", + "clusterName": "419", "managedFields": [ { - "manager": "418", + "manager": "420", "operation": "ÕW肤", - "apiVersion": "419" + "apiVersion": "421", + "fieldsType": "422" } ] }, @@ -1355,13 +1358,13 @@ "犔kU坥;ȉv5": "156" } }, - "volumeName": "426", - "storageClassName": "427", + "volumeName": "429", + "storageClassName": "430", "volumeMode": "qwïźU痤ȵ", "dataSource": { - "apiGroup": "428", - "kind": "429", - "name": "430" + "apiGroup": "431", + "kind": "432", + "name": "433" } }, "status": { @@ -1378,14 +1381,14 @@ "status": "RY客\\ǯ'_", "lastProbeTime": "2513-10-02T03:37:43Z", "lastTransitionTime": "2172-12-06T22:36:31Z", - "reason": "431", - "message": "432" + "reason": "434", + "message": "435" } ] } } ], - "serviceName": "433", + "serviceName": "436", "podManagementPolicy": "榭ș«lj}砵(ɋǬAÃɮǜ:ɐ", "updateStrategy": { "type": "瓘ȿ4", @@ -1401,16 +1404,16 @@ "readyReplicas": -1823513364, "currentReplicas": -981691190, "updatedReplicas": 2069003631, - "currentRevision": "434", - "updateRevision": "435", + "currentRevision": "437", + "updateRevision": "438", "collisionCount": -2044314719, "conditions": [ { "type": "GZ耏驧¹ƽɟ9ɭ锻ó/階ħ叟V", "status": "x臥", "lastTransitionTime": "2583-07-02T00:14:17Z", - "reason": "436", - "message": "437" + "reason": "439", + "message": "440" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.pb index 89af2240834..1b92aab60f8 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.yaml index e30dce7f233..11b6e4871cb 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1.StatefulSet.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -38,35 +39,36 @@ spec: operator: Exists matchLabels: 74404d5---g8c2-k-91e.y5-g--58----0683-b-w7ld-6cs06xj-x5yv0wm-k18/M_-Nx.N_6-___._-.-W._AAn---v_-5-_8LXj: 6-4_WE-_JTrcd-2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--1 - serviceName: "433" + serviceName: "436" template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: -2575298329142810753 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -8542870036622468681 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: 躢 - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: true - kind: "34" - name: "35" + kind: "35" + name: "36" uid: ƶȤ^} resourceVersion: "1736621709629422270" - selfLink: "27" + selfLink: "28" uid: ?Qȫş spec: activeDeadlineSeconds: -3214891994203952546 @@ -75,28 +77,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "350" + - key: "352" operator: n覦灲閈誹ʅ蕉 values: - - "351" + - "353" matchFields: - - key: "352" + - key: "354" operator: "" values: - - "353" + - "355" weight: 702968201 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "346" + - key: "348" operator: Ǚ( values: - - "347" + - "349" matchFields: - - key: "348" + - key: "350" operator: 瘍Nʊ輔3璾ėȜv1b繐汚 values: - - "349" + - "351" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -109,8 +111,8 @@ spec: matchLabels: Bk.j._g-G-7--p9.-_0R.-_-3_L_2--_v2.5p_..Y-.wg_-b8a_68: Q4_.84.K_-_0_..u.F.pq..--Q namespaces: - - "368" - topologyKey: "369" + - "370" + topologyKey: "371" weight: 1195176401 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -120,8 +122,8 @@ spec: matchLabels: lm-e46-r-g63--gt1--6mx-r-927--m6-k8-c2---2etfh41ca-z-g/0p_3_J_SA995IKCR.s--f.-f.-zv._._.5-H.T.-.-.d: b_9_1o.w_aI._31-_I-A-_3bz._8M0U1_-__.71-_-9_._X-D---k..1Q7._l.I namespaces: - - "360" - topologyKey: "361" + - "362" + topologyKey: "363" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -134,8 +136,8 @@ spec: matchLabels: 3--rgvf3q-z-5z80n--t5--9-4-d2-22--i--40wv--in-870w--it6k47-7y1.h72n-cnp-75/c10KkQ-R_R.-.--4_IT_O__3.5h_XC0_-3: 20_._.-_L-__bf_9_-C-PfNx__-U_.Pn-W23-_.z_.._s--_F-BR-.h_-2-.F namespaces: - - "384" - topologyKey: "385" + - "386" + topologyKey: "387" weight: -1508769491 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -147,119 +149,119 @@ spec: matchLabels: H__V.Vz_6.Hz_V_.r_v_._e_-78o_6Z..11_7pX_.-mLlx...w_j: 35.40Rw4gD.._.-x6db-L7.-__-G_2kCpS_1 namespaces: - - "376" - topologyKey: "377" + - "378" + topologyKey: "379" automountServiceAccountToken: true containers: - args: - - "209" + - "211" command: - - "208" + - "210" env: - - name: "216" - value: "217" + - name: "218" + value: "219" valueFrom: configMapKeyRef: - key: "223" - name: "222" - optional: false - fieldRef: - apiVersion: "218" - fieldPath: "219" - resourceFieldRef: - containerName: "220" - divisor: "771" - resource: "221" - secretKeyRef: key: "225" name: "224" + optional: false + fieldRef: + apiVersion: "220" + fieldPath: "221" + resourceFieldRef: + containerName: "222" + divisor: "771" + resource: "223" + secretKeyRef: + key: "227" + name: "226" optional: true envFrom: - configMapRef: - name: "214" + name: "216" optional: false - prefix: "213" + prefix: "215" secretRef: - name: "215" + name: "217" optional: true - image: "207" + image: "209" imagePullPolicy: ƙt叀碧闳ȩr嚧ʣq埄趛屡 lifecycle: postStart: exec: command: - - "246" + - "248" httpGet: - host: "248" + host: "250" httpHeaders: - - name: "249" - value: "250" - path: "247" + - name: "251" + value: "252" + path: "249" port: -2013568185 scheme: '#yV''WKw(ğ儴Ůĺ}' tcpSocket: - host: "251" + host: "253" port: -20130017 preStop: exec: command: - - "252" + - "254" httpGet: - host: "254" + host: "256" httpHeaders: - - name: "255" - value: "256" - path: "253" + - name: "257" + value: "258" + path: "255" port: -661937776 scheme: ØœȠƬQg鄠[颐o tcpSocket: - host: "257" + host: "259" port: 461585849 livenessProbe: exec: command: - - "232" + - "234" failureThreshold: -93157681 httpGet: - host: "234" + host: "236" httpHeaders: - - name: "235" - value: "236" - path: "233" + - name: "237" + value: "238" + path: "235" port: -1285424066 scheme: ni酛3ƁÀ initialDelaySeconds: -2036074491 periodSeconds: 165047920 successThreshold: -393291312 tcpSocket: - host: "238" - port: "237" + host: "240" + port: "239" timeoutSeconds: -148216266 - name: "206" + name: "208" ports: - containerPort: 1923334396 - hostIP: "212" + hostIP: "214" hostPort: 474119379 - name: "211" + name: "213" protocol: 旿@掇lNdǂ>5姣>懔%熷谟þ readinessProbe: exec: command: - - "239" + - "241" failureThreshold: 267768240 httpGet: - host: "242" + host: "244" httpHeaders: - - name: "243" - value: "244" - path: "240" - port: "241" + - name: "245" + value: "246" + path: "242" + port: "243" scheme: 3!Zɾģ毋Ó6 initialDelaySeconds: -228822833 periodSeconds: -1213051101 successThreshold: 1451056156 tcpSocket: - host: "245" + host: "247" port: -832805508 timeoutSeconds: -970312425 resources: @@ -281,149 +283,149 @@ spec: runAsNonRoot: false runAsUser: -5835415947553716289 seLinuxOptions: - level: "262" - role: "260" - type: "261" - user: "259" + level: "264" + role: "262" + type: "263" + user: "261" windowsOptions: - gmsaCredentialSpec: "264" - gmsaCredentialSpecName: "263" - runAsUserName: "265" - terminationMessagePath: "258" + gmsaCredentialSpec: "266" + gmsaCredentialSpecName: "265" + runAsUserName: "267" + terminationMessagePath: "260" terminationMessagePolicy: ɇ卷荙JLĹ]佱¿>犵殇ŕ-Ɂ tty: true volumeDevices: - - devicePath: "231" - name: "230" + - devicePath: "233" + name: "232" volumeMounts: - - mountPath: "227" + - mountPath: "229" mountPropagation: 0矀Kʝ瘴I\p[ħsĨɆâĺɗŹ倗S - name: "226" + name: "228" readOnly: true - subPath: "228" - subPathExpr: "229" - workingDir: "210" + subPath: "230" + subPathExpr: "231" + workingDir: "212" dnsConfig: nameservers: - - "392" + - "394" options: - - name: "394" - value: "395" + - name: "396" + value: "397" searches: - - "393" + - "395" dnsPolicy: 晲T[irȎ3Ĕ\ enableServiceLinks: false ephemeralContainers: - args: - - "269" + - "271" command: - - "268" + - "270" env: - - name: "276" - value: "277" + - name: "278" + value: "279" valueFrom: configMapKeyRef: - key: "283" - name: "282" - optional: true - fieldRef: - apiVersion: "278" - fieldPath: "279" - resourceFieldRef: - containerName: "280" - divisor: "185" - resource: "281" - secretKeyRef: key: "285" name: "284" + optional: true + fieldRef: + apiVersion: "280" + fieldPath: "281" + resourceFieldRef: + containerName: "282" + divisor: "185" + resource: "283" + secretKeyRef: + key: "287" + name: "286" optional: false envFrom: - configMapRef: - name: "274" + name: "276" optional: false - prefix: "273" + prefix: "275" secretRef: - name: "275" + name: "277" optional: false - image: "267" + image: "269" imagePullPolicy: 騎C"6x$1sȣ±p鋄 lifecycle: postStart: exec: command: - - "307" + - "309" httpGet: - host: "309" + host: "311" httpHeaders: - - name: "310" - value: "311" - path: "308" + - name: "312" + value: "313" + path: "310" port: -934378634 scheme: ɐ鰥 tcpSocket: - host: "312" + host: "314" port: 630140708 preStop: exec: command: - - "313" + - "315" httpGet: - host: "316" + host: "318" httpHeaders: - - name: "317" - value: "318" - path: "314" - port: "315" + - name: "319" + value: "320" + path: "316" + port: "317" scheme: 8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録² tcpSocket: - host: "319" + host: "321" port: 2080874371 livenessProbe: exec: command: - - "292" + - "294" failureThreshold: 1993268896 httpGet: - host: "295" + host: "297" httpHeaders: - - name: "296" - value: "297" - path: "293" - port: "294" + - name: "298" + value: "299" + path: "295" + port: "296" scheme: 頸 initialDelaySeconds: 711020087 periodSeconds: -1965247100 successThreshold: 218453478 tcpSocket: - host: "298" + host: "300" port: 1315054653 timeoutSeconds: 1103049140 - name: "266" + name: "268" ports: - containerPort: -677617960 - hostIP: "272" + hostIP: "274" hostPort: -552281772 - name: "271" + name: "273" protocol: ŕ翑0展} readinessProbe: exec: command: - - "299" + - "301" failureThreshold: -1250314365 httpGet: - host: "302" + host: "304" httpHeaders: - - name: "303" - value: "304" - path: "300" - port: "301" + - name: "305" + value: "306" + path: "302" + port: "303" scheme: 'ƿ頀"冓鍓贯澔 ' initialDelaySeconds: 1058960779 periodSeconds: 472742933 successThreshold: 50696420 tcpSocket: - host: "306" - port: "305" + host: "308" + port: "307" timeoutSeconds: -2133441986 resources: limits: @@ -444,147 +446,147 @@ spec: runAsNonRoot: false runAsUser: 4288903380102217677 seLinuxOptions: - level: "324" - role: "322" - type: "323" - user: "321" + level: "326" + role: "324" + type: "325" + user: "323" windowsOptions: - gmsaCredentialSpec: "326" - gmsaCredentialSpecName: "325" - runAsUserName: "327" + gmsaCredentialSpec: "328" + gmsaCredentialSpecName: "327" + runAsUserName: "329" stdinOnce: true - targetContainerName: "328" - terminationMessagePath: "320" + targetContainerName: "330" + terminationMessagePath: "322" terminationMessagePolicy: 灩聋3趐囨鏻砅邻 tty: true volumeDevices: - - devicePath: "291" - name: "290" + - devicePath: "293" + name: "292" volumeMounts: - - mountPath: "287" + - mountPath: "289" mountPropagation: "" - name: "286" - subPath: "288" - subPathExpr: "289" - workingDir: "270" + name: "288" + subPath: "290" + subPathExpr: "291" + workingDir: "272" hostAliases: - hostnames: - - "390" - ip: "389" + - "392" + ip: "391" hostIPC: true - hostname: "344" + hostname: "346" imagePullSecrets: - - name: "343" + - name: "345" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "650" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "650" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: true envFrom: - configMapRef: - name: "153" + name: "155" optional: true - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: true - image: "146" + image: "148" lifecycle: postStart: exec: command: - - "184" + - "186" httpGet: - host: "187" + host: "189" httpHeaders: - - name: "188" - value: "189" - path: "185" - port: "186" + - name: "190" + value: "191" + path: "187" + port: "188" scheme: £ȹ嫰ƹǔw÷nI粛E煹 tcpSocket: - host: "190" + host: "192" port: 135036402 preStop: exec: command: - - "191" + - "193" httpGet: - host: "193" + host: "195" httpHeaders: - - name: "194" - value: "195" - path: "192" + - name: "196" + value: "197" + path: "194" port: -1188430996 scheme: djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪 tcpSocket: - host: "197" - port: "196" + host: "199" + port: "198" livenessProbe: exec: command: - - "171" + - "173" failureThreshold: -1113628381 httpGet: - host: "173" + host: "175" httpHeaders: - - name: "174" - value: "175" - path: "172" + - name: "176" + value: "177" + path: "174" port: -152585895 scheme: E@Ȗs«ö initialDelaySeconds: 1843758068 periodSeconds: 1702578303 successThreshold: -1565157256 tcpSocket: - host: "176" + host: "178" port: 1135182169 timeoutSeconds: -1967469005 - name: "145" + name: "147" ports: - containerPort: 1403721475 - hostIP: "151" + hostIP: "153" hostPort: -606111218 - name: "150" + name: "152" protocol: ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳 readinessProbe: exec: command: - - "177" + - "179" failureThreshold: -1167888910 httpGet: - host: "179" + host: "181" httpHeaders: - - name: "180" - value: "181" - path: "178" + - name: "182" + value: "183" + path: "180" port: 386652373 scheme: ʙ嫙& initialDelaySeconds: -802585193 periodSeconds: 1944205014 successThreshold: -2079582559 tcpSocket: - host: "183" - port: "182" + host: "185" + port: "184" timeoutSeconds: 1901330124 resources: limits: @@ -605,72 +607,72 @@ spec: runAsNonRoot: false runAsUser: 7739117973959656085 seLinuxOptions: - level: "202" - role: "200" - type: "201" - user: "199" + level: "204" + role: "202" + type: "203" + user: "201" windowsOptions: - gmsaCredentialSpec: "204" - gmsaCredentialSpecName: "203" - runAsUserName: "205" + gmsaCredentialSpec: "206" + gmsaCredentialSpecName: "205" + runAsUserName: "207" stdin: true stdinOnce: true - terminationMessagePath: "198" + terminationMessagePath: "200" terminationMessagePolicy: ɩC volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: "" - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "333" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "335" nodeSelector: - "329": "330" + "331": "332" overhead: tHǽ÷閂抰^窄CǙķȈ: "97" preemptionPolicy: ý筞X priority: -1331113536 - priorityClassName: "391" + priorityClassName: "393" readinessGates: - conditionType: mō6µɑ`ȗ<8^翜 restartPolicy: w妕眵笭/9崍h趭(娕 - runtimeClassName: "396" - schedulerName: "386" + runtimeClassName: "398" + schedulerName: "388" securityContext: fsGroup: 7747616967629081728 runAsGroup: 7461098988156705429 runAsNonRoot: false runAsUser: 4430285638700927057 seLinuxOptions: - level: "337" - role: "335" - type: "336" - user: "334" + level: "339" + role: "337" + type: "338" + user: "336" supplementalGroups: - 7866826580662861268 sysctls: - - name: "341" - value: "342" + - name: "343" + value: "344" windowsOptions: - gmsaCredentialSpec: "339" - gmsaCredentialSpecName: "338" - runAsUserName: "340" - serviceAccount: "332" - serviceAccountName: "331" + gmsaCredentialSpec: "341" + gmsaCredentialSpecName: "340" + runAsUserName: "342" + serviceAccount: "334" + serviceAccountName: "333" shareProcessNamespace: true - subdomain: "345" + subdomain: "347" terminationGracePeriodSeconds: 6245571390016329382 tolerations: - effect: 緍k¢茤 - key: "387" + key: "389" operator: 抄3昞财Î嘝zʄ!ć tolerationSeconds: 4096844323391966153 - value: "388" + value: "390" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -680,207 +682,207 @@ spec: ? zp22o4a-w----11rqy3eo79p-f4r1--7p--053--suu--98.y1s8-j-6j4uvf1-sdg--132bid-7x0u738--7w-tdt-u-0--v/Ied-0-i_zZsY_o8t5Vl6_..7CY-_dc__G6N-_-0o.0C_gV.9_G5 : x_.4dwFbuvEf55Y2k.F-4 maxSkew: 1956797678 - topologyKey: "397" + topologyKey: "399" whenUnsatisfiable: ƀ+瑏eCmAȥ睙 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: 912004803 readOnly: true - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: '|@?鷅bȻN' - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: 榱*Gưoɘ檲 readOnly: true azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 1593906314 items: - - key: "97" + - key: "99" mode: 195263908 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: false volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: 824682619 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 1569992019 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "660" - resource: "90" + resource: "92" emptyDir: medium: Xŋ朘瑥A徙ɶɊł/擇ɦĽ胚O醔ɍ厶耈 sizeLimit: "473" fc: - fsType: "92" + fsType: "94" lun: -1740986684 readOnly: true targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" readOnly: true secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1188153605 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" readOnly: true hostPath: - path: "41" + path: "43" type: ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱< iscsi: chapAuthDiscovery: true - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 994527057 portals: - - "58" + - "60" secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" + fsType: "129" readOnly: true - volumeID: "126" + volumeID: "128" projected: defaultMode: -1334904807 sources: - configMap: items: - - key: "122" + - key: "124" mode: 2063799569 - path: "123" - name: "121" + path: "125" + name: "123" optional: false downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: 173030157 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "106" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: -323584340 - path: "115" - name: "113" + path: "117" + name: "115" optional: true serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: 8357931971650847566 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + name: "132" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 332383000 items: - - key: "50" + - key: "52" mode: -547518679 - path: "51" + path: "53" optional: true - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" updateStrategy: rollingUpdate: partition: -1578718618 @@ -888,39 +890,40 @@ spec: volumeClaimTemplates: - metadata: annotations: - "411": "412" - clusterName: "417" + "413": "414" + clusterName: "419" creationTimestamp: null deletionGracePeriodSeconds: -7871971636641833314 finalizers: - - "416" - generateName: "405" + - "418" + generateName: "407" generation: -3408884454087787958 labels: - "409": "410" + "411": "412" managedFields: - - apiVersion: "419" - manager: "418" + - apiVersion: "421" + fieldsType: "422" + manager: "420" operation: ÕW肤 - name: "404" - namespace: "406" + name: "406" + namespace: "408" ownerReferences: - - apiVersion: "413" + - apiVersion: "415" blockOwnerDeletion: true controller: false - kind: "414" - name: "415" + kind: "416" + name: "417" uid: 9F徵{ɦ!f親ʚ«Ǥ栌Ə侷ŧ resourceVersion: "7821588463673401230" - selfLink: "407" + selfLink: "409" uid: 鋡浤ɖ緖焿熣 spec: accessModes: - 婻漛Ǒ僕ʨƌɦ dataSource: - apiGroup: "428" - kind: "429" - name: "430" + apiGroup: "431" + kind: "432" + name: "433" resources: limits: 宥ɓ: "692" @@ -932,9 +935,9 @@ spec: operator: Exists matchLabels: ANx__-F_._n.WaY_o.-0-yE-R55: 2n...78aou_j-3.J-.-r_-oPd-.2_Z__.-_U-.60--o._H - storageClassName: "427" + storageClassName: "430" volumeMode: qwïźU痤ȵ - volumeName: "426" + volumeName: "429" status: accessModes: - \屪kƱ @@ -943,8 +946,8 @@ spec: conditions: - lastProbeTime: "2513-10-02T03:37:43Z" lastTransitionTime: "2172-12-06T22:36:31Z" - message: "432" - reason: "431" + message: "435" + reason: "434" status: RY客\ǯ'_ type: nj phase: 怿ÿ易+ǴȰ¤趜磕绘翁揌p:oŇE0Lj @@ -952,14 +955,14 @@ status: collisionCount: -2044314719 conditions: - lastTransitionTime: "2583-07-02T00:14:17Z" - message: "437" - reason: "436" + message: "440" + reason: "439" status: x臥 type: GZ耏驧¹ƽɟ9ɭ锻ó/階ħ叟V currentReplicas: -981691190 - currentRevision: "434" + currentRevision: "437" observedGeneration: -2994706141758547943 readyReplicas: -1823513364 replicas: -148329440 - updateRevision: "435" + updateRevision: "438" updatedReplicas: 2069003631 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.json index 012c8ccf892..dfc8b52658a 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.json +++ b/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" } ] }, diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.pb index e1b18182aa5..691dabf14a2 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.yaml index 83e3045cfe3..f2dd1e754ab 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.ControllerRevision.yaml +++ b/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" diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.json index f361adb3b8c..d285704563c 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.json +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -54,49 +55,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "?Qȫş", "resourceVersion": "1736621709629422270", "generation": -8542870036622468681, "creationTimestamp": null, "deletionGracePeriodSeconds": -2575298329142810753, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "ƶȤ^}", "controller": true, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "躢", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱\u003c" }, "emptyDir": { @@ -104,27 +106,27 @@ "sizeLimit": "473" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1188153605 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": 912004803, "readOnly": true }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": -547518679 } ], @@ -132,91 +134,91 @@ "optional": true }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 994527057, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "portals": [ - "58" + "60" ], "chapAuthDiscovery": true, "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62", + "endpoints": "63", + "path": "64", "readOnly": true }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" } }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "readOnly": true, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "660" }, "mode": 1569992019 @@ -226,26 +228,26 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": -1740986684, - "fsType": "92", + "fsType": "94", "readOnly": true, "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95", + "secretName": "96", + "shareName": "97", "readOnly": true }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": 195263908 } ], @@ -253,39 +255,39 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", - "user": "105", - "group": "106", - "tenant": "107" + "registry": "105", + "volume": "106", + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "|@?鷅bȻN", - "fsType": "110", + "fsType": "112", "readOnly": true, "kind": "榱*Gưoɘ檲" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": -323584340 } ], @@ -294,14 +296,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "106" }, "mode": 173030157 @@ -309,118 +311,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": 2063799569 } ], "optional": false }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": 8357931971650847566, - "path": "125" + "path": "127" } } ], "defaultMode": -1334904807 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127", + "volumeID": "128", + "fsType": "129", "readOnly": true }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": false, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -606111218, "containerPort": 1403721475, "protocol": "ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": true }, "secretRef": { - "name": "154", + "name": "156", "optional": true } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "650" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": false }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": true } } @@ -436,41 +438,41 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", + "path": "174", "port": -152585895, - "host": "173", + "host": "175", "scheme": "E@Ȗs«ö", "httpHeaders": [ { - "name": "174", - "value": "175" + "name": "176", + "value": "177" } ] }, "tcpSocket": { "port": 1135182169, - "host": "176" + "host": "178" }, "initialDelaySeconds": 1843758068, "timeoutSeconds": -1967469005, @@ -481,24 +483,24 @@ "readinessProbe": { "exec": { "command": [ - "177" + "179" ] }, "httpGet": { - "path": "178", + "path": "180", "port": 386652373, - "host": "179", + "host": "181", "scheme": "ʙ嫙\u0026", "httpHeaders": [ { - "name": "180", - "value": "181" + "name": "182", + "value": "183" } ] }, "tcpSocket": { - "port": "182", - "host": "183" + "port": "184", + "host": "185" }, "initialDelaySeconds": -802585193, "timeoutSeconds": 1901330124, @@ -510,51 +512,51 @@ "postStart": { "exec": { "command": [ - "184" + "186" ] }, "httpGet": { - "path": "185", - "port": "186", - "host": "187", + "path": "187", + "port": "188", + "host": "189", "scheme": "£ȹ嫰ƹǔw÷nI粛E煹", "httpHeaders": [ { - "name": "188", - "value": "189" + "name": "190", + "value": "191" } ] }, "tcpSocket": { "port": 135036402, - "host": "190" + "host": "192" } }, "preStop": { "exec": { "command": [ - "191" + "193" ] }, "httpGet": { - "path": "192", + "path": "194", "port": -1188430996, - "host": "193", + "host": "195", "scheme": "djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪", "httpHeaders": [ { - "name": "194", - "value": "195" + "name": "196", + "value": "197" } ] }, "tcpSocket": { - "port": "196", - "host": "197" + "port": "198", + "host": "199" } } }, - "terminationMessagePath": "198", + "terminationMessagePath": "200", "terminationMessagePolicy": "ɩC", "securityContext": { "capabilities": { @@ -567,15 +569,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "199", - "role": "200", - "type": "201", - "level": "202" + "user": "201", + "role": "202", + "type": "203", + "level": "204" }, "windowsOptions": { - "gmsaCredentialSpecName": "203", - "gmsaCredentialSpec": "204", - "runAsUserName": "205" + "gmsaCredentialSpecName": "205", + "gmsaCredentialSpec": "206", + "runAsUserName": "207" }, "runAsUser": 7739117973959656085, "runAsGroup": 3747003978559617838, @@ -590,59 +592,59 @@ ], "containers": [ { - "name": "206", - "image": "207", + "name": "208", + "image": "209", "command": [ - "208" + "210" ], "args": [ - "209" + "211" ], - "workingDir": "210", + "workingDir": "212", "ports": [ { - "name": "211", + "name": "213", "hostPort": 474119379, "containerPort": 1923334396, "protocol": "旿@掇lNdǂ\u003e5姣\u003e懔%熷谟þ", - "hostIP": "212" + "hostIP": "214" } ], "envFrom": [ { - "prefix": "213", + "prefix": "215", "configMapRef": { - "name": "214", + "name": "216", "optional": false }, "secretRef": { - "name": "215", + "name": "217", "optional": true } } ], "env": [ { - "name": "216", - "value": "217", + "name": "218", + "value": "219", "valueFrom": { "fieldRef": { - "apiVersion": "218", - "fieldPath": "219" + "apiVersion": "220", + "fieldPath": "221" }, "resourceFieldRef": { - "containerName": "220", - "resource": "221", + "containerName": "222", + "resource": "223", "divisor": "771" }, "configMapKeyRef": { - "name": "222", - "key": "223", + "name": "224", + "key": "225", "optional": false }, "secretKeyRef": { - "name": "224", - "key": "225", + "name": "226", + "key": "227", "optional": true } } @@ -658,41 +660,41 @@ }, "volumeMounts": [ { - "name": "226", + "name": "228", "readOnly": true, - "mountPath": "227", - "subPath": "228", + "mountPath": "229", + "subPath": "230", "mountPropagation": "0矀Kʝ瘴I\\p[ħsĨɆâĺɗŹ倗S", - "subPathExpr": "229" + "subPathExpr": "231" } ], "volumeDevices": [ { - "name": "230", - "devicePath": "231" + "name": "232", + "devicePath": "233" } ], "livenessProbe": { "exec": { "command": [ - "232" + "234" ] }, "httpGet": { - "path": "233", + "path": "235", "port": -1285424066, - "host": "234", + "host": "236", "scheme": "ni酛3ƁÀ", "httpHeaders": [ { - "name": "235", - "value": "236" + "name": "237", + "value": "238" } ] }, "tcpSocket": { - "port": "237", - "host": "238" + "port": "239", + "host": "240" }, "initialDelaySeconds": -2036074491, "timeoutSeconds": -148216266, @@ -703,24 +705,24 @@ "readinessProbe": { "exec": { "command": [ - "239" + "241" ] }, "httpGet": { - "path": "240", - "port": "241", - "host": "242", + "path": "242", + "port": "243", + "host": "244", "scheme": "3!Zɾģ毋Ó6", "httpHeaders": [ { - "name": "243", - "value": "244" + "name": "245", + "value": "246" } ] }, "tcpSocket": { "port": -832805508, - "host": "245" + "host": "247" }, "initialDelaySeconds": -228822833, "timeoutSeconds": -970312425, @@ -732,51 +734,51 @@ "postStart": { "exec": { "command": [ - "246" + "248" ] }, "httpGet": { - "path": "247", + "path": "249", "port": -2013568185, - "host": "248", + "host": "250", "scheme": "#yV'WKw(ğ儴Ůĺ}", "httpHeaders": [ { - "name": "249", - "value": "250" + "name": "251", + "value": "252" } ] }, "tcpSocket": { "port": -20130017, - "host": "251" + "host": "253" } }, "preStop": { "exec": { "command": [ - "252" + "254" ] }, "httpGet": { - "path": "253", + "path": "255", "port": -661937776, - "host": "254", + "host": "256", "scheme": "ØœȠƬQg鄠[颐o", "httpHeaders": [ { - "name": "255", - "value": "256" + "name": "257", + "value": "258" } ] }, "tcpSocket": { "port": 461585849, - "host": "257" + "host": "259" } } }, - "terminationMessagePath": "258", + "terminationMessagePath": "260", "terminationMessagePolicy": "ɇ卷荙JLĹ]佱¿\u003e犵殇ŕ-Ɂ", "imagePullPolicy": "ƙt叀碧闳ȩr嚧ʣq埄趛屡", "securityContext": { @@ -790,15 +792,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "259", - "role": "260", - "type": "261", - "level": "262" + "user": "261", + "role": "262", + "type": "263", + "level": "264" }, "windowsOptions": { - "gmsaCredentialSpecName": "263", - "gmsaCredentialSpec": "264", - "runAsUserName": "265" + "gmsaCredentialSpecName": "265", + "gmsaCredentialSpec": "266", + "runAsUserName": "267" }, "runAsUser": -5835415947553716289, "runAsGroup": 2540215688947167763, @@ -812,59 +814,59 @@ ], "ephemeralContainers": [ { - "name": "266", - "image": "267", + "name": "268", + "image": "269", "command": [ - "268" + "270" ], "args": [ - "269" + "271" ], - "workingDir": "270", + "workingDir": "272", "ports": [ { - "name": "271", + "name": "273", "hostPort": -552281772, "containerPort": -677617960, "protocol": "ŕ翑0展}", - "hostIP": "272" + "hostIP": "274" } ], "envFrom": [ { - "prefix": "273", + "prefix": "275", "configMapRef": { - "name": "274", + "name": "276", "optional": false }, "secretRef": { - "name": "275", + "name": "277", "optional": false } } ], "env": [ { - "name": "276", - "value": "277", + "name": "278", + "value": "279", "valueFrom": { "fieldRef": { - "apiVersion": "278", - "fieldPath": "279" + "apiVersion": "280", + "fieldPath": "281" }, "resourceFieldRef": { - "containerName": "280", - "resource": "281", + "containerName": "282", + "resource": "283", "divisor": "185" }, "configMapKeyRef": { - "name": "282", - "key": "283", + "name": "284", + "key": "285", "optional": true }, "secretKeyRef": { - "name": "284", - "key": "285", + "name": "286", + "key": "287", "optional": false } } @@ -880,40 +882,40 @@ }, "volumeMounts": [ { - "name": "286", - "mountPath": "287", - "subPath": "288", + "name": "288", + "mountPath": "289", + "subPath": "290", "mountPropagation": "", - "subPathExpr": "289" + "subPathExpr": "291" } ], "volumeDevices": [ { - "name": "290", - "devicePath": "291" + "name": "292", + "devicePath": "293" } ], "livenessProbe": { "exec": { "command": [ - "292" + "294" ] }, "httpGet": { - "path": "293", - "port": "294", - "host": "295", + "path": "295", + "port": "296", + "host": "297", "scheme": "頸", "httpHeaders": [ { - "name": "296", - "value": "297" + "name": "298", + "value": "299" } ] }, "tcpSocket": { "port": 1315054653, - "host": "298" + "host": "300" }, "initialDelaySeconds": 711020087, "timeoutSeconds": 1103049140, @@ -924,24 +926,24 @@ "readinessProbe": { "exec": { "command": [ - "299" + "301" ] }, "httpGet": { - "path": "300", - "port": "301", - "host": "302", + "path": "302", + "port": "303", + "host": "304", "scheme": "ƿ頀\"冓鍓贯澔 ", "httpHeaders": [ { - "name": "303", - "value": "304" + "name": "305", + "value": "306" } ] }, "tcpSocket": { - "port": "305", - "host": "306" + "port": "307", + "host": "308" }, "initialDelaySeconds": 1058960779, "timeoutSeconds": -2133441986, @@ -953,51 +955,51 @@ "postStart": { "exec": { "command": [ - "307" + "309" ] }, "httpGet": { - "path": "308", + "path": "310", "port": -934378634, - "host": "309", + "host": "311", "scheme": "ɐ鰥", "httpHeaders": [ { - "name": "310", - "value": "311" + "name": "312", + "value": "313" } ] }, "tcpSocket": { "port": 630140708, - "host": "312" + "host": "314" } }, "preStop": { "exec": { "command": [ - "313" + "315" ] }, "httpGet": { - "path": "314", - "port": "315", - "host": "316", + "path": "316", + "port": "317", + "host": "318", "scheme": "8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録²", "httpHeaders": [ { - "name": "317", - "value": "318" + "name": "319", + "value": "320" } ] }, "tcpSocket": { "port": 2080874371, - "host": "319" + "host": "321" } } }, - "terminationMessagePath": "320", + "terminationMessagePath": "322", "terminationMessagePolicy": "灩聋3趐囨鏻砅邻", "imagePullPolicy": "騎C\"6x$1sȣ±p鋄", "securityContext": { @@ -1011,15 +1013,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "321", - "role": "322", - "type": "323", - "level": "324" + "user": "323", + "role": "324", + "type": "325", + "level": "326" }, "windowsOptions": { - "gmsaCredentialSpecName": "325", - "gmsaCredentialSpec": "326", - "runAsUserName": "327" + "gmsaCredentialSpecName": "327", + "gmsaCredentialSpec": "328", + "runAsUserName": "329" }, "runAsUser": 4288903380102217677, "runAsGroup": 6618112330449141397, @@ -1030,7 +1032,7 @@ }, "stdinOnce": true, "tty": true, - "targetContainerName": "328" + "targetContainerName": "330" } ], "restartPolicy": "w妕眵笭/9崍h趭(娕", @@ -1038,25 +1040,25 @@ "activeDeadlineSeconds": -3214891994203952546, "dnsPolicy": "晲T[irȎ3Ĕ\\", "nodeSelector": { - "329": "330" + "331": "332" }, - "serviceAccountName": "331", - "serviceAccount": "332", + "serviceAccountName": "333", + "serviceAccount": "334", "automountServiceAccountToken": true, - "nodeName": "333", + "nodeName": "335", "hostIPC": true, "shareProcessNamespace": true, "securityContext": { "seLinuxOptions": { - "user": "334", - "role": "335", - "type": "336", - "level": "337" + "user": "336", + "role": "337", + "type": "338", + "level": "339" }, "windowsOptions": { - "gmsaCredentialSpecName": "338", - "gmsaCredentialSpec": "339", - "runAsUserName": "340" + "gmsaCredentialSpecName": "340", + "gmsaCredentialSpec": "341", + "runAsUserName": "342" }, "runAsUser": 4430285638700927057, "runAsGroup": 7461098988156705429, @@ -1067,18 +1069,18 @@ "fsGroup": 7747616967629081728, "sysctls": [ { - "name": "341", - "value": "342" + "name": "343", + "value": "344" } ] }, "imagePullSecrets": [ { - "name": "343" + "name": "345" } ], - "hostname": "344", - "subdomain": "345", + "hostname": "346", + "subdomain": "347", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1086,19 +1088,19 @@ { "matchExpressions": [ { - "key": "346", + "key": "348", "operator": "Ǚ(", "values": [ - "347" + "349" ] } ], "matchFields": [ { - "key": "348", + "key": "350", "operator": "瘍Nʊ輔3璾ėȜv1b繐汚", "values": [ - "349" + "351" ] } ] @@ -1111,19 +1113,19 @@ "preference": { "matchExpressions": [ { - "key": "350", + "key": "352", "operator": "n覦灲閈誹ʅ蕉", "values": [ - "351" + "353" ] } ], "matchFields": [ { - "key": "352", + "key": "354", "operator": "", "values": [ - "353" + "355" ] } ] @@ -1146,9 +1148,9 @@ ] }, "namespaces": [ - "360" + "362" ], - "topologyKey": "361" + "topologyKey": "363" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1170,9 +1172,9 @@ ] }, "namespaces": [ - "368" + "370" ], - "topologyKey": "369" + "topologyKey": "371" } } ] @@ -1195,9 +1197,9 @@ ] }, "namespaces": [ - "376" + "378" ], - "topologyKey": "377" + "topologyKey": "379" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1219,45 +1221,45 @@ ] }, "namespaces": [ - "384" + "386" ], - "topologyKey": "385" + "topologyKey": "387" } } ] } }, - "schedulerName": "386", + "schedulerName": "388", "tolerations": [ { - "key": "387", + "key": "389", "operator": "抄3昞财Î嘝zʄ!ć", - "value": "388", + "value": "390", "effect": "緍k¢茤", "tolerationSeconds": 4096844323391966153 } ], "hostAliases": [ { - "ip": "389", + "ip": "391", "hostnames": [ - "390" + "392" ] } ], - "priorityClassName": "391", + "priorityClassName": "393", "priority": -1331113536, "dnsConfig": { "nameservers": [ - "392" + "394" ], "searches": [ - "393" + "395" ], "options": [ { - "name": "394", - "value": "395" + "name": "396", + "value": "397" } ] }, @@ -1266,7 +1268,7 @@ "conditionType": "mō6µɑ`ȗ\u003c8^翜" } ], - "runtimeClassName": "396", + "runtimeClassName": "398", "enableServiceLinks": false, "preemptionPolicy": "ý筞X", "overhead": { @@ -1275,7 +1277,7 @@ "topologySpreadConstraints": [ { "maxSkew": 1956797678, - "topologyKey": "397", + "topologyKey": "399", "whenUnsatisfiable": "ƀ+瑏eCmAȥ睙", "labelSelector": { "matchLabels": { @@ -1317,8 +1319,8 @@ "status": "2ț", "lastUpdateTime": "2733-02-09T15:36:31Z", "lastTransitionTime": "2615-10-02T05:14:27Z", - "reason": "404", - "message": "405" + "reason": "406", + "message": "407" } ], "collisionCount": -612321491 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.pb index 8181bcb6f9b..a2334b15a9f 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.yaml index 5fea07e3b29..dac939e96b7 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Deployment.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -46,31 +47,32 @@ spec: template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: -2575298329142810753 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -8542870036622468681 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: 躢 - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: true - kind: "34" - name: "35" + kind: "35" + name: "36" uid: ƶȤ^} resourceVersion: "1736621709629422270" - selfLink: "27" + selfLink: "28" uid: ?Qȫş spec: activeDeadlineSeconds: -3214891994203952546 @@ -79,28 +81,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "350" + - key: "352" operator: n覦灲閈誹ʅ蕉 values: - - "351" + - "353" matchFields: - - key: "352" + - key: "354" operator: "" values: - - "353" + - "355" weight: 702968201 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "346" + - key: "348" operator: Ǚ( values: - - "347" + - "349" matchFields: - - key: "348" + - key: "350" operator: 瘍Nʊ輔3璾ėȜv1b繐汚 values: - - "349" + - "351" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -113,8 +115,8 @@ spec: matchLabels: Bk.j._g-G-7--p9.-_0R.-_-3_L_2--_v2.5p_..Y-.wg_-b8a_68: Q4_.84.K_-_0_..u.F.pq..--Q namespaces: - - "368" - topologyKey: "369" + - "370" + topologyKey: "371" weight: 1195176401 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -124,8 +126,8 @@ spec: matchLabels: lm-e46-r-g63--gt1--6mx-r-927--m6-k8-c2---2etfh41ca-z-g/0p_3_J_SA995IKCR.s--f.-f.-zv._._.5-H.T.-.-.d: b_9_1o.w_aI._31-_I-A-_3bz._8M0U1_-__.71-_-9_._X-D---k..1Q7._l.I namespaces: - - "360" - topologyKey: "361" + - "362" + topologyKey: "363" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -138,8 +140,8 @@ spec: matchLabels: 3--rgvf3q-z-5z80n--t5--9-4-d2-22--i--40wv--in-870w--it6k47-7y1.h72n-cnp-75/c10KkQ-R_R.-.--4_IT_O__3.5h_XC0_-3: 20_._.-_L-__bf_9_-C-PfNx__-U_.Pn-W23-_.z_.._s--_F-BR-.h_-2-.F namespaces: - - "384" - topologyKey: "385" + - "386" + topologyKey: "387" weight: -1508769491 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -151,119 +153,119 @@ spec: matchLabels: H__V.Vz_6.Hz_V_.r_v_._e_-78o_6Z..11_7pX_.-mLlx...w_j: 35.40Rw4gD.._.-x6db-L7.-__-G_2kCpS_1 namespaces: - - "376" - topologyKey: "377" + - "378" + topologyKey: "379" automountServiceAccountToken: true containers: - args: - - "209" + - "211" command: - - "208" + - "210" env: - - name: "216" - value: "217" + - name: "218" + value: "219" valueFrom: configMapKeyRef: - key: "223" - name: "222" - optional: false - fieldRef: - apiVersion: "218" - fieldPath: "219" - resourceFieldRef: - containerName: "220" - divisor: "771" - resource: "221" - secretKeyRef: key: "225" name: "224" + optional: false + fieldRef: + apiVersion: "220" + fieldPath: "221" + resourceFieldRef: + containerName: "222" + divisor: "771" + resource: "223" + secretKeyRef: + key: "227" + name: "226" optional: true envFrom: - configMapRef: - name: "214" + name: "216" optional: false - prefix: "213" + prefix: "215" secretRef: - name: "215" + name: "217" optional: true - image: "207" + image: "209" imagePullPolicy: ƙt叀碧闳ȩr嚧ʣq埄趛屡 lifecycle: postStart: exec: command: - - "246" + - "248" httpGet: - host: "248" + host: "250" httpHeaders: - - name: "249" - value: "250" - path: "247" + - name: "251" + value: "252" + path: "249" port: -2013568185 scheme: '#yV''WKw(ğ儴Ůĺ}' tcpSocket: - host: "251" + host: "253" port: -20130017 preStop: exec: command: - - "252" + - "254" httpGet: - host: "254" + host: "256" httpHeaders: - - name: "255" - value: "256" - path: "253" + - name: "257" + value: "258" + path: "255" port: -661937776 scheme: ØœȠƬQg鄠[颐o tcpSocket: - host: "257" + host: "259" port: 461585849 livenessProbe: exec: command: - - "232" + - "234" failureThreshold: -93157681 httpGet: - host: "234" + host: "236" httpHeaders: - - name: "235" - value: "236" - path: "233" + - name: "237" + value: "238" + path: "235" port: -1285424066 scheme: ni酛3ƁÀ initialDelaySeconds: -2036074491 periodSeconds: 165047920 successThreshold: -393291312 tcpSocket: - host: "238" - port: "237" + host: "240" + port: "239" timeoutSeconds: -148216266 - name: "206" + name: "208" ports: - containerPort: 1923334396 - hostIP: "212" + hostIP: "214" hostPort: 474119379 - name: "211" + name: "213" protocol: 旿@掇lNdǂ>5姣>懔%熷谟þ readinessProbe: exec: command: - - "239" + - "241" failureThreshold: 267768240 httpGet: - host: "242" + host: "244" httpHeaders: - - name: "243" - value: "244" - path: "240" - port: "241" + - name: "245" + value: "246" + path: "242" + port: "243" scheme: 3!Zɾģ毋Ó6 initialDelaySeconds: -228822833 periodSeconds: -1213051101 successThreshold: 1451056156 tcpSocket: - host: "245" + host: "247" port: -832805508 timeoutSeconds: -970312425 resources: @@ -285,149 +287,149 @@ spec: runAsNonRoot: false runAsUser: -5835415947553716289 seLinuxOptions: - level: "262" - role: "260" - type: "261" - user: "259" + level: "264" + role: "262" + type: "263" + user: "261" windowsOptions: - gmsaCredentialSpec: "264" - gmsaCredentialSpecName: "263" - runAsUserName: "265" - terminationMessagePath: "258" + gmsaCredentialSpec: "266" + gmsaCredentialSpecName: "265" + runAsUserName: "267" + terminationMessagePath: "260" terminationMessagePolicy: ɇ卷荙JLĹ]佱¿>犵殇ŕ-Ɂ tty: true volumeDevices: - - devicePath: "231" - name: "230" + - devicePath: "233" + name: "232" volumeMounts: - - mountPath: "227" + - mountPath: "229" mountPropagation: 0矀Kʝ瘴I\p[ħsĨɆâĺɗŹ倗S - name: "226" + name: "228" readOnly: true - subPath: "228" - subPathExpr: "229" - workingDir: "210" + subPath: "230" + subPathExpr: "231" + workingDir: "212" dnsConfig: nameservers: - - "392" + - "394" options: - - name: "394" - value: "395" + - name: "396" + value: "397" searches: - - "393" + - "395" dnsPolicy: 晲T[irȎ3Ĕ\ enableServiceLinks: false ephemeralContainers: - args: - - "269" + - "271" command: - - "268" + - "270" env: - - name: "276" - value: "277" + - name: "278" + value: "279" valueFrom: configMapKeyRef: - key: "283" - name: "282" - optional: true - fieldRef: - apiVersion: "278" - fieldPath: "279" - resourceFieldRef: - containerName: "280" - divisor: "185" - resource: "281" - secretKeyRef: key: "285" name: "284" + optional: true + fieldRef: + apiVersion: "280" + fieldPath: "281" + resourceFieldRef: + containerName: "282" + divisor: "185" + resource: "283" + secretKeyRef: + key: "287" + name: "286" optional: false envFrom: - configMapRef: - name: "274" + name: "276" optional: false - prefix: "273" + prefix: "275" secretRef: - name: "275" + name: "277" optional: false - image: "267" + image: "269" imagePullPolicy: 騎C"6x$1sȣ±p鋄 lifecycle: postStart: exec: command: - - "307" + - "309" httpGet: - host: "309" + host: "311" httpHeaders: - - name: "310" - value: "311" - path: "308" + - name: "312" + value: "313" + path: "310" port: -934378634 scheme: ɐ鰥 tcpSocket: - host: "312" + host: "314" port: 630140708 preStop: exec: command: - - "313" + - "315" httpGet: - host: "316" + host: "318" httpHeaders: - - name: "317" - value: "318" - path: "314" - port: "315" + - name: "319" + value: "320" + path: "316" + port: "317" scheme: 8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録² tcpSocket: - host: "319" + host: "321" port: 2080874371 livenessProbe: exec: command: - - "292" + - "294" failureThreshold: 1993268896 httpGet: - host: "295" + host: "297" httpHeaders: - - name: "296" - value: "297" - path: "293" - port: "294" + - name: "298" + value: "299" + path: "295" + port: "296" scheme: 頸 initialDelaySeconds: 711020087 periodSeconds: -1965247100 successThreshold: 218453478 tcpSocket: - host: "298" + host: "300" port: 1315054653 timeoutSeconds: 1103049140 - name: "266" + name: "268" ports: - containerPort: -677617960 - hostIP: "272" + hostIP: "274" hostPort: -552281772 - name: "271" + name: "273" protocol: ŕ翑0展} readinessProbe: exec: command: - - "299" + - "301" failureThreshold: -1250314365 httpGet: - host: "302" + host: "304" httpHeaders: - - name: "303" - value: "304" - path: "300" - port: "301" + - name: "305" + value: "306" + path: "302" + port: "303" scheme: 'ƿ頀"冓鍓贯澔 ' initialDelaySeconds: 1058960779 periodSeconds: 472742933 successThreshold: 50696420 tcpSocket: - host: "306" - port: "305" + host: "308" + port: "307" timeoutSeconds: -2133441986 resources: limits: @@ -448,147 +450,147 @@ spec: runAsNonRoot: false runAsUser: 4288903380102217677 seLinuxOptions: - level: "324" - role: "322" - type: "323" - user: "321" + level: "326" + role: "324" + type: "325" + user: "323" windowsOptions: - gmsaCredentialSpec: "326" - gmsaCredentialSpecName: "325" - runAsUserName: "327" + gmsaCredentialSpec: "328" + gmsaCredentialSpecName: "327" + runAsUserName: "329" stdinOnce: true - targetContainerName: "328" - terminationMessagePath: "320" + targetContainerName: "330" + terminationMessagePath: "322" terminationMessagePolicy: 灩聋3趐囨鏻砅邻 tty: true volumeDevices: - - devicePath: "291" - name: "290" + - devicePath: "293" + name: "292" volumeMounts: - - mountPath: "287" + - mountPath: "289" mountPropagation: "" - name: "286" - subPath: "288" - subPathExpr: "289" - workingDir: "270" + name: "288" + subPath: "290" + subPathExpr: "291" + workingDir: "272" hostAliases: - hostnames: - - "390" - ip: "389" + - "392" + ip: "391" hostIPC: true - hostname: "344" + hostname: "346" imagePullSecrets: - - name: "343" + - name: "345" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "650" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "650" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: true envFrom: - configMapRef: - name: "153" + name: "155" optional: true - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: true - image: "146" + image: "148" lifecycle: postStart: exec: command: - - "184" + - "186" httpGet: - host: "187" + host: "189" httpHeaders: - - name: "188" - value: "189" - path: "185" - port: "186" + - name: "190" + value: "191" + path: "187" + port: "188" scheme: £ȹ嫰ƹǔw÷nI粛E煹 tcpSocket: - host: "190" + host: "192" port: 135036402 preStop: exec: command: - - "191" + - "193" httpGet: - host: "193" + host: "195" httpHeaders: - - name: "194" - value: "195" - path: "192" + - name: "196" + value: "197" + path: "194" port: -1188430996 scheme: djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪 tcpSocket: - host: "197" - port: "196" + host: "199" + port: "198" livenessProbe: exec: command: - - "171" + - "173" failureThreshold: -1113628381 httpGet: - host: "173" + host: "175" httpHeaders: - - name: "174" - value: "175" - path: "172" + - name: "176" + value: "177" + path: "174" port: -152585895 scheme: E@Ȗs«ö initialDelaySeconds: 1843758068 periodSeconds: 1702578303 successThreshold: -1565157256 tcpSocket: - host: "176" + host: "178" port: 1135182169 timeoutSeconds: -1967469005 - name: "145" + name: "147" ports: - containerPort: 1403721475 - hostIP: "151" + hostIP: "153" hostPort: -606111218 - name: "150" + name: "152" protocol: ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳 readinessProbe: exec: command: - - "177" + - "179" failureThreshold: -1167888910 httpGet: - host: "179" + host: "181" httpHeaders: - - name: "180" - value: "181" - path: "178" + - name: "182" + value: "183" + path: "180" port: 386652373 scheme: ʙ嫙& initialDelaySeconds: -802585193 periodSeconds: 1944205014 successThreshold: -2079582559 tcpSocket: - host: "183" - port: "182" + host: "185" + port: "184" timeoutSeconds: 1901330124 resources: limits: @@ -609,72 +611,72 @@ spec: runAsNonRoot: false runAsUser: 7739117973959656085 seLinuxOptions: - level: "202" - role: "200" - type: "201" - user: "199" + level: "204" + role: "202" + type: "203" + user: "201" windowsOptions: - gmsaCredentialSpec: "204" - gmsaCredentialSpecName: "203" - runAsUserName: "205" + gmsaCredentialSpec: "206" + gmsaCredentialSpecName: "205" + runAsUserName: "207" stdin: true stdinOnce: true - terminationMessagePath: "198" + terminationMessagePath: "200" terminationMessagePolicy: ɩC volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: "" - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "333" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "335" nodeSelector: - "329": "330" + "331": "332" overhead: tHǽ÷閂抰^窄CǙķȈ: "97" preemptionPolicy: ý筞X priority: -1331113536 - priorityClassName: "391" + priorityClassName: "393" readinessGates: - conditionType: mō6µɑ`ȗ<8^翜 restartPolicy: w妕眵笭/9崍h趭(娕 - runtimeClassName: "396" - schedulerName: "386" + runtimeClassName: "398" + schedulerName: "388" securityContext: fsGroup: 7747616967629081728 runAsGroup: 7461098988156705429 runAsNonRoot: false runAsUser: 4430285638700927057 seLinuxOptions: - level: "337" - role: "335" - type: "336" - user: "334" + level: "339" + role: "337" + type: "338" + user: "336" supplementalGroups: - 7866826580662861268 sysctls: - - name: "341" - value: "342" + - name: "343" + value: "344" windowsOptions: - gmsaCredentialSpec: "339" - gmsaCredentialSpecName: "338" - runAsUserName: "340" - serviceAccount: "332" - serviceAccountName: "331" + gmsaCredentialSpec: "341" + gmsaCredentialSpecName: "340" + runAsUserName: "342" + serviceAccount: "334" + serviceAccountName: "333" shareProcessNamespace: true - subdomain: "345" + subdomain: "347" terminationGracePeriodSeconds: 6245571390016329382 tolerations: - effect: 緍k¢茤 - key: "387" + key: "389" operator: 抄3昞财Î嘝zʄ!ć tolerationSeconds: 4096844323391966153 - value: "388" + value: "390" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -684,215 +686,215 @@ spec: ? zp22o4a-w----11rqy3eo79p-f4r1--7p--053--suu--98.y1s8-j-6j4uvf1-sdg--132bid-7x0u738--7w-tdt-u-0--v/Ied-0-i_zZsY_o8t5Vl6_..7CY-_dc__G6N-_-0o.0C_gV.9_G5 : x_.4dwFbuvEf55Y2k.F-4 maxSkew: 1956797678 - topologyKey: "397" + topologyKey: "399" whenUnsatisfiable: ƀ+瑏eCmAȥ睙 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: 912004803 readOnly: true - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: '|@?鷅bȻN' - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: 榱*Gưoɘ檲 readOnly: true azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 1593906314 items: - - key: "97" + - key: "99" mode: 195263908 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: false volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: 824682619 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 1569992019 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "660" - resource: "90" + resource: "92" emptyDir: medium: Xŋ朘瑥A徙ɶɊł/擇ɦĽ胚O醔ɍ厶耈 sizeLimit: "473" fc: - fsType: "92" + fsType: "94" lun: -1740986684 readOnly: true targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" readOnly: true secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1188153605 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" readOnly: true hostPath: - path: "41" + path: "43" type: ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱< iscsi: chapAuthDiscovery: true - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 994527057 portals: - - "58" + - "60" secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" + fsType: "129" readOnly: true - volumeID: "126" + volumeID: "128" projected: defaultMode: -1334904807 sources: - configMap: items: - - key: "122" + - key: "124" mode: 2063799569 - path: "123" - name: "121" + path: "125" + name: "123" optional: false downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: 173030157 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "106" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: -323584340 - path: "115" - name: "113" + path: "117" + name: "115" optional: true serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: 8357931971650847566 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + name: "132" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 332383000 items: - - key: "50" + - key: "52" mode: -547518679 - path: "51" + path: "53" optional: true - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" status: availableReplicas: -1521312599 collisionCount: -612321491 conditions: - lastTransitionTime: "2615-10-02T05:14:27Z" lastUpdateTime: "2733-02-09T15:36:31Z" - message: "405" - reason: "404" + message: "407" + reason: "406" status: 2ț type: '{ɦ!f親ʚ«Ǥ栌Ə侷ŧĞö' observedGeneration: -4950488263500864484 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.json index 5165a088f3d..6ec5d74471c 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.json +++ b/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" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.pb index ae29cd6343b..65a8f0ec45e 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.yaml index 421301c3a80..4cf545604a9 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.Scale.yaml +++ b/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" diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.json index 27e2eb713e3..6543ea631e7 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.json +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -54,49 +55,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "?Qȫş", "resourceVersion": "1736621709629422270", "generation": -8542870036622468681, "creationTimestamp": null, "deletionGracePeriodSeconds": -2575298329142810753, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "ƶȤ^}", "controller": true, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "躢", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱\u003c" }, "emptyDir": { @@ -104,27 +106,27 @@ "sizeLimit": "473" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1188153605 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": 912004803, "readOnly": true }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": -547518679 } ], @@ -132,91 +134,91 @@ "optional": true }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 994527057, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "portals": [ - "58" + "60" ], "chapAuthDiscovery": true, "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62", + "endpoints": "63", + "path": "64", "readOnly": true }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" } }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "readOnly": true, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "660" }, "mode": 1569992019 @@ -226,26 +228,26 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": -1740986684, - "fsType": "92", + "fsType": "94", "readOnly": true, "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95", + "secretName": "96", + "shareName": "97", "readOnly": true }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": 195263908 } ], @@ -253,39 +255,39 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", - "user": "105", - "group": "106", - "tenant": "107" + "registry": "105", + "volume": "106", + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "|@?鷅bȻN", - "fsType": "110", + "fsType": "112", "readOnly": true, "kind": "榱*Gưoɘ檲" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": -323584340 } ], @@ -294,14 +296,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "106" }, "mode": 173030157 @@ -309,118 +311,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": 2063799569 } ], "optional": false }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": 8357931971650847566, - "path": "125" + "path": "127" } } ], "defaultMode": -1334904807 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127", + "volumeID": "128", + "fsType": "129", "readOnly": true }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": false, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -606111218, "containerPort": 1403721475, "protocol": "ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": true }, "secretRef": { - "name": "154", + "name": "156", "optional": true } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "650" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": false }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": true } } @@ -436,41 +438,41 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", + "path": "174", "port": -152585895, - "host": "173", + "host": "175", "scheme": "E@Ȗs«ö", "httpHeaders": [ { - "name": "174", - "value": "175" + "name": "176", + "value": "177" } ] }, "tcpSocket": { "port": 1135182169, - "host": "176" + "host": "178" }, "initialDelaySeconds": 1843758068, "timeoutSeconds": -1967469005, @@ -481,24 +483,24 @@ "readinessProbe": { "exec": { "command": [ - "177" + "179" ] }, "httpGet": { - "path": "178", + "path": "180", "port": 386652373, - "host": "179", + "host": "181", "scheme": "ʙ嫙\u0026", "httpHeaders": [ { - "name": "180", - "value": "181" + "name": "182", + "value": "183" } ] }, "tcpSocket": { - "port": "182", - "host": "183" + "port": "184", + "host": "185" }, "initialDelaySeconds": -802585193, "timeoutSeconds": 1901330124, @@ -510,51 +512,51 @@ "postStart": { "exec": { "command": [ - "184" + "186" ] }, "httpGet": { - "path": "185", - "port": "186", - "host": "187", + "path": "187", + "port": "188", + "host": "189", "scheme": "£ȹ嫰ƹǔw÷nI粛E煹", "httpHeaders": [ { - "name": "188", - "value": "189" + "name": "190", + "value": "191" } ] }, "tcpSocket": { "port": 135036402, - "host": "190" + "host": "192" } }, "preStop": { "exec": { "command": [ - "191" + "193" ] }, "httpGet": { - "path": "192", + "path": "194", "port": -1188430996, - "host": "193", + "host": "195", "scheme": "djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪", "httpHeaders": [ { - "name": "194", - "value": "195" + "name": "196", + "value": "197" } ] }, "tcpSocket": { - "port": "196", - "host": "197" + "port": "198", + "host": "199" } } }, - "terminationMessagePath": "198", + "terminationMessagePath": "200", "terminationMessagePolicy": "ɩC", "securityContext": { "capabilities": { @@ -567,15 +569,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "199", - "role": "200", - "type": "201", - "level": "202" + "user": "201", + "role": "202", + "type": "203", + "level": "204" }, "windowsOptions": { - "gmsaCredentialSpecName": "203", - "gmsaCredentialSpec": "204", - "runAsUserName": "205" + "gmsaCredentialSpecName": "205", + "gmsaCredentialSpec": "206", + "runAsUserName": "207" }, "runAsUser": 7739117973959656085, "runAsGroup": 3747003978559617838, @@ -590,59 +592,59 @@ ], "containers": [ { - "name": "206", - "image": "207", + "name": "208", + "image": "209", "command": [ - "208" + "210" ], "args": [ - "209" + "211" ], - "workingDir": "210", + "workingDir": "212", "ports": [ { - "name": "211", + "name": "213", "hostPort": 474119379, "containerPort": 1923334396, "protocol": "旿@掇lNdǂ\u003e5姣\u003e懔%熷谟þ", - "hostIP": "212" + "hostIP": "214" } ], "envFrom": [ { - "prefix": "213", + "prefix": "215", "configMapRef": { - "name": "214", + "name": "216", "optional": false }, "secretRef": { - "name": "215", + "name": "217", "optional": true } } ], "env": [ { - "name": "216", - "value": "217", + "name": "218", + "value": "219", "valueFrom": { "fieldRef": { - "apiVersion": "218", - "fieldPath": "219" + "apiVersion": "220", + "fieldPath": "221" }, "resourceFieldRef": { - "containerName": "220", - "resource": "221", + "containerName": "222", + "resource": "223", "divisor": "771" }, "configMapKeyRef": { - "name": "222", - "key": "223", + "name": "224", + "key": "225", "optional": false }, "secretKeyRef": { - "name": "224", - "key": "225", + "name": "226", + "key": "227", "optional": true } } @@ -658,41 +660,41 @@ }, "volumeMounts": [ { - "name": "226", + "name": "228", "readOnly": true, - "mountPath": "227", - "subPath": "228", + "mountPath": "229", + "subPath": "230", "mountPropagation": "0矀Kʝ瘴I\\p[ħsĨɆâĺɗŹ倗S", - "subPathExpr": "229" + "subPathExpr": "231" } ], "volumeDevices": [ { - "name": "230", - "devicePath": "231" + "name": "232", + "devicePath": "233" } ], "livenessProbe": { "exec": { "command": [ - "232" + "234" ] }, "httpGet": { - "path": "233", + "path": "235", "port": -1285424066, - "host": "234", + "host": "236", "scheme": "ni酛3ƁÀ", "httpHeaders": [ { - "name": "235", - "value": "236" + "name": "237", + "value": "238" } ] }, "tcpSocket": { - "port": "237", - "host": "238" + "port": "239", + "host": "240" }, "initialDelaySeconds": -2036074491, "timeoutSeconds": -148216266, @@ -703,24 +705,24 @@ "readinessProbe": { "exec": { "command": [ - "239" + "241" ] }, "httpGet": { - "path": "240", - "port": "241", - "host": "242", + "path": "242", + "port": "243", + "host": "244", "scheme": "3!Zɾģ毋Ó6", "httpHeaders": [ { - "name": "243", - "value": "244" + "name": "245", + "value": "246" } ] }, "tcpSocket": { "port": -832805508, - "host": "245" + "host": "247" }, "initialDelaySeconds": -228822833, "timeoutSeconds": -970312425, @@ -732,51 +734,51 @@ "postStart": { "exec": { "command": [ - "246" + "248" ] }, "httpGet": { - "path": "247", + "path": "249", "port": -2013568185, - "host": "248", + "host": "250", "scheme": "#yV'WKw(ğ儴Ůĺ}", "httpHeaders": [ { - "name": "249", - "value": "250" + "name": "251", + "value": "252" } ] }, "tcpSocket": { "port": -20130017, - "host": "251" + "host": "253" } }, "preStop": { "exec": { "command": [ - "252" + "254" ] }, "httpGet": { - "path": "253", + "path": "255", "port": -661937776, - "host": "254", + "host": "256", "scheme": "ØœȠƬQg鄠[颐o", "httpHeaders": [ { - "name": "255", - "value": "256" + "name": "257", + "value": "258" } ] }, "tcpSocket": { "port": 461585849, - "host": "257" + "host": "259" } } }, - "terminationMessagePath": "258", + "terminationMessagePath": "260", "terminationMessagePolicy": "ɇ卷荙JLĹ]佱¿\u003e犵殇ŕ-Ɂ", "imagePullPolicy": "ƙt叀碧闳ȩr嚧ʣq埄趛屡", "securityContext": { @@ -790,15 +792,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "259", - "role": "260", - "type": "261", - "level": "262" + "user": "261", + "role": "262", + "type": "263", + "level": "264" }, "windowsOptions": { - "gmsaCredentialSpecName": "263", - "gmsaCredentialSpec": "264", - "runAsUserName": "265" + "gmsaCredentialSpecName": "265", + "gmsaCredentialSpec": "266", + "runAsUserName": "267" }, "runAsUser": -5835415947553716289, "runAsGroup": 2540215688947167763, @@ -812,59 +814,59 @@ ], "ephemeralContainers": [ { - "name": "266", - "image": "267", + "name": "268", + "image": "269", "command": [ - "268" + "270" ], "args": [ - "269" + "271" ], - "workingDir": "270", + "workingDir": "272", "ports": [ { - "name": "271", + "name": "273", "hostPort": -552281772, "containerPort": -677617960, "protocol": "ŕ翑0展}", - "hostIP": "272" + "hostIP": "274" } ], "envFrom": [ { - "prefix": "273", + "prefix": "275", "configMapRef": { - "name": "274", + "name": "276", "optional": false }, "secretRef": { - "name": "275", + "name": "277", "optional": false } } ], "env": [ { - "name": "276", - "value": "277", + "name": "278", + "value": "279", "valueFrom": { "fieldRef": { - "apiVersion": "278", - "fieldPath": "279" + "apiVersion": "280", + "fieldPath": "281" }, "resourceFieldRef": { - "containerName": "280", - "resource": "281", + "containerName": "282", + "resource": "283", "divisor": "185" }, "configMapKeyRef": { - "name": "282", - "key": "283", + "name": "284", + "key": "285", "optional": true }, "secretKeyRef": { - "name": "284", - "key": "285", + "name": "286", + "key": "287", "optional": false } } @@ -880,40 +882,40 @@ }, "volumeMounts": [ { - "name": "286", - "mountPath": "287", - "subPath": "288", + "name": "288", + "mountPath": "289", + "subPath": "290", "mountPropagation": "", - "subPathExpr": "289" + "subPathExpr": "291" } ], "volumeDevices": [ { - "name": "290", - "devicePath": "291" + "name": "292", + "devicePath": "293" } ], "livenessProbe": { "exec": { "command": [ - "292" + "294" ] }, "httpGet": { - "path": "293", - "port": "294", - "host": "295", + "path": "295", + "port": "296", + "host": "297", "scheme": "頸", "httpHeaders": [ { - "name": "296", - "value": "297" + "name": "298", + "value": "299" } ] }, "tcpSocket": { "port": 1315054653, - "host": "298" + "host": "300" }, "initialDelaySeconds": 711020087, "timeoutSeconds": 1103049140, @@ -924,24 +926,24 @@ "readinessProbe": { "exec": { "command": [ - "299" + "301" ] }, "httpGet": { - "path": "300", - "port": "301", - "host": "302", + "path": "302", + "port": "303", + "host": "304", "scheme": "ƿ頀\"冓鍓贯澔 ", "httpHeaders": [ { - "name": "303", - "value": "304" + "name": "305", + "value": "306" } ] }, "tcpSocket": { - "port": "305", - "host": "306" + "port": "307", + "host": "308" }, "initialDelaySeconds": 1058960779, "timeoutSeconds": -2133441986, @@ -953,51 +955,51 @@ "postStart": { "exec": { "command": [ - "307" + "309" ] }, "httpGet": { - "path": "308", + "path": "310", "port": -934378634, - "host": "309", + "host": "311", "scheme": "ɐ鰥", "httpHeaders": [ { - "name": "310", - "value": "311" + "name": "312", + "value": "313" } ] }, "tcpSocket": { "port": 630140708, - "host": "312" + "host": "314" } }, "preStop": { "exec": { "command": [ - "313" + "315" ] }, "httpGet": { - "path": "314", - "port": "315", - "host": "316", + "path": "316", + "port": "317", + "host": "318", "scheme": "8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録²", "httpHeaders": [ { - "name": "317", - "value": "318" + "name": "319", + "value": "320" } ] }, "tcpSocket": { "port": 2080874371, - "host": "319" + "host": "321" } } }, - "terminationMessagePath": "320", + "terminationMessagePath": "322", "terminationMessagePolicy": "灩聋3趐囨鏻砅邻", "imagePullPolicy": "騎C\"6x$1sȣ±p鋄", "securityContext": { @@ -1011,15 +1013,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "321", - "role": "322", - "type": "323", - "level": "324" + "user": "323", + "role": "324", + "type": "325", + "level": "326" }, "windowsOptions": { - "gmsaCredentialSpecName": "325", - "gmsaCredentialSpec": "326", - "runAsUserName": "327" + "gmsaCredentialSpecName": "327", + "gmsaCredentialSpec": "328", + "runAsUserName": "329" }, "runAsUser": 4288903380102217677, "runAsGroup": 6618112330449141397, @@ -1030,7 +1032,7 @@ }, "stdinOnce": true, "tty": true, - "targetContainerName": "328" + "targetContainerName": "330" } ], "restartPolicy": "w妕眵笭/9崍h趭(娕", @@ -1038,25 +1040,25 @@ "activeDeadlineSeconds": -3214891994203952546, "dnsPolicy": "晲T[irȎ3Ĕ\\", "nodeSelector": { - "329": "330" + "331": "332" }, - "serviceAccountName": "331", - "serviceAccount": "332", + "serviceAccountName": "333", + "serviceAccount": "334", "automountServiceAccountToken": true, - "nodeName": "333", + "nodeName": "335", "hostIPC": true, "shareProcessNamespace": true, "securityContext": { "seLinuxOptions": { - "user": "334", - "role": "335", - "type": "336", - "level": "337" + "user": "336", + "role": "337", + "type": "338", + "level": "339" }, "windowsOptions": { - "gmsaCredentialSpecName": "338", - "gmsaCredentialSpec": "339", - "runAsUserName": "340" + "gmsaCredentialSpecName": "340", + "gmsaCredentialSpec": "341", + "runAsUserName": "342" }, "runAsUser": 4430285638700927057, "runAsGroup": 7461098988156705429, @@ -1067,18 +1069,18 @@ "fsGroup": 7747616967629081728, "sysctls": [ { - "name": "341", - "value": "342" + "name": "343", + "value": "344" } ] }, "imagePullSecrets": [ { - "name": "343" + "name": "345" } ], - "hostname": "344", - "subdomain": "345", + "hostname": "346", + "subdomain": "347", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1086,19 +1088,19 @@ { "matchExpressions": [ { - "key": "346", + "key": "348", "operator": "Ǚ(", "values": [ - "347" + "349" ] } ], "matchFields": [ { - "key": "348", + "key": "350", "operator": "瘍Nʊ輔3璾ėȜv1b繐汚", "values": [ - "349" + "351" ] } ] @@ -1111,19 +1113,19 @@ "preference": { "matchExpressions": [ { - "key": "350", + "key": "352", "operator": "n覦灲閈誹ʅ蕉", "values": [ - "351" + "353" ] } ], "matchFields": [ { - "key": "352", + "key": "354", "operator": "", "values": [ - "353" + "355" ] } ] @@ -1146,9 +1148,9 @@ ] }, "namespaces": [ - "360" + "362" ], - "topologyKey": "361" + "topologyKey": "363" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1170,9 +1172,9 @@ ] }, "namespaces": [ - "368" + "370" ], - "topologyKey": "369" + "topologyKey": "371" } } ] @@ -1195,9 +1197,9 @@ ] }, "namespaces": [ - "376" + "378" ], - "topologyKey": "377" + "topologyKey": "379" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1219,45 +1221,45 @@ ] }, "namespaces": [ - "384" + "386" ], - "topologyKey": "385" + "topologyKey": "387" } } ] } }, - "schedulerName": "386", + "schedulerName": "388", "tolerations": [ { - "key": "387", + "key": "389", "operator": "抄3昞财Î嘝zʄ!ć", - "value": "388", + "value": "390", "effect": "緍k¢茤", "tolerationSeconds": 4096844323391966153 } ], "hostAliases": [ { - "ip": "389", + "ip": "391", "hostnames": [ - "390" + "392" ] } ], - "priorityClassName": "391", + "priorityClassName": "393", "priority": -1331113536, "dnsConfig": { "nameservers": [ - "392" + "394" ], "searches": [ - "393" + "395" ], "options": [ { - "name": "394", - "value": "395" + "name": "396", + "value": "397" } ] }, @@ -1266,7 +1268,7 @@ "conditionType": "mō6µɑ`ȗ\u003c8^翜" } ], - "runtimeClassName": "396", + "runtimeClassName": "398", "enableServiceLinks": false, "preemptionPolicy": "ý筞X", "overhead": { @@ -1275,7 +1277,7 @@ "topologySpreadConstraints": [ { "maxSkew": 1956797678, - "topologyKey": "397", + "topologyKey": "399", "whenUnsatisfiable": "ƀ+瑏eCmAȥ睙", "labelSelector": { "matchLabels": { @@ -1295,40 +1297,41 @@ "volumeClaimTemplates": [ { "metadata": { - "name": "404", - "generateName": "405", - "namespace": "406", - "selfLink": "407", + "name": "406", + "generateName": "407", + "namespace": "408", + "selfLink": "409", "uid": "鋡浤ɖ緖焿熣", "resourceVersion": "7821588463673401230", "generation": -3408884454087787958, "creationTimestamp": null, "deletionGracePeriodSeconds": -7871971636641833314, "labels": { - "409": "410" + "411": "412" }, "annotations": { - "411": "412" + "413": "414" }, "ownerReferences": [ { - "apiVersion": "413", - "kind": "414", - "name": "415", + "apiVersion": "415", + "kind": "416", + "name": "417", "uid": "9F徵{ɦ!f親ʚ«Ǥ栌Ə侷ŧ", "controller": false, "blockOwnerDeletion": true } ], "finalizers": [ - "416" + "418" ], - "clusterName": "417", + "clusterName": "419", "managedFields": [ { - "manager": "418", + "manager": "420", "operation": "ÕW肤", - "apiVersion": "419" + "apiVersion": "421", + "fieldsType": "422" } ] }, @@ -1355,13 +1358,13 @@ "犔kU坥;ȉv5": "156" } }, - "volumeName": "426", - "storageClassName": "427", + "volumeName": "429", + "storageClassName": "430", "volumeMode": "qwïźU痤ȵ", "dataSource": { - "apiGroup": "428", - "kind": "429", - "name": "430" + "apiGroup": "431", + "kind": "432", + "name": "433" } }, "status": { @@ -1378,14 +1381,14 @@ "status": "RY客\\ǯ'_", "lastProbeTime": "2513-10-02T03:37:43Z", "lastTransitionTime": "2172-12-06T22:36:31Z", - "reason": "431", - "message": "432" + "reason": "434", + "message": "435" } ] } } ], - "serviceName": "433", + "serviceName": "436", "podManagementPolicy": "榭ș«lj}砵(ɋǬAÃɮǜ:ɐ", "updateStrategy": { "type": "瓘ȿ4", @@ -1401,16 +1404,16 @@ "readyReplicas": -1633381902, "currentReplicas": 125606756, "updatedReplicas": 120643071, - "currentRevision": "434", - "updateRevision": "435", + "currentRevision": "437", + "updateRevision": "438", "collisionCount": -126974464, "conditions": [ { "type": "5ƞɔJ灭ƳĽ", "status": "ɭ锻ó/階", "lastTransitionTime": "2478-01-26T13:55:29Z", - "reason": "436", - "message": "437" + "reason": "439", + "message": "440" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.pb index ca358d31464..b76eba7dbf9 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.yaml index 577e49051c0..c401830056c 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta1.StatefulSet.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -38,35 +39,36 @@ spec: operator: Exists matchLabels: 74404d5---g8c2-k-91e.y5-g--58----0683-b-w7ld-6cs06xj-x5yv0wm-k18/M_-Nx.N_6-___._-.-W._AAn---v_-5-_8LXj: 6-4_WE-_JTrcd-2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--1 - serviceName: "433" + serviceName: "436" template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: -2575298329142810753 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -8542870036622468681 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: 躢 - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: true - kind: "34" - name: "35" + kind: "35" + name: "36" uid: ƶȤ^} resourceVersion: "1736621709629422270" - selfLink: "27" + selfLink: "28" uid: ?Qȫş spec: activeDeadlineSeconds: -3214891994203952546 @@ -75,28 +77,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "350" + - key: "352" operator: n覦灲閈誹ʅ蕉 values: - - "351" + - "353" matchFields: - - key: "352" + - key: "354" operator: "" values: - - "353" + - "355" weight: 702968201 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "346" + - key: "348" operator: Ǚ( values: - - "347" + - "349" matchFields: - - key: "348" + - key: "350" operator: 瘍Nʊ輔3璾ėȜv1b繐汚 values: - - "349" + - "351" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -109,8 +111,8 @@ spec: matchLabels: Bk.j._g-G-7--p9.-_0R.-_-3_L_2--_v2.5p_..Y-.wg_-b8a_68: Q4_.84.K_-_0_..u.F.pq..--Q namespaces: - - "368" - topologyKey: "369" + - "370" + topologyKey: "371" weight: 1195176401 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -120,8 +122,8 @@ spec: matchLabels: lm-e46-r-g63--gt1--6mx-r-927--m6-k8-c2---2etfh41ca-z-g/0p_3_J_SA995IKCR.s--f.-f.-zv._._.5-H.T.-.-.d: b_9_1o.w_aI._31-_I-A-_3bz._8M0U1_-__.71-_-9_._X-D---k..1Q7._l.I namespaces: - - "360" - topologyKey: "361" + - "362" + topologyKey: "363" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -134,8 +136,8 @@ spec: matchLabels: 3--rgvf3q-z-5z80n--t5--9-4-d2-22--i--40wv--in-870w--it6k47-7y1.h72n-cnp-75/c10KkQ-R_R.-.--4_IT_O__3.5h_XC0_-3: 20_._.-_L-__bf_9_-C-PfNx__-U_.Pn-W23-_.z_.._s--_F-BR-.h_-2-.F namespaces: - - "384" - topologyKey: "385" + - "386" + topologyKey: "387" weight: -1508769491 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -147,119 +149,119 @@ spec: matchLabels: H__V.Vz_6.Hz_V_.r_v_._e_-78o_6Z..11_7pX_.-mLlx...w_j: 35.40Rw4gD.._.-x6db-L7.-__-G_2kCpS_1 namespaces: - - "376" - topologyKey: "377" + - "378" + topologyKey: "379" automountServiceAccountToken: true containers: - args: - - "209" + - "211" command: - - "208" + - "210" env: - - name: "216" - value: "217" + - name: "218" + value: "219" valueFrom: configMapKeyRef: - key: "223" - name: "222" - optional: false - fieldRef: - apiVersion: "218" - fieldPath: "219" - resourceFieldRef: - containerName: "220" - divisor: "771" - resource: "221" - secretKeyRef: key: "225" name: "224" + optional: false + fieldRef: + apiVersion: "220" + fieldPath: "221" + resourceFieldRef: + containerName: "222" + divisor: "771" + resource: "223" + secretKeyRef: + key: "227" + name: "226" optional: true envFrom: - configMapRef: - name: "214" + name: "216" optional: false - prefix: "213" + prefix: "215" secretRef: - name: "215" + name: "217" optional: true - image: "207" + image: "209" imagePullPolicy: ƙt叀碧闳ȩr嚧ʣq埄趛屡 lifecycle: postStart: exec: command: - - "246" + - "248" httpGet: - host: "248" + host: "250" httpHeaders: - - name: "249" - value: "250" - path: "247" + - name: "251" + value: "252" + path: "249" port: -2013568185 scheme: '#yV''WKw(ğ儴Ůĺ}' tcpSocket: - host: "251" + host: "253" port: -20130017 preStop: exec: command: - - "252" + - "254" httpGet: - host: "254" + host: "256" httpHeaders: - - name: "255" - value: "256" - path: "253" + - name: "257" + value: "258" + path: "255" port: -661937776 scheme: ØœȠƬQg鄠[颐o tcpSocket: - host: "257" + host: "259" port: 461585849 livenessProbe: exec: command: - - "232" + - "234" failureThreshold: -93157681 httpGet: - host: "234" + host: "236" httpHeaders: - - name: "235" - value: "236" - path: "233" + - name: "237" + value: "238" + path: "235" port: -1285424066 scheme: ni酛3ƁÀ initialDelaySeconds: -2036074491 periodSeconds: 165047920 successThreshold: -393291312 tcpSocket: - host: "238" - port: "237" + host: "240" + port: "239" timeoutSeconds: -148216266 - name: "206" + name: "208" ports: - containerPort: 1923334396 - hostIP: "212" + hostIP: "214" hostPort: 474119379 - name: "211" + name: "213" protocol: 旿@掇lNdǂ>5姣>懔%熷谟þ readinessProbe: exec: command: - - "239" + - "241" failureThreshold: 267768240 httpGet: - host: "242" + host: "244" httpHeaders: - - name: "243" - value: "244" - path: "240" - port: "241" + - name: "245" + value: "246" + path: "242" + port: "243" scheme: 3!Zɾģ毋Ó6 initialDelaySeconds: -228822833 periodSeconds: -1213051101 successThreshold: 1451056156 tcpSocket: - host: "245" + host: "247" port: -832805508 timeoutSeconds: -970312425 resources: @@ -281,149 +283,149 @@ spec: runAsNonRoot: false runAsUser: -5835415947553716289 seLinuxOptions: - level: "262" - role: "260" - type: "261" - user: "259" + level: "264" + role: "262" + type: "263" + user: "261" windowsOptions: - gmsaCredentialSpec: "264" - gmsaCredentialSpecName: "263" - runAsUserName: "265" - terminationMessagePath: "258" + gmsaCredentialSpec: "266" + gmsaCredentialSpecName: "265" + runAsUserName: "267" + terminationMessagePath: "260" terminationMessagePolicy: ɇ卷荙JLĹ]佱¿>犵殇ŕ-Ɂ tty: true volumeDevices: - - devicePath: "231" - name: "230" + - devicePath: "233" + name: "232" volumeMounts: - - mountPath: "227" + - mountPath: "229" mountPropagation: 0矀Kʝ瘴I\p[ħsĨɆâĺɗŹ倗S - name: "226" + name: "228" readOnly: true - subPath: "228" - subPathExpr: "229" - workingDir: "210" + subPath: "230" + subPathExpr: "231" + workingDir: "212" dnsConfig: nameservers: - - "392" + - "394" options: - - name: "394" - value: "395" + - name: "396" + value: "397" searches: - - "393" + - "395" dnsPolicy: 晲T[irȎ3Ĕ\ enableServiceLinks: false ephemeralContainers: - args: - - "269" + - "271" command: - - "268" + - "270" env: - - name: "276" - value: "277" + - name: "278" + value: "279" valueFrom: configMapKeyRef: - key: "283" - name: "282" - optional: true - fieldRef: - apiVersion: "278" - fieldPath: "279" - resourceFieldRef: - containerName: "280" - divisor: "185" - resource: "281" - secretKeyRef: key: "285" name: "284" + optional: true + fieldRef: + apiVersion: "280" + fieldPath: "281" + resourceFieldRef: + containerName: "282" + divisor: "185" + resource: "283" + secretKeyRef: + key: "287" + name: "286" optional: false envFrom: - configMapRef: - name: "274" + name: "276" optional: false - prefix: "273" + prefix: "275" secretRef: - name: "275" + name: "277" optional: false - image: "267" + image: "269" imagePullPolicy: 騎C"6x$1sȣ±p鋄 lifecycle: postStart: exec: command: - - "307" + - "309" httpGet: - host: "309" + host: "311" httpHeaders: - - name: "310" - value: "311" - path: "308" + - name: "312" + value: "313" + path: "310" port: -934378634 scheme: ɐ鰥 tcpSocket: - host: "312" + host: "314" port: 630140708 preStop: exec: command: - - "313" + - "315" httpGet: - host: "316" + host: "318" httpHeaders: - - name: "317" - value: "318" - path: "314" - port: "315" + - name: "319" + value: "320" + path: "316" + port: "317" scheme: 8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録² tcpSocket: - host: "319" + host: "321" port: 2080874371 livenessProbe: exec: command: - - "292" + - "294" failureThreshold: 1993268896 httpGet: - host: "295" + host: "297" httpHeaders: - - name: "296" - value: "297" - path: "293" - port: "294" + - name: "298" + value: "299" + path: "295" + port: "296" scheme: 頸 initialDelaySeconds: 711020087 periodSeconds: -1965247100 successThreshold: 218453478 tcpSocket: - host: "298" + host: "300" port: 1315054653 timeoutSeconds: 1103049140 - name: "266" + name: "268" ports: - containerPort: -677617960 - hostIP: "272" + hostIP: "274" hostPort: -552281772 - name: "271" + name: "273" protocol: ŕ翑0展} readinessProbe: exec: command: - - "299" + - "301" failureThreshold: -1250314365 httpGet: - host: "302" + host: "304" httpHeaders: - - name: "303" - value: "304" - path: "300" - port: "301" + - name: "305" + value: "306" + path: "302" + port: "303" scheme: 'ƿ頀"冓鍓贯澔 ' initialDelaySeconds: 1058960779 periodSeconds: 472742933 successThreshold: 50696420 tcpSocket: - host: "306" - port: "305" + host: "308" + port: "307" timeoutSeconds: -2133441986 resources: limits: @@ -444,147 +446,147 @@ spec: runAsNonRoot: false runAsUser: 4288903380102217677 seLinuxOptions: - level: "324" - role: "322" - type: "323" - user: "321" + level: "326" + role: "324" + type: "325" + user: "323" windowsOptions: - gmsaCredentialSpec: "326" - gmsaCredentialSpecName: "325" - runAsUserName: "327" + gmsaCredentialSpec: "328" + gmsaCredentialSpecName: "327" + runAsUserName: "329" stdinOnce: true - targetContainerName: "328" - terminationMessagePath: "320" + targetContainerName: "330" + terminationMessagePath: "322" terminationMessagePolicy: 灩聋3趐囨鏻砅邻 tty: true volumeDevices: - - devicePath: "291" - name: "290" + - devicePath: "293" + name: "292" volumeMounts: - - mountPath: "287" + - mountPath: "289" mountPropagation: "" - name: "286" - subPath: "288" - subPathExpr: "289" - workingDir: "270" + name: "288" + subPath: "290" + subPathExpr: "291" + workingDir: "272" hostAliases: - hostnames: - - "390" - ip: "389" + - "392" + ip: "391" hostIPC: true - hostname: "344" + hostname: "346" imagePullSecrets: - - name: "343" + - name: "345" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "650" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "650" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: true envFrom: - configMapRef: - name: "153" + name: "155" optional: true - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: true - image: "146" + image: "148" lifecycle: postStart: exec: command: - - "184" + - "186" httpGet: - host: "187" + host: "189" httpHeaders: - - name: "188" - value: "189" - path: "185" - port: "186" + - name: "190" + value: "191" + path: "187" + port: "188" scheme: £ȹ嫰ƹǔw÷nI粛E煹 tcpSocket: - host: "190" + host: "192" port: 135036402 preStop: exec: command: - - "191" + - "193" httpGet: - host: "193" + host: "195" httpHeaders: - - name: "194" - value: "195" - path: "192" + - name: "196" + value: "197" + path: "194" port: -1188430996 scheme: djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪 tcpSocket: - host: "197" - port: "196" + host: "199" + port: "198" livenessProbe: exec: command: - - "171" + - "173" failureThreshold: -1113628381 httpGet: - host: "173" + host: "175" httpHeaders: - - name: "174" - value: "175" - path: "172" + - name: "176" + value: "177" + path: "174" port: -152585895 scheme: E@Ȗs«ö initialDelaySeconds: 1843758068 periodSeconds: 1702578303 successThreshold: -1565157256 tcpSocket: - host: "176" + host: "178" port: 1135182169 timeoutSeconds: -1967469005 - name: "145" + name: "147" ports: - containerPort: 1403721475 - hostIP: "151" + hostIP: "153" hostPort: -606111218 - name: "150" + name: "152" protocol: ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳 readinessProbe: exec: command: - - "177" + - "179" failureThreshold: -1167888910 httpGet: - host: "179" + host: "181" httpHeaders: - - name: "180" - value: "181" - path: "178" + - name: "182" + value: "183" + path: "180" port: 386652373 scheme: ʙ嫙& initialDelaySeconds: -802585193 periodSeconds: 1944205014 successThreshold: -2079582559 tcpSocket: - host: "183" - port: "182" + host: "185" + port: "184" timeoutSeconds: 1901330124 resources: limits: @@ -605,72 +607,72 @@ spec: runAsNonRoot: false runAsUser: 7739117973959656085 seLinuxOptions: - level: "202" - role: "200" - type: "201" - user: "199" + level: "204" + role: "202" + type: "203" + user: "201" windowsOptions: - gmsaCredentialSpec: "204" - gmsaCredentialSpecName: "203" - runAsUserName: "205" + gmsaCredentialSpec: "206" + gmsaCredentialSpecName: "205" + runAsUserName: "207" stdin: true stdinOnce: true - terminationMessagePath: "198" + terminationMessagePath: "200" terminationMessagePolicy: ɩC volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: "" - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "333" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "335" nodeSelector: - "329": "330" + "331": "332" overhead: tHǽ÷閂抰^窄CǙķȈ: "97" preemptionPolicy: ý筞X priority: -1331113536 - priorityClassName: "391" + priorityClassName: "393" readinessGates: - conditionType: mō6µɑ`ȗ<8^翜 restartPolicy: w妕眵笭/9崍h趭(娕 - runtimeClassName: "396" - schedulerName: "386" + runtimeClassName: "398" + schedulerName: "388" securityContext: fsGroup: 7747616967629081728 runAsGroup: 7461098988156705429 runAsNonRoot: false runAsUser: 4430285638700927057 seLinuxOptions: - level: "337" - role: "335" - type: "336" - user: "334" + level: "339" + role: "337" + type: "338" + user: "336" supplementalGroups: - 7866826580662861268 sysctls: - - name: "341" - value: "342" + - name: "343" + value: "344" windowsOptions: - gmsaCredentialSpec: "339" - gmsaCredentialSpecName: "338" - runAsUserName: "340" - serviceAccount: "332" - serviceAccountName: "331" + gmsaCredentialSpec: "341" + gmsaCredentialSpecName: "340" + runAsUserName: "342" + serviceAccount: "334" + serviceAccountName: "333" shareProcessNamespace: true - subdomain: "345" + subdomain: "347" terminationGracePeriodSeconds: 6245571390016329382 tolerations: - effect: 緍k¢茤 - key: "387" + key: "389" operator: 抄3昞财Î嘝zʄ!ć tolerationSeconds: 4096844323391966153 - value: "388" + value: "390" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -680,207 +682,207 @@ spec: ? zp22o4a-w----11rqy3eo79p-f4r1--7p--053--suu--98.y1s8-j-6j4uvf1-sdg--132bid-7x0u738--7w-tdt-u-0--v/Ied-0-i_zZsY_o8t5Vl6_..7CY-_dc__G6N-_-0o.0C_gV.9_G5 : x_.4dwFbuvEf55Y2k.F-4 maxSkew: 1956797678 - topologyKey: "397" + topologyKey: "399" whenUnsatisfiable: ƀ+瑏eCmAȥ睙 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: 912004803 readOnly: true - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: '|@?鷅bȻN' - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: 榱*Gưoɘ檲 readOnly: true azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 1593906314 items: - - key: "97" + - key: "99" mode: 195263908 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: false volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: 824682619 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 1569992019 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "660" - resource: "90" + resource: "92" emptyDir: medium: Xŋ朘瑥A徙ɶɊł/擇ɦĽ胚O醔ɍ厶耈 sizeLimit: "473" fc: - fsType: "92" + fsType: "94" lun: -1740986684 readOnly: true targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" readOnly: true secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1188153605 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" readOnly: true hostPath: - path: "41" + path: "43" type: ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱< iscsi: chapAuthDiscovery: true - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 994527057 portals: - - "58" + - "60" secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" + fsType: "129" readOnly: true - volumeID: "126" + volumeID: "128" projected: defaultMode: -1334904807 sources: - configMap: items: - - key: "122" + - key: "124" mode: 2063799569 - path: "123" - name: "121" + path: "125" + name: "123" optional: false downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: 173030157 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "106" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: -323584340 - path: "115" - name: "113" + path: "117" + name: "115" optional: true serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: 8357931971650847566 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + name: "132" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 332383000 items: - - key: "50" + - key: "52" mode: -547518679 - path: "51" + path: "53" optional: true - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" updateStrategy: rollingUpdate: partition: -1578718618 @@ -888,39 +890,40 @@ spec: volumeClaimTemplates: - metadata: annotations: - "411": "412" - clusterName: "417" + "413": "414" + clusterName: "419" creationTimestamp: null deletionGracePeriodSeconds: -7871971636641833314 finalizers: - - "416" - generateName: "405" + - "418" + generateName: "407" generation: -3408884454087787958 labels: - "409": "410" + "411": "412" managedFields: - - apiVersion: "419" - manager: "418" + - apiVersion: "421" + fieldsType: "422" + manager: "420" operation: ÕW肤 - name: "404" - namespace: "406" + name: "406" + namespace: "408" ownerReferences: - - apiVersion: "413" + - apiVersion: "415" blockOwnerDeletion: true controller: false - kind: "414" - name: "415" + kind: "416" + name: "417" uid: 9F徵{ɦ!f親ʚ«Ǥ栌Ə侷ŧ resourceVersion: "7821588463673401230" - selfLink: "407" + selfLink: "409" uid: 鋡浤ɖ緖焿熣 spec: accessModes: - 婻漛Ǒ僕ʨƌɦ dataSource: - apiGroup: "428" - kind: "429" - name: "430" + apiGroup: "431" + kind: "432" + name: "433" resources: limits: 宥ɓ: "692" @@ -932,9 +935,9 @@ spec: operator: Exists matchLabels: ANx__-F_._n.WaY_o.-0-yE-R55: 2n...78aou_j-3.J-.-r_-oPd-.2_Z__.-_U-.60--o._H - storageClassName: "427" + storageClassName: "430" volumeMode: qwïźU痤ȵ - volumeName: "426" + volumeName: "429" status: accessModes: - \屪kƱ @@ -943,8 +946,8 @@ spec: conditions: - lastProbeTime: "2513-10-02T03:37:43Z" lastTransitionTime: "2172-12-06T22:36:31Z" - message: "432" - reason: "431" + message: "435" + reason: "434" status: RY客\ǯ'_ type: nj phase: 怿ÿ易+ǴȰ¤趜磕绘翁揌p:oŇE0Lj @@ -952,14 +955,14 @@ status: collisionCount: -126974464 conditions: - lastTransitionTime: "2478-01-26T13:55:29Z" - message: "437" - reason: "436" + message: "440" + reason: "439" status: ɭ锻ó/階 type: 5ƞɔJ灭ƳĽ currentReplicas: 125606756 - currentRevision: "434" + currentRevision: "437" observedGeneration: 8488467370342917811 readyReplicas: -1633381902 replicas: -1786394556 - updateRevision: "435" + updateRevision: "438" updatedReplicas: 120643071 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.json index 2c6a7fc8db7..487201d14da 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.json +++ b/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" } ] }, diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.pb index 87c9647a49b..85bf0f55c8e 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.yaml index 4ed96810dde..60d97812a6d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ControllerRevision.yaml +++ b/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" diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.json index 24a0440dc8f..3ef8660bbd4 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.json +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -56,49 +57,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "TʡȂŏ{sǡƟ", "resourceVersion": "1698285396218902212", "generation": -4139900758039117471, "creationTimestamp": null, "deletionGracePeriodSeconds": 7534629739119643351, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "^", "controller": false, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "ĪȸŹăȲĻ¤Ħʅ芝", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "" }, "emptyDir": { @@ -106,26 +108,26 @@ "sizeLimit": "804" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1318752360 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": -2007808768 }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": 228756891 } ], @@ -133,93 +135,93 @@ "optional": false }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 408756018, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "readOnly": true, "portals": [ - "58" + "60" ], "chapAuthDiscovery": true, "chapAuthSession": true, "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62" + "endpoints": "63", + "path": "64" }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" }, "readOnly": true }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "readOnly": true, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "915" }, "mode": -1768075156 @@ -229,25 +231,25 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": 570501002, - "fsType": "92", + "fsType": "94", "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95", + "secretName": "96", + "shareName": "97", "readOnly": true }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": 2020789772 } ], @@ -255,39 +257,39 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", - "user": "105", - "group": "106", - "tenant": "107" + "registry": "105", + "volume": "106", + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "k ź贩j瀉ǚrǜnh0åȂ", - "fsType": "110", + "fsType": "112", "readOnly": false, "kind": "nj揠8lj黳鈫ʕ禒Ƙá腿ħ缶" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": 675406340 } ], @@ -296,14 +298,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "461" }, "mode": -1618937335 @@ -311,118 +313,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": -1126738259 } ], "optional": true }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": -6345861634934949644, - "path": "125" + "path": "127" } } ], "defaultMode": 480521693 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127" + "volumeID": "128", + "fsType": "129" }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, "sslEnabled": true, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": true, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -1510026905, "containerPort": 437857734, "protocol": "Rƥ贫d飼$俊跾|@?鷅b", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": false }, "secretRef": { - "name": "154", + "name": "156", "optional": false } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "468" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": false }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": true } } @@ -438,40 +440,40 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "卩蝾", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", - "port": "173", - "host": "174", + "path": "174", + "port": "175", + "host": "176", "httpHeaders": [ { - "name": "175", - "value": "176" + "name": "177", + "value": "178" } ] }, "tcpSocket": { - "port": "177", - "host": "178" + "port": "179", + "host": "180" }, "initialDelaySeconds": 1805144649, "timeoutSeconds": -606111218, @@ -482,24 +484,24 @@ "readinessProbe": { "exec": { "command": [ - "179" + "181" ] }, "httpGet": { - "path": "180", - "port": "181", - "host": "182", + "path": "182", + "port": "183", + "host": "184", "scheme": "w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ", "httpHeaders": [ { - "name": "183", - "value": "184" + "name": "185", + "value": "186" } ] }, "tcpSocket": { "port": -337353552, - "host": "185" + "host": "187" }, "initialDelaySeconds": -1724160601, "timeoutSeconds": -1158840571, @@ -511,50 +513,50 @@ "postStart": { "exec": { "command": [ - "186" + "188" ] }, "httpGet": { - "path": "187", - "port": "188", - "host": "189", + "path": "189", + "port": "190", + "host": "191", "httpHeaders": [ { - "name": "190", - "value": "191" + "name": "192", + "value": "193" } ] }, "tcpSocket": { "port": 559781916, - "host": "192" + "host": "194" } }, "preStop": { "exec": { "command": [ - "193" + "195" ] }, "httpGet": { - "path": "194", + "path": "196", "port": 1150375229, - "host": "195", + "host": "197", "scheme": "QÄȻȊ+?ƭ峧Y栲茇竛吲蚛隖\u003cǶ", "httpHeaders": [ { - "name": "196", - "value": "197" + "name": "198", + "value": "199" } ] }, "tcpSocket": { "port": -1696471293, - "host": "198" + "host": "200" } } }, - "terminationMessagePath": "199", + "terminationMessagePath": "201", "terminationMessagePolicy": "£軶ǃ*ʙ嫙\u0026蒒5靇C'ɵK.Q貇", "imagePullPolicy": "Ŵ廷s{Ⱦdz@", "securityContext": { @@ -568,15 +570,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "200", - "role": "201", - "type": "202", - "level": "203" + "user": "202", + "role": "203", + "type": "204", + "level": "205" }, "windowsOptions": { - "gmsaCredentialSpecName": "204", - "gmsaCredentialSpec": "205", - "runAsUserName": "206" + "gmsaCredentialSpecName": "206", + "gmsaCredentialSpec": "207", + "runAsUserName": "208" }, "runAsUser": 4181787587415673530, "runAsGroup": 825262458636305509, @@ -591,59 +593,59 @@ ], "containers": [ { - "name": "207", - "image": "208", + "name": "209", + "image": "210", "command": [ - "209" + "211" ], "args": [ - "210" + "212" ], - "workingDir": "211", + "workingDir": "213", "ports": [ { - "name": "212", + "name": "214", "hostPort": 1385030458, "containerPort": 427196286, "protocol": "o/樝fw[Řż丩Ž", - "hostIP": "213" + "hostIP": "215" } ], "envFrom": [ { - "prefix": "214", + "prefix": "216", "configMapRef": { - "name": "215", + "name": "217", "optional": false }, "secretRef": { - "name": "216", + "name": "218", "optional": true } } ], "env": [ { - "name": "217", - "value": "218", + "name": "219", + "value": "220", "valueFrom": { "fieldRef": { - "apiVersion": "219", - "fieldPath": "220" + "apiVersion": "221", + "fieldPath": "222" }, "resourceFieldRef": { - "containerName": "221", - "resource": "222", + "containerName": "223", + "resource": "224", "divisor": "932" }, "configMapKeyRef": { - "name": "223", - "key": "224", + "name": "225", + "key": "226", "optional": false }, "secretKeyRef": { - "name": "225", - "key": "226", + "name": "227", + "key": "228", "optional": true } } @@ -659,41 +661,41 @@ }, "volumeMounts": [ { - "name": "227", + "name": "229", "readOnly": true, - "mountPath": "228", - "subPath": "229", + "mountPath": "230", + "subPath": "231", "mountPropagation": "奺Ȋ礶惇¸t颟.鵫ǚ", - "subPathExpr": "230" + "subPathExpr": "232" } ], "volumeDevices": [ { - "name": "231", - "devicePath": "232" + "name": "233", + "devicePath": "234" } ], "livenessProbe": { "exec": { "command": [ - "233" + "235" ] }, "httpGet": { - "path": "234", - "port": "235", - "host": "236", + "path": "236", + "port": "237", + "host": "238", "scheme": "Ȥ藠3.", "httpHeaders": [ { - "name": "237", - "value": "238" + "name": "239", + "value": "240" } ] }, "tcpSocket": { - "port": "239", - "host": "240" + "port": "241", + "host": "242" }, "initialDelaySeconds": -1389418722, "timeoutSeconds": 851018015, @@ -704,24 +706,24 @@ "readinessProbe": { "exec": { "command": [ - "241" + "243" ] }, "httpGet": { - "path": "242", - "port": "243", - "host": "244", + "path": "244", + "port": "245", + "host": "246", "scheme": "«丯Ƙ枛牐ɺ皚", "httpHeaders": [ { - "name": "245", - "value": "246" + "name": "247", + "value": "248" } ] }, "tcpSocket": { "port": -1934111455, - "host": "247" + "host": "249" }, "initialDelaySeconds": 766864314, "timeoutSeconds": 1146016612, @@ -733,51 +735,51 @@ "postStart": { "exec": { "command": [ - "248" + "250" ] }, "httpGet": { - "path": "249", - "port": "250", - "host": "251", + "path": "251", + "port": "252", + "host": "253", "scheme": "'", "httpHeaders": [ { - "name": "252", - "value": "253" + "name": "254", + "value": "255" } ] }, "tcpSocket": { "port": -801430937, - "host": "254" + "host": "256" } }, "preStop": { "exec": { "command": [ - "255" + "257" ] }, "httpGet": { - "path": "256", + "path": "258", "port": 1810980158, - "host": "257", + "host": "259", "scheme": "_ƮA攤/ɸɎ R§耶FfBl", "httpHeaders": [ { - "name": "258", - "value": "259" + "name": "260", + "value": "261" } ] }, "tcpSocket": { "port": 1074486306, - "host": "260" + "host": "262" } } }, - "terminationMessagePath": "261", + "terminationMessagePath": "263", "terminationMessagePolicy": "Zɾģ毋Ó6dz娝嘚庎D}埽uʎ", "imagePullPolicy": "Ǖɳɷ9Ì崟¿瘦ɖ緕", "securityContext": { @@ -791,15 +793,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "262", - "role": "263", - "type": "264", - "level": "265" + "user": "264", + "role": "265", + "type": "266", + "level": "267" }, "windowsOptions": { - "gmsaCredentialSpecName": "266", - "gmsaCredentialSpec": "267", - "runAsUserName": "268" + "gmsaCredentialSpecName": "268", + "gmsaCredentialSpec": "269", + "runAsUserName": "270" }, "runAsUser": -6470941481344047265, "runAsGroup": 1373384864388370080, @@ -813,59 +815,59 @@ ], "ephemeralContainers": [ { - "name": "269", - "image": "270", + "name": "271", + "image": "272", "command": [ - "271" + "273" ], "args": [ - "272" + "274" ], - "workingDir": "273", + "workingDir": "275", "ports": [ { - "name": "274", + "name": "276", "hostPort": 2058122084, "containerPort": -379385405, "protocol": "#嬀ơŸ8T 苧yñKJɐ扵Gƚ绤f", - "hostIP": "275" + "hostIP": "277" } ], "envFrom": [ { - "prefix": "276", + "prefix": "278", "configMapRef": { - "name": "277", + "name": "279", "optional": true }, "secretRef": { - "name": "278", + "name": "280", "optional": false } } ], "env": [ { - "name": "279", - "value": "280", + "name": "281", + "value": "282", "valueFrom": { "fieldRef": { - "apiVersion": "281", - "fieldPath": "282" + "apiVersion": "283", + "fieldPath": "284" }, "resourceFieldRef": { - "containerName": "283", - "resource": "284", + "containerName": "285", + "resource": "286", "divisor": "355" }, "configMapKeyRef": { - "name": "285", - "key": "286", + "name": "287", + "key": "288", "optional": false }, "secretKeyRef": { - "name": "287", - "key": "288", + "name": "289", + "key": "290", "optional": true } } @@ -881,40 +883,40 @@ }, "volumeMounts": [ { - "name": "289", - "mountPath": "290", - "subPath": "291", + "name": "291", + "mountPath": "292", + "subPath": "293", "mountPropagation": "簳°Ļǟi\u0026皥贸", - "subPathExpr": "292" + "subPathExpr": "294" } ], "volumeDevices": [ { - "name": "293", - "devicePath": "294" + "name": "295", + "devicePath": "296" } ], "livenessProbe": { "exec": { "command": [ - "295" + "297" ] }, "httpGet": { - "path": "296", - "port": "297", - "host": "298", + "path": "298", + "port": "299", + "host": "300", "scheme": "现葢ŵ橨鬶l獕;跣Hǝcw媀瓄\u0026翜舞拉", "httpHeaders": [ { - "name": "299", - "value": "300" + "name": "301", + "value": "302" } ] }, "tcpSocket": { - "port": "301", - "host": "302" + "port": "303", + "host": "304" }, "initialDelaySeconds": 2066735093, "timeoutSeconds": -190183379, @@ -925,24 +927,24 @@ "readinessProbe": { "exec": { "command": [ - "303" + "305" ] }, "httpGet": { - "path": "304", - "port": "305", - "host": "306", + "path": "306", + "port": "307", + "host": "308", "scheme": "M蘇KŅ/»頸+SÄ蚃ɣľ)酊龨δ", "httpHeaders": [ { - "name": "307", - "value": "308" + "name": "309", + "value": "310" } ] }, "tcpSocket": { "port": 458427807, - "host": "309" + "host": "311" }, "initialDelaySeconds": -1971421078, "timeoutSeconds": 1905181464, @@ -954,51 +956,51 @@ "postStart": { "exec": { "command": [ - "310" + "312" ] }, "httpGet": { - "path": "311", - "port": "312", - "host": "313", + "path": "313", + "port": "314", + "host": "315", "scheme": "鶫:顇ə娯Ȱ囌{屿oiɥ嵐sC", "httpHeaders": [ { - "name": "314", - "value": "315" + "name": "316", + "value": "317" } ] }, "tcpSocket": { - "port": "316", - "host": "317" + "port": "318", + "host": "319" } }, "preStop": { "exec": { "command": [ - "318" + "320" ] }, "httpGet": { - "path": "319", - "port": "320", - "host": "321", + "path": "321", + "port": "322", + "host": "323", "scheme": "鬍熖B芭花ª瘡蟦JBʟ鍏H鯂²", "httpHeaders": [ { - "name": "322", - "value": "323" + "name": "324", + "value": "325" } ] }, "tcpSocket": { "port": -1187301925, - "host": "324" + "host": "326" } } }, - "terminationMessagePath": "325", + "terminationMessagePath": "327", "terminationMessagePolicy": "Őnj汰8ŕ", "imagePullPolicy": "邻爥蹔ŧOǨ繫ʎǑyZ涬P­蜷ɔ幩", "securityContext": { @@ -1012,15 +1014,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "326", - "role": "327", - "type": "328", - "level": "329" + "user": "328", + "role": "329", + "type": "330", + "level": "331" }, "windowsOptions": { - "gmsaCredentialSpecName": "330", - "gmsaCredentialSpec": "331", - "runAsUserName": "332" + "gmsaCredentialSpecName": "332", + "gmsaCredentialSpec": "333", + "runAsUserName": "334" }, "runAsUser": 6726836758549163621, "runAsGroup": 741362943076737213, @@ -1032,7 +1034,7 @@ "stdin": true, "stdinOnce": true, "tty": true, - "targetContainerName": "333" + "targetContainerName": "335" } ], "restartPolicy": "åe躒訙", @@ -1040,25 +1042,25 @@ "activeDeadlineSeconds": 9212087462729867542, "dnsPolicy": "娕uE增猍ǵ xǨŴ壶ƵfȽÃ茓pȓɻ", "nodeSelector": { - "334": "335" + "336": "337" }, - "serviceAccountName": "336", - "serviceAccount": "337", + "serviceAccountName": "338", + "serviceAccount": "339", "automountServiceAccountToken": false, - "nodeName": "338", + "nodeName": "340", "hostPID": true, "shareProcessNamespace": false, "securityContext": { "seLinuxOptions": { - "user": "339", - "role": "340", - "type": "341", - "level": "342" + "user": "341", + "role": "342", + "type": "343", + "level": "344" }, "windowsOptions": { - "gmsaCredentialSpecName": "343", - "gmsaCredentialSpec": "344", - "runAsUserName": "345" + "gmsaCredentialSpecName": "345", + "gmsaCredentialSpec": "346", + "runAsUserName": "347" }, "runAsUser": 7747616967629081728, "runAsGroup": 2548453080315983269, @@ -1069,18 +1071,18 @@ "fsGroup": -7117039988160665426, "sysctls": [ { - "name": "346", - "value": "347" + "name": "348", + "value": "349" } ] }, "imagePullSecrets": [ { - "name": "348" + "name": "350" } ], - "hostname": "349", - "subdomain": "350", + "hostname": "351", + "subdomain": "352", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1088,19 +1090,19 @@ { "matchExpressions": [ { - "key": "351", + "key": "353", "operator": "", "values": [ - "352" + "354" ] } ], "matchFields": [ { - "key": "353", + "key": "355", "operator": "ƽ眝{æ盪泙", "values": [ - "354" + "356" ] } ] @@ -1113,19 +1115,19 @@ "preference": { "matchExpressions": [ { - "key": "355", + "key": "357", "operator": "}Ñ蠂Ü[ƛ^輅9ɛ棕ƈ眽炊", "values": [ - "356" + "358" ] } ], "matchFields": [ { - "key": "357", + "key": "359", "operator": "ʨIk(dŊiɢzĮ蛋I滞", "values": [ - "358" + "360" ] } ] @@ -1148,9 +1150,9 @@ ] }, "namespaces": [ - "365" + "367" ], - "topologyKey": "366" + "topologyKey": "368" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1172,9 +1174,9 @@ ] }, "namespaces": [ - "373" + "375" ], - "topologyKey": "374" + "topologyKey": "376" } } ] @@ -1194,9 +1196,9 @@ ] }, "namespaces": [ - "381" + "383" ], - "topologyKey": "382" + "topologyKey": "384" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1215,45 +1217,45 @@ ] }, "namespaces": [ - "389" + "391" ], - "topologyKey": "390" + "topologyKey": "392" } } ] } }, - "schedulerName": "391", + "schedulerName": "393", "tolerations": [ { - "key": "392", + "key": "394", "operator": "ƹ|", - "value": "393", + "value": "395", "effect": "料ȭzV镜籬ƽ", "tolerationSeconds": 935587338391120947 } ], "hostAliases": [ { - "ip": "394", + "ip": "396", "hostnames": [ - "395" + "397" ] } ], - "priorityClassName": "396", + "priorityClassName": "398", "priority": 1690570439, "dnsConfig": { "nameservers": [ - "397" + "399" ], "searches": [ - "398" + "400" ], "options": [ { - "name": "399", - "value": "400" + "name": "401", + "value": "402" } ] }, @@ -1262,7 +1264,7 @@ "conditionType": "梑ʀŖ鱓;鹡鑓侅闍ŏŃŋŏ}ŀ姳" } ], - "runtimeClassName": "401", + "runtimeClassName": "403", "enableServiceLinks": true, "preemptionPolicy": "eáNRNJ丧鴻Ŀ", "overhead": { @@ -1271,7 +1273,7 @@ "topologySpreadConstraints": [ { "maxSkew": -137402083, - "topologyKey": "402", + "topologyKey": "404", "whenUnsatisfiable": "Ȩç捌聮ŃŻ@ǮJ=礏ƴ磳藷曥", "labelSelector": { "matchLabels": { @@ -1315,8 +1317,8 @@ "type": "", "status": "'ƈoIǢ龞瞯å", "lastTransitionTime": "2469-07-10T03:20:34Z", - "reason": "409", - "message": "410" + "reason": "411", + "message": "412" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.pb index 0443e2bd197..8ee663b76eb 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.yaml index a5e8fec23e7..c96298eb3c4 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.DaemonSet.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -42,31 +43,32 @@ spec: template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: 7534629739119643351 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -4139900758039117471 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: ĪȸŹăȲĻ¤Ħʅ芝 - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: false - kind: "34" - name: "35" + kind: "35" + name: "36" uid: ^ resourceVersion: "1698285396218902212" - selfLink: "27" + selfLink: "28" uid: TʡȂŏ{sǡƟ spec: activeDeadlineSeconds: 9212087462729867542 @@ -75,28 +77,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "355" + - key: "357" operator: '}Ñ蠂Ü[ƛ^輅9ɛ棕ƈ眽炊' values: - - "356" + - "358" matchFields: - - key: "357" + - key: "359" operator: ʨIk(dŊiɢzĮ蛋I滞 values: - - "358" + - "360" weight: 646133945 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "351" + - key: "353" operator: "" values: - - "352" + - "354" matchFields: - - key: "353" + - key: "355" operator: ƽ眝{æ盪泙 values: - - "354" + - "356" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -109,8 +111,8 @@ spec: matchLabels: w--162-gk2-99v22.g-65m8-1x129-9d8-s7-t7--336-11k9-8609a-e0--1----v8-4--558n1asz5/BD8.TS-jJ.Ys_Mop34_y: f_ZN.-_--r.E__-.8_e_l2.._8s--7_3x_-J5 namespaces: - - "373" - topologyKey: "374" + - "375" + topologyKey: "376" weight: -855547676 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -120,8 +122,8 @@ spec: matchLabels: 3.csh-3--Z1Tvw39FC: rtSY.g._2F7.-_e..Or_-.3OHgt._6 namespaces: - - "365" - topologyKey: "366" + - "367" + topologyKey: "368" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -132,8 +134,8 @@ spec: matchLabels: 3-mLlx...w_t-_.5.40Rw4gD.._.-x6db-L7.-__-G2: CpS__.39g_.--_-_ve5.m_2_--XZx namespaces: - - "389" - topologyKey: "390" + - "391" + topologyKey: "392" weight: 808399187 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -143,119 +145,119 @@ spec: matchLabels: 4-m_0-m-6Sp_N-S..O-BZ..6-1.S-B33: 17ca-_p-y.eQZ9p_1 namespaces: - - "381" - topologyKey: "382" + - "383" + topologyKey: "384" automountServiceAccountToken: false containers: - args: - - "210" + - "212" command: - - "209" + - "211" env: - - name: "217" - value: "218" + - name: "219" + value: "220" valueFrom: configMapKeyRef: - key: "224" - name: "223" - optional: false - fieldRef: - apiVersion: "219" - fieldPath: "220" - resourceFieldRef: - containerName: "221" - divisor: "932" - resource: "222" - secretKeyRef: key: "226" name: "225" + optional: false + fieldRef: + apiVersion: "221" + fieldPath: "222" + resourceFieldRef: + containerName: "223" + divisor: "932" + resource: "224" + secretKeyRef: + key: "228" + name: "227" optional: true envFrom: - configMapRef: - name: "215" + name: "217" optional: false - prefix: "214" + prefix: "216" secretRef: - name: "216" + name: "218" optional: true - image: "208" + image: "210" imagePullPolicy: Ǖɳɷ9Ì崟¿瘦ɖ緕 lifecycle: postStart: exec: command: - - "248" + - "250" httpGet: - host: "251" + host: "253" httpHeaders: - - name: "252" - value: "253" - path: "249" - port: "250" + - name: "254" + value: "255" + path: "251" + port: "252" scheme: '''' tcpSocket: - host: "254" + host: "256" port: -801430937 preStop: exec: command: - - "255" + - "257" httpGet: - host: "257" + host: "259" httpHeaders: - - name: "258" - value: "259" - path: "256" + - name: "260" + value: "261" + path: "258" port: 1810980158 scheme: _ƮA攤/ɸɎ R§耶FfBl tcpSocket: - host: "260" + host: "262" port: 1074486306 livenessProbe: exec: command: - - "233" + - "235" failureThreshold: -161485752 httpGet: - host: "236" + host: "238" httpHeaders: - - name: "237" - value: "238" - path: "234" - port: "235" + - name: "239" + value: "240" + path: "236" + port: "237" scheme: Ȥ藠3. initialDelaySeconds: -1389418722 periodSeconds: 596942561 successThreshold: -1880980172 tcpSocket: - host: "240" - port: "239" + host: "242" + port: "241" timeoutSeconds: 851018015 - name: "207" + name: "209" ports: - containerPort: 427196286 - hostIP: "213" + hostIP: "215" hostPort: 1385030458 - name: "212" + name: "214" protocol: o/樝fw[Řż丩Ž readinessProbe: exec: command: - - "241" + - "243" failureThreshold: 59664438 httpGet: - host: "244" + host: "246" httpHeaders: - - name: "245" - value: "246" - path: "242" - port: "243" + - name: "247" + value: "248" + path: "244" + port: "245" scheme: «丯Ƙ枛牐ɺ皚 initialDelaySeconds: 766864314 periodSeconds: 1495880465 successThreshold: -1032967081 tcpSocket: - host: "247" + host: "249" port: -1934111455 timeoutSeconds: 1146016612 resources: @@ -277,148 +279,148 @@ spec: runAsNonRoot: false runAsUser: -6470941481344047265 seLinuxOptions: - level: "265" - role: "263" - type: "264" - user: "262" + level: "267" + role: "265" + type: "266" + user: "264" windowsOptions: - gmsaCredentialSpec: "267" - gmsaCredentialSpecName: "266" - runAsUserName: "268" - terminationMessagePath: "261" + gmsaCredentialSpec: "269" + gmsaCredentialSpecName: "268" + runAsUserName: "270" + terminationMessagePath: "263" terminationMessagePolicy: Zɾģ毋Ó6dz娝嘚庎D}埽uʎ tty: true volumeDevices: - - devicePath: "232" - name: "231" + - devicePath: "234" + name: "233" volumeMounts: - - mountPath: "228" + - mountPath: "230" mountPropagation: 奺Ȋ礶惇¸t颟.鵫ǚ - name: "227" + name: "229" readOnly: true - subPath: "229" - subPathExpr: "230" - workingDir: "211" + subPath: "231" + subPathExpr: "232" + workingDir: "213" dnsConfig: nameservers: - - "397" + - "399" options: - - name: "399" - value: "400" + - name: "401" + value: "402" searches: - - "398" + - "400" dnsPolicy: 娕uE增猍ǵ xǨŴ壶ƵfȽÃ茓pȓɻ enableServiceLinks: true ephemeralContainers: - args: - - "272" + - "274" command: - - "271" + - "273" env: - - name: "279" - value: "280" + - name: "281" + value: "282" valueFrom: configMapKeyRef: - key: "286" - name: "285" - optional: false - fieldRef: - apiVersion: "281" - fieldPath: "282" - resourceFieldRef: - containerName: "283" - divisor: "355" - resource: "284" - secretKeyRef: key: "288" name: "287" + optional: false + fieldRef: + apiVersion: "283" + fieldPath: "284" + resourceFieldRef: + containerName: "285" + divisor: "355" + resource: "286" + secretKeyRef: + key: "290" + name: "289" optional: true envFrom: - configMapRef: - name: "277" + name: "279" optional: true - prefix: "276" + prefix: "278" secretRef: - name: "278" + name: "280" optional: false - image: "270" + image: "272" imagePullPolicy: 邻爥蹔ŧOǨ繫ʎǑyZ涬P­蜷ɔ幩 lifecycle: postStart: exec: command: - - "310" + - "312" httpGet: - host: "313" + host: "315" httpHeaders: - - name: "314" - value: "315" - path: "311" - port: "312" + - name: "316" + value: "317" + path: "313" + port: "314" scheme: 鶫:顇ə娯Ȱ囌{屿oiɥ嵐sC tcpSocket: - host: "317" - port: "316" + host: "319" + port: "318" preStop: exec: command: - - "318" + - "320" httpGet: - host: "321" + host: "323" httpHeaders: - - name: "322" - value: "323" - path: "319" - port: "320" + - name: "324" + value: "325" + path: "321" + port: "322" scheme: 鬍熖B芭花ª瘡蟦JBʟ鍏H鯂² tcpSocket: - host: "324" + host: "326" port: -1187301925 livenessProbe: exec: command: - - "295" + - "297" failureThreshold: 2030115750 httpGet: - host: "298" + host: "300" httpHeaders: - - name: "299" - value: "300" - path: "296" - port: "297" + - name: "301" + value: "302" + path: "298" + port: "299" scheme: 现葢ŵ橨鬶l獕;跣Hǝcw媀瓄&翜舞拉 initialDelaySeconds: 2066735093 periodSeconds: -940334911 successThreshold: -341287812 tcpSocket: - host: "302" - port: "301" + host: "304" + port: "303" timeoutSeconds: -190183379 - name: "269" + name: "271" ports: - containerPort: -379385405 - hostIP: "275" + hostIP: "277" hostPort: 2058122084 - name: "274" + name: "276" protocol: '#嬀ơŸ8T 苧yñKJɐ扵Gƚ绤f' readinessProbe: exec: command: - - "303" + - "305" failureThreshold: -385597677 httpGet: - host: "306" + host: "308" httpHeaders: - - name: "307" - value: "308" - path: "304" - port: "305" + - name: "309" + value: "310" + path: "306" + port: "307" scheme: M蘇KŅ/»頸+SÄ蚃ɣľ)酊龨δ initialDelaySeconds: -1971421078 periodSeconds: -1730959016 successThreshold: 1272940694 tcpSocket: - host: "309" + host: "311" port: 458427807 timeoutSeconds: 1905181464 resources: @@ -440,146 +442,146 @@ spec: runAsNonRoot: false runAsUser: 6726836758549163621 seLinuxOptions: - level: "329" - role: "327" - type: "328" - user: "326" + level: "331" + role: "329" + type: "330" + user: "328" windowsOptions: - gmsaCredentialSpec: "331" - gmsaCredentialSpecName: "330" - runAsUserName: "332" + gmsaCredentialSpec: "333" + gmsaCredentialSpecName: "332" + runAsUserName: "334" stdin: true stdinOnce: true - targetContainerName: "333" - terminationMessagePath: "325" + targetContainerName: "335" + terminationMessagePath: "327" terminationMessagePolicy: Őnj汰8ŕ tty: true volumeDevices: - - devicePath: "294" - name: "293" + - devicePath: "296" + name: "295" volumeMounts: - - mountPath: "290" + - mountPath: "292" mountPropagation: 簳°Ļǟi&皥贸 - name: "289" - subPath: "291" - subPathExpr: "292" - workingDir: "273" + name: "291" + subPath: "293" + subPathExpr: "294" + workingDir: "275" hostAliases: - hostnames: - - "395" - ip: "394" + - "397" + ip: "396" hostPID: true - hostname: "349" + hostname: "351" imagePullSecrets: - - name: "348" + - name: "350" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "468" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "468" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: true envFrom: - configMapRef: - name: "153" + name: "155" optional: false - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: false - image: "146" + image: "148" imagePullPolicy: Ŵ廷s{Ⱦdz@ lifecycle: postStart: exec: command: - - "186" + - "188" httpGet: - host: "189" + host: "191" httpHeaders: - - name: "190" - value: "191" - path: "187" - port: "188" + - name: "192" + value: "193" + path: "189" + port: "190" tcpSocket: - host: "192" + host: "194" port: 559781916 preStop: exec: command: - - "193" + - "195" httpGet: - host: "195" + host: "197" httpHeaders: - - name: "196" - value: "197" - path: "194" + - name: "198" + value: "199" + path: "196" port: 1150375229 scheme: QÄȻȊ+?ƭ峧Y栲茇竛吲蚛隖<Ƕ tcpSocket: - host: "198" + host: "200" port: -1696471293 livenessProbe: exec: command: - - "171" + - "173" failureThreshold: 1466047181 httpGet: - host: "174" + host: "176" httpHeaders: - - name: "175" - value: "176" - path: "172" - port: "173" + - name: "177" + value: "178" + path: "174" + port: "175" initialDelaySeconds: 1805144649 periodSeconds: 1403721475 successThreshold: 519906483 tcpSocket: - host: "178" - port: "177" + host: "180" + port: "179" timeoutSeconds: -606111218 - name: "145" + name: "147" ports: - containerPort: 437857734 - hostIP: "151" + hostIP: "153" hostPort: -1510026905 - name: "150" + name: "152" protocol: Rƥ贫d飼$俊跾|@?鷅b readinessProbe: exec: command: - - "179" + - "181" failureThreshold: 524249411 httpGet: - host: "182" + host: "184" httpHeaders: - - name: "183" - value: "184" - path: "180" - port: "181" + - name: "185" + value: "186" + path: "182" + port: "183" scheme: w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ initialDelaySeconds: -1724160601 periodSeconds: 1435507444 successThreshold: -1430577593 tcpSocket: - host: "185" + host: "187" port: -337353552 timeoutSeconds: -1158840571 resources: @@ -601,72 +603,72 @@ spec: runAsNonRoot: true runAsUser: 4181787587415673530 seLinuxOptions: - level: "203" - role: "201" - type: "202" - user: "200" + level: "205" + role: "203" + type: "204" + user: "202" windowsOptions: - gmsaCredentialSpec: "205" - gmsaCredentialSpecName: "204" - runAsUserName: "206" + gmsaCredentialSpec: "207" + gmsaCredentialSpecName: "206" + runAsUserName: "208" stdin: true stdinOnce: true - terminationMessagePath: "199" + terminationMessagePath: "201" terminationMessagePolicy: £軶ǃ*ʙ嫙&蒒5靇C'ɵK.Q貇 volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: 卩蝾 - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "338" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "340" nodeSelector: - "334": "335" + "336": "337" overhead: 癜鞤A馱z芀¿l磶Bb偃礳Ȭ痍脉PPö: "607" preemptionPolicy: eáNRNJ丧鴻Ŀ priority: 1690570439 - priorityClassName: "396" + priorityClassName: "398" readinessGates: - conditionType: 梑ʀŖ鱓;鹡鑓侅闍ŏŃŋŏ}ŀ姳 restartPolicy: åe躒訙 - runtimeClassName: "401" - schedulerName: "391" + runtimeClassName: "403" + schedulerName: "393" securityContext: fsGroup: -7117039988160665426 runAsGroup: 2548453080315983269 runAsNonRoot: false runAsUser: 7747616967629081728 seLinuxOptions: - level: "342" - role: "340" - type: "341" - user: "339" + level: "344" + role: "342" + type: "343" + user: "341" supplementalGroups: - -1193643752264108019 sysctls: - - name: "346" - value: "347" + - name: "348" + value: "349" windowsOptions: - gmsaCredentialSpec: "344" - gmsaCredentialSpecName: "343" - runAsUserName: "345" - serviceAccount: "337" - serviceAccountName: "336" + gmsaCredentialSpec: "346" + gmsaCredentialSpecName: "345" + runAsUserName: "347" + serviceAccount: "339" + serviceAccountName: "338" shareProcessNamespace: false - subdomain: "350" + subdomain: "352" terminationGracePeriodSeconds: 6942343986058351509 tolerations: - effect: 料ȭzV镜籬ƽ - key: "392" + key: "394" operator: ƹ| tolerationSeconds: 935587338391120947 - value: "393" + value: "395" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -677,207 +679,207 @@ spec: matchLabels: E--pT751: mV__1-wv3UDf.-4D-r.-F__r.oh..2_uGGP..X maxSkew: -137402083 - topologyKey: "402" + topologyKey: "404" whenUnsatisfiable: Ȩç捌聮ŃŻ@ǮJ=礏ƴ磳藷曥 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: -2007808768 - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: k ź贩j瀉ǚrǜnh0åȂ - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: nj揠8lj黳鈫ʕ禒Ƙá腿ħ缶 readOnly: false azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 952979935 items: - - key: "97" + - key: "99" mode: 2020789772 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: true volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: -868808281 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: -1768075156 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "915" - resource: "90" + resource: "92" emptyDir: medium: ɹ坼É/pȿ sizeLimit: "804" fc: - fsType: "92" + fsType: "94" lun: 570501002 targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" readOnly: true secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1318752360 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" hostPath: - path: "41" + path: "43" type: "" iscsi: chapAuthDiscovery: true chapAuthSession: true - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 408756018 portals: - - "58" + - "60" readOnly: true secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" - volumeID: "126" + fsType: "129" + volumeID: "128" projected: defaultMode: 480521693 sources: - configMap: items: - - key: "122" + - key: "124" mode: -1126738259 - path: "123" - name: "121" + path: "125" + name: "123" optional: true downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: -1618937335 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "461" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: 675406340 - path: "115" - name: "113" + path: "117" + name: "115" optional: false serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: -6345861634934949644 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" readOnly: true secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" + name: "132" sslEnabled: true - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 1233814916 items: - - key: "50" + - key: "52" mode: 228756891 - path: "51" + path: "53" optional: false - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" updateStrategy: rollingUpdate: {} type: 荥ơ'禧ǵŊ)TiD¢ƿ媴h5 @@ -885,8 +887,8 @@ status: collisionCount: -449319810 conditions: - lastTransitionTime: "2469-07-10T03:20:34Z" - message: "410" - reason: "409" + message: "412" + reason: "411" status: '''ƈoIǢ龞瞯å' type: "" currentNumberScheduled: -1979737528 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.json index 9706f33b3cb..8e3d7cc73f0 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.json +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -54,49 +55,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "?Qȫş", "resourceVersion": "1736621709629422270", "generation": -8542870036622468681, "creationTimestamp": null, "deletionGracePeriodSeconds": -2575298329142810753, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "ƶȤ^}", "controller": true, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "躢", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱\u003c" }, "emptyDir": { @@ -104,27 +106,27 @@ "sizeLimit": "473" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1188153605 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": 912004803, "readOnly": true }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": -547518679 } ], @@ -132,91 +134,91 @@ "optional": true }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 994527057, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "portals": [ - "58" + "60" ], "chapAuthDiscovery": true, "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62", + "endpoints": "63", + "path": "64", "readOnly": true }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" } }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "readOnly": true, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "660" }, "mode": 1569992019 @@ -226,26 +228,26 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": -1740986684, - "fsType": "92", + "fsType": "94", "readOnly": true, "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95", + "secretName": "96", + "shareName": "97", "readOnly": true }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": 195263908 } ], @@ -253,39 +255,39 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", - "user": "105", - "group": "106", - "tenant": "107" + "registry": "105", + "volume": "106", + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "|@?鷅bȻN", - "fsType": "110", + "fsType": "112", "readOnly": true, "kind": "榱*Gưoɘ檲" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": -323584340 } ], @@ -294,14 +296,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "106" }, "mode": 173030157 @@ -309,118 +311,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": 2063799569 } ], "optional": false }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": 8357931971650847566, - "path": "125" + "path": "127" } } ], "defaultMode": -1334904807 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127", + "volumeID": "128", + "fsType": "129", "readOnly": true }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": false, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -606111218, "containerPort": 1403721475, "protocol": "ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": true }, "secretRef": { - "name": "154", + "name": "156", "optional": true } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "650" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": false }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": true } } @@ -436,41 +438,41 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", + "path": "174", "port": -152585895, - "host": "173", + "host": "175", "scheme": "E@Ȗs«ö", "httpHeaders": [ { - "name": "174", - "value": "175" + "name": "176", + "value": "177" } ] }, "tcpSocket": { "port": 1135182169, - "host": "176" + "host": "178" }, "initialDelaySeconds": 1843758068, "timeoutSeconds": -1967469005, @@ -481,24 +483,24 @@ "readinessProbe": { "exec": { "command": [ - "177" + "179" ] }, "httpGet": { - "path": "178", + "path": "180", "port": 386652373, - "host": "179", + "host": "181", "scheme": "ʙ嫙\u0026", "httpHeaders": [ { - "name": "180", - "value": "181" + "name": "182", + "value": "183" } ] }, "tcpSocket": { - "port": "182", - "host": "183" + "port": "184", + "host": "185" }, "initialDelaySeconds": -802585193, "timeoutSeconds": 1901330124, @@ -510,51 +512,51 @@ "postStart": { "exec": { "command": [ - "184" + "186" ] }, "httpGet": { - "path": "185", - "port": "186", - "host": "187", + "path": "187", + "port": "188", + "host": "189", "scheme": "£ȹ嫰ƹǔw÷nI粛E煹", "httpHeaders": [ { - "name": "188", - "value": "189" + "name": "190", + "value": "191" } ] }, "tcpSocket": { "port": 135036402, - "host": "190" + "host": "192" } }, "preStop": { "exec": { "command": [ - "191" + "193" ] }, "httpGet": { - "path": "192", + "path": "194", "port": -1188430996, - "host": "193", + "host": "195", "scheme": "djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪", "httpHeaders": [ { - "name": "194", - "value": "195" + "name": "196", + "value": "197" } ] }, "tcpSocket": { - "port": "196", - "host": "197" + "port": "198", + "host": "199" } } }, - "terminationMessagePath": "198", + "terminationMessagePath": "200", "terminationMessagePolicy": "ɩC", "securityContext": { "capabilities": { @@ -567,15 +569,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "199", - "role": "200", - "type": "201", - "level": "202" + "user": "201", + "role": "202", + "type": "203", + "level": "204" }, "windowsOptions": { - "gmsaCredentialSpecName": "203", - "gmsaCredentialSpec": "204", - "runAsUserName": "205" + "gmsaCredentialSpecName": "205", + "gmsaCredentialSpec": "206", + "runAsUserName": "207" }, "runAsUser": 7739117973959656085, "runAsGroup": 3747003978559617838, @@ -590,59 +592,59 @@ ], "containers": [ { - "name": "206", - "image": "207", + "name": "208", + "image": "209", "command": [ - "208" + "210" ], "args": [ - "209" + "211" ], - "workingDir": "210", + "workingDir": "212", "ports": [ { - "name": "211", + "name": "213", "hostPort": 474119379, "containerPort": 1923334396, "protocol": "旿@掇lNdǂ\u003e5姣\u003e懔%熷谟þ", - "hostIP": "212" + "hostIP": "214" } ], "envFrom": [ { - "prefix": "213", + "prefix": "215", "configMapRef": { - "name": "214", + "name": "216", "optional": false }, "secretRef": { - "name": "215", + "name": "217", "optional": true } } ], "env": [ { - "name": "216", - "value": "217", + "name": "218", + "value": "219", "valueFrom": { "fieldRef": { - "apiVersion": "218", - "fieldPath": "219" + "apiVersion": "220", + "fieldPath": "221" }, "resourceFieldRef": { - "containerName": "220", - "resource": "221", + "containerName": "222", + "resource": "223", "divisor": "771" }, "configMapKeyRef": { - "name": "222", - "key": "223", + "name": "224", + "key": "225", "optional": false }, "secretKeyRef": { - "name": "224", - "key": "225", + "name": "226", + "key": "227", "optional": true } } @@ -658,41 +660,41 @@ }, "volumeMounts": [ { - "name": "226", + "name": "228", "readOnly": true, - "mountPath": "227", - "subPath": "228", + "mountPath": "229", + "subPath": "230", "mountPropagation": "0矀Kʝ瘴I\\p[ħsĨɆâĺɗŹ倗S", - "subPathExpr": "229" + "subPathExpr": "231" } ], "volumeDevices": [ { - "name": "230", - "devicePath": "231" + "name": "232", + "devicePath": "233" } ], "livenessProbe": { "exec": { "command": [ - "232" + "234" ] }, "httpGet": { - "path": "233", + "path": "235", "port": -1285424066, - "host": "234", + "host": "236", "scheme": "ni酛3ƁÀ", "httpHeaders": [ { - "name": "235", - "value": "236" + "name": "237", + "value": "238" } ] }, "tcpSocket": { - "port": "237", - "host": "238" + "port": "239", + "host": "240" }, "initialDelaySeconds": -2036074491, "timeoutSeconds": -148216266, @@ -703,24 +705,24 @@ "readinessProbe": { "exec": { "command": [ - "239" + "241" ] }, "httpGet": { - "path": "240", - "port": "241", - "host": "242", + "path": "242", + "port": "243", + "host": "244", "scheme": "3!Zɾģ毋Ó6", "httpHeaders": [ { - "name": "243", - "value": "244" + "name": "245", + "value": "246" } ] }, "tcpSocket": { "port": -832805508, - "host": "245" + "host": "247" }, "initialDelaySeconds": -228822833, "timeoutSeconds": -970312425, @@ -732,51 +734,51 @@ "postStart": { "exec": { "command": [ - "246" + "248" ] }, "httpGet": { - "path": "247", + "path": "249", "port": -2013568185, - "host": "248", + "host": "250", "scheme": "#yV'WKw(ğ儴Ůĺ}", "httpHeaders": [ { - "name": "249", - "value": "250" + "name": "251", + "value": "252" } ] }, "tcpSocket": { "port": -20130017, - "host": "251" + "host": "253" } }, "preStop": { "exec": { "command": [ - "252" + "254" ] }, "httpGet": { - "path": "253", + "path": "255", "port": -661937776, - "host": "254", + "host": "256", "scheme": "ØœȠƬQg鄠[颐o", "httpHeaders": [ { - "name": "255", - "value": "256" + "name": "257", + "value": "258" } ] }, "tcpSocket": { "port": 461585849, - "host": "257" + "host": "259" } } }, - "terminationMessagePath": "258", + "terminationMessagePath": "260", "terminationMessagePolicy": "ɇ卷荙JLĹ]佱¿\u003e犵殇ŕ-Ɂ", "imagePullPolicy": "ƙt叀碧闳ȩr嚧ʣq埄趛屡", "securityContext": { @@ -790,15 +792,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "259", - "role": "260", - "type": "261", - "level": "262" + "user": "261", + "role": "262", + "type": "263", + "level": "264" }, "windowsOptions": { - "gmsaCredentialSpecName": "263", - "gmsaCredentialSpec": "264", - "runAsUserName": "265" + "gmsaCredentialSpecName": "265", + "gmsaCredentialSpec": "266", + "runAsUserName": "267" }, "runAsUser": -5835415947553716289, "runAsGroup": 2540215688947167763, @@ -812,59 +814,59 @@ ], "ephemeralContainers": [ { - "name": "266", - "image": "267", + "name": "268", + "image": "269", "command": [ - "268" + "270" ], "args": [ - "269" + "271" ], - "workingDir": "270", + "workingDir": "272", "ports": [ { - "name": "271", + "name": "273", "hostPort": -552281772, "containerPort": -677617960, "protocol": "ŕ翑0展}", - "hostIP": "272" + "hostIP": "274" } ], "envFrom": [ { - "prefix": "273", + "prefix": "275", "configMapRef": { - "name": "274", + "name": "276", "optional": false }, "secretRef": { - "name": "275", + "name": "277", "optional": false } } ], "env": [ { - "name": "276", - "value": "277", + "name": "278", + "value": "279", "valueFrom": { "fieldRef": { - "apiVersion": "278", - "fieldPath": "279" + "apiVersion": "280", + "fieldPath": "281" }, "resourceFieldRef": { - "containerName": "280", - "resource": "281", + "containerName": "282", + "resource": "283", "divisor": "185" }, "configMapKeyRef": { - "name": "282", - "key": "283", + "name": "284", + "key": "285", "optional": true }, "secretKeyRef": { - "name": "284", - "key": "285", + "name": "286", + "key": "287", "optional": false } } @@ -880,40 +882,40 @@ }, "volumeMounts": [ { - "name": "286", - "mountPath": "287", - "subPath": "288", + "name": "288", + "mountPath": "289", + "subPath": "290", "mountPropagation": "", - "subPathExpr": "289" + "subPathExpr": "291" } ], "volumeDevices": [ { - "name": "290", - "devicePath": "291" + "name": "292", + "devicePath": "293" } ], "livenessProbe": { "exec": { "command": [ - "292" + "294" ] }, "httpGet": { - "path": "293", - "port": "294", - "host": "295", + "path": "295", + "port": "296", + "host": "297", "scheme": "頸", "httpHeaders": [ { - "name": "296", - "value": "297" + "name": "298", + "value": "299" } ] }, "tcpSocket": { "port": 1315054653, - "host": "298" + "host": "300" }, "initialDelaySeconds": 711020087, "timeoutSeconds": 1103049140, @@ -924,24 +926,24 @@ "readinessProbe": { "exec": { "command": [ - "299" + "301" ] }, "httpGet": { - "path": "300", - "port": "301", - "host": "302", + "path": "302", + "port": "303", + "host": "304", "scheme": "ƿ頀\"冓鍓贯澔 ", "httpHeaders": [ { - "name": "303", - "value": "304" + "name": "305", + "value": "306" } ] }, "tcpSocket": { - "port": "305", - "host": "306" + "port": "307", + "host": "308" }, "initialDelaySeconds": 1058960779, "timeoutSeconds": -2133441986, @@ -953,51 +955,51 @@ "postStart": { "exec": { "command": [ - "307" + "309" ] }, "httpGet": { - "path": "308", + "path": "310", "port": -934378634, - "host": "309", + "host": "311", "scheme": "ɐ鰥", "httpHeaders": [ { - "name": "310", - "value": "311" + "name": "312", + "value": "313" } ] }, "tcpSocket": { "port": 630140708, - "host": "312" + "host": "314" } }, "preStop": { "exec": { "command": [ - "313" + "315" ] }, "httpGet": { - "path": "314", - "port": "315", - "host": "316", + "path": "316", + "port": "317", + "host": "318", "scheme": "8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録²", "httpHeaders": [ { - "name": "317", - "value": "318" + "name": "319", + "value": "320" } ] }, "tcpSocket": { "port": 2080874371, - "host": "319" + "host": "321" } } }, - "terminationMessagePath": "320", + "terminationMessagePath": "322", "terminationMessagePolicy": "灩聋3趐囨鏻砅邻", "imagePullPolicy": "騎C\"6x$1sȣ±p鋄", "securityContext": { @@ -1011,15 +1013,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "321", - "role": "322", - "type": "323", - "level": "324" + "user": "323", + "role": "324", + "type": "325", + "level": "326" }, "windowsOptions": { - "gmsaCredentialSpecName": "325", - "gmsaCredentialSpec": "326", - "runAsUserName": "327" + "gmsaCredentialSpecName": "327", + "gmsaCredentialSpec": "328", + "runAsUserName": "329" }, "runAsUser": 4288903380102217677, "runAsGroup": 6618112330449141397, @@ -1030,7 +1032,7 @@ }, "stdinOnce": true, "tty": true, - "targetContainerName": "328" + "targetContainerName": "330" } ], "restartPolicy": "w妕眵笭/9崍h趭(娕", @@ -1038,25 +1040,25 @@ "activeDeadlineSeconds": -3214891994203952546, "dnsPolicy": "晲T[irȎ3Ĕ\\", "nodeSelector": { - "329": "330" + "331": "332" }, - "serviceAccountName": "331", - "serviceAccount": "332", + "serviceAccountName": "333", + "serviceAccount": "334", "automountServiceAccountToken": true, - "nodeName": "333", + "nodeName": "335", "hostIPC": true, "shareProcessNamespace": true, "securityContext": { "seLinuxOptions": { - "user": "334", - "role": "335", - "type": "336", - "level": "337" + "user": "336", + "role": "337", + "type": "338", + "level": "339" }, "windowsOptions": { - "gmsaCredentialSpecName": "338", - "gmsaCredentialSpec": "339", - "runAsUserName": "340" + "gmsaCredentialSpecName": "340", + "gmsaCredentialSpec": "341", + "runAsUserName": "342" }, "runAsUser": 4430285638700927057, "runAsGroup": 7461098988156705429, @@ -1067,18 +1069,18 @@ "fsGroup": 7747616967629081728, "sysctls": [ { - "name": "341", - "value": "342" + "name": "343", + "value": "344" } ] }, "imagePullSecrets": [ { - "name": "343" + "name": "345" } ], - "hostname": "344", - "subdomain": "345", + "hostname": "346", + "subdomain": "347", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1086,19 +1088,19 @@ { "matchExpressions": [ { - "key": "346", + "key": "348", "operator": "Ǚ(", "values": [ - "347" + "349" ] } ], "matchFields": [ { - "key": "348", + "key": "350", "operator": "瘍Nʊ輔3璾ėȜv1b繐汚", "values": [ - "349" + "351" ] } ] @@ -1111,19 +1113,19 @@ "preference": { "matchExpressions": [ { - "key": "350", + "key": "352", "operator": "n覦灲閈誹ʅ蕉", "values": [ - "351" + "353" ] } ], "matchFields": [ { - "key": "352", + "key": "354", "operator": "", "values": [ - "353" + "355" ] } ] @@ -1146,9 +1148,9 @@ ] }, "namespaces": [ - "360" + "362" ], - "topologyKey": "361" + "topologyKey": "363" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1170,9 +1172,9 @@ ] }, "namespaces": [ - "368" + "370" ], - "topologyKey": "369" + "topologyKey": "371" } } ] @@ -1195,9 +1197,9 @@ ] }, "namespaces": [ - "376" + "378" ], - "topologyKey": "377" + "topologyKey": "379" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1219,45 +1221,45 @@ ] }, "namespaces": [ - "384" + "386" ], - "topologyKey": "385" + "topologyKey": "387" } } ] } }, - "schedulerName": "386", + "schedulerName": "388", "tolerations": [ { - "key": "387", + "key": "389", "operator": "抄3昞财Î嘝zʄ!ć", - "value": "388", + "value": "390", "effect": "緍k¢茤", "tolerationSeconds": 4096844323391966153 } ], "hostAliases": [ { - "ip": "389", + "ip": "391", "hostnames": [ - "390" + "392" ] } ], - "priorityClassName": "391", + "priorityClassName": "393", "priority": -1331113536, "dnsConfig": { "nameservers": [ - "392" + "394" ], "searches": [ - "393" + "395" ], "options": [ { - "name": "394", - "value": "395" + "name": "396", + "value": "397" } ] }, @@ -1266,7 +1268,7 @@ "conditionType": "mō6µɑ`ȗ\u003c8^翜" } ], - "runtimeClassName": "396", + "runtimeClassName": "398", "enableServiceLinks": false, "preemptionPolicy": "ý筞X", "overhead": { @@ -1275,7 +1277,7 @@ "topologySpreadConstraints": [ { "maxSkew": 1956797678, - "topologyKey": "397", + "topologyKey": "399", "whenUnsatisfiable": "ƀ+瑏eCmAȥ睙", "labelSelector": { "matchLabels": { @@ -1314,8 +1316,8 @@ "status": "ZÕW肤 ", "lastUpdateTime": "2674-04-10T12:16:26Z", "lastTransitionTime": "2674-07-14T13:22:49Z", - "reason": "404", - "message": "405" + "reason": "406", + "message": "407" } ], "collisionCount": 1658632493 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.pb index 7b6ece4dc1e..8670adf6edd 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.yaml index 9e6582b6b5e..7e13169c1ee 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -44,31 +45,32 @@ spec: template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: -2575298329142810753 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -8542870036622468681 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: 躢 - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: true - kind: "34" - name: "35" + kind: "35" + name: "36" uid: ƶȤ^} resourceVersion: "1736621709629422270" - selfLink: "27" + selfLink: "28" uid: ?Qȫş spec: activeDeadlineSeconds: -3214891994203952546 @@ -77,28 +79,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "350" + - key: "352" operator: n覦灲閈誹ʅ蕉 values: - - "351" + - "353" matchFields: - - key: "352" + - key: "354" operator: "" values: - - "353" + - "355" weight: 702968201 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "346" + - key: "348" operator: Ǚ( values: - - "347" + - "349" matchFields: - - key: "348" + - key: "350" operator: 瘍Nʊ輔3璾ėȜv1b繐汚 values: - - "349" + - "351" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -111,8 +113,8 @@ spec: matchLabels: Bk.j._g-G-7--p9.-_0R.-_-3_L_2--_v2.5p_..Y-.wg_-b8a_68: Q4_.84.K_-_0_..u.F.pq..--Q namespaces: - - "368" - topologyKey: "369" + - "370" + topologyKey: "371" weight: 1195176401 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -122,8 +124,8 @@ spec: matchLabels: lm-e46-r-g63--gt1--6mx-r-927--m6-k8-c2---2etfh41ca-z-g/0p_3_J_SA995IKCR.s--f.-f.-zv._._.5-H.T.-.-.d: b_9_1o.w_aI._31-_I-A-_3bz._8M0U1_-__.71-_-9_._X-D---k..1Q7._l.I namespaces: - - "360" - topologyKey: "361" + - "362" + topologyKey: "363" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -136,8 +138,8 @@ spec: matchLabels: 3--rgvf3q-z-5z80n--t5--9-4-d2-22--i--40wv--in-870w--it6k47-7y1.h72n-cnp-75/c10KkQ-R_R.-.--4_IT_O__3.5h_XC0_-3: 20_._.-_L-__bf_9_-C-PfNx__-U_.Pn-W23-_.z_.._s--_F-BR-.h_-2-.F namespaces: - - "384" - topologyKey: "385" + - "386" + topologyKey: "387" weight: -1508769491 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -149,119 +151,119 @@ spec: matchLabels: H__V.Vz_6.Hz_V_.r_v_._e_-78o_6Z..11_7pX_.-mLlx...w_j: 35.40Rw4gD.._.-x6db-L7.-__-G_2kCpS_1 namespaces: - - "376" - topologyKey: "377" + - "378" + topologyKey: "379" automountServiceAccountToken: true containers: - args: - - "209" + - "211" command: - - "208" + - "210" env: - - name: "216" - value: "217" + - name: "218" + value: "219" valueFrom: configMapKeyRef: - key: "223" - name: "222" - optional: false - fieldRef: - apiVersion: "218" - fieldPath: "219" - resourceFieldRef: - containerName: "220" - divisor: "771" - resource: "221" - secretKeyRef: key: "225" name: "224" + optional: false + fieldRef: + apiVersion: "220" + fieldPath: "221" + resourceFieldRef: + containerName: "222" + divisor: "771" + resource: "223" + secretKeyRef: + key: "227" + name: "226" optional: true envFrom: - configMapRef: - name: "214" + name: "216" optional: false - prefix: "213" + prefix: "215" secretRef: - name: "215" + name: "217" optional: true - image: "207" + image: "209" imagePullPolicy: ƙt叀碧闳ȩr嚧ʣq埄趛屡 lifecycle: postStart: exec: command: - - "246" + - "248" httpGet: - host: "248" + host: "250" httpHeaders: - - name: "249" - value: "250" - path: "247" + - name: "251" + value: "252" + path: "249" port: -2013568185 scheme: '#yV''WKw(ğ儴Ůĺ}' tcpSocket: - host: "251" + host: "253" port: -20130017 preStop: exec: command: - - "252" + - "254" httpGet: - host: "254" + host: "256" httpHeaders: - - name: "255" - value: "256" - path: "253" + - name: "257" + value: "258" + path: "255" port: -661937776 scheme: ØœȠƬQg鄠[颐o tcpSocket: - host: "257" + host: "259" port: 461585849 livenessProbe: exec: command: - - "232" + - "234" failureThreshold: -93157681 httpGet: - host: "234" + host: "236" httpHeaders: - - name: "235" - value: "236" - path: "233" + - name: "237" + value: "238" + path: "235" port: -1285424066 scheme: ni酛3ƁÀ initialDelaySeconds: -2036074491 periodSeconds: 165047920 successThreshold: -393291312 tcpSocket: - host: "238" - port: "237" + host: "240" + port: "239" timeoutSeconds: -148216266 - name: "206" + name: "208" ports: - containerPort: 1923334396 - hostIP: "212" + hostIP: "214" hostPort: 474119379 - name: "211" + name: "213" protocol: 旿@掇lNdǂ>5姣>懔%熷谟þ readinessProbe: exec: command: - - "239" + - "241" failureThreshold: 267768240 httpGet: - host: "242" + host: "244" httpHeaders: - - name: "243" - value: "244" - path: "240" - port: "241" + - name: "245" + value: "246" + path: "242" + port: "243" scheme: 3!Zɾģ毋Ó6 initialDelaySeconds: -228822833 periodSeconds: -1213051101 successThreshold: 1451056156 tcpSocket: - host: "245" + host: "247" port: -832805508 timeoutSeconds: -970312425 resources: @@ -283,149 +285,149 @@ spec: runAsNonRoot: false runAsUser: -5835415947553716289 seLinuxOptions: - level: "262" - role: "260" - type: "261" - user: "259" + level: "264" + role: "262" + type: "263" + user: "261" windowsOptions: - gmsaCredentialSpec: "264" - gmsaCredentialSpecName: "263" - runAsUserName: "265" - terminationMessagePath: "258" + gmsaCredentialSpec: "266" + gmsaCredentialSpecName: "265" + runAsUserName: "267" + terminationMessagePath: "260" terminationMessagePolicy: ɇ卷荙JLĹ]佱¿>犵殇ŕ-Ɂ tty: true volumeDevices: - - devicePath: "231" - name: "230" + - devicePath: "233" + name: "232" volumeMounts: - - mountPath: "227" + - mountPath: "229" mountPropagation: 0矀Kʝ瘴I\p[ħsĨɆâĺɗŹ倗S - name: "226" + name: "228" readOnly: true - subPath: "228" - subPathExpr: "229" - workingDir: "210" + subPath: "230" + subPathExpr: "231" + workingDir: "212" dnsConfig: nameservers: - - "392" + - "394" options: - - name: "394" - value: "395" + - name: "396" + value: "397" searches: - - "393" + - "395" dnsPolicy: 晲T[irȎ3Ĕ\ enableServiceLinks: false ephemeralContainers: - args: - - "269" + - "271" command: - - "268" + - "270" env: - - name: "276" - value: "277" + - name: "278" + value: "279" valueFrom: configMapKeyRef: - key: "283" - name: "282" - optional: true - fieldRef: - apiVersion: "278" - fieldPath: "279" - resourceFieldRef: - containerName: "280" - divisor: "185" - resource: "281" - secretKeyRef: key: "285" name: "284" + optional: true + fieldRef: + apiVersion: "280" + fieldPath: "281" + resourceFieldRef: + containerName: "282" + divisor: "185" + resource: "283" + secretKeyRef: + key: "287" + name: "286" optional: false envFrom: - configMapRef: - name: "274" + name: "276" optional: false - prefix: "273" + prefix: "275" secretRef: - name: "275" + name: "277" optional: false - image: "267" + image: "269" imagePullPolicy: 騎C"6x$1sȣ±p鋄 lifecycle: postStart: exec: command: - - "307" + - "309" httpGet: - host: "309" + host: "311" httpHeaders: - - name: "310" - value: "311" - path: "308" + - name: "312" + value: "313" + path: "310" port: -934378634 scheme: ɐ鰥 tcpSocket: - host: "312" + host: "314" port: 630140708 preStop: exec: command: - - "313" + - "315" httpGet: - host: "316" + host: "318" httpHeaders: - - name: "317" - value: "318" - path: "314" - port: "315" + - name: "319" + value: "320" + path: "316" + port: "317" scheme: 8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録² tcpSocket: - host: "319" + host: "321" port: 2080874371 livenessProbe: exec: command: - - "292" + - "294" failureThreshold: 1993268896 httpGet: - host: "295" + host: "297" httpHeaders: - - name: "296" - value: "297" - path: "293" - port: "294" + - name: "298" + value: "299" + path: "295" + port: "296" scheme: 頸 initialDelaySeconds: 711020087 periodSeconds: -1965247100 successThreshold: 218453478 tcpSocket: - host: "298" + host: "300" port: 1315054653 timeoutSeconds: 1103049140 - name: "266" + name: "268" ports: - containerPort: -677617960 - hostIP: "272" + hostIP: "274" hostPort: -552281772 - name: "271" + name: "273" protocol: ŕ翑0展} readinessProbe: exec: command: - - "299" + - "301" failureThreshold: -1250314365 httpGet: - host: "302" + host: "304" httpHeaders: - - name: "303" - value: "304" - path: "300" - port: "301" + - name: "305" + value: "306" + path: "302" + port: "303" scheme: 'ƿ頀"冓鍓贯澔 ' initialDelaySeconds: 1058960779 periodSeconds: 472742933 successThreshold: 50696420 tcpSocket: - host: "306" - port: "305" + host: "308" + port: "307" timeoutSeconds: -2133441986 resources: limits: @@ -446,147 +448,147 @@ spec: runAsNonRoot: false runAsUser: 4288903380102217677 seLinuxOptions: - level: "324" - role: "322" - type: "323" - user: "321" + level: "326" + role: "324" + type: "325" + user: "323" windowsOptions: - gmsaCredentialSpec: "326" - gmsaCredentialSpecName: "325" - runAsUserName: "327" + gmsaCredentialSpec: "328" + gmsaCredentialSpecName: "327" + runAsUserName: "329" stdinOnce: true - targetContainerName: "328" - terminationMessagePath: "320" + targetContainerName: "330" + terminationMessagePath: "322" terminationMessagePolicy: 灩聋3趐囨鏻砅邻 tty: true volumeDevices: - - devicePath: "291" - name: "290" + - devicePath: "293" + name: "292" volumeMounts: - - mountPath: "287" + - mountPath: "289" mountPropagation: "" - name: "286" - subPath: "288" - subPathExpr: "289" - workingDir: "270" + name: "288" + subPath: "290" + subPathExpr: "291" + workingDir: "272" hostAliases: - hostnames: - - "390" - ip: "389" + - "392" + ip: "391" hostIPC: true - hostname: "344" + hostname: "346" imagePullSecrets: - - name: "343" + - name: "345" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "650" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "650" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: true envFrom: - configMapRef: - name: "153" + name: "155" optional: true - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: true - image: "146" + image: "148" lifecycle: postStart: exec: command: - - "184" + - "186" httpGet: - host: "187" + host: "189" httpHeaders: - - name: "188" - value: "189" - path: "185" - port: "186" + - name: "190" + value: "191" + path: "187" + port: "188" scheme: £ȹ嫰ƹǔw÷nI粛E煹 tcpSocket: - host: "190" + host: "192" port: 135036402 preStop: exec: command: - - "191" + - "193" httpGet: - host: "193" + host: "195" httpHeaders: - - name: "194" - value: "195" - path: "192" + - name: "196" + value: "197" + path: "194" port: -1188430996 scheme: djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪 tcpSocket: - host: "197" - port: "196" + host: "199" + port: "198" livenessProbe: exec: command: - - "171" + - "173" failureThreshold: -1113628381 httpGet: - host: "173" + host: "175" httpHeaders: - - name: "174" - value: "175" - path: "172" + - name: "176" + value: "177" + path: "174" port: -152585895 scheme: E@Ȗs«ö initialDelaySeconds: 1843758068 periodSeconds: 1702578303 successThreshold: -1565157256 tcpSocket: - host: "176" + host: "178" port: 1135182169 timeoutSeconds: -1967469005 - name: "145" + name: "147" ports: - containerPort: 1403721475 - hostIP: "151" + hostIP: "153" hostPort: -606111218 - name: "150" + name: "152" protocol: ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳 readinessProbe: exec: command: - - "177" + - "179" failureThreshold: -1167888910 httpGet: - host: "179" + host: "181" httpHeaders: - - name: "180" - value: "181" - path: "178" + - name: "182" + value: "183" + path: "180" port: 386652373 scheme: ʙ嫙& initialDelaySeconds: -802585193 periodSeconds: 1944205014 successThreshold: -2079582559 tcpSocket: - host: "183" - port: "182" + host: "185" + port: "184" timeoutSeconds: 1901330124 resources: limits: @@ -607,72 +609,72 @@ spec: runAsNonRoot: false runAsUser: 7739117973959656085 seLinuxOptions: - level: "202" - role: "200" - type: "201" - user: "199" + level: "204" + role: "202" + type: "203" + user: "201" windowsOptions: - gmsaCredentialSpec: "204" - gmsaCredentialSpecName: "203" - runAsUserName: "205" + gmsaCredentialSpec: "206" + gmsaCredentialSpecName: "205" + runAsUserName: "207" stdin: true stdinOnce: true - terminationMessagePath: "198" + terminationMessagePath: "200" terminationMessagePolicy: ɩC volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: "" - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "333" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "335" nodeSelector: - "329": "330" + "331": "332" overhead: tHǽ÷閂抰^窄CǙķȈ: "97" preemptionPolicy: ý筞X priority: -1331113536 - priorityClassName: "391" + priorityClassName: "393" readinessGates: - conditionType: mō6µɑ`ȗ<8^翜 restartPolicy: w妕眵笭/9崍h趭(娕 - runtimeClassName: "396" - schedulerName: "386" + runtimeClassName: "398" + schedulerName: "388" securityContext: fsGroup: 7747616967629081728 runAsGroup: 7461098988156705429 runAsNonRoot: false runAsUser: 4430285638700927057 seLinuxOptions: - level: "337" - role: "335" - type: "336" - user: "334" + level: "339" + role: "337" + type: "338" + user: "336" supplementalGroups: - 7866826580662861268 sysctls: - - name: "341" - value: "342" + - name: "343" + value: "344" windowsOptions: - gmsaCredentialSpec: "339" - gmsaCredentialSpecName: "338" - runAsUserName: "340" - serviceAccount: "332" - serviceAccountName: "331" + gmsaCredentialSpec: "341" + gmsaCredentialSpecName: "340" + runAsUserName: "342" + serviceAccount: "334" + serviceAccountName: "333" shareProcessNamespace: true - subdomain: "345" + subdomain: "347" terminationGracePeriodSeconds: 6245571390016329382 tolerations: - effect: 緍k¢茤 - key: "387" + key: "389" operator: 抄3昞财Î嘝zʄ!ć tolerationSeconds: 4096844323391966153 - value: "388" + value: "390" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -682,215 +684,215 @@ spec: ? zp22o4a-w----11rqy3eo79p-f4r1--7p--053--suu--98.y1s8-j-6j4uvf1-sdg--132bid-7x0u738--7w-tdt-u-0--v/Ied-0-i_zZsY_o8t5Vl6_..7CY-_dc__G6N-_-0o.0C_gV.9_G5 : x_.4dwFbuvEf55Y2k.F-4 maxSkew: 1956797678 - topologyKey: "397" + topologyKey: "399" whenUnsatisfiable: ƀ+瑏eCmAȥ睙 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: 912004803 readOnly: true - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: '|@?鷅bȻN' - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: 榱*Gưoɘ檲 readOnly: true azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 1593906314 items: - - key: "97" + - key: "99" mode: 195263908 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: false volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: 824682619 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 1569992019 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "660" - resource: "90" + resource: "92" emptyDir: medium: Xŋ朘瑥A徙ɶɊł/擇ɦĽ胚O醔ɍ厶耈 sizeLimit: "473" fc: - fsType: "92" + fsType: "94" lun: -1740986684 readOnly: true targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" readOnly: true secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1188153605 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" readOnly: true hostPath: - path: "41" + path: "43" type: ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱< iscsi: chapAuthDiscovery: true - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 994527057 portals: - - "58" + - "60" secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" + fsType: "129" readOnly: true - volumeID: "126" + volumeID: "128" projected: defaultMode: -1334904807 sources: - configMap: items: - - key: "122" + - key: "124" mode: 2063799569 - path: "123" - name: "121" + path: "125" + name: "123" optional: false downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: 173030157 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "106" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: -323584340 - path: "115" - name: "113" + path: "117" + name: "115" optional: true serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: 8357931971650847566 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + name: "132" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 332383000 items: - - key: "50" + - key: "52" mode: -547518679 - path: "51" + path: "53" optional: true - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" status: availableReplicas: -1734448297 collisionCount: 1658632493 conditions: - lastTransitionTime: "2674-07-14T13:22:49Z" lastUpdateTime: "2674-04-10T12:16:26Z" - message: "405" - reason: "404" + message: "407" + reason: "406" status: ZÕW肤  type: ȷ滣ƆƾȊ(XEfê澙凋B/ü observedGeneration: -1249679108465412698 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.json index 8162348064e..8dda6190a83 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.json +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -58,49 +59,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "ʬ", "resourceVersion": "7336814125345800857", "generation": -6617020301190572172, "creationTimestamp": null, "deletionGracePeriodSeconds": -152893758082474859, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "ɖgȏ哙ȍȂ揲ȼDDŽLŬp:", "controller": true, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "ƅS·Õüe0ɔȖ脵鴈Ō", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "6NJPM饣`诫z徃鷢6ȥ啕禗Ǐ2啗塧ȱ" }, "emptyDir": { @@ -108,27 +110,27 @@ "sizeLimit": "115" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1499132872 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": -762366823, "readOnly": true }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": -104666658 } ], @@ -136,90 +138,90 @@ "optional": true }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 1655406148, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "readOnly": true, "portals": [ - "58" + "60" ], "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62" + "endpoints": "63", + "path": "64" }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" }, "readOnly": true }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "457" }, "mode": 1235524154 @@ -229,25 +231,25 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": 441887498, - "fsType": "92", + "fsType": "94", "readOnly": true, "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95" + "secretName": "96", + "shareName": "97" }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": -2039036935 } ], @@ -255,40 +257,40 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", + "registry": "105", + "volume": "106", "readOnly": true, - "user": "105", - "group": "106", - "tenant": "107" + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "HǺƶȤ^}穠", - "fsType": "110", + "fsType": "112", "readOnly": true, "kind": "躢" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": -1399063270 } ], @@ -297,14 +299,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "746" }, "mode": 926891073 @@ -312,118 +314,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": -1694464659 } ], "optional": true }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": -7593824971107985079, - "path": "125" + "path": "127" } } ], "defaultMode": -522879476 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127" + "volumeID": "128", + "fsType": "129" }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "readOnly": true, "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": false, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -1896921306, "containerPort": 715087892, "protocol": "倱\u003c", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": false }, "secretRef": { - "name": "154", + "name": "156", "optional": false } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "455" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": true }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": false } } @@ -439,41 +441,41 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "dʪīT捘ɍi縱ù墴1Rƥ", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", - "port": "173", - "host": "174", + "path": "174", + "port": "175", + "host": "176", "scheme": "ƴy綸_Ú8參遼ūPH炮", "httpHeaders": [ { - "name": "175", - "value": "176" + "name": "177", + "value": "178" } ] }, "tcpSocket": { - "port": "177", - "host": "178" + "port": "179", + "host": "180" }, "initialDelaySeconds": 741871873, "timeoutSeconds": 446829537, @@ -484,24 +486,24 @@ "readinessProbe": { "exec": { "command": [ - "179" + "181" ] }, "httpGet": { - "path": "180", + "path": "182", "port": -1903685915, - "host": "181", + "host": "183", "scheme": "ȓƇ$缔獵偐ę腬瓷碑=ɉ鎷卩蝾H韹寬", "httpHeaders": [ { - "name": "182", - "value": "183" + "name": "184", + "value": "185" } ] }, "tcpSocket": { - "port": "184", - "host": "185" + "port": "186", + "host": "187" }, "initialDelaySeconds": 128019484, "timeoutSeconds": 431781335, @@ -513,51 +515,51 @@ "postStart": { "exec": { "command": [ - "186" + "188" ] }, "httpGet": { - "path": "187", - "port": "188", - "host": "189", + "path": "189", + "port": "190", + "host": "191", "scheme": "w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ", "httpHeaders": [ { - "name": "190", - "value": "191" + "name": "192", + "value": "193" } ] }, "tcpSocket": { "port": -337353552, - "host": "192" + "host": "194" } }, "preStop": { "exec": { "command": [ - "193" + "195" ] }, "httpGet": { - "path": "194", + "path": "196", "port": -374922344, - "host": "195", + "host": "197", "scheme": "緄Ú|dk_瀹鞎sn芞", "httpHeaders": [ { - "name": "196", - "value": "197" + "name": "198", + "value": "199" } ] }, "tcpSocket": { "port": 912103005, - "host": "198" + "host": "200" } } }, - "terminationMessagePath": "199", + "terminationMessagePath": "201", "terminationMessagePolicy": "Ȋ+?ƭ峧Y栲茇竛吲蚛", "imagePullPolicy": "\u003cé瞾", "securityContext": { @@ -571,15 +573,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "200", - "role": "201", - "type": "202", - "level": "203" + "user": "202", + "role": "203", + "type": "204", + "level": "205" }, "windowsOptions": { - "gmsaCredentialSpecName": "204", - "gmsaCredentialSpec": "205", - "runAsUserName": "206" + "gmsaCredentialSpecName": "206", + "gmsaCredentialSpec": "207", + "runAsUserName": "208" }, "runAsUser": -3447077152667955293, "runAsGroup": -6457174729896610090, @@ -593,59 +595,59 @@ ], "containers": [ { - "name": "207", - "image": "208", + "name": "209", + "image": "210", "command": [ - "209" + "211" ], "args": [ - "210" + "212" ], - "workingDir": "211", + "workingDir": "213", "ports": [ { - "name": "212", + "name": "214", "hostPort": 1065976533, "containerPort": -820119398, "protocol": "@ùƸʋŀ樺ȃv", - "hostIP": "213" + "hostIP": "215" } ], "envFrom": [ { - "prefix": "214", + "prefix": "216", "configMapRef": { - "name": "215", + "name": "217", "optional": true }, "secretRef": { - "name": "216", + "name": "218", "optional": true } } ], "env": [ { - "name": "217", - "value": "218", + "name": "219", + "value": "220", "valueFrom": { "fieldRef": { - "apiVersion": "219", - "fieldPath": "220" + "apiVersion": "221", + "fieldPath": "222" }, "resourceFieldRef": { - "containerName": "221", - "resource": "222", + "containerName": "223", + "resource": "224", "divisor": "508" }, "configMapKeyRef": { - "name": "223", - "key": "224", + "name": "225", + "key": "226", "optional": false }, "secretKeyRef": { - "name": "225", - "key": "226", + "name": "227", + "key": "228", "optional": true } } @@ -661,41 +663,41 @@ }, "volumeMounts": [ { - "name": "227", + "name": "229", "readOnly": true, - "mountPath": "228", - "subPath": "229", + "mountPath": "230", + "subPath": "231", "mountPropagation": "", - "subPathExpr": "230" + "subPathExpr": "232" } ], "volumeDevices": [ { - "name": "231", - "devicePath": "232" + "name": "233", + "devicePath": "234" } ], "livenessProbe": { "exec": { "command": [ - "233" + "235" ] }, "httpGet": { - "path": "234", - "port": "235", - "host": "236", + "path": "236", + "port": "237", + "host": "238", "scheme": "ȫ焗捏ĨFħ籘Àǒɿʒ刽", "httpHeaders": [ { - "name": "237", - "value": "238" + "name": "239", + "value": "240" } ] }, "tcpSocket": { "port": 1096174794, - "host": "239" + "host": "241" }, "initialDelaySeconds": 1591029717, "timeoutSeconds": 1255169591, @@ -706,24 +708,24 @@ "readinessProbe": { "exec": { "command": [ - "240" + "242" ] }, "httpGet": { - "path": "241", - "port": "242", - "host": "243", + "path": "243", + "port": "244", + "host": "245", "scheme": "ŽoǠŻʘY賃ɪ鐊瀑Ź9Ǖ", "httpHeaders": [ { - "name": "244", - "value": "245" + "name": "246", + "value": "247" } ] }, "tcpSocket": { - "port": "246", - "host": "247" + "port": "248", + "host": "249" }, "initialDelaySeconds": -394397948, "timeoutSeconds": 2040455355, @@ -735,51 +737,51 @@ "postStart": { "exec": { "command": [ - "248" + "250" ] }, "httpGet": { - "path": "249", - "port": "250", - "host": "251", + "path": "251", + "port": "252", + "host": "253", "scheme": "Ƹ[Ęİ榌U髷裎$MVȟ@7", "httpHeaders": [ { - "name": "252", - "value": "253" + "name": "254", + "value": "255" } ] }, "tcpSocket": { - "port": "254", - "host": "255" + "port": "256", + "host": "257" } }, "preStop": { "exec": { "command": [ - "256" + "258" ] }, "httpGet": { - "path": "257", + "path": "259", "port": -1675041613, - "host": "258", + "host": "260", "scheme": "揆ɘȌ脾嚏吐", "httpHeaders": [ { - "name": "259", - "value": "260" + "name": "261", + "value": "262" } ] }, "tcpSocket": { "port": -194343002, - "host": "261" + "host": "263" } } }, - "terminationMessagePath": "262", + "terminationMessagePath": "264", "terminationMessagePolicy": "Ȥ藠3.", "imagePullPolicy": "t莭琽§ć\\ ïì", "securityContext": { @@ -793,15 +795,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "263", - "role": "264", - "type": "265", - "level": "266" + "user": "265", + "role": "266", + "type": "267", + "level": "268" }, "windowsOptions": { - "gmsaCredentialSpecName": "267", - "gmsaCredentialSpec": "268", - "runAsUserName": "269" + "gmsaCredentialSpecName": "269", + "gmsaCredentialSpec": "270", + "runAsUserName": "271" }, "runAsUser": -2142888785755371163, "runAsGroup": -2879304435996142911, @@ -815,58 +817,58 @@ ], "ephemeralContainers": [ { - "name": "270", - "image": "271", + "name": "272", + "image": "273", "command": [ - "272" + "274" ], "args": [ - "273" + "275" ], - "workingDir": "274", + "workingDir": "276", "ports": [ { - "name": "275", + "name": "277", "hostPort": -1740959124, "containerPort": 158280212, - "hostIP": "276" + "hostIP": "278" } ], "envFrom": [ { - "prefix": "277", + "prefix": "279", "configMapRef": { - "name": "278", + "name": "280", "optional": true }, "secretRef": { - "name": "279", + "name": "281", "optional": true } } ], "env": [ { - "name": "280", - "value": "281", + "name": "282", + "value": "283", "valueFrom": { "fieldRef": { - "apiVersion": "282", - "fieldPath": "283" + "apiVersion": "284", + "fieldPath": "285" }, "resourceFieldRef": { - "containerName": "284", - "resource": "285", + "containerName": "286", + "resource": "287", "divisor": "985" }, "configMapKeyRef": { - "name": "286", - "key": "287", + "name": "288", + "key": "289", "optional": false }, "secretKeyRef": { - "name": "288", - "key": "289", + "name": "290", + "key": "291", "optional": false } } @@ -882,40 +884,40 @@ }, "volumeMounts": [ { - "name": "290", - "mountPath": "291", - "subPath": "292", + "name": "292", + "mountPath": "293", + "subPath": "294", "mountPropagation": "啛更", - "subPathExpr": "293" + "subPathExpr": "295" } ], "volumeDevices": [ { - "name": "294", - "devicePath": "295" + "name": "296", + "devicePath": "297" } ], "livenessProbe": { "exec": { "command": [ - "296" + "298" ] }, "httpGet": { - "path": "297", - "port": "298", - "host": "299", + "path": "299", + "port": "300", + "host": "301", "scheme": "Ů+朷Ǝ膯ljVX1虊", "httpHeaders": [ { - "name": "300", - "value": "301" + "name": "302", + "value": "303" } ] }, "tcpSocket": { "port": -979584143, - "host": "302" + "host": "304" }, "initialDelaySeconds": -1748648882, "timeoutSeconds": -239843014, @@ -926,24 +928,24 @@ "readinessProbe": { "exec": { "command": [ - "303" + "305" ] }, "httpGet": { - "path": "304", - "port": "305", - "host": "306", + "path": "306", + "port": "307", + "host": "308", "scheme": "铿ʩȂ4ē鐭#嬀ơŸ8T", "httpHeaders": [ { - "name": "307", - "value": "308" + "name": "309", + "value": "310" } ] }, "tcpSocket": { - "port": "309", - "host": "310" + "port": "311", + "host": "312" }, "initialDelaySeconds": 37514563, "timeoutSeconds": -1871050070, @@ -955,51 +957,51 @@ "postStart": { "exec": { "command": [ - "311" + "313" ] }, "httpGet": { - "path": "312", - "port": "313", - "host": "314", + "path": "314", + "port": "315", + "host": "316", "scheme": "绤fʀļ腩墺Ò媁荭g", "httpHeaders": [ { - "name": "315", - "value": "316" + "name": "317", + "value": "318" } ] }, "tcpSocket": { - "port": "317", - "host": "318" + "port": "319", + "host": "320" } }, "preStop": { "exec": { "command": [ - "319" + "321" ] }, "httpGet": { - "path": "320", + "path": "322", "port": -2133054549, - "host": "321", + "host": "323", "scheme": "遰=E", "httpHeaders": [ { - "name": "322", - "value": "323" + "name": "324", + "value": "325" } ] }, "tcpSocket": { - "port": "324", - "host": "325" + "port": "326", + "host": "327" } } }, - "terminationMessagePath": "326", + "terminationMessagePath": "328", "terminationMessagePolicy": "朦 wƯ貾坢'跩", "imagePullPolicy": "簳°Ļǟi\u0026皥贸", "securityContext": { @@ -1013,15 +1015,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "327", - "role": "328", - "type": "329", - "level": "330" + "user": "329", + "role": "330", + "type": "331", + "level": "332" }, "windowsOptions": { - "gmsaCredentialSpecName": "331", - "gmsaCredentialSpec": "332", - "runAsUserName": "333" + "gmsaCredentialSpecName": "333", + "gmsaCredentialSpec": "334", + "runAsUserName": "335" }, "runAsUser": 7933506142593743951, "runAsGroup": -8521633679555431923, @@ -1033,7 +1035,7 @@ "stdin": true, "stdinOnce": true, "tty": true, - "targetContainerName": "334" + "targetContainerName": "336" } ], "restartPolicy": "ȱğ_\u003cǬëJ橈'琕鶫:顇ə", @@ -1041,26 +1043,26 @@ "activeDeadlineSeconds": -499179336506637450, "dnsPolicy": "ɐ鰥", "nodeSelector": { - "335": "336" + "337": "338" }, - "serviceAccountName": "337", - "serviceAccount": "338", + "serviceAccountName": "339", + "serviceAccount": "340", "automountServiceAccountToken": true, - "nodeName": "339", + "nodeName": "341", "hostNetwork": true, "hostPID": true, "shareProcessNamespace": false, "securityContext": { "seLinuxOptions": { - "user": "340", - "role": "341", - "type": "342", - "level": "343" + "user": "342", + "role": "343", + "type": "344", + "level": "345" }, "windowsOptions": { - "gmsaCredentialSpecName": "344", - "gmsaCredentialSpec": "345", - "runAsUserName": "346" + "gmsaCredentialSpecName": "346", + "gmsaCredentialSpec": "347", + "runAsUserName": "348" }, "runAsUser": 3634773701753283428, "runAsGroup": -3042614092601658792, @@ -1071,18 +1073,18 @@ "fsGroup": -1778638259613624198, "sysctls": [ { - "name": "347", - "value": "348" + "name": "349", + "value": "350" } ] }, "imagePullSecrets": [ { - "name": "349" + "name": "351" } ], - "hostname": "350", - "subdomain": "351", + "hostname": "352", + "subdomain": "353", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1090,19 +1092,19 @@ { "matchExpressions": [ { - "key": "352", + "key": "354", "operator": "h亏yƕ丆録²Ŏ)/灩聋3趐囨鏻砅邻", "values": [ - "353" + "355" ] } ], "matchFields": [ { - "key": "354", + "key": "356", "operator": "C\"6x$1s", "values": [ - "355" + "357" ] } ] @@ -1115,19 +1117,19 @@ "preference": { "matchExpressions": [ { - "key": "356", + "key": "358", "operator": "鋄5弢ȹ均", "values": [ - "357" + "359" ] } ], "matchFields": [ { - "key": "358", + "key": "360", "operator": "SvEȤƏ埮p", "values": [ - "359" + "361" ] } ] @@ -1150,9 +1152,9 @@ ] }, "namespaces": [ - "366" + "368" ], - "topologyKey": "367" + "topologyKey": "369" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1174,9 +1176,9 @@ ] }, "namespaces": [ - "374" + "376" ], - "topologyKey": "375" + "topologyKey": "377" } } ] @@ -1199,9 +1201,9 @@ ] }, "namespaces": [ - "382" + "384" ], - "topologyKey": "383" + "topologyKey": "385" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1220,45 +1222,45 @@ ] }, "namespaces": [ - "390" + "392" ], - "topologyKey": "391" + "topologyKey": "393" } } ] } }, - "schedulerName": "392", + "schedulerName": "394", "tolerations": [ { - "key": "393", + "key": "395", "operator": "[L", - "value": "394", + "value": "396", "effect": "Ġ滔xvŗÑ\"虆k遚釾ʼn{朣Jɩɼ", "tolerationSeconds": 4456040724914385859 } ], "hostAliases": [ { - "ip": "395", + "ip": "397", "hostnames": [ - "396" + "398" ] } ], - "priorityClassName": "397", + "priorityClassName": "399", "priority": -1576968453, "dnsConfig": { "nameservers": [ - "398" + "400" ], "searches": [ - "399" + "401" ], "options": [ { - "name": "400", - "value": "401" + "name": "402", + "value": "403" } ] }, @@ -1267,7 +1269,7 @@ "conditionType": "v" } ], - "runtimeClassName": "402", + "runtimeClassName": "404", "enableServiceLinks": false, "preemptionPolicy": "忖p様", "overhead": { @@ -1276,7 +1278,7 @@ "topologySpreadConstraints": [ { "maxSkew": -782776982, - "topologyKey": "403", + "topologyKey": "405", "whenUnsatisfiable": "鈀", "labelSelector": { "matchLabels": { @@ -1305,8 +1307,8 @@ "type": "", "status": "'ƈoIǢ龞瞯å", "lastTransitionTime": "2469-07-10T03:20:34Z", - "reason": "410", - "message": "411" + "reason": "412", + "message": "413" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.pb index 890d3b87736..45ab115c85d 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.yaml index 573957b05c6..dfc25d1d706 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.ReplicaSet.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -42,31 +43,32 @@ spec: template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: -152893758082474859 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -6617020301190572172 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: ƅS·Õüe0ɔȖ脵鴈Ō - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: true - kind: "34" - name: "35" + kind: "35" + name: "36" uid: 'ɖgȏ哙ȍȂ揲ȼDDŽLŬp:' resourceVersion: "7336814125345800857" - selfLink: "27" + selfLink: "28" uid: ʬ spec: activeDeadlineSeconds: -499179336506637450 @@ -75,28 +77,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "356" + - key: "358" operator: 鋄5弢ȹ均 values: - - "357" + - "359" matchFields: - - key: "358" + - key: "360" operator: SvEȤƏ埮p values: - - "359" + - "361" weight: -1292310438 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "352" + - key: "354" operator: h亏yƕ丆録²Ŏ)/灩聋3趐囨鏻砅邻 values: - - "353" + - "355" matchFields: - - key: "354" + - key: "356" operator: C"6x$1s values: - - "355" + - "357" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -109,8 +111,8 @@ spec: matchLabels: 1/dCv3j._.-_pP__up.2L_s-o7: k-5___-Qq..csh-3--Z1Tvw3F namespaces: - - "374" - topologyKey: "375" + - "376" + topologyKey: "377" weight: -531787516 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -120,8 +122,8 @@ spec: matchLabels: o.6GA2C: s.Nj-s namespaces: - - "366" - topologyKey: "367" + - "368" + topologyKey: "369" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -132,8 +134,8 @@ spec: matchLabels: t-u-4----q-x3w3dn5-1rhm-5y--z---69o-9-69mxv17r--32b-----4-67t.qk5--f4e4--r1k278l-d-8o1-x-1wl-r/a6Sp_N-S..O-BZ..6-1.b: L_gw_-z6 namespaces: - - "390" - topologyKey: "391" + - "392" + topologyKey: "393" weight: -1139477828 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -145,120 +147,120 @@ spec: matchLabels: 4.B.__6m: J1-1.9_.-.Ms7_tP namespaces: - - "382" - topologyKey: "383" + - "384" + topologyKey: "385" automountServiceAccountToken: true containers: - args: - - "210" + - "212" command: - - "209" + - "211" env: - - name: "217" - value: "218" + - name: "219" + value: "220" valueFrom: configMapKeyRef: - key: "224" - name: "223" - optional: false - fieldRef: - apiVersion: "219" - fieldPath: "220" - resourceFieldRef: - containerName: "221" - divisor: "508" - resource: "222" - secretKeyRef: key: "226" name: "225" + optional: false + fieldRef: + apiVersion: "221" + fieldPath: "222" + resourceFieldRef: + containerName: "223" + divisor: "508" + resource: "224" + secretKeyRef: + key: "228" + name: "227" optional: true envFrom: - configMapRef: - name: "215" + name: "217" optional: true - prefix: "214" + prefix: "216" secretRef: - name: "216" + name: "218" optional: true - image: "208" + image: "210" imagePullPolicy: t莭琽§ć\ ïì lifecycle: postStart: exec: command: - - "248" + - "250" httpGet: - host: "251" + host: "253" httpHeaders: - - name: "252" - value: "253" - path: "249" - port: "250" + - name: "254" + value: "255" + path: "251" + port: "252" scheme: Ƹ[Ęİ榌U髷裎$MVȟ@7 tcpSocket: - host: "255" - port: "254" + host: "257" + port: "256" preStop: exec: command: - - "256" + - "258" httpGet: - host: "258" + host: "260" httpHeaders: - - name: "259" - value: "260" - path: "257" + - name: "261" + value: "262" + path: "259" port: -1675041613 scheme: 揆ɘȌ脾嚏吐 tcpSocket: - host: "261" + host: "263" port: -194343002 livenessProbe: exec: command: - - "233" + - "235" failureThreshold: 817152661 httpGet: - host: "236" + host: "238" httpHeaders: - - name: "237" - value: "238" - path: "234" - port: "235" + - name: "239" + value: "240" + path: "236" + port: "237" scheme: ȫ焗捏ĨFħ籘Àǒɿʒ刽 initialDelaySeconds: 1591029717 periodSeconds: 622473257 successThreshold: -966649167 tcpSocket: - host: "239" + host: "241" port: 1096174794 timeoutSeconds: 1255169591 - name: "207" + name: "209" ports: - containerPort: -820119398 - hostIP: "213" + hostIP: "215" hostPort: 1065976533 - name: "212" + name: "214" protocol: '@ùƸʋŀ樺ȃv' readinessProbe: exec: command: - - "240" + - "242" failureThreshold: 1214895765 httpGet: - host: "243" + host: "245" httpHeaders: - - name: "244" - value: "245" - path: "241" - port: "242" + - name: "246" + value: "247" + path: "243" + port: "244" scheme: ŽoǠŻʘY賃ɪ鐊瀑Ź9Ǖ initialDelaySeconds: -394397948 periodSeconds: 1505972335 successThreshold: -26910286 tcpSocket: - host: "247" - port: "246" + host: "249" + port: "248" timeoutSeconds: 2040455355 resources: limits: @@ -279,148 +281,148 @@ spec: runAsNonRoot: false runAsUser: -2142888785755371163 seLinuxOptions: - level: "266" - role: "264" - type: "265" - user: "263" + level: "268" + role: "266" + type: "267" + user: "265" windowsOptions: - gmsaCredentialSpec: "268" - gmsaCredentialSpecName: "267" - runAsUserName: "269" + gmsaCredentialSpec: "270" + gmsaCredentialSpecName: "269" + runAsUserName: "271" stdin: true - terminationMessagePath: "262" + terminationMessagePath: "264" terminationMessagePolicy: Ȥ藠3. volumeDevices: - - devicePath: "232" - name: "231" + - devicePath: "234" + name: "233" volumeMounts: - - mountPath: "228" + - mountPath: "230" mountPropagation: "" - name: "227" + name: "229" readOnly: true - subPath: "229" - subPathExpr: "230" - workingDir: "211" + subPath: "231" + subPathExpr: "232" + workingDir: "213" dnsConfig: nameservers: - - "398" + - "400" options: - - name: "400" - value: "401" + - name: "402" + value: "403" searches: - - "399" + - "401" dnsPolicy: ɐ鰥 enableServiceLinks: false ephemeralContainers: - args: - - "273" + - "275" command: - - "272" + - "274" env: - - name: "280" - value: "281" + - name: "282" + value: "283" valueFrom: configMapKeyRef: - key: "287" - name: "286" - optional: false - fieldRef: - apiVersion: "282" - fieldPath: "283" - resourceFieldRef: - containerName: "284" - divisor: "985" - resource: "285" - secretKeyRef: key: "289" name: "288" optional: false + fieldRef: + apiVersion: "284" + fieldPath: "285" + resourceFieldRef: + containerName: "286" + divisor: "985" + resource: "287" + secretKeyRef: + key: "291" + name: "290" + optional: false envFrom: - configMapRef: - name: "278" + name: "280" optional: true - prefix: "277" + prefix: "279" secretRef: - name: "279" + name: "281" optional: true - image: "271" + image: "273" imagePullPolicy: 簳°Ļǟi&皥贸 lifecycle: postStart: exec: command: - - "311" + - "313" httpGet: - host: "314" + host: "316" httpHeaders: - - name: "315" - value: "316" - path: "312" - port: "313" + - name: "317" + value: "318" + path: "314" + port: "315" scheme: 绤fʀļ腩墺Ò媁荭g tcpSocket: - host: "318" - port: "317" + host: "320" + port: "319" preStop: exec: command: - - "319" + - "321" httpGet: - host: "321" + host: "323" httpHeaders: - - name: "322" - value: "323" - path: "320" + - name: "324" + value: "325" + path: "322" port: -2133054549 scheme: 遰=E tcpSocket: - host: "325" - port: "324" + host: "327" + port: "326" livenessProbe: exec: command: - - "296" + - "298" failureThreshold: -1538905728 httpGet: - host: "299" + host: "301" httpHeaders: - - name: "300" - value: "301" - path: "297" - port: "298" + - name: "302" + value: "303" + path: "299" + port: "300" scheme: Ů+朷Ǝ膯ljVX1虊 initialDelaySeconds: -1748648882 periodSeconds: 1381579966 successThreshold: -1418092595 tcpSocket: - host: "302" + host: "304" port: -979584143 timeoutSeconds: -239843014 - name: "270" + name: "272" ports: - containerPort: 158280212 - hostIP: "276" + hostIP: "278" hostPort: -1740959124 - name: "275" + name: "277" readinessProbe: exec: command: - - "303" + - "305" failureThreshold: 522560228 httpGet: - host: "306" + host: "308" httpHeaders: - - name: "307" - value: "308" - path: "304" - port: "305" + - name: "309" + value: "310" + path: "306" + port: "307" scheme: 铿ʩȂ4ē鐭#嬀ơŸ8T initialDelaySeconds: 37514563 periodSeconds: 474715842 successThreshold: -1620315711 tcpSocket: - host: "310" - port: "309" + host: "312" + port: "311" timeoutSeconds: -1871050070 resources: limits: @@ -441,150 +443,150 @@ spec: runAsNonRoot: true runAsUser: 7933506142593743951 seLinuxOptions: - level: "330" - role: "328" - type: "329" - user: "327" + level: "332" + role: "330" + type: "331" + user: "329" windowsOptions: - gmsaCredentialSpec: "332" - gmsaCredentialSpecName: "331" - runAsUserName: "333" + gmsaCredentialSpec: "334" + gmsaCredentialSpecName: "333" + runAsUserName: "335" stdin: true stdinOnce: true - targetContainerName: "334" - terminationMessagePath: "326" + targetContainerName: "336" + terminationMessagePath: "328" terminationMessagePolicy: 朦 wƯ貾坢'跩 tty: true volumeDevices: - - devicePath: "295" - name: "294" + - devicePath: "297" + name: "296" volumeMounts: - - mountPath: "291" + - mountPath: "293" mountPropagation: 啛更 - name: "290" - subPath: "292" - subPathExpr: "293" - workingDir: "274" + name: "292" + subPath: "294" + subPathExpr: "295" + workingDir: "276" hostAliases: - hostnames: - - "396" - ip: "395" + - "398" + ip: "397" hostNetwork: true hostPID: true - hostname: "350" + hostname: "352" imagePullSecrets: - - name: "349" + - name: "351" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: true - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "455" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: true + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "455" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: false envFrom: - configMapRef: - name: "153" + name: "155" optional: false - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: false - image: "146" + image: "148" imagePullPolicy: <é瞾 lifecycle: postStart: exec: command: - - "186" + - "188" httpGet: - host: "189" + host: "191" httpHeaders: - - name: "190" - value: "191" - path: "187" - port: "188" + - name: "192" + value: "193" + path: "189" + port: "190" scheme: w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ tcpSocket: - host: "192" + host: "194" port: -337353552 preStop: exec: command: - - "193" + - "195" httpGet: - host: "195" + host: "197" httpHeaders: - - name: "196" - value: "197" - path: "194" + - name: "198" + value: "199" + path: "196" port: -374922344 scheme: 緄Ú|dk_瀹鞎sn芞 tcpSocket: - host: "198" + host: "200" port: 912103005 livenessProbe: exec: command: - - "171" + - "173" failureThreshold: 2053960192 httpGet: - host: "174" + host: "176" httpHeaders: - - name: "175" - value: "176" - path: "172" - port: "173" + - name: "177" + value: "178" + path: "174" + port: "175" scheme: ƴy綸_Ú8參遼ūPH炮 initialDelaySeconds: 741871873 periodSeconds: -1987044888 successThreshold: -1638339389 tcpSocket: - host: "178" - port: "177" + host: "180" + port: "179" timeoutSeconds: 446829537 - name: "145" + name: "147" ports: - containerPort: 715087892 - hostIP: "151" + hostIP: "153" hostPort: -1896921306 - name: "150" + name: "152" protocol: 倱< readinessProbe: exec: command: - - "179" + - "181" failureThreshold: -57352147 httpGet: - host: "181" + host: "183" httpHeaders: - - name: "182" - value: "183" - path: "180" + - name: "184" + value: "185" + path: "182" port: -1903685915 scheme: ȓƇ$缔獵偐ę腬瓷碑=ɉ鎷卩蝾H韹寬 initialDelaySeconds: 128019484 periodSeconds: -2130554644 successThreshold: 290736426 tcpSocket: - host: "185" - port: "184" + host: "187" + port: "186" timeoutSeconds: 431781335 resources: limits: @@ -605,71 +607,71 @@ spec: runAsNonRoot: true runAsUser: -3447077152667955293 seLinuxOptions: - level: "203" - role: "201" - type: "202" - user: "200" + level: "205" + role: "203" + type: "204" + user: "202" windowsOptions: - gmsaCredentialSpec: "205" - gmsaCredentialSpecName: "204" - runAsUserName: "206" + gmsaCredentialSpec: "207" + gmsaCredentialSpecName: "206" + runAsUserName: "208" stdinOnce: true - terminationMessagePath: "199" + terminationMessagePath: "201" terminationMessagePolicy: Ȋ+?ƭ峧Y栲茇竛吲蚛 volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: dʪīT捘ɍi縱ù墴1Rƥ - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "339" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "341" nodeSelector: - "335": "336" + "337": "338" overhead: U凮: "684" preemptionPolicy: 忖p様 priority: -1576968453 - priorityClassName: "397" + priorityClassName: "399" readinessGates: - conditionType: v restartPolicy: ȱğ_<ǬëJ橈'琕鶫:顇ə - runtimeClassName: "402" - schedulerName: "392" + runtimeClassName: "404" + schedulerName: "394" securityContext: fsGroup: -1778638259613624198 runAsGroup: -3042614092601658792 runAsNonRoot: false runAsUser: 3634773701753283428 seLinuxOptions: - level: "343" - role: "341" - type: "342" - user: "340" + level: "345" + role: "343" + type: "344" + user: "342" supplementalGroups: - -2125560879532395341 sysctls: - - name: "347" - value: "348" + - name: "349" + value: "350" windowsOptions: - gmsaCredentialSpec: "345" - gmsaCredentialSpecName: "344" - runAsUserName: "346" - serviceAccount: "338" - serviceAccountName: "337" + gmsaCredentialSpec: "347" + gmsaCredentialSpecName: "346" + runAsUserName: "348" + serviceAccount: "340" + serviceAccountName: "339" shareProcessNamespace: false - subdomain: "351" + subdomain: "353" terminationGracePeriodSeconds: 5620818514944490121 tolerations: - effect: Ġ滔xvŗÑ"虆k遚釾ʼn{朣Jɩɼ - key: "393" + key: "395" operator: '[L' tolerationSeconds: 4456040724914385859 - value: "394" + value: "396" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -679,212 +681,212 @@ spec: ? nw0-3i--a7-2--o--u0038mp9c10-k-r---3g7nz4-------385h---0-u73pj.brgvf3q-z-5z80n--t5--9-4-d2-22--i--40wv--in-870w--itk/kCpS__.39g_.--_-_ve5.m_2_--XZ-x.__.Y_2-n_5023Xl-3Pw_-r75--_A : BM.6-.Y_72-_--p7 maxSkew: -782776982 - topologyKey: "403" + topologyKey: "405" whenUnsatisfiable: 鈀 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: -762366823 readOnly: true - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: HǺƶȤ^}穠 - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: 躢 readOnly: true azureFile: - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: -460478410 items: - - key: "97" + - key: "99" mode: -2039036935 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: false volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: -106644772 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 1235524154 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "457" - resource: "90" + resource: "92" emptyDir: medium: 彭聡A3fƻfʣ sizeLimit: "115" fc: - fsType: "92" + fsType: "94" lun: 441887498 readOnly: true targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1499132872 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" hostPath: - path: "41" + path: "43" type: 6NJPM饣`诫z徃鷢6ȥ啕禗Ǐ2啗塧ȱ iscsi: - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 1655406148 portals: - - "58" + - "60" readOnly: true secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" - volumeID: "126" + fsType: "129" + volumeID: "128" projected: defaultMode: -522879476 sources: - configMap: items: - - key: "122" + - key: "124" mode: -1694464659 - path: "123" - name: "121" + path: "125" + name: "123" optional: true downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: 926891073 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "746" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: -1399063270 - path: "115" - name: "113" + path: "117" + name: "115" optional: true serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: -7593824971107985079 - path: "125" + path: "127" quobyte: - group: "106" + group: "108" readOnly: true - registry: "103" - tenant: "107" - user: "105" - volume: "104" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" readOnly: true secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + name: "132" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 372704313 items: - - key: "50" + - key: "52" mode: -104666658 - path: "51" + path: "53" optional: true - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" readOnly: true secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" status: availableReplicas: 740158871 conditions: - lastTransitionTime: "2469-07-10T03:20:34Z" - message: "411" - reason: "410" + message: "413" + reason: "412" status: '''ƈoIǢ龞瞯å' type: "" fullyLabeledReplicas: -929473748 diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.json index 2ba5a3924db..150b067eea8 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.json +++ b/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" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.pb index 38bb5c991c8..a0c735c2ef5 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.yaml index b41c7208cc6..585bb7772d7 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Scale.yaml +++ b/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" diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.json index fd0b298c5d2..ee87679b5d3 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.json +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -54,49 +55,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "?Qȫş", "resourceVersion": "1736621709629422270", "generation": -8542870036622468681, "creationTimestamp": null, "deletionGracePeriodSeconds": -2575298329142810753, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "ƶȤ^}", "controller": true, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "躢", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱\u003c" }, "emptyDir": { @@ -104,27 +106,27 @@ "sizeLimit": "473" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1188153605 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": 912004803, "readOnly": true }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": -547518679 } ], @@ -132,91 +134,91 @@ "optional": true }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 994527057, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "portals": [ - "58" + "60" ], "chapAuthDiscovery": true, "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62", + "endpoints": "63", + "path": "64", "readOnly": true }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" } }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "readOnly": true, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "660" }, "mode": 1569992019 @@ -226,26 +228,26 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": -1740986684, - "fsType": "92", + "fsType": "94", "readOnly": true, "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95", + "secretName": "96", + "shareName": "97", "readOnly": true }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": 195263908 } ], @@ -253,39 +255,39 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", - "user": "105", - "group": "106", - "tenant": "107" + "registry": "105", + "volume": "106", + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "|@?鷅bȻN", - "fsType": "110", + "fsType": "112", "readOnly": true, "kind": "榱*Gưoɘ檲" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": -323584340 } ], @@ -294,14 +296,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "106" }, "mode": 173030157 @@ -309,118 +311,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": 2063799569 } ], "optional": false }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": 8357931971650847566, - "path": "125" + "path": "127" } } ], "defaultMode": -1334904807 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127", + "volumeID": "128", + "fsType": "129", "readOnly": true }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": false, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -606111218, "containerPort": 1403721475, "protocol": "ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": true }, "secretRef": { - "name": "154", + "name": "156", "optional": true } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "650" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": false }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": true } } @@ -436,41 +438,41 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", + "path": "174", "port": -152585895, - "host": "173", + "host": "175", "scheme": "E@Ȗs«ö", "httpHeaders": [ { - "name": "174", - "value": "175" + "name": "176", + "value": "177" } ] }, "tcpSocket": { "port": 1135182169, - "host": "176" + "host": "178" }, "initialDelaySeconds": 1843758068, "timeoutSeconds": -1967469005, @@ -481,24 +483,24 @@ "readinessProbe": { "exec": { "command": [ - "177" + "179" ] }, "httpGet": { - "path": "178", + "path": "180", "port": 386652373, - "host": "179", + "host": "181", "scheme": "ʙ嫙\u0026", "httpHeaders": [ { - "name": "180", - "value": "181" + "name": "182", + "value": "183" } ] }, "tcpSocket": { - "port": "182", - "host": "183" + "port": "184", + "host": "185" }, "initialDelaySeconds": -802585193, "timeoutSeconds": 1901330124, @@ -510,51 +512,51 @@ "postStart": { "exec": { "command": [ - "184" + "186" ] }, "httpGet": { - "path": "185", - "port": "186", - "host": "187", + "path": "187", + "port": "188", + "host": "189", "scheme": "£ȹ嫰ƹǔw÷nI粛E煹", "httpHeaders": [ { - "name": "188", - "value": "189" + "name": "190", + "value": "191" } ] }, "tcpSocket": { "port": 135036402, - "host": "190" + "host": "192" } }, "preStop": { "exec": { "command": [ - "191" + "193" ] }, "httpGet": { - "path": "192", + "path": "194", "port": -1188430996, - "host": "193", + "host": "195", "scheme": "djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪", "httpHeaders": [ { - "name": "194", - "value": "195" + "name": "196", + "value": "197" } ] }, "tcpSocket": { - "port": "196", - "host": "197" + "port": "198", + "host": "199" } } }, - "terminationMessagePath": "198", + "terminationMessagePath": "200", "terminationMessagePolicy": "ɩC", "securityContext": { "capabilities": { @@ -567,15 +569,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "199", - "role": "200", - "type": "201", - "level": "202" + "user": "201", + "role": "202", + "type": "203", + "level": "204" }, "windowsOptions": { - "gmsaCredentialSpecName": "203", - "gmsaCredentialSpec": "204", - "runAsUserName": "205" + "gmsaCredentialSpecName": "205", + "gmsaCredentialSpec": "206", + "runAsUserName": "207" }, "runAsUser": 7739117973959656085, "runAsGroup": 3747003978559617838, @@ -590,59 +592,59 @@ ], "containers": [ { - "name": "206", - "image": "207", + "name": "208", + "image": "209", "command": [ - "208" + "210" ], "args": [ - "209" + "211" ], - "workingDir": "210", + "workingDir": "212", "ports": [ { - "name": "211", + "name": "213", "hostPort": 474119379, "containerPort": 1923334396, "protocol": "旿@掇lNdǂ\u003e5姣\u003e懔%熷谟þ", - "hostIP": "212" + "hostIP": "214" } ], "envFrom": [ { - "prefix": "213", + "prefix": "215", "configMapRef": { - "name": "214", + "name": "216", "optional": false }, "secretRef": { - "name": "215", + "name": "217", "optional": true } } ], "env": [ { - "name": "216", - "value": "217", + "name": "218", + "value": "219", "valueFrom": { "fieldRef": { - "apiVersion": "218", - "fieldPath": "219" + "apiVersion": "220", + "fieldPath": "221" }, "resourceFieldRef": { - "containerName": "220", - "resource": "221", + "containerName": "222", + "resource": "223", "divisor": "771" }, "configMapKeyRef": { - "name": "222", - "key": "223", + "name": "224", + "key": "225", "optional": false }, "secretKeyRef": { - "name": "224", - "key": "225", + "name": "226", + "key": "227", "optional": true } } @@ -658,41 +660,41 @@ }, "volumeMounts": [ { - "name": "226", + "name": "228", "readOnly": true, - "mountPath": "227", - "subPath": "228", + "mountPath": "229", + "subPath": "230", "mountPropagation": "0矀Kʝ瘴I\\p[ħsĨɆâĺɗŹ倗S", - "subPathExpr": "229" + "subPathExpr": "231" } ], "volumeDevices": [ { - "name": "230", - "devicePath": "231" + "name": "232", + "devicePath": "233" } ], "livenessProbe": { "exec": { "command": [ - "232" + "234" ] }, "httpGet": { - "path": "233", + "path": "235", "port": -1285424066, - "host": "234", + "host": "236", "scheme": "ni酛3ƁÀ", "httpHeaders": [ { - "name": "235", - "value": "236" + "name": "237", + "value": "238" } ] }, "tcpSocket": { - "port": "237", - "host": "238" + "port": "239", + "host": "240" }, "initialDelaySeconds": -2036074491, "timeoutSeconds": -148216266, @@ -703,24 +705,24 @@ "readinessProbe": { "exec": { "command": [ - "239" + "241" ] }, "httpGet": { - "path": "240", - "port": "241", - "host": "242", + "path": "242", + "port": "243", + "host": "244", "scheme": "3!Zɾģ毋Ó6", "httpHeaders": [ { - "name": "243", - "value": "244" + "name": "245", + "value": "246" } ] }, "tcpSocket": { "port": -832805508, - "host": "245" + "host": "247" }, "initialDelaySeconds": -228822833, "timeoutSeconds": -970312425, @@ -732,51 +734,51 @@ "postStart": { "exec": { "command": [ - "246" + "248" ] }, "httpGet": { - "path": "247", + "path": "249", "port": -2013568185, - "host": "248", + "host": "250", "scheme": "#yV'WKw(ğ儴Ůĺ}", "httpHeaders": [ { - "name": "249", - "value": "250" + "name": "251", + "value": "252" } ] }, "tcpSocket": { "port": -20130017, - "host": "251" + "host": "253" } }, "preStop": { "exec": { "command": [ - "252" + "254" ] }, "httpGet": { - "path": "253", + "path": "255", "port": -661937776, - "host": "254", + "host": "256", "scheme": "ØœȠƬQg鄠[颐o", "httpHeaders": [ { - "name": "255", - "value": "256" + "name": "257", + "value": "258" } ] }, "tcpSocket": { "port": 461585849, - "host": "257" + "host": "259" } } }, - "terminationMessagePath": "258", + "terminationMessagePath": "260", "terminationMessagePolicy": "ɇ卷荙JLĹ]佱¿\u003e犵殇ŕ-Ɂ", "imagePullPolicy": "ƙt叀碧闳ȩr嚧ʣq埄趛屡", "securityContext": { @@ -790,15 +792,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "259", - "role": "260", - "type": "261", - "level": "262" + "user": "261", + "role": "262", + "type": "263", + "level": "264" }, "windowsOptions": { - "gmsaCredentialSpecName": "263", - "gmsaCredentialSpec": "264", - "runAsUserName": "265" + "gmsaCredentialSpecName": "265", + "gmsaCredentialSpec": "266", + "runAsUserName": "267" }, "runAsUser": -5835415947553716289, "runAsGroup": 2540215688947167763, @@ -812,59 +814,59 @@ ], "ephemeralContainers": [ { - "name": "266", - "image": "267", + "name": "268", + "image": "269", "command": [ - "268" + "270" ], "args": [ - "269" + "271" ], - "workingDir": "270", + "workingDir": "272", "ports": [ { - "name": "271", + "name": "273", "hostPort": -552281772, "containerPort": -677617960, "protocol": "ŕ翑0展}", - "hostIP": "272" + "hostIP": "274" } ], "envFrom": [ { - "prefix": "273", + "prefix": "275", "configMapRef": { - "name": "274", + "name": "276", "optional": false }, "secretRef": { - "name": "275", + "name": "277", "optional": false } } ], "env": [ { - "name": "276", - "value": "277", + "name": "278", + "value": "279", "valueFrom": { "fieldRef": { - "apiVersion": "278", - "fieldPath": "279" + "apiVersion": "280", + "fieldPath": "281" }, "resourceFieldRef": { - "containerName": "280", - "resource": "281", + "containerName": "282", + "resource": "283", "divisor": "185" }, "configMapKeyRef": { - "name": "282", - "key": "283", + "name": "284", + "key": "285", "optional": true }, "secretKeyRef": { - "name": "284", - "key": "285", + "name": "286", + "key": "287", "optional": false } } @@ -880,40 +882,40 @@ }, "volumeMounts": [ { - "name": "286", - "mountPath": "287", - "subPath": "288", + "name": "288", + "mountPath": "289", + "subPath": "290", "mountPropagation": "", - "subPathExpr": "289" + "subPathExpr": "291" } ], "volumeDevices": [ { - "name": "290", - "devicePath": "291" + "name": "292", + "devicePath": "293" } ], "livenessProbe": { "exec": { "command": [ - "292" + "294" ] }, "httpGet": { - "path": "293", - "port": "294", - "host": "295", + "path": "295", + "port": "296", + "host": "297", "scheme": "頸", "httpHeaders": [ { - "name": "296", - "value": "297" + "name": "298", + "value": "299" } ] }, "tcpSocket": { "port": 1315054653, - "host": "298" + "host": "300" }, "initialDelaySeconds": 711020087, "timeoutSeconds": 1103049140, @@ -924,24 +926,24 @@ "readinessProbe": { "exec": { "command": [ - "299" + "301" ] }, "httpGet": { - "path": "300", - "port": "301", - "host": "302", + "path": "302", + "port": "303", + "host": "304", "scheme": "ƿ頀\"冓鍓贯澔 ", "httpHeaders": [ { - "name": "303", - "value": "304" + "name": "305", + "value": "306" } ] }, "tcpSocket": { - "port": "305", - "host": "306" + "port": "307", + "host": "308" }, "initialDelaySeconds": 1058960779, "timeoutSeconds": -2133441986, @@ -953,51 +955,51 @@ "postStart": { "exec": { "command": [ - "307" + "309" ] }, "httpGet": { - "path": "308", + "path": "310", "port": -934378634, - "host": "309", + "host": "311", "scheme": "ɐ鰥", "httpHeaders": [ { - "name": "310", - "value": "311" + "name": "312", + "value": "313" } ] }, "tcpSocket": { "port": 630140708, - "host": "312" + "host": "314" } }, "preStop": { "exec": { "command": [ - "313" + "315" ] }, "httpGet": { - "path": "314", - "port": "315", - "host": "316", + "path": "316", + "port": "317", + "host": "318", "scheme": "8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録²", "httpHeaders": [ { - "name": "317", - "value": "318" + "name": "319", + "value": "320" } ] }, "tcpSocket": { "port": 2080874371, - "host": "319" + "host": "321" } } }, - "terminationMessagePath": "320", + "terminationMessagePath": "322", "terminationMessagePolicy": "灩聋3趐囨鏻砅邻", "imagePullPolicy": "騎C\"6x$1sȣ±p鋄", "securityContext": { @@ -1011,15 +1013,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "321", - "role": "322", - "type": "323", - "level": "324" + "user": "323", + "role": "324", + "type": "325", + "level": "326" }, "windowsOptions": { - "gmsaCredentialSpecName": "325", - "gmsaCredentialSpec": "326", - "runAsUserName": "327" + "gmsaCredentialSpecName": "327", + "gmsaCredentialSpec": "328", + "runAsUserName": "329" }, "runAsUser": 4288903380102217677, "runAsGroup": 6618112330449141397, @@ -1030,7 +1032,7 @@ }, "stdinOnce": true, "tty": true, - "targetContainerName": "328" + "targetContainerName": "330" } ], "restartPolicy": "w妕眵笭/9崍h趭(娕", @@ -1038,25 +1040,25 @@ "activeDeadlineSeconds": -3214891994203952546, "dnsPolicy": "晲T[irȎ3Ĕ\\", "nodeSelector": { - "329": "330" + "331": "332" }, - "serviceAccountName": "331", - "serviceAccount": "332", + "serviceAccountName": "333", + "serviceAccount": "334", "automountServiceAccountToken": true, - "nodeName": "333", + "nodeName": "335", "hostIPC": true, "shareProcessNamespace": true, "securityContext": { "seLinuxOptions": { - "user": "334", - "role": "335", - "type": "336", - "level": "337" + "user": "336", + "role": "337", + "type": "338", + "level": "339" }, "windowsOptions": { - "gmsaCredentialSpecName": "338", - "gmsaCredentialSpec": "339", - "runAsUserName": "340" + "gmsaCredentialSpecName": "340", + "gmsaCredentialSpec": "341", + "runAsUserName": "342" }, "runAsUser": 4430285638700927057, "runAsGroup": 7461098988156705429, @@ -1067,18 +1069,18 @@ "fsGroup": 7747616967629081728, "sysctls": [ { - "name": "341", - "value": "342" + "name": "343", + "value": "344" } ] }, "imagePullSecrets": [ { - "name": "343" + "name": "345" } ], - "hostname": "344", - "subdomain": "345", + "hostname": "346", + "subdomain": "347", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1086,19 +1088,19 @@ { "matchExpressions": [ { - "key": "346", + "key": "348", "operator": "Ǚ(", "values": [ - "347" + "349" ] } ], "matchFields": [ { - "key": "348", + "key": "350", "operator": "瘍Nʊ輔3璾ėȜv1b繐汚", "values": [ - "349" + "351" ] } ] @@ -1111,19 +1113,19 @@ "preference": { "matchExpressions": [ { - "key": "350", + "key": "352", "operator": "n覦灲閈誹ʅ蕉", "values": [ - "351" + "353" ] } ], "matchFields": [ { - "key": "352", + "key": "354", "operator": "", "values": [ - "353" + "355" ] } ] @@ -1146,9 +1148,9 @@ ] }, "namespaces": [ - "360" + "362" ], - "topologyKey": "361" + "topologyKey": "363" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1170,9 +1172,9 @@ ] }, "namespaces": [ - "368" + "370" ], - "topologyKey": "369" + "topologyKey": "371" } } ] @@ -1195,9 +1197,9 @@ ] }, "namespaces": [ - "376" + "378" ], - "topologyKey": "377" + "topologyKey": "379" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1219,45 +1221,45 @@ ] }, "namespaces": [ - "384" + "386" ], - "topologyKey": "385" + "topologyKey": "387" } } ] } }, - "schedulerName": "386", + "schedulerName": "388", "tolerations": [ { - "key": "387", + "key": "389", "operator": "抄3昞财Î嘝zʄ!ć", - "value": "388", + "value": "390", "effect": "緍k¢茤", "tolerationSeconds": 4096844323391966153 } ], "hostAliases": [ { - "ip": "389", + "ip": "391", "hostnames": [ - "390" + "392" ] } ], - "priorityClassName": "391", + "priorityClassName": "393", "priority": -1331113536, "dnsConfig": { "nameservers": [ - "392" + "394" ], "searches": [ - "393" + "395" ], "options": [ { - "name": "394", - "value": "395" + "name": "396", + "value": "397" } ] }, @@ -1266,7 +1268,7 @@ "conditionType": "mō6µɑ`ȗ\u003c8^翜" } ], - "runtimeClassName": "396", + "runtimeClassName": "398", "enableServiceLinks": false, "preemptionPolicy": "ý筞X", "overhead": { @@ -1275,7 +1277,7 @@ "topologySpreadConstraints": [ { "maxSkew": 1956797678, - "topologyKey": "397", + "topologyKey": "399", "whenUnsatisfiable": "ƀ+瑏eCmAȥ睙", "labelSelector": { "matchLabels": { @@ -1295,40 +1297,41 @@ "volumeClaimTemplates": [ { "metadata": { - "name": "404", - "generateName": "405", - "namespace": "406", - "selfLink": "407", + "name": "406", + "generateName": "407", + "namespace": "408", + "selfLink": "409", "uid": "鋡浤ɖ緖焿熣", "resourceVersion": "7821588463673401230", "generation": -3408884454087787958, "creationTimestamp": null, "deletionGracePeriodSeconds": -7871971636641833314, "labels": { - "409": "410" + "411": "412" }, "annotations": { - "411": "412" + "413": "414" }, "ownerReferences": [ { - "apiVersion": "413", - "kind": "414", - "name": "415", + "apiVersion": "415", + "kind": "416", + "name": "417", "uid": "9F徵{ɦ!f親ʚ«Ǥ栌Ə侷ŧ", "controller": false, "blockOwnerDeletion": true } ], "finalizers": [ - "416" + "418" ], - "clusterName": "417", + "clusterName": "419", "managedFields": [ { - "manager": "418", + "manager": "420", "operation": "ÕW肤", - "apiVersion": "419" + "apiVersion": "421", + "fieldsType": "422" } ] }, @@ -1355,13 +1358,13 @@ "犔kU坥;ȉv5": "156" } }, - "volumeName": "426", - "storageClassName": "427", + "volumeName": "429", + "storageClassName": "430", "volumeMode": "qwïźU痤ȵ", "dataSource": { - "apiGroup": "428", - "kind": "429", - "name": "430" + "apiGroup": "431", + "kind": "432", + "name": "433" } }, "status": { @@ -1378,14 +1381,14 @@ "status": "RY客\\ǯ'_", "lastProbeTime": "2513-10-02T03:37:43Z", "lastTransitionTime": "2172-12-06T22:36:31Z", - "reason": "431", - "message": "432" + "reason": "434", + "message": "435" } ] } } ], - "serviceName": "433", + "serviceName": "436", "podManagementPolicy": "榭ș«lj}砵(ɋǬAÃɮǜ:ɐ", "updateStrategy": { "type": "瓘ȿ4", @@ -1401,16 +1404,16 @@ "readyReplicas": -1823513364, "currentReplicas": -981691190, "updatedReplicas": 2069003631, - "currentRevision": "434", - "updateRevision": "435", + "currentRevision": "437", + "updateRevision": "438", "collisionCount": -2044314719, "conditions": [ { "type": "GZ耏驧¹ƽɟ9ɭ锻ó/階ħ叟V", "status": "x臥", "lastTransitionTime": "2583-07-02T00:14:17Z", - "reason": "436", - "message": "437" + "reason": "439", + "message": "440" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.pb index 64369a21ec2..e7632a0f1c6 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.pb and b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.yaml b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.yaml index 0075a7b5fa9..67456df5345 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.StatefulSet.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -38,35 +39,36 @@ spec: operator: Exists matchLabels: 74404d5---g8c2-k-91e.y5-g--58----0683-b-w7ld-6cs06xj-x5yv0wm-k18/M_-Nx.N_6-___._-.-W._AAn---v_-5-_8LXj: 6-4_WE-_JTrcd-2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--1 - serviceName: "433" + serviceName: "436" template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: -2575298329142810753 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -8542870036622468681 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: 躢 - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: true - kind: "34" - name: "35" + kind: "35" + name: "36" uid: ƶȤ^} resourceVersion: "1736621709629422270" - selfLink: "27" + selfLink: "28" uid: ?Qȫş spec: activeDeadlineSeconds: -3214891994203952546 @@ -75,28 +77,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "350" + - key: "352" operator: n覦灲閈誹ʅ蕉 values: - - "351" + - "353" matchFields: - - key: "352" + - key: "354" operator: "" values: - - "353" + - "355" weight: 702968201 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "346" + - key: "348" operator: Ǚ( values: - - "347" + - "349" matchFields: - - key: "348" + - key: "350" operator: 瘍Nʊ輔3璾ėȜv1b繐汚 values: - - "349" + - "351" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -109,8 +111,8 @@ spec: matchLabels: Bk.j._g-G-7--p9.-_0R.-_-3_L_2--_v2.5p_..Y-.wg_-b8a_68: Q4_.84.K_-_0_..u.F.pq..--Q namespaces: - - "368" - topologyKey: "369" + - "370" + topologyKey: "371" weight: 1195176401 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -120,8 +122,8 @@ spec: matchLabels: lm-e46-r-g63--gt1--6mx-r-927--m6-k8-c2---2etfh41ca-z-g/0p_3_J_SA995IKCR.s--f.-f.-zv._._.5-H.T.-.-.d: b_9_1o.w_aI._31-_I-A-_3bz._8M0U1_-__.71-_-9_._X-D---k..1Q7._l.I namespaces: - - "360" - topologyKey: "361" + - "362" + topologyKey: "363" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -134,8 +136,8 @@ spec: matchLabels: 3--rgvf3q-z-5z80n--t5--9-4-d2-22--i--40wv--in-870w--it6k47-7y1.h72n-cnp-75/c10KkQ-R_R.-.--4_IT_O__3.5h_XC0_-3: 20_._.-_L-__bf_9_-C-PfNx__-U_.Pn-W23-_.z_.._s--_F-BR-.h_-2-.F namespaces: - - "384" - topologyKey: "385" + - "386" + topologyKey: "387" weight: -1508769491 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -147,119 +149,119 @@ spec: matchLabels: H__V.Vz_6.Hz_V_.r_v_._e_-78o_6Z..11_7pX_.-mLlx...w_j: 35.40Rw4gD.._.-x6db-L7.-__-G_2kCpS_1 namespaces: - - "376" - topologyKey: "377" + - "378" + topologyKey: "379" automountServiceAccountToken: true containers: - args: - - "209" + - "211" command: - - "208" + - "210" env: - - name: "216" - value: "217" + - name: "218" + value: "219" valueFrom: configMapKeyRef: - key: "223" - name: "222" - optional: false - fieldRef: - apiVersion: "218" - fieldPath: "219" - resourceFieldRef: - containerName: "220" - divisor: "771" - resource: "221" - secretKeyRef: key: "225" name: "224" + optional: false + fieldRef: + apiVersion: "220" + fieldPath: "221" + resourceFieldRef: + containerName: "222" + divisor: "771" + resource: "223" + secretKeyRef: + key: "227" + name: "226" optional: true envFrom: - configMapRef: - name: "214" + name: "216" optional: false - prefix: "213" + prefix: "215" secretRef: - name: "215" + name: "217" optional: true - image: "207" + image: "209" imagePullPolicy: ƙt叀碧闳ȩr嚧ʣq埄趛屡 lifecycle: postStart: exec: command: - - "246" + - "248" httpGet: - host: "248" + host: "250" httpHeaders: - - name: "249" - value: "250" - path: "247" + - name: "251" + value: "252" + path: "249" port: -2013568185 scheme: '#yV''WKw(ğ儴Ůĺ}' tcpSocket: - host: "251" + host: "253" port: -20130017 preStop: exec: command: - - "252" + - "254" httpGet: - host: "254" + host: "256" httpHeaders: - - name: "255" - value: "256" - path: "253" + - name: "257" + value: "258" + path: "255" port: -661937776 scheme: ØœȠƬQg鄠[颐o tcpSocket: - host: "257" + host: "259" port: 461585849 livenessProbe: exec: command: - - "232" + - "234" failureThreshold: -93157681 httpGet: - host: "234" + host: "236" httpHeaders: - - name: "235" - value: "236" - path: "233" + - name: "237" + value: "238" + path: "235" port: -1285424066 scheme: ni酛3ƁÀ initialDelaySeconds: -2036074491 periodSeconds: 165047920 successThreshold: -393291312 tcpSocket: - host: "238" - port: "237" + host: "240" + port: "239" timeoutSeconds: -148216266 - name: "206" + name: "208" ports: - containerPort: 1923334396 - hostIP: "212" + hostIP: "214" hostPort: 474119379 - name: "211" + name: "213" protocol: 旿@掇lNdǂ>5姣>懔%熷谟þ readinessProbe: exec: command: - - "239" + - "241" failureThreshold: 267768240 httpGet: - host: "242" + host: "244" httpHeaders: - - name: "243" - value: "244" - path: "240" - port: "241" + - name: "245" + value: "246" + path: "242" + port: "243" scheme: 3!Zɾģ毋Ó6 initialDelaySeconds: -228822833 periodSeconds: -1213051101 successThreshold: 1451056156 tcpSocket: - host: "245" + host: "247" port: -832805508 timeoutSeconds: -970312425 resources: @@ -281,149 +283,149 @@ spec: runAsNonRoot: false runAsUser: -5835415947553716289 seLinuxOptions: - level: "262" - role: "260" - type: "261" - user: "259" + level: "264" + role: "262" + type: "263" + user: "261" windowsOptions: - gmsaCredentialSpec: "264" - gmsaCredentialSpecName: "263" - runAsUserName: "265" - terminationMessagePath: "258" + gmsaCredentialSpec: "266" + gmsaCredentialSpecName: "265" + runAsUserName: "267" + terminationMessagePath: "260" terminationMessagePolicy: ɇ卷荙JLĹ]佱¿>犵殇ŕ-Ɂ tty: true volumeDevices: - - devicePath: "231" - name: "230" + - devicePath: "233" + name: "232" volumeMounts: - - mountPath: "227" + - mountPath: "229" mountPropagation: 0矀Kʝ瘴I\p[ħsĨɆâĺɗŹ倗S - name: "226" + name: "228" readOnly: true - subPath: "228" - subPathExpr: "229" - workingDir: "210" + subPath: "230" + subPathExpr: "231" + workingDir: "212" dnsConfig: nameservers: - - "392" + - "394" options: - - name: "394" - value: "395" + - name: "396" + value: "397" searches: - - "393" + - "395" dnsPolicy: 晲T[irȎ3Ĕ\ enableServiceLinks: false ephemeralContainers: - args: - - "269" + - "271" command: - - "268" + - "270" env: - - name: "276" - value: "277" + - name: "278" + value: "279" valueFrom: configMapKeyRef: - key: "283" - name: "282" - optional: true - fieldRef: - apiVersion: "278" - fieldPath: "279" - resourceFieldRef: - containerName: "280" - divisor: "185" - resource: "281" - secretKeyRef: key: "285" name: "284" + optional: true + fieldRef: + apiVersion: "280" + fieldPath: "281" + resourceFieldRef: + containerName: "282" + divisor: "185" + resource: "283" + secretKeyRef: + key: "287" + name: "286" optional: false envFrom: - configMapRef: - name: "274" + name: "276" optional: false - prefix: "273" + prefix: "275" secretRef: - name: "275" + name: "277" optional: false - image: "267" + image: "269" imagePullPolicy: 騎C"6x$1sȣ±p鋄 lifecycle: postStart: exec: command: - - "307" + - "309" httpGet: - host: "309" + host: "311" httpHeaders: - - name: "310" - value: "311" - path: "308" + - name: "312" + value: "313" + path: "310" port: -934378634 scheme: ɐ鰥 tcpSocket: - host: "312" + host: "314" port: 630140708 preStop: exec: command: - - "313" + - "315" httpGet: - host: "316" + host: "318" httpHeaders: - - name: "317" - value: "318" - path: "314" - port: "315" + - name: "319" + value: "320" + path: "316" + port: "317" scheme: 8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録² tcpSocket: - host: "319" + host: "321" port: 2080874371 livenessProbe: exec: command: - - "292" + - "294" failureThreshold: 1993268896 httpGet: - host: "295" + host: "297" httpHeaders: - - name: "296" - value: "297" - path: "293" - port: "294" + - name: "298" + value: "299" + path: "295" + port: "296" scheme: 頸 initialDelaySeconds: 711020087 periodSeconds: -1965247100 successThreshold: 218453478 tcpSocket: - host: "298" + host: "300" port: 1315054653 timeoutSeconds: 1103049140 - name: "266" + name: "268" ports: - containerPort: -677617960 - hostIP: "272" + hostIP: "274" hostPort: -552281772 - name: "271" + name: "273" protocol: ŕ翑0展} readinessProbe: exec: command: - - "299" + - "301" failureThreshold: -1250314365 httpGet: - host: "302" + host: "304" httpHeaders: - - name: "303" - value: "304" - path: "300" - port: "301" + - name: "305" + value: "306" + path: "302" + port: "303" scheme: 'ƿ頀"冓鍓贯澔 ' initialDelaySeconds: 1058960779 periodSeconds: 472742933 successThreshold: 50696420 tcpSocket: - host: "306" - port: "305" + host: "308" + port: "307" timeoutSeconds: -2133441986 resources: limits: @@ -444,147 +446,147 @@ spec: runAsNonRoot: false runAsUser: 4288903380102217677 seLinuxOptions: - level: "324" - role: "322" - type: "323" - user: "321" + level: "326" + role: "324" + type: "325" + user: "323" windowsOptions: - gmsaCredentialSpec: "326" - gmsaCredentialSpecName: "325" - runAsUserName: "327" + gmsaCredentialSpec: "328" + gmsaCredentialSpecName: "327" + runAsUserName: "329" stdinOnce: true - targetContainerName: "328" - terminationMessagePath: "320" + targetContainerName: "330" + terminationMessagePath: "322" terminationMessagePolicy: 灩聋3趐囨鏻砅邻 tty: true volumeDevices: - - devicePath: "291" - name: "290" + - devicePath: "293" + name: "292" volumeMounts: - - mountPath: "287" + - mountPath: "289" mountPropagation: "" - name: "286" - subPath: "288" - subPathExpr: "289" - workingDir: "270" + name: "288" + subPath: "290" + subPathExpr: "291" + workingDir: "272" hostAliases: - hostnames: - - "390" - ip: "389" + - "392" + ip: "391" hostIPC: true - hostname: "344" + hostname: "346" imagePullSecrets: - - name: "343" + - name: "345" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "650" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "650" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: true envFrom: - configMapRef: - name: "153" + name: "155" optional: true - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: true - image: "146" + image: "148" lifecycle: postStart: exec: command: - - "184" + - "186" httpGet: - host: "187" + host: "189" httpHeaders: - - name: "188" - value: "189" - path: "185" - port: "186" + - name: "190" + value: "191" + path: "187" + port: "188" scheme: £ȹ嫰ƹǔw÷nI粛E煹 tcpSocket: - host: "190" + host: "192" port: 135036402 preStop: exec: command: - - "191" + - "193" httpGet: - host: "193" + host: "195" httpHeaders: - - name: "194" - value: "195" - path: "192" + - name: "196" + value: "197" + path: "194" port: -1188430996 scheme: djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪 tcpSocket: - host: "197" - port: "196" + host: "199" + port: "198" livenessProbe: exec: command: - - "171" + - "173" failureThreshold: -1113628381 httpGet: - host: "173" + host: "175" httpHeaders: - - name: "174" - value: "175" - path: "172" + - name: "176" + value: "177" + path: "174" port: -152585895 scheme: E@Ȗs«ö initialDelaySeconds: 1843758068 periodSeconds: 1702578303 successThreshold: -1565157256 tcpSocket: - host: "176" + host: "178" port: 1135182169 timeoutSeconds: -1967469005 - name: "145" + name: "147" ports: - containerPort: 1403721475 - hostIP: "151" + hostIP: "153" hostPort: -606111218 - name: "150" + name: "152" protocol: ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳 readinessProbe: exec: command: - - "177" + - "179" failureThreshold: -1167888910 httpGet: - host: "179" + host: "181" httpHeaders: - - name: "180" - value: "181" - path: "178" + - name: "182" + value: "183" + path: "180" port: 386652373 scheme: ʙ嫙& initialDelaySeconds: -802585193 periodSeconds: 1944205014 successThreshold: -2079582559 tcpSocket: - host: "183" - port: "182" + host: "185" + port: "184" timeoutSeconds: 1901330124 resources: limits: @@ -605,72 +607,72 @@ spec: runAsNonRoot: false runAsUser: 7739117973959656085 seLinuxOptions: - level: "202" - role: "200" - type: "201" - user: "199" + level: "204" + role: "202" + type: "203" + user: "201" windowsOptions: - gmsaCredentialSpec: "204" - gmsaCredentialSpecName: "203" - runAsUserName: "205" + gmsaCredentialSpec: "206" + gmsaCredentialSpecName: "205" + runAsUserName: "207" stdin: true stdinOnce: true - terminationMessagePath: "198" + terminationMessagePath: "200" terminationMessagePolicy: ɩC volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: "" - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "333" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "335" nodeSelector: - "329": "330" + "331": "332" overhead: tHǽ÷閂抰^窄CǙķȈ: "97" preemptionPolicy: ý筞X priority: -1331113536 - priorityClassName: "391" + priorityClassName: "393" readinessGates: - conditionType: mō6µɑ`ȗ<8^翜 restartPolicy: w妕眵笭/9崍h趭(娕 - runtimeClassName: "396" - schedulerName: "386" + runtimeClassName: "398" + schedulerName: "388" securityContext: fsGroup: 7747616967629081728 runAsGroup: 7461098988156705429 runAsNonRoot: false runAsUser: 4430285638700927057 seLinuxOptions: - level: "337" - role: "335" - type: "336" - user: "334" + level: "339" + role: "337" + type: "338" + user: "336" supplementalGroups: - 7866826580662861268 sysctls: - - name: "341" - value: "342" + - name: "343" + value: "344" windowsOptions: - gmsaCredentialSpec: "339" - gmsaCredentialSpecName: "338" - runAsUserName: "340" - serviceAccount: "332" - serviceAccountName: "331" + gmsaCredentialSpec: "341" + gmsaCredentialSpecName: "340" + runAsUserName: "342" + serviceAccount: "334" + serviceAccountName: "333" shareProcessNamespace: true - subdomain: "345" + subdomain: "347" terminationGracePeriodSeconds: 6245571390016329382 tolerations: - effect: 緍k¢茤 - key: "387" + key: "389" operator: 抄3昞财Î嘝zʄ!ć tolerationSeconds: 4096844323391966153 - value: "388" + value: "390" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -680,207 +682,207 @@ spec: ? zp22o4a-w----11rqy3eo79p-f4r1--7p--053--suu--98.y1s8-j-6j4uvf1-sdg--132bid-7x0u738--7w-tdt-u-0--v/Ied-0-i_zZsY_o8t5Vl6_..7CY-_dc__G6N-_-0o.0C_gV.9_G5 : x_.4dwFbuvEf55Y2k.F-4 maxSkew: 1956797678 - topologyKey: "397" + topologyKey: "399" whenUnsatisfiable: ƀ+瑏eCmAȥ睙 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: 912004803 readOnly: true - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: '|@?鷅bȻN' - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: 榱*Gưoɘ檲 readOnly: true azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 1593906314 items: - - key: "97" + - key: "99" mode: 195263908 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: false volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: 824682619 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 1569992019 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "660" - resource: "90" + resource: "92" emptyDir: medium: Xŋ朘瑥A徙ɶɊł/擇ɦĽ胚O醔ɍ厶耈 sizeLimit: "473" fc: - fsType: "92" + fsType: "94" lun: -1740986684 readOnly: true targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" readOnly: true secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1188153605 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" readOnly: true hostPath: - path: "41" + path: "43" type: ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱< iscsi: chapAuthDiscovery: true - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 994527057 portals: - - "58" + - "60" secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" + fsType: "129" readOnly: true - volumeID: "126" + volumeID: "128" projected: defaultMode: -1334904807 sources: - configMap: items: - - key: "122" + - key: "124" mode: 2063799569 - path: "123" - name: "121" + path: "125" + name: "123" optional: false downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: 173030157 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "106" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: -323584340 - path: "115" - name: "113" + path: "117" + name: "115" optional: true serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: 8357931971650847566 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + name: "132" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 332383000 items: - - key: "50" + - key: "52" mode: -547518679 - path: "51" + path: "53" optional: true - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" updateStrategy: rollingUpdate: partition: -1578718618 @@ -888,39 +890,40 @@ spec: volumeClaimTemplates: - metadata: annotations: - "411": "412" - clusterName: "417" + "413": "414" + clusterName: "419" creationTimestamp: null deletionGracePeriodSeconds: -7871971636641833314 finalizers: - - "416" - generateName: "405" + - "418" + generateName: "407" generation: -3408884454087787958 labels: - "409": "410" + "411": "412" managedFields: - - apiVersion: "419" - manager: "418" + - apiVersion: "421" + fieldsType: "422" + manager: "420" operation: ÕW肤 - name: "404" - namespace: "406" + name: "406" + namespace: "408" ownerReferences: - - apiVersion: "413" + - apiVersion: "415" blockOwnerDeletion: true controller: false - kind: "414" - name: "415" + kind: "416" + name: "417" uid: 9F徵{ɦ!f親ʚ«Ǥ栌Ə侷ŧ resourceVersion: "7821588463673401230" - selfLink: "407" + selfLink: "409" uid: 鋡浤ɖ緖焿熣 spec: accessModes: - 婻漛Ǒ僕ʨƌɦ dataSource: - apiGroup: "428" - kind: "429" - name: "430" + apiGroup: "431" + kind: "432" + name: "433" resources: limits: 宥ɓ: "692" @@ -932,9 +935,9 @@ spec: operator: Exists matchLabels: ANx__-F_._n.WaY_o.-0-yE-R55: 2n...78aou_j-3.J-.-r_-oPd-.2_Z__.-_U-.60--o._H - storageClassName: "427" + storageClassName: "430" volumeMode: qwïźU痤ȵ - volumeName: "426" + volumeName: "429" status: accessModes: - \屪kƱ @@ -943,8 +946,8 @@ spec: conditions: - lastProbeTime: "2513-10-02T03:37:43Z" lastTransitionTime: "2172-12-06T22:36:31Z" - message: "432" - reason: "431" + message: "435" + reason: "434" status: RY客\ǯ'_ type: nj phase: 怿ÿ易+ǴȰ¤趜磕绘翁揌p:oŇE0Lj @@ -952,14 +955,14 @@ status: collisionCount: -2044314719 conditions: - lastTransitionTime: "2583-07-02T00:14:17Z" - message: "437" - reason: "436" + message: "440" + reason: "439" status: x臥 type: GZ耏驧¹ƽɟ9ɭ锻ó/階ħ叟V currentReplicas: -981691190 - currentRevision: "434" + currentRevision: "437" observedGeneration: -2994706141758547943 readyReplicas: -1823513364 replicas: -148329440 - updateRevision: "435" + updateRevision: "438" updatedReplicas: 2069003631 diff --git a/staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.json b/staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.json index 8db869d9ccd..28a6ed11370 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.json +++ b/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" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.pb b/staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.pb index 5e754aa522f..aa4125f2d2b 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.pb and b/staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.yaml b/staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.yaml index 2595b8b7f57..994088b8c33 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/authentication.k8s.io.v1.TokenRequest.yaml +++ b/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鯹)晿郵[+扴 tcpSocket: - host: "318" - port: "317" + host: "320" + port: "319" preStop: exec: command: - - "319" + - "321" httpGet: - host: "322" + host: "324" httpHeaders: - - name: "323" - value: "324" - path: "320" - port: "321" + - name: "325" + value: "326" + path: "322" + port: "323" scheme: ']佱¿>犵殇ŕ-Ɂ圯W' tcpSocket: - host: "326" - port: "325" + host: "328" + port: "327" livenessProbe: exec: command: - - "300" + - "302" failureThreshold: -361442565 httpGet: - host: "302" + host: "304" httpHeaders: - - name: "303" - value: "304" - path: "301" + - name: "305" + value: "306" + path: "303" port: 896430536 scheme: 罴ņ螡źȰ initialDelaySeconds: 627713162 periodSeconds: -1740959124 successThreshold: 158280212 tcpSocket: - host: "305" + host: "307" port: 513341278 timeoutSeconds: 1255312175 - name: "274" + name: "276" ports: - containerPort: -819723498 - hostIP: "280" + hostIP: "282" hostPort: 2035347577 - name: "279" + name: "281" protocol: '>懔%熷谟þ蛯ɰ荶ljʁ揆ɘȌ脾嚏吐' readinessProbe: exec: command: - - "306" + - "308" failureThreshold: -36782737 httpGet: - host: "308" + host: "310" httpHeaders: - - name: "309" - value: "310" - path: "307" + - name: "311" + value: "312" + path: "309" port: -2013568185 scheme: '#yV''WKw(ğ儴Ůĺ}' initialDelaySeconds: -1244623134 periodSeconds: -398297599 successThreshold: 873056500 tcpSocket: - host: "311" + host: "313" port: -20130017 timeoutSeconds: -1334110502 resources: @@ -442,150 +444,150 @@ spec: runAsNonRoot: true runAsUser: -230763786643460687 seLinuxOptions: - level: "331" - role: "329" - type: "330" - user: "328" + level: "333" + role: "331" + type: "332" + user: "330" windowsOptions: - gmsaCredentialSpec: "333" - gmsaCredentialSpecName: "332" - runAsUserName: "334" + gmsaCredentialSpec: "335" + gmsaCredentialSpecName: "334" + runAsUserName: "336" stdin: true stdinOnce: true - targetContainerName: "335" - terminationMessagePath: "327" + targetContainerName: "337" + terminationMessagePath: "329" terminationMessagePolicy: 輦唊#v铿ʩȂ4ē鐭 volumeDevices: - - devicePath: "299" - name: "298" + - devicePath: "301" + name: "300" volumeMounts: - - mountPath: "295" + - mountPath: "297" mountPropagation: Ɏ R§耶FfBl - name: "294" + name: "296" readOnly: true - subPath: "296" - subPathExpr: "297" - workingDir: "278" + subPath: "298" + subPathExpr: "299" + workingDir: "280" hostAliases: - hostnames: - - "397" - ip: "396" + - "399" + ip: "398" hostIPC: true hostPID: true - hostname: "351" + hostname: "353" imagePullSecrets: - - name: "350" + - name: "352" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "671" - resource: "160" - secretKeyRef: key: "164" name: "163" optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "671" + resource: "162" + secretKeyRef: + key: "166" + name: "165" + optional: false envFrom: - configMapRef: - name: "153" + name: "155" optional: false - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: true - image: "146" + image: "148" imagePullPolicy: j瀉ǚrǜnh0åȂ町恰nj揠8lj黳鈫 lifecycle: postStart: exec: command: - - "186" + - "188" httpGet: - host: "189" + host: "191" httpHeaders: - - name: "190" - value: "191" - path: "187" - port: "188" + - name: "192" + value: "193" + path: "189" + port: "190" scheme: 怳冘HǺƶȤ^}穠C]躢|)黰eȪ嵛4 tcpSocket: - host: "193" - port: "192" + host: "195" + port: "194" preStop: exec: command: - - "194" + - "196" httpGet: - host: "197" + host: "199" httpHeaders: - - name: "198" - value: "199" - path: "195" - port: "196" + - name: "200" + value: "201" + path: "197" + port: "198" scheme: ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱< tcpSocket: - host: "201" - port: "200" + host: "203" + port: "202" livenessProbe: exec: command: - - "171" + - "173" failureThreshold: -20764200 httpGet: - host: "174" + host: "176" httpHeaders: - - name: "175" - value: "176" - path: "172" - port: "173" + - name: "177" + value: "178" + path: "174" + port: "175" scheme: ȲĻ¤Ħʅ芝M initialDelaySeconds: 664393458 periodSeconds: 964433164 successThreshold: 679825403 tcpSocket: - host: "177" + host: "179" port: 1784914896 timeoutSeconds: -573382936 - name: "145" + name: "147" ports: - containerPort: 223177366 - hostIP: "151" + hostIP: "153" hostPort: -884734093 - name: "150" + name: "152" protocol: 2ħ籦ö嗏ʑ>季 readinessProbe: exec: command: - - "178" + - "180" failureThreshold: -2039036935 httpGet: - host: "181" + host: "183" httpHeaders: - - name: "182" - value: "183" - path: "179" - port: "180" + - name: "184" + value: "185" + path: "181" + port: "182" scheme: 狩鴈o_ initialDelaySeconds: -1249460160 periodSeconds: -1944279238 successThreshold: 1169718433 tcpSocket: - host: "185" - port: "184" + host: "187" + port: "186" timeoutSeconds: -1027661779 resources: limits: @@ -606,70 +608,70 @@ spec: runAsNonRoot: true runAsUser: -7587297753202451973 seLinuxOptions: - level: "206" - role: "204" - type: "205" - user: "203" + level: "208" + role: "206" + type: "207" + user: "205" windowsOptions: - gmsaCredentialSpec: "208" - gmsaCredentialSpecName: "207" - runAsUserName: "209" + gmsaCredentialSpec: "210" + gmsaCredentialSpecName: "209" + runAsUserName: "211" stdin: true stdinOnce: true - terminationMessagePath: "202" + terminationMessagePath: "204" volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: 2啗塧ȱ蓿彭聡A3fƻfʣ繡楙¯ĦE勗 - name: "165" - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "340" + name: "167" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "342" nodeSelector: - "336": "337" + "338": "339" overhead: "": "814" preemptionPolicy: L©鈀6w屑_ǪɄ6ɲǛʦ緒gb priority: 449312902 - priorityClassName: "398" + priorityClassName: "400" readinessGates: - conditionType: ':' restartPolicy: 庰%皧V - runtimeClassName: "403" - schedulerName: "393" + runtimeClassName: "405" + schedulerName: "395" securityContext: fsGroup: -4038707688124072116 runAsGroup: 8025933883888025358 runAsNonRoot: true runAsUser: 5307265951662522113 seLinuxOptions: - level: "344" - role: "342" - type: "343" - user: "341" + level: "346" + role: "344" + type: "345" + user: "343" supplementalGroups: - 6410850623145248813 sysctls: - - name: "348" - value: "349" + - name: "350" + value: "351" windowsOptions: - gmsaCredentialSpec: "346" - gmsaCredentialSpecName: "345" - runAsUserName: "347" - serviceAccount: "339" - serviceAccountName: "338" + gmsaCredentialSpec: "348" + gmsaCredentialSpecName: "347" + runAsUserName: "349" + serviceAccount: "341" + serviceAccountName: "340" shareProcessNamespace: false - subdomain: "352" + subdomain: "354" terminationGracePeriodSeconds: -5569844914519516591 tolerations: - effect: vĝ線 - key: "394" + key: "396" operator: 滔xvŗÑ"虆k遚釾ʼn{朣Jɩɼɏ眞a tolerationSeconds: 3441490580161241924 - value: "395" + value: "397" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -680,213 +682,213 @@ spec: matchLabels: 5-ux3--0--2pn-5023-lt3-w-br75gp-c-coa--yh/83Po_L3f1-7_4: Ca.O2G_-_K-.03.mp.-10KkQ-R_R.-.--4_IT_O__3.5h_XC0_-7.-j maxSkew: -4712534 - topologyKey: "404" + topologyKey: "406" whenUnsatisfiable: '''6Ǫ槲Ǭ9|`gɩ' volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: -972874331 - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: 鎥ʟ<$洅ɹ7 - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: Þ readOnly: false azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 938765968 items: - - key: "97" + - key: "99" mode: -421817404 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: true volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: -331664193 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 848754324 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "110" - resource: "90" + resource: "92" emptyDir: medium: 瓷雼浢Ü礽绅{囥 sizeLimit: "721" fc: - fsType: "92" + fsType: "94" lun: -1341615783 targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: 1673568505 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" readOnly: true hostPath: - path: "41" + path: "43" type: 龷ȪÆl iscsi: - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: -1888506207 portals: - - "58" + - "60" readOnly: true secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" - server: "52" + path: "55" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" - volumeID: "126" + fsType: "129" + volumeID: "128" projected: defaultMode: -1884322607 sources: - configMap: items: - - key: "122" + - key: "124" mode: -1147975588 - path: "123" - name: "121" + path: "125" + name: "123" optional: true downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: -1240667156 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "750" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: 1550211208 - path: "115" - name: "113" + path: "117" + name: "115" optional: false serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: 2293771102284463819 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" readOnly: true secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" readOnly: true secretRef: - name: "130" + name: "132" sslEnabled: true - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 798972405 items: - - key: "50" + - key: "52" mode: -1628457490 - path: "51" + path: "53" optional: false - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" ttlSecondsAfterFinished: -1388868268 status: active: -810338968 conditions: - lastProbeTime: "2821-07-19T11:49:26Z" lastTransitionTime: "2086-12-20T18:43:07Z" - message: "412" - reason: "411" + message: "414" + reason: "413" status: 钖 type: ɍ颬灲Ɍ邪鳖üz failed: 1007324766 diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.json b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.json index fee0d6723ee..c46aab17dde 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.json +++ b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.json @@ -35,51 +35,53 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { - "schedule": "18", + "schedule": "19", "startingDeadlineSeconds": -2555947251840004808, "concurrencyPolicy": "Hr鯹)晿\u003co,c鮽ort昍řČ扷5Ɨ", "suspend": true, "jobTemplate": { "metadata": { - "name": "19", - "generateName": "20", - "namespace": "21", - "selfLink": "22", + "name": "20", + "generateName": "21", + "namespace": "22", + "selfLink": "23", "uid": "^苣", "resourceVersion": "1092536316763508004", "generation": 3798025802092444428, "creationTimestamp": null, "deletionGracePeriodSeconds": -6114802437535409255, "labels": { - "24": "25" + "25": "26" }, "annotations": { - "26": "27" + "27": "28" }, "ownerReferences": [ { - "apiVersion": "28", - "kind": "29", - "name": "30", + "apiVersion": "29", + "kind": "30", + "name": "31", "uid": "憍峕?狱³-Ǐ忄*", "controller": false, "blockOwnerDeletion": false } ], "finalizers": [ - "31" + "32" ], - "clusterName": "32", + "clusterName": "33", "managedFields": [ { - "manager": "33", + "manager": "34", "operation": "ȎțêɘIJ斬³;Ơ歿", - "apiVersion": "34" + "apiVersion": "35", + "fieldsType": "36" } ] }, @@ -102,49 +104,50 @@ "manualSelector": true, "template": { "metadata": { - "name": "41", - "generateName": "42", - "namespace": "43", - "selfLink": "44", + "name": "43", + "generateName": "44", + "namespace": "45", + "selfLink": "46", "uid": "A", "resourceVersion": "13282108741396501211", "generation": -1988464041375677738, "creationTimestamp": null, "deletionGracePeriodSeconds": -961038652544818647, "labels": { - "46": "47" + "48": "49" }, "annotations": { - "48": "49" + "50": "51" }, "ownerReferences": [ { - "apiVersion": "50", - "kind": "51", - "name": "52", + "apiVersion": "52", + "kind": "53", + "name": "54", "uid": "a縳讋ɮ衺勽Ƙq/Ź u衲\u003c¿燥ǖ_è", "controller": false, "blockOwnerDeletion": false } ], "finalizers": [ - "53" + "55" ], - "clusterName": "54", + "clusterName": "56", "managedFields": [ { - "manager": "55", + "manager": "57", "operation": "聻鎥ʟ\u003c$洅ɹ7\\弌Þ帺萸", - "apiVersion": "56" + "apiVersion": "58", + "fieldsType": "59" } ] }, "spec": { "volumes": [ { - "name": "57", + "name": "60", "hostPath": { - "path": "58", + "path": "61", "type": "j剐'宣I拍N嚳ķȗ" }, "emptyDir": { @@ -152,27 +155,27 @@ "sizeLimit": "347" }, "gcePersistentDisk": { - "pdName": "59", - "fsType": "60", + "pdName": "62", + "fsType": "63", "partition": 1399152294, "readOnly": true }, "awsElasticBlockStore": { - "volumeID": "61", - "fsType": "62", + "volumeID": "64", + "fsType": "65", "partition": -1853411528 }, "gitRepo": { - "repository": "63", - "revision": "64", - "directory": "65" + "repository": "66", + "revision": "67", + "directory": "68" }, "secret": { - "secretName": "66", + "secretName": "69", "items": [ { - "key": "67", - "path": "68", + "key": "70", + "path": "71", "mode": 1395607230 } ], @@ -180,90 +183,90 @@ "optional": true }, "nfs": { - "server": "69", - "path": "70" + "server": "72", + "path": "73" }, "iscsi": { - "targetPortal": "71", - "iqn": "72", + "targetPortal": "74", + "iqn": "75", "lun": -1483417237, - "iscsiInterface": "73", - "fsType": "74", + "iscsiInterface": "76", + "fsType": "77", "portals": [ - "75" + "78" ], "secretRef": { - "name": "76" + "name": "79" }, - "initiatorName": "77" + "initiatorName": "80" }, "glusterfs": { - "endpoints": "78", - "path": "79", + "endpoints": "81", + "path": "82", "readOnly": true }, "persistentVolumeClaim": { - "claimName": "80", + "claimName": "83", "readOnly": true }, "rbd": { "monitors": [ - "81" + "84" ], - "image": "82", - "fsType": "83", - "pool": "84", - "user": "85", - "keyring": "86", + "image": "85", + "fsType": "86", + "pool": "87", + "user": "88", + "keyring": "89", "secretRef": { - "name": "87" + "name": "90" }, "readOnly": true }, "flexVolume": { - "driver": "88", - "fsType": "89", + "driver": "91", + "fsType": "92", "secretRef": { - "name": "90" + "name": "93" }, "options": { - "91": "92" + "94": "95" } }, "cinder": { - "volumeID": "93", - "fsType": "94", + "volumeID": "96", + "fsType": "97", "secretRef": { - "name": "95" + "name": "98" } }, "cephfs": { "monitors": [ - "96" + "99" ], - "path": "97", - "user": "98", - "secretFile": "99", + "path": "100", + "user": "101", + "secretFile": "102", "secretRef": { - "name": "100" + "name": "103" }, "readOnly": true }, "flocker": { - "datasetName": "101", - "datasetUUID": "102" + "datasetName": "104", + "datasetUUID": "105" }, "downwardAPI": { "items": [ { - "path": "103", + "path": "106", "fieldRef": { - "apiVersion": "104", - "fieldPath": "105" + "apiVersion": "107", + "fieldPath": "108" }, "resourceFieldRef": { - "containerName": "106", - "resource": "107", + "containerName": "109", + "resource": "110", "divisor": "52" }, "mode": -1011172037 @@ -273,24 +276,24 @@ }, "fc": { "targetWWNs": [ - "108" + "111" ], "lun": -740816174, - "fsType": "109", + "fsType": "112", "wwids": [ - "110" + "113" ] }, "azureFile": { - "secretName": "111", - "shareName": "112" + "secretName": "114", + "shareName": "115" }, "configMap": { - "name": "113", + "name": "116", "items": [ { - "key": "114", - "path": "115", + "key": "117", + "path": "118", "mode": 1793473487 } ], @@ -298,40 +301,40 @@ "optional": false }, "vsphereVolume": { - "volumePath": "116", - "fsType": "117", - "storagePolicyName": "118", - "storagePolicyID": "119" + "volumePath": "119", + "fsType": "120", + "storagePolicyName": "121", + "storagePolicyID": "122" }, "quobyte": { - "registry": "120", - "volume": "121", + "registry": "123", + "volume": "124", "readOnly": true, - "user": "122", - "group": "123", - "tenant": "124" + "user": "125", + "group": "126", + "tenant": "127" }, "azureDisk": { - "diskName": "125", - "diskURI": "126", + "diskName": "128", + "diskURI": "129", "cachingMode": "A3fƻfʣ繡楙¯", - "fsType": "127", + "fsType": "130", "readOnly": true, "kind": "勗E濞偘1ɩÅ議Ǹ轺@)蓳嗘TʡȂ" }, "photonPersistentDisk": { - "pdID": "128", - "fsType": "129" + "pdID": "131", + "fsType": "132" }, "projected": { "sources": [ { "secret": { - "name": "130", + "name": "133", "items": [ { - "key": "131", - "path": "132", + "key": "134", + "path": "135", "mode": 550215822 } ], @@ -340,14 +343,14 @@ "downwardAPI": { "items": [ { - "path": "133", + "path": "136", "fieldRef": { - "apiVersion": "134", - "fieldPath": "135" + "apiVersion": "137", + "fieldPath": "138" }, "resourceFieldRef": { - "containerName": "136", - "resource": "137", + "containerName": "139", + "resource": "140", "divisor": "618" }, "mode": 1525389481 @@ -355,119 +358,119 @@ ] }, "configMap": { - "name": "138", + "name": "141", "items": [ { - "key": "139", - "path": "140", + "key": "142", + "path": "143", "mode": -1249460160 } ], "optional": false }, "serviceAccountToken": { - "audience": "141", + "audience": "144", "expirationSeconds": -8988970531898753887, - "path": "142" + "path": "145" } } ], "defaultMode": -1332301579 }, "portworxVolume": { - "volumeID": "143", - "fsType": "144" + "volumeID": "146", + "fsType": "147" }, "scaleIO": { - "gateway": "145", - "system": "146", + "gateway": "148", + "system": "149", "secretRef": { - "name": "147" + "name": "150" }, - "protectionDomain": "148", - "storagePool": "149", - "storageMode": "150", - "volumeName": "151", - "fsType": "152", + "protectionDomain": "151", + "storagePool": "152", + "storageMode": "153", + "volumeName": "154", + "fsType": "155", "readOnly": true }, "storageos": { - "volumeName": "153", - "volumeNamespace": "154", - "fsType": "155", + "volumeName": "156", + "volumeNamespace": "157", + "fsType": "158", "readOnly": true, "secretRef": { - "name": "156" + "name": "159" } }, "csi": { - "driver": "157", + "driver": "160", "readOnly": false, - "fsType": "158", + "fsType": "161", "volumeAttributes": { - "159": "160" + "162": "163" }, "nodePublishSecretRef": { - "name": "161" + "name": "164" } } } ], "initContainers": [ { - "name": "162", - "image": "163", + "name": "165", + "image": "166", "command": [ - "164" + "167" ], "args": [ - "165" + "168" ], - "workingDir": "166", + "workingDir": "169", "ports": [ { - "name": "167", + "name": "170", "hostPort": 1632959949, "containerPort": 487826951, "protocol": "ldg滠鼍ƭt?", - "hostIP": "168" + "hostIP": "171" } ], "envFrom": [ { - "prefix": "169", + "prefix": "172", "configMapRef": { - "name": "170", + "name": "173", "optional": false }, "secretRef": { - "name": "171", + "name": "174", "optional": false } } ], "env": [ { - "name": "172", - "value": "173", + "name": "175", + "value": "176", "valueFrom": { "fieldRef": { - "apiVersion": "174", - "fieldPath": "175" + "apiVersion": "177", + "fieldPath": "178" }, "resourceFieldRef": { - "containerName": "176", - "resource": "177", + "containerName": "179", + "resource": "180", "divisor": "597" }, "configMapKeyRef": { - "name": "178", - "key": "179", + "name": "181", + "key": "182", "optional": false }, "secretKeyRef": { - "name": "180", - "key": "181", + "name": "183", + "key": "184", "optional": false } } @@ -483,41 +486,41 @@ }, "volumeMounts": [ { - "name": "182", + "name": "185", "readOnly": true, - "mountPath": "183", - "subPath": "184", + "mountPath": "186", + "subPath": "187", "mountPropagation": "瑥A", - "subPathExpr": "185" + "subPathExpr": "188" } ], "volumeDevices": [ { - "name": "186", - "devicePath": "187" + "name": "189", + "devicePath": "190" } ], "livenessProbe": { "exec": { "command": [ - "188" + "191" ] }, "httpGet": { - "path": "189", - "port": "190", - "host": "191", + "path": "192", + "port": "193", + "host": "194", "scheme": "0åȂ町恰nj揠8lj", "httpHeaders": [ { - "name": "192", - "value": "193" + "name": "195", + "value": "196" } ] }, "tcpSocket": { "port": -2049272966, - "host": "194" + "host": "197" }, "initialDelaySeconds": -1188153605, "timeoutSeconds": -427769948, @@ -528,23 +531,23 @@ "readinessProbe": { "exec": { "command": [ - "195" + "198" ] }, "httpGet": { - "path": "196", - "port": "197", - "host": "198", + "path": "199", + "port": "200", + "host": "201", "httpHeaders": [ { - "name": "199", - "value": "200" + "name": "202", + "value": "203" } ] }, "tcpSocket": { "port": 675406340, - "host": "201" + "host": "204" }, "initialDelaySeconds": 994527057, "timeoutSeconds": -1482763519, @@ -556,51 +559,51 @@ "postStart": { "exec": { "command": [ - "202" + "205" ] }, "httpGet": { - "path": "203", - "port": "204", - "host": "205", + "path": "206", + "port": "207", + "host": "208", "scheme": "%:;栍dʪīT捘ɍi", "httpHeaders": [ { - "name": "206", - "value": "207" + "name": "209", + "value": "210" } ] }, "tcpSocket": { - "port": "208", - "host": "209" + "port": "211", + "host": "212" } }, "preStop": { "exec": { "command": [ - "210" + "213" ] }, "httpGet": { - "path": "211", + "path": "214", "port": -1171060347, - "host": "212", + "host": "215", "scheme": "咻痗ȡmƴy綸_Ú8參遼ūPH炮掊°", "httpHeaders": [ { - "name": "213", - "value": "214" + "name": "216", + "value": "217" } ] }, "tcpSocket": { - "port": "215", - "host": "216" + "port": "218", + "host": "219" } } }, - "terminationMessagePath": "217", + "terminationMessagePath": "220", "terminationMessagePolicy": "閼咎櫸eʔŊ", "imagePullPolicy": "ȓƇ$缔獵偐ę腬瓷碑=ɉ鎷卩蝾H韹寬", "securityContext": { @@ -614,15 +617,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "218", - "role": "219", - "type": "220", - "level": "221" + "user": "221", + "role": "222", + "type": "223", + "level": "224" }, "windowsOptions": { - "gmsaCredentialSpecName": "222", - "gmsaCredentialSpec": "223", - "runAsUserName": "224" + "gmsaCredentialSpecName": "225", + "gmsaCredentialSpec": "226", + "runAsUserName": "227" }, "runAsUser": -4642229086806245627, "runAsGroup": 6165457529064596376, @@ -637,59 +640,59 @@ ], "containers": [ { - "name": "225", - "image": "226", + "name": "228", + "image": "229", "command": [ - "227" + "230" ], "args": [ - "228" + "231" ], - "workingDir": "229", + "workingDir": "232", "ports": [ { - "name": "230", + "name": "233", "hostPort": -1703360754, "containerPort": -1569009987, "protocol": "ɢǵʭd鲡:贅wE@Ȗs«öʮĀ\u003c", - "hostIP": "231" + "hostIP": "234" } ], "envFrom": [ { - "prefix": "232", + "prefix": "235", "configMapRef": { - "name": "233", + "name": "236", "optional": true }, "secretRef": { - "name": "234", + "name": "237", "optional": false } } ], "env": [ { - "name": "235", - "value": "236", + "name": "238", + "value": "239", "valueFrom": { "fieldRef": { - "apiVersion": "237", - "fieldPath": "238" + "apiVersion": "240", + "fieldPath": "241" }, "resourceFieldRef": { - "containerName": "239", - "resource": "240", + "containerName": "242", + "resource": "243", "divisor": "405" }, "configMapKeyRef": { - "name": "241", - "key": "242", + "name": "244", + "key": "245", "optional": false }, "secretKeyRef": { - "name": "243", - "key": "244", + "name": "246", + "key": "247", "optional": false } } @@ -705,40 +708,40 @@ }, "volumeMounts": [ { - "name": "245", - "mountPath": "246", - "subPath": "247", + "name": "248", + "mountPath": "249", + "subPath": "250", "mountPropagation": "@ùƸʋŀ樺ȃv", - "subPathExpr": "248" + "subPathExpr": "251" } ], "volumeDevices": [ { - "name": "249", - "devicePath": "250" + "name": "252", + "devicePath": "253" } ], "livenessProbe": { "exec": { "command": [ - "251" + "254" ] }, "httpGet": { - "path": "252", - "port": "253", - "host": "254", + "path": "255", + "port": "256", + "host": "257", "scheme": "Źʣy豎@ɀ羭,铻O", "httpHeaders": [ { - "name": "255", - "value": "256" + "name": "258", + "value": "259" } ] }, "tcpSocket": { - "port": "257", - "host": "258" + "port": "260", + "host": "261" }, "initialDelaySeconds": 1424053148, "timeoutSeconds": 747521320, @@ -749,24 +752,24 @@ "readinessProbe": { "exec": { "command": [ - "259" + "262" ] }, "httpGet": { - "path": "260", + "path": "263", "port": -1710454086, - "host": "261", + "host": "264", "scheme": "mɩC[ó瓧", "httpHeaders": [ { - "name": "262", - "value": "263" + "name": "265", + "value": "266" } ] }, "tcpSocket": { "port": -122979840, - "host": "264" + "host": "267" }, "initialDelaySeconds": 915577348, "timeoutSeconds": -590798124, @@ -778,51 +781,51 @@ "postStart": { "exec": { "command": [ - "265" + "268" ] }, "httpGet": { - "path": "266", + "path": "269", "port": 1385030458, - "host": "267", + "host": "270", "scheme": "Ao/樝fw[Řż丩ŽoǠŻ", "httpHeaders": [ { - "name": "268", - "value": "269" + "name": "271", + "value": "272" } ] }, "tcpSocket": { - "port": "270", - "host": "271" + "port": "273", + "host": "274" } }, "preStop": { "exec": { "command": [ - "272" + "275" ] }, "httpGet": { - "path": "273", + "path": "276", "port": -1589303862, - "host": "274", + "host": "277", "scheme": "ľǎɳ,ǿ飏騀呣ǎ", "httpHeaders": [ { - "name": "275", - "value": "276" + "name": "278", + "value": "279" } ] }, "tcpSocket": { - "port": "277", - "host": "278" + "port": "280", + "host": "281" } } }, - "terminationMessagePath": "279", + "terminationMessagePath": "282", "terminationMessagePolicy": "萭旿@掇lNdǂ\u003e5姣", "securityContext": { "capabilities": { @@ -835,15 +838,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "280", - "role": "281", - "type": "282", - "level": "283" + "user": "283", + "role": "284", + "type": "285", + "level": "286" }, "windowsOptions": { - "gmsaCredentialSpecName": "284", - "gmsaCredentialSpec": "285", - "runAsUserName": "286" + "gmsaCredentialSpecName": "287", + "gmsaCredentialSpec": "288", + "runAsUserName": "289" }, "runAsUser": -5738810661106213940, "runAsGroup": 3195567116206635190, @@ -858,59 +861,59 @@ ], "ephemeralContainers": [ { - "name": "287", - "image": "288", + "name": "290", + "image": "291", "command": [ - "289" + "292" ], "args": [ - "290" + "293" ], - "workingDir": "291", + "workingDir": "294", "ports": [ { - "name": "292", + "name": "295", "hostPort": -1097611426, "containerPort": 1871952835, "protocol": "D剂讼ɓȌʟni酛3ƁÀ*", - "hostIP": "293" + "hostIP": "296" } ], "envFrom": [ { - "prefix": "294", + "prefix": "297", "configMapRef": { - "name": "295", + "name": "298", "optional": false }, "secretRef": { - "name": "296", + "name": "299", "optional": true } } ], "env": [ { - "name": "297", - "value": "298", + "name": "300", + "value": "301", "valueFrom": { "fieldRef": { - "apiVersion": "299", - "fieldPath": "300" + "apiVersion": "302", + "fieldPath": "303" }, "resourceFieldRef": { - "containerName": "301", - "resource": "302", + "containerName": "304", + "resource": "305", "divisor": "19" }, "configMapKeyRef": { - "name": "303", - "key": "304", + "name": "306", + "key": "307", "optional": false }, "secretKeyRef": { - "name": "305", - "key": "306", + "name": "308", + "key": "309", "optional": true } } @@ -926,40 +929,40 @@ }, "volumeMounts": [ { - "name": "307", - "mountPath": "308", - "subPath": "309", + "name": "310", + "mountPath": "311", + "subPath": "312", "mountPropagation": "¿", - "subPathExpr": "310" + "subPathExpr": "313" } ], "volumeDevices": [ { - "name": "311", - "devicePath": "312" + "name": "314", + "devicePath": "315" } ], "livenessProbe": { "exec": { "command": [ - "313" + "316" ] }, "httpGet": { - "path": "314", + "path": "317", "port": -534498506, - "host": "315", + "host": "318", "scheme": "儴Ůĺ}潷ʒ胵輓Ɔȓ蹣ɐ", "httpHeaders": [ { - "name": "316", - "value": "317" + "name": "319", + "value": "320" } ] }, "tcpSocket": { - "port": "318", - "host": "319" + "port": "321", + "host": "322" }, "initialDelaySeconds": -805795167, "timeoutSeconds": 1791615594, @@ -970,24 +973,24 @@ "readinessProbe": { "exec": { "command": [ - "320" + "323" ] }, "httpGet": { - "path": "321", - "port": "322", - "host": "323", + "path": "324", + "port": "325", + "host": "326", "scheme": "更偢ɇ卷荙JLĹ]佱¿\u003e犵殇ŕ-Ɂ", "httpHeaders": [ { - "name": "324", - "value": "325" + "name": "327", + "value": "328" } ] }, "tcpSocket": { "port": 467291328, - "host": "326" + "host": "329" }, "initialDelaySeconds": -1664778008, "timeoutSeconds": -1191528701, @@ -999,51 +1002,51 @@ "postStart": { "exec": { "command": [ - "327" + "330" ] }, "httpGet": { - "path": "328", + "path": "331", "port": -467985423, - "host": "329", + "host": "332", "scheme": "ē鐭#嬀ơŸ8T 苧yñKJɐ", "httpHeaders": [ { - "name": "330", - "value": "331" + "name": "333", + "value": "334" } ] }, "tcpSocket": { - "port": "332", - "host": "333" + "port": "335", + "host": "336" } }, "preStop": { "exec": { "command": [ - "334" + "337" ] }, "httpGet": { - "path": "335", + "path": "338", "port": 591440053, - "host": "336", + "host": "339", "scheme": "\u003c敄lu|榝$î.Ȏ蝪ʜ5遰=E埄", "httpHeaders": [ { - "name": "337", - "value": "338" + "name": "340", + "value": "341" } ] }, "tcpSocket": { - "port": "339", - "host": "340" + "port": "342", + "host": "343" } } }, - "terminationMessagePath": "341", + "terminationMessagePath": "344", "terminationMessagePolicy": " wƯ貾坢'跩aŕ", "imagePullPolicy": "Ļǟi\u0026", "securityContext": { @@ -1057,15 +1060,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "342", - "role": "343", - "type": "344", - "level": "345" + "user": "345", + "role": "346", + "type": "347", + "level": "348" }, "windowsOptions": { - "gmsaCredentialSpecName": "346", - "gmsaCredentialSpec": "347", - "runAsUserName": "348" + "gmsaCredentialSpecName": "349", + "gmsaCredentialSpec": "350", + "runAsUserName": "351" }, "runAsUser": -7971724279034955974, "runAsGroup": 2011630253582325853, @@ -1075,7 +1078,7 @@ "procMount": ",ŕ" }, "stdinOnce": true, - "targetContainerName": "349" + "targetContainerName": "352" } ], "restartPolicy": "M蘇KŅ/»頸+SÄ蚃ɣľ)酊龨δ", @@ -1083,25 +1086,25 @@ "activeDeadlineSeconds": 1968932441807931700, "dnsPolicy": "鍓贯澔 ƺ蛜6Ɖ飴", "nodeSelector": { - "350": "351" + "353": "354" }, - "serviceAccountName": "352", - "serviceAccount": "353", + "serviceAccountName": "355", + "serviceAccount": "356", "automountServiceAccountToken": false, - "nodeName": "354", + "nodeName": "357", "hostNetwork": true, "shareProcessNamespace": true, "securityContext": { "seLinuxOptions": { - "user": "355", - "role": "356", - "type": "357", - "level": "358" + "user": "358", + "role": "359", + "type": "360", + "level": "361" }, "windowsOptions": { - "gmsaCredentialSpecName": "359", - "gmsaCredentialSpec": "360", - "runAsUserName": "361" + "gmsaCredentialSpecName": "362", + "gmsaCredentialSpec": "363", + "runAsUserName": "364" }, "runAsUser": -6241205430888228274, "runAsGroup": 3716388262106582789, @@ -1112,18 +1115,18 @@ "fsGroup": -500234369132816308, "sysctls": [ { - "name": "362", - "value": "363" + "name": "365", + "value": "366" } ] }, "imagePullSecrets": [ { - "name": "364" + "name": "367" } ], - "hostname": "365", - "subdomain": "366", + "hostname": "368", + "subdomain": "369", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1131,19 +1134,19 @@ { "matchExpressions": [ { - "key": "367", + "key": "370", "operator": "鱎ƙ;Nŕ璻Ji", "values": [ - "368" + "371" ] } ], "matchFields": [ { - "key": "369", + "key": "372", "operator": "J", "values": [ - "370" + "373" ] } ] @@ -1156,19 +1159,19 @@ "preference": { "matchExpressions": [ { - "key": "371", + "key": "374", "operator": "H鯂²静ƲǦŐnj汰8ŕİi騎C\"6", "values": [ - "372" + "375" ] } ], "matchFields": [ { - "key": "373", + "key": "376", "operator": "ʎǑyZ涬P­", "values": [ - "374" + "377" ] } ] @@ -1194,9 +1197,9 @@ ] }, "namespaces": [ - "381" + "384" ], - "topologyKey": "382" + "topologyKey": "385" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1218,9 +1221,9 @@ ] }, "namespaces": [ - "389" + "392" ], - "topologyKey": "390" + "topologyKey": "393" } } ] @@ -1243,9 +1246,9 @@ ] }, "namespaces": [ - "397" + "400" ], - "topologyKey": "398" + "topologyKey": "401" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1267,45 +1270,45 @@ ] }, "namespaces": [ - "405" + "408" ], - "topologyKey": "406" + "topologyKey": "409" } } ] } }, - "schedulerName": "407", + "schedulerName": "410", "tolerations": [ { - "key": "408", + "key": "411", "operator": "抷qTfZȻ干m謆7", - "value": "409", + "value": "412", "effect": "儉ɩ柀", "tolerationSeconds": -7411984641310969236 } ], "hostAliases": [ { - "ip": "410", + "ip": "413", "hostnames": [ - "411" + "414" ] } ], - "priorityClassName": "412", + "priorityClassName": "415", "priority": -895317190, "dnsConfig": { "nameservers": [ - "413" + "416" ], "searches": [ - "414" + "417" ], "options": [ { - "name": "415", - "value": "416" + "name": "418", + "value": "419" } ] }, @@ -1314,7 +1317,7 @@ "conditionType": "ċƹ|慼櫁色苆试揯遐e4'ď曕椐敛n" } ], - "runtimeClassName": "417", + "runtimeClassName": "420", "enableServiceLinks": true, "preemptionPolicy": "qiǙĞǠ", "overhead": { @@ -1323,7 +1326,7 @@ "topologySpreadConstraints": [ { "maxSkew": 44905239, - "topologyKey": "418", + "topologyKey": "421", "whenUnsatisfiable": "NRNJ丧鴻ĿW癜鞤A馱z芀¿l磶Bb偃", "labelSelector": { "matchLabels": { @@ -1349,12 +1352,12 @@ "status": { "active": [ { - "kind": "425", - "namespace": "426", - "name": "427", - "apiVersion": "428", - "resourceVersion": "429", - "fieldPath": "430" + "kind": "428", + "namespace": "429", + "name": "430", + "apiVersion": "431", + "resourceVersion": "432", + "fieldPath": "433" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.pb b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.pb index 4a518f8d9c4..52ffc822f49 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.pb and b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.yaml b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.yaml index 184351bf3a0..090e3e45b0e 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.CronJob.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -34,31 +35,32 @@ spec: jobTemplate: metadata: annotations: - "26": "27" - clusterName: "32" + "27": "28" + clusterName: "33" creationTimestamp: null deletionGracePeriodSeconds: -6114802437535409255 finalizers: - - "31" - generateName: "20" + - "32" + generateName: "21" generation: 3798025802092444428 labels: - "24": "25" + "25": "26" managedFields: - - apiVersion: "34" - manager: "33" + - apiVersion: "35" + fieldsType: "36" + manager: "34" operation: ȎțêɘIJ斬³;Ơ歿 - name: "19" - namespace: "21" + name: "20" + namespace: "22" ownerReferences: - - apiVersion: "28" + - apiVersion: "29" blockOwnerDeletion: false controller: false - kind: "29" - name: "30" + kind: "30" + name: "31" uid: 憍峕?狱³-Ǐ忄* resourceVersion: "1092536316763508004" - selfLink: "22" + selfLink: "23" uid: ^苣 spec: activeDeadlineSeconds: -1483125035702892746 @@ -75,31 +77,32 @@ spec: template: metadata: annotations: - "48": "49" - clusterName: "54" + "50": "51" + clusterName: "56" creationTimestamp: null deletionGracePeriodSeconds: -961038652544818647 finalizers: - - "53" - generateName: "42" + - "55" + generateName: "44" generation: -1988464041375677738 labels: - "46": "47" + "48": "49" managedFields: - - apiVersion: "56" - manager: "55" + - apiVersion: "58" + fieldsType: "59" + manager: "57" operation: 聻鎥ʟ<$洅ɹ7\弌Þ帺萸 - name: "41" - namespace: "43" + name: "43" + namespace: "45" ownerReferences: - - apiVersion: "50" + - apiVersion: "52" blockOwnerDeletion: false controller: false - kind: "51" - name: "52" + kind: "53" + name: "54" uid: a縳讋ɮ衺勽Ƙq/Ź u衲<¿燥ǖ_è resourceVersion: "13282108741396501211" - selfLink: "44" + selfLink: "46" uid: A spec: activeDeadlineSeconds: 1968932441807931700 @@ -108,28 +111,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "371" + - key: "374" operator: H鯂²静ƲǦŐnj汰8ŕİi騎C"6 values: - - "372" + - "375" matchFields: - - key: "373" + - key: "376" operator: ʎǑyZ涬P­ values: - - "374" + - "377" weight: 902978249 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "367" + - key: "370" operator: 鱎ƙ;Nŕ璻Ji values: - - "368" + - "371" matchFields: - - key: "369" + - key: "372" operator: J values: - - "370" + - "373" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -142,8 +145,8 @@ spec: matchLabels: 26-k8-c2---2etfh41ca-z-5g2wco280.ka-6-31g--z-o-3bz6-8-0-1-z--271s-p9-8--m-cbck561-7n/VC..7o_x3..-.8J: 28_38xm-.nx.sEK4B namespaces: - - "389" - topologyKey: "390" + - "392" + topologyKey: "393" weight: -3478003 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -155,8 +158,8 @@ spec: matchLabels: 05mj-94-8134i5k6q6--5tu-0/j_.-.6GA26C-s.Nj-d-4_4--.-_Z4.LA3HVG3: 0-8-.M-.-.-v namespaces: - - "381" - topologyKey: "382" + - "384" + topologyKey: "385" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -169,8 +172,8 @@ spec: matchLabels: H__V.Vz_6.Hz_V_.r_v_._e_-78o_6Z..11_7pX_.-mLlx...w_j: 35.40Rw4gD.._.-x6db-L7.-__-G_2kCpS_1 namespaces: - - "405" - topologyKey: "406" + - "408" + topologyKey: "409" weight: -1078366610 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -182,118 +185,118 @@ spec: matchLabels: O.Um.-__k.j._g-G-7--p9.-0: 1-_-3_L_2--_v2.5p_..Y-.wg_-b8a_6_.0Q4_.84.K_-_0_..u.F.pq..-3 namespaces: - - "397" - topologyKey: "398" + - "400" + topologyKey: "401" automountServiceAccountToken: false containers: - args: - - "228" + - "231" command: - - "227" + - "230" env: - - name: "235" - value: "236" + - name: "238" + value: "239" valueFrom: configMapKeyRef: - key: "242" - name: "241" + key: "245" + name: "244" optional: false fieldRef: - apiVersion: "237" - fieldPath: "238" + apiVersion: "240" + fieldPath: "241" resourceFieldRef: - containerName: "239" + containerName: "242" divisor: "405" - resource: "240" + resource: "243" secretKeyRef: - key: "244" - name: "243" + key: "247" + name: "246" optional: false envFrom: - configMapRef: - name: "233" + name: "236" optional: true - prefix: "232" + prefix: "235" secretRef: - name: "234" + name: "237" optional: false - image: "226" + image: "229" lifecycle: postStart: exec: command: - - "265" + - "268" httpGet: - host: "267" + host: "270" httpHeaders: - - name: "268" - value: "269" - path: "266" + - name: "271" + value: "272" + path: "269" port: 1385030458 scheme: Ao/樝fw[Řż丩ŽoǠŻ tcpSocket: - host: "271" - port: "270" + host: "274" + port: "273" preStop: exec: command: - - "272" + - "275" httpGet: - host: "274" + host: "277" httpHeaders: - - name: "275" - value: "276" - path: "273" + - name: "278" + value: "279" + path: "276" port: -1589303862 scheme: ľǎɳ,ǿ飏騀呣ǎ tcpSocket: - host: "278" - port: "277" + host: "281" + port: "280" livenessProbe: exec: command: - - "251" + - "254" failureThreshold: -1131820775 httpGet: - host: "254" + host: "257" httpHeaders: - - name: "255" - value: "256" - path: "252" - port: "253" + - name: "258" + value: "259" + path: "255" + port: "256" scheme: Źʣy豎@ɀ羭,铻O initialDelaySeconds: 1424053148 periodSeconds: 859639931 successThreshold: -1663149700 tcpSocket: - host: "258" - port: "257" + host: "261" + port: "260" timeoutSeconds: 747521320 - name: "225" + name: "228" ports: - containerPort: -1569009987 - hostIP: "231" + hostIP: "234" hostPort: -1703360754 - name: "230" + name: "233" protocol: ɢǵʭd鲡:贅wE@Ȗs«öʮĀ< readinessProbe: exec: command: - - "259" + - "262" failureThreshold: -233378149 httpGet: - host: "261" + host: "264" httpHeaders: - - name: "262" - value: "263" - path: "260" + - name: "265" + value: "266" + path: "263" port: -1710454086 scheme: mɩC[ó瓧 initialDelaySeconds: 915577348 periodSeconds: -1386967282 successThreshold: -2030286732 tcpSocket: - host: "264" + host: "267" port: -122979840 timeoutSeconds: -590798124 resources: @@ -315,148 +318,148 @@ spec: runAsNonRoot: true runAsUser: -5738810661106213940 seLinuxOptions: - level: "283" - role: "281" - type: "282" - user: "280" + level: "286" + role: "284" + type: "285" + user: "283" windowsOptions: - gmsaCredentialSpec: "285" - gmsaCredentialSpecName: "284" - runAsUserName: "286" + gmsaCredentialSpec: "288" + gmsaCredentialSpecName: "287" + runAsUserName: "289" stdin: true - terminationMessagePath: "279" + terminationMessagePath: "282" terminationMessagePolicy: 萭旿@掇lNdǂ>5姣 tty: true volumeDevices: - - devicePath: "250" - name: "249" + - devicePath: "253" + name: "252" volumeMounts: - - mountPath: "246" + - mountPath: "249" mountPropagation: '@ùƸʋŀ樺ȃv' - name: "245" - subPath: "247" - subPathExpr: "248" - workingDir: "229" + name: "248" + subPath: "250" + subPathExpr: "251" + workingDir: "232" dnsConfig: nameservers: - - "413" + - "416" options: - - name: "415" - value: "416" + - name: "418" + value: "419" searches: - - "414" + - "417" dnsPolicy: 鍓贯澔 ƺ蛜6Ɖ飴 enableServiceLinks: true ephemeralContainers: - args: - - "290" + - "293" command: - - "289" + - "292" env: - - name: "297" - value: "298" + - name: "300" + value: "301" valueFrom: configMapKeyRef: - key: "304" - name: "303" + key: "307" + name: "306" optional: false fieldRef: - apiVersion: "299" - fieldPath: "300" + apiVersion: "302" + fieldPath: "303" resourceFieldRef: - containerName: "301" + containerName: "304" divisor: "19" - resource: "302" + resource: "305" secretKeyRef: - key: "306" - name: "305" + key: "309" + name: "308" optional: true envFrom: - configMapRef: - name: "295" + name: "298" optional: false - prefix: "294" + prefix: "297" secretRef: - name: "296" + name: "299" optional: true - image: "288" + image: "291" imagePullPolicy: Ļǟi& lifecycle: postStart: exec: command: - - "327" + - "330" httpGet: - host: "329" + host: "332" httpHeaders: - - name: "330" - value: "331" - path: "328" + - name: "333" + value: "334" + path: "331" port: -467985423 scheme: ē鐭#嬀ơŸ8T 苧yñKJɐ tcpSocket: - host: "333" - port: "332" + host: "336" + port: "335" preStop: exec: command: - - "334" + - "337" httpGet: - host: "336" + host: "339" httpHeaders: - - name: "337" - value: "338" - path: "335" + - name: "340" + value: "341" + path: "338" port: 591440053 scheme: <敄lu|榝$î.Ȏ蝪ʜ5遰=E埄 tcpSocket: - host: "340" - port: "339" + host: "343" + port: "342" livenessProbe: exec: command: - - "313" + - "316" failureThreshold: 1831208885 httpGet: - host: "315" + host: "318" httpHeaders: - - name: "316" - value: "317" - path: "314" + - name: "319" + value: "320" + path: "317" port: -534498506 scheme: 儴Ůĺ}潷ʒ胵輓Ɔȓ蹣ɐ initialDelaySeconds: -805795167 periodSeconds: 785984384 successThreshold: 193463975 tcpSocket: - host: "319" - port: "318" + host: "322" + port: "321" timeoutSeconds: 1791615594 - name: "287" + name: "290" ports: - containerPort: 1871952835 - hostIP: "293" + hostIP: "296" hostPort: -1097611426 - name: "292" + name: "295" protocol: D剂讼ɓȌʟni酛3ƁÀ* readinessProbe: exec: command: - - "320" + - "323" failureThreshold: 18113448 httpGet: - host: "323" + host: "326" httpHeaders: - - name: "324" - value: "325" - path: "321" - port: "322" + - name: "327" + value: "328" + path: "324" + port: "325" scheme: 更偢ɇ卷荙JLĹ]佱¿>犵殇ŕ-Ɂ initialDelaySeconds: -1664778008 periodSeconds: -978176982 successThreshold: 415947324 tcpSocket: - host: "326" + host: "329" port: 467291328 timeoutSeconds: -1191528701 resources: @@ -478,145 +481,145 @@ spec: runAsNonRoot: false runAsUser: -7971724279034955974 seLinuxOptions: - level: "345" - role: "343" - type: "344" - user: "342" + level: "348" + role: "346" + type: "347" + user: "345" windowsOptions: - gmsaCredentialSpec: "347" - gmsaCredentialSpecName: "346" - runAsUserName: "348" + gmsaCredentialSpec: "350" + gmsaCredentialSpecName: "349" + runAsUserName: "351" stdinOnce: true - targetContainerName: "349" - terminationMessagePath: "341" + targetContainerName: "352" + terminationMessagePath: "344" terminationMessagePolicy: ' wƯ貾坢''跩aŕ' volumeDevices: - - devicePath: "312" - name: "311" + - devicePath: "315" + name: "314" volumeMounts: - - mountPath: "308" + - mountPath: "311" mountPropagation: ¿ - name: "307" - subPath: "309" - subPathExpr: "310" - workingDir: "291" + name: "310" + subPath: "312" + subPathExpr: "313" + workingDir: "294" hostAliases: - hostnames: - - "411" - ip: "410" + - "414" + ip: "413" hostNetwork: true - hostname: "365" + hostname: "368" imagePullSecrets: - - name: "364" + - name: "367" initContainers: - args: - - "165" + - "168" command: - - "164" + - "167" env: - - name: "172" - value: "173" + - name: "175" + value: "176" valueFrom: configMapKeyRef: - key: "179" - name: "178" + key: "182" + name: "181" optional: false fieldRef: - apiVersion: "174" - fieldPath: "175" + apiVersion: "177" + fieldPath: "178" resourceFieldRef: - containerName: "176" + containerName: "179" divisor: "597" - resource: "177" + resource: "180" secretKeyRef: - key: "181" - name: "180" + key: "184" + name: "183" optional: false envFrom: - configMapRef: - name: "170" + name: "173" optional: false - prefix: "169" + prefix: "172" secretRef: - name: "171" + name: "174" optional: false - image: "163" + image: "166" imagePullPolicy: ȓƇ$缔獵偐ę腬瓷碑=ɉ鎷卩蝾H韹寬 lifecycle: postStart: exec: command: - - "202" + - "205" httpGet: - host: "205" + host: "208" httpHeaders: - - name: "206" - value: "207" - path: "203" - port: "204" + - name: "209" + value: "210" + path: "206" + port: "207" scheme: '%:;栍dʪīT捘ɍi' tcpSocket: - host: "209" - port: "208" + host: "212" + port: "211" preStop: exec: command: - - "210" + - "213" httpGet: - host: "212" + host: "215" httpHeaders: - - name: "213" - value: "214" - path: "211" + - name: "216" + value: "217" + path: "214" port: -1171060347 scheme: 咻痗ȡmƴy綸_Ú8參遼ūPH炮掊° tcpSocket: - host: "216" - port: "215" + host: "219" + port: "218" livenessProbe: exec: command: - - "188" + - "191" failureThreshold: 1231820696 httpGet: - host: "191" + host: "194" httpHeaders: - - name: "192" - value: "193" - path: "189" - port: "190" + - name: "195" + value: "196" + path: "192" + port: "193" scheme: 0åȂ町恰nj揠8lj initialDelaySeconds: -1188153605 periodSeconds: 912004803 successThreshold: -2098817064 tcpSocket: - host: "194" + host: "197" port: -2049272966 timeoutSeconds: -427769948 - name: "162" + name: "165" ports: - containerPort: 487826951 - hostIP: "168" + hostIP: "171" hostPort: 1632959949 - name: "167" + name: "170" protocol: ldg滠鼍ƭt? readinessProbe: exec: command: - - "195" + - "198" failureThreshold: -1618937335 httpGet: - host: "198" + host: "201" httpHeaders: - - name: "199" - value: "200" - path: "196" - port: "197" + - name: "202" + value: "203" + path: "199" + port: "200" initialDelaySeconds: 994527057 periodSeconds: -1346458591 successThreshold: 1234551517 tcpSocket: - host: "201" + host: "204" port: 675406340 timeoutSeconds: -1482763519 resources: @@ -638,72 +641,72 @@ spec: runAsNonRoot: false runAsUser: -4642229086806245627 seLinuxOptions: - level: "221" - role: "219" - type: "220" - user: "218" + level: "224" + role: "222" + type: "223" + user: "221" windowsOptions: - gmsaCredentialSpec: "223" - gmsaCredentialSpecName: "222" - runAsUserName: "224" + gmsaCredentialSpec: "226" + gmsaCredentialSpecName: "225" + runAsUserName: "227" stdinOnce: true - terminationMessagePath: "217" + terminationMessagePath: "220" terminationMessagePolicy: 閼咎櫸eʔŊ tty: true volumeDevices: - - devicePath: "187" - name: "186" + - devicePath: "190" + name: "189" volumeMounts: - - mountPath: "183" + - mountPath: "186" mountPropagation: 瑥A - name: "182" + name: "185" readOnly: true - subPath: "184" - subPathExpr: "185" - workingDir: "166" - nodeName: "354" + subPath: "187" + subPathExpr: "188" + workingDir: "169" + nodeName: "357" nodeSelector: - "350": "351" + "353": "354" overhead: 锒鿦Ršțb贇髪č: "840" preemptionPolicy: qiǙĞǠ priority: -895317190 - priorityClassName: "412" + priorityClassName: "415" readinessGates: - conditionType: ċƹ|慼櫁色苆试揯遐e4'ď曕椐敛n restartPolicy: M蘇KŅ/»頸+SÄ蚃ɣľ)酊龨δ - runtimeClassName: "417" - schedulerName: "407" + runtimeClassName: "420" + schedulerName: "410" securityContext: fsGroup: -500234369132816308 runAsGroup: 3716388262106582789 runAsNonRoot: true runAsUser: -6241205430888228274 seLinuxOptions: - level: "358" - role: "356" - type: "357" - user: "355" + level: "361" + role: "359" + type: "360" + user: "358" supplementalGroups: - 2706433733228765005 sysctls: - - name: "362" - value: "363" + - name: "365" + value: "366" windowsOptions: - gmsaCredentialSpec: "360" - gmsaCredentialSpecName: "359" - runAsUserName: "361" - serviceAccount: "353" - serviceAccountName: "352" + gmsaCredentialSpec: "363" + gmsaCredentialSpecName: "362" + runAsUserName: "364" + serviceAccount: "356" + serviceAccountName: "355" shareProcessNamespace: true - subdomain: "366" + subdomain: "369" terminationGracePeriodSeconds: -1027492015449357669 tolerations: - effect: 儉ɩ柀 - key: "408" + key: "411" operator: 抷qTfZȻ干m謆7 tolerationSeconds: -7411984641310969236 - value: "409" + value: "412" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -712,216 +715,216 @@ spec: matchLabels: 54-br5r---r8oh782-u---76g---h-4-lx-0-2qg-4.94s-6-k57/8..-__--.k47M7y-Dy__3wc.q.8_00.0_._.-_L-_b: E_8-7_-YD-Q9_-__..YNFu7Pg-.814e-_07-ht-E6___-X__H.-39-A_-_l67Qa maxSkew: 44905239 - topologyKey: "418" + topologyKey: "421" whenUnsatisfiable: NRNJ丧鴻ĿW癜鞤A馱z芀¿l磶Bb偃 volumes: - awsElasticBlockStore: - fsType: "62" + fsType: "65" partition: -1853411528 - volumeID: "61" + volumeID: "64" azureDisk: cachingMode: A3fƻfʣ繡楙¯ - diskName: "125" - diskURI: "126" - fsType: "127" + diskName: "128" + diskURI: "129" + fsType: "130" kind: 勗E濞偘1ɩÅ議Ǹ轺@)蓳嗘TʡȂ readOnly: true azureFile: - secretName: "111" - shareName: "112" + secretName: "114" + shareName: "115" cephfs: monitors: - - "96" - path: "97" + - "99" + path: "100" readOnly: true - secretFile: "99" + secretFile: "102" secretRef: - name: "100" - user: "98" + name: "103" + user: "101" cinder: - fsType: "94" + fsType: "97" secretRef: - name: "95" - volumeID: "93" + name: "98" + volumeID: "96" configMap: defaultMode: -347579237 items: - - key: "114" + - key: "117" mode: 1793473487 - path: "115" - name: "113" + path: "118" + name: "116" optional: false csi: - driver: "157" - fsType: "158" + driver: "160" + fsType: "161" nodePublishSecretRef: - name: "161" + name: "164" readOnly: false volumeAttributes: - "159": "160" + "162": "163" downwardAPI: defaultMode: -1775926229 items: - fieldRef: - apiVersion: "104" - fieldPath: "105" + apiVersion: "107" + fieldPath: "108" mode: -1011172037 - path: "103" + path: "106" resourceFieldRef: - containerName: "106" + containerName: "109" divisor: "52" - resource: "107" + resource: "110" emptyDir: medium: 捵TwMȗ礼2ħ籦ö嗏ʑ>季Cʖ畬 sizeLimit: "347" fc: - fsType: "109" + fsType: "112" lun: -740816174 targetWWNs: - - "108" + - "111" wwids: - - "110" + - "113" flexVolume: - driver: "88" - fsType: "89" + driver: "91" + fsType: "92" options: - "91": "92" + "94": "95" secretRef: - name: "90" + name: "93" flocker: - datasetName: "101" - datasetUUID: "102" + datasetName: "104" + datasetUUID: "105" gcePersistentDisk: - fsType: "60" + fsType: "63" partition: 1399152294 - pdName: "59" + pdName: "62" readOnly: true gitRepo: - directory: "65" - repository: "63" - revision: "64" + directory: "68" + repository: "66" + revision: "67" glusterfs: - endpoints: "78" - path: "79" + endpoints: "81" + path: "82" readOnly: true hostPath: - path: "58" + path: "61" type: j剐'宣I拍N嚳ķȗ iscsi: - fsType: "74" - initiatorName: "77" - iqn: "72" - iscsiInterface: "73" + fsType: "77" + initiatorName: "80" + iqn: "75" + iscsiInterface: "76" lun: -1483417237 portals: - - "75" + - "78" secretRef: - name: "76" - targetPortal: "71" - name: "57" + name: "79" + targetPortal: "74" + name: "60" nfs: - path: "70" - server: "69" + path: "73" + server: "72" persistentVolumeClaim: - claimName: "80" + claimName: "83" readOnly: true photonPersistentDisk: - fsType: "129" - pdID: "128" + fsType: "132" + pdID: "131" portworxVolume: - fsType: "144" - volumeID: "143" + fsType: "147" + volumeID: "146" projected: defaultMode: -1332301579 sources: - configMap: items: - - key: "139" + - key: "142" mode: -1249460160 - path: "140" - name: "138" + path: "143" + name: "141" optional: false downwardAPI: items: - fieldRef: - apiVersion: "134" - fieldPath: "135" + apiVersion: "137" + fieldPath: "138" mode: 1525389481 - path: "133" + path: "136" resourceFieldRef: - containerName: "136" + containerName: "139" divisor: "618" - resource: "137" + resource: "140" secret: items: - - key: "131" + - key: "134" mode: 550215822 - path: "132" - name: "130" + path: "135" + name: "133" optional: false serviceAccountToken: - audience: "141" + audience: "144" expirationSeconds: -8988970531898753887 - path: "142" + path: "145" quobyte: - group: "123" + group: "126" readOnly: true - registry: "120" - tenant: "124" - user: "122" - volume: "121" + registry: "123" + tenant: "127" + user: "125" + volume: "124" rbd: - fsType: "83" - image: "82" - keyring: "86" + fsType: "86" + image: "85" + keyring: "89" monitors: - - "81" - pool: "84" + - "84" + pool: "87" readOnly: true secretRef: - name: "87" - user: "85" + name: "90" + user: "88" scaleIO: - fsType: "152" - gateway: "145" - protectionDomain: "148" + fsType: "155" + gateway: "148" + protectionDomain: "151" readOnly: true secretRef: - name: "147" - storageMode: "150" - storagePool: "149" - system: "146" - volumeName: "151" + name: "150" + storageMode: "153" + storagePool: "152" + system: "149" + volumeName: "154" secret: defaultMode: -1852451720 items: - - key: "67" + - key: "70" mode: 1395607230 - path: "68" + path: "71" optional: true - secretName: "66" + secretName: "69" storageos: - fsType: "155" + fsType: "158" readOnly: true secretRef: - name: "156" - volumeName: "153" - volumeNamespace: "154" + name: "159" + volumeName: "156" + volumeNamespace: "157" vsphereVolume: - fsType: "117" - storagePolicyID: "119" - storagePolicyName: "118" - volumePath: "116" + fsType: "120" + storagePolicyID: "122" + storagePolicyName: "121" + volumePath: "119" ttlSecondsAfterFinished: -37906634 - schedule: "18" + schedule: "19" startingDeadlineSeconds: -2555947251840004808 successfulJobsHistoryLimit: 1893057016 suspend: true status: active: - - apiVersion: "428" - fieldPath: "430" - kind: "425" - name: "427" - namespace: "426" - resourceVersion: "429" + - apiVersion: "431" + fieldPath: "433" + kind: "428" + name: "430" + namespace: "429" + resourceVersion: "432" diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.json b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.json index 3f2a8602501..c478923fbe8 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.json +++ b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.json @@ -35,46 +35,48 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "template": { "metadata": { - "name": "18", - "generateName": "19", - "namespace": "20", - "selfLink": "21", + "name": "19", + "generateName": "20", + "namespace": "21", + "selfLink": "22", "uid": "SǡƏ", "resourceVersion": "17916580954637291219", "generation": 5259823216098853135, "creationTimestamp": null, "deletionGracePeriodSeconds": 4075183944016503389, "labels": { - "23": "24" + "24": "25" }, "annotations": { - "25": "26" + "26": "27" }, "ownerReferences": [ { - "apiVersion": "27", - "kind": "28", - "name": "29", + "apiVersion": "28", + "kind": "29", + "name": "30", "uid": "ɑ", "controller": true, "blockOwnerDeletion": false } ], "finalizers": [ - "30" + "31" ], - "clusterName": "31", + "clusterName": "32", "managedFields": [ { - "manager": "32", + "manager": "33", "operation": "ěĂ凗蓏Ŋ蛊ĉy緅縕", - "apiVersion": "33" + "apiVersion": "34", + "fieldsType": "35" } ] }, @@ -100,49 +102,50 @@ "manualSelector": false, "template": { "metadata": { - "name": "40", - "generateName": "41", - "namespace": "42", - "selfLink": "43", + "name": "42", + "generateName": "43", + "namespace": "44", + "selfLink": "45", "uid": "Ȗ脵鴈Ō", "resourceVersion": "5994087412557504692", "generation": 9213888658033954596, "creationTimestamp": null, "deletionGracePeriodSeconds": -2901856114738744973, "labels": { - "45": "46" + "47": "48" }, "annotations": { - "47": "48" + "49": "50" }, "ownerReferences": [ { - "apiVersion": "49", - "kind": "50", - "name": "51", + "apiVersion": "51", + "kind": "52", + "name": "53", "uid": "I拍N嚳ķȗɊ捵TwMȗ礼", "controller": false, "blockOwnerDeletion": false } ], "finalizers": [ - "52" + "54" ], - "clusterName": "53", + "clusterName": "55", "managedFields": [ { - "manager": "54", + "manager": "56", "operation": "ö嗏ʑ\u003e季Cʖ畬x骀Šĸů", - "apiVersion": "55" + "apiVersion": "57", + "fieldsType": "58" } ] }, "spec": { "volumes": [ { - "name": "56", + "name": "59", "hostPath": { - "path": "57", + "path": "60", "type": "/淹\\韲翁\u0026ʢsɜ曢\\%枅:=ǛƓ" }, "emptyDir": { @@ -150,28 +153,28 @@ "sizeLimit": "681" }, "gcePersistentDisk": { - "pdName": "58", - "fsType": "59", + "pdName": "61", + "fsType": "62", "partition": 2065358741, "readOnly": true }, "awsElasticBlockStore": { - "volumeID": "60", - "fsType": "61", + "volumeID": "63", + "fsType": "64", "partition": -104666658, "readOnly": true }, "gitRepo": { - "repository": "62", - "revision": "63", - "directory": "64" + "repository": "65", + "revision": "66", + "directory": "67" }, "secret": { - "secretName": "65", + "secretName": "68", "items": [ { - "key": "66", - "path": "67", + "key": "69", + "path": "70", "mode": 1648350164 } ], @@ -179,91 +182,91 @@ "optional": true }, "nfs": { - "server": "68", - "path": "69" + "server": "71", + "path": "72" }, "iscsi": { - "targetPortal": "70", - "iqn": "71", + "targetPortal": "73", + "iqn": "74", "lun": -663180249, - "iscsiInterface": "72", - "fsType": "73", + "iscsiInterface": "75", + "fsType": "76", "readOnly": true, "portals": [ - "74" + "77" ], "chapAuthSession": true, "secretRef": { - "name": "75" + "name": "78" }, - "initiatorName": "76" + "initiatorName": "79" }, "glusterfs": { - "endpoints": "77", - "path": "78" + "endpoints": "80", + "path": "81" }, "persistentVolumeClaim": { - "claimName": "79" + "claimName": "82" }, "rbd": { "monitors": [ - "80" + "83" ], - "image": "81", - "fsType": "82", - "pool": "83", - "user": "84", - "keyring": "85", + "image": "84", + "fsType": "85", + "pool": "86", + "user": "87", + "keyring": "88", "secretRef": { - "name": "86" + "name": "89" }, "readOnly": true }, "flexVolume": { - "driver": "87", - "fsType": "88", + "driver": "90", + "fsType": "91", "secretRef": { - "name": "89" + "name": "92" }, "readOnly": true, "options": { - "90": "91" + "93": "94" } }, "cinder": { - "volumeID": "92", - "fsType": "93", + "volumeID": "95", + "fsType": "96", "readOnly": true, "secretRef": { - "name": "94" + "name": "97" } }, "cephfs": { "monitors": [ - "95" + "98" ], - "path": "96", - "user": "97", - "secretFile": "98", + "path": "99", + "user": "100", + "secretFile": "101", "secretRef": { - "name": "99" + "name": "102" } }, "flocker": { - "datasetName": "100", - "datasetUUID": "101" + "datasetName": "103", + "datasetUUID": "104" }, "downwardAPI": { "items": [ { - "path": "102", + "path": "105", "fieldRef": { - "apiVersion": "103", - "fieldPath": "104" + "apiVersion": "106", + "fieldPath": "107" }, "resourceFieldRef": { - "containerName": "105", - "resource": "106", + "containerName": "108", + "resource": "109", "divisor": "889" }, "mode": 1322858613 @@ -273,24 +276,24 @@ }, "fc": { "targetWWNs": [ - "107" + "110" ], "lun": 1169718433, - "fsType": "108", + "fsType": "111", "wwids": [ - "109" + "112" ] }, "azureFile": { - "secretName": "110", - "shareName": "111" + "secretName": "113", + "shareName": "114" }, "configMap": { - "name": "112", + "name": "115", "items": [ { - "key": "113", - "path": "114", + "key": "116", + "path": "117", "mode": -1194714697 } ], @@ -298,40 +301,40 @@ "optional": true }, "vsphereVolume": { - "volumePath": "115", - "fsType": "116", - "storagePolicyName": "117", - "storagePolicyID": "118" + "volumePath": "118", + "fsType": "119", + "storagePolicyName": "120", + "storagePolicyID": "121" }, "quobyte": { - "registry": "119", - "volume": "120", + "registry": "122", + "volume": "123", "readOnly": true, - "user": "121", - "group": "122", - "tenant": "123" + "user": "124", + "group": "125", + "tenant": "126" }, "azureDisk": { - "diskName": "124", - "diskURI": "125", + "diskName": "127", + "diskURI": "128", "cachingMode": "ʜǝ鿟ldg滠鼍ƭt", - "fsType": "126", + "fsType": "129", "readOnly": true, "kind": "ȫşŇɜa" }, "photonPersistentDisk": { - "pdID": "127", - "fsType": "128" + "pdID": "130", + "fsType": "131" }, "projected": { "sources": [ { "secret": { - "name": "129", + "name": "132", "items": [ { - "key": "130", - "path": "131", + "key": "133", + "path": "134", "mode": 782113097 } ], @@ -340,14 +343,14 @@ "downwardAPI": { "items": [ { - "path": "132", + "path": "135", "fieldRef": { - "apiVersion": "133", - "fieldPath": "134" + "apiVersion": "136", + "fieldPath": "137" }, "resourceFieldRef": { - "containerName": "135", - "resource": "136", + "containerName": "138", + "resource": "139", "divisor": "952" }, "mode": -555780268 @@ -355,120 +358,120 @@ ] }, "configMap": { - "name": "137", + "name": "140", "items": [ { - "key": "138", - "path": "139", + "key": "141", + "path": "142", "mode": 1730325900 } ], "optional": true }, "serviceAccountToken": { - "audience": "140", + "audience": "143", "expirationSeconds": -2937394236764575757, - "path": "141" + "path": "144" } } ], "defaultMode": -1980941277 }, "portworxVolume": { - "volumeID": "142", - "fsType": "143", + "volumeID": "145", + "fsType": "146", "readOnly": true }, "scaleIO": { - "gateway": "144", - "system": "145", + "gateway": "147", + "system": "148", "secretRef": { - "name": "146" + "name": "149" }, "sslEnabled": true, - "protectionDomain": "147", - "storagePool": "148", - "storageMode": "149", - "volumeName": "150", - "fsType": "151" + "protectionDomain": "150", + "storagePool": "151", + "storageMode": "152", + "volumeName": "153", + "fsType": "154" }, "storageos": { - "volumeName": "152", - "volumeNamespace": "153", - "fsType": "154", + "volumeName": "155", + "volumeNamespace": "156", + "fsType": "157", "readOnly": true, "secretRef": { - "name": "155" + "name": "158" } }, "csi": { - "driver": "156", + "driver": "159", "readOnly": true, - "fsType": "157", + "fsType": "160", "volumeAttributes": { - "158": "159" + "161": "162" }, "nodePublishSecretRef": { - "name": "160" + "name": "163" } } } ], "initContainers": [ { - "name": "161", - "image": "162", + "name": "164", + "image": "165", "command": [ - "163" + "166" ], "args": [ - "164" + "167" ], - "workingDir": "165", + "workingDir": "168", "ports": [ { - "name": "166", + "name": "169", "hostPort": 580681683, "containerPort": 38897467, "protocol": "h0åȂ町恰nj揠", - "hostIP": "167" + "hostIP": "170" } ], "envFrom": [ { - "prefix": "168", + "prefix": "171", "configMapRef": { - "name": "169", + "name": "172", "optional": false }, "secretRef": { - "name": "170", + "name": "173", "optional": true } } ], "env": [ { - "name": "171", - "value": "172", + "name": "174", + "value": "175", "valueFrom": { "fieldRef": { - "apiVersion": "173", - "fieldPath": "174" + "apiVersion": "176", + "fieldPath": "177" }, "resourceFieldRef": { - "containerName": "175", - "resource": "176", + "containerName": "178", + "resource": "179", "divisor": "618" }, "configMapKeyRef": { - "name": "177", - "key": "178", + "name": "180", + "key": "181", "optional": false }, "secretKeyRef": { - "name": "179", - "key": "180", + "name": "182", + "key": "183", "optional": false } } @@ -484,41 +487,41 @@ }, "volumeMounts": [ { - "name": "181", + "name": "184", "readOnly": true, - "mountPath": "182", - "subPath": "183", + "mountPath": "185", + "subPath": "186", "mountPropagation": "咻痗ȡmƴy綸_Ú8參遼ūPH炮掊°", - "subPathExpr": "184" + "subPathExpr": "187" } ], "volumeDevices": [ { - "name": "185", - "devicePath": "186" + "name": "188", + "devicePath": "189" } ], "livenessProbe": { "exec": { "command": [ - "187" + "190" ] }, "httpGet": { - "path": "188", + "path": "191", "port": -575512248, - "host": "189", + "host": "192", "scheme": "ɨ銦妰黖ȓƇ$缔獵偐ę腬瓷碑=ɉ", "httpHeaders": [ { - "name": "190", - "value": "191" + "name": "193", + "value": "194" } ] }, "tcpSocket": { "port": 1180382332, - "host": "192" + "host": "195" }, "initialDelaySeconds": -1846991380, "timeoutSeconds": 325236550, @@ -529,24 +532,24 @@ "readinessProbe": { "exec": { "command": [ - "193" + "196" ] }, "httpGet": { - "path": "194", + "path": "197", "port": 1403721475, - "host": "195", + "host": "198", "scheme": "ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳", "httpHeaders": [ { - "name": "196", - "value": "197" + "name": "199", + "value": "200" } ] }, "tcpSocket": { "port": -2064174383, - "host": "198" + "host": "201" }, "initialDelaySeconds": -1327537699, "timeoutSeconds": 483512911, @@ -558,51 +561,51 @@ "postStart": { "exec": { "command": [ - "199" + "202" ] }, "httpGet": { - "path": "200", - "port": "201", - "host": "202", + "path": "203", + "port": "204", + "host": "205", "scheme": "Ɖ立hdz緄Ú|dk_瀹鞎", "httpHeaders": [ { - "name": "203", - "value": "204" + "name": "206", + "value": "207" } ] }, "tcpSocket": { "port": 1150375229, - "host": "205" + "host": "208" } }, "preStop": { "exec": { "command": [ - "206" + "209" ] }, "httpGet": { - "path": "207", - "port": "208", - "host": "209", + "path": "210", + "port": "211", + "host": "212", "scheme": "鲡:", "httpHeaders": [ { - "name": "210", - "value": "211" + "name": "213", + "value": "214" } ] }, "tcpSocket": { "port": -2037320199, - "host": "212" + "host": "215" } } }, - "terminationMessagePath": "213", + "terminationMessagePath": "216", "terminationMessagePolicy": "@Ȗs«öʮĀ\u003cé瞾", "imagePullPolicy": "4y£軶ǃ*ʙ嫙\u0026蒒5", "securityContext": { @@ -616,15 +619,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "214", - "role": "215", - "type": "216", - "level": "217" + "user": "217", + "role": "218", + "type": "219", + "level": "220" }, "windowsOptions": { - "gmsaCredentialSpecName": "218", - "gmsaCredentialSpec": "219", - "runAsUserName": "220" + "gmsaCredentialSpecName": "221", + "gmsaCredentialSpec": "222", + "runAsUserName": "223" }, "runAsUser": -3150075726777852858, "runAsGroup": -4491268618106522555, @@ -639,59 +642,59 @@ ], "containers": [ { - "name": "221", - "image": "222", + "name": "224", + "image": "225", "command": [ - "223" + "226" ], "args": [ - "224" + "227" ], - "workingDir": "225", + "workingDir": "228", "ports": [ { - "name": "226", + "name": "229", "hostPort": -321513994, "containerPort": 1024248645, "protocol": "籘Àǒɿʒ刽ʼn", - "hostIP": "227" + "hostIP": "230" } ], "envFrom": [ { - "prefix": "228", + "prefix": "231", "configMapRef": { - "name": "229", + "name": "232", "optional": true }, "secretRef": { - "name": "230", + "name": "233", "optional": true } } ], "env": [ { - "name": "231", - "value": "232", + "name": "234", + "value": "235", "valueFrom": { "fieldRef": { - "apiVersion": "233", - "fieldPath": "234" + "apiVersion": "236", + "fieldPath": "237" }, "resourceFieldRef": { - "containerName": "235", - "resource": "236", + "containerName": "238", + "resource": "239", "divisor": "103" }, "configMapKeyRef": { - "name": "237", - "key": "238", + "name": "240", + "key": "241", "optional": false }, "secretKeyRef": { - "name": "239", - "key": "240", + "name": "242", + "key": "243", "optional": false } } @@ -707,41 +710,41 @@ }, "volumeMounts": [ { - "name": "241", + "name": "244", "readOnly": true, - "mountPath": "242", - "subPath": "243", + "mountPath": "245", + "subPath": "246", "mountPropagation": "\u003e懔%熷谟þ蛯ɰ荶ljʁ揆ɘȌ脾嚏吐", - "subPathExpr": "244" + "subPathExpr": "247" } ], "volumeDevices": [ { - "name": "245", - "devicePath": "246" + "name": "248", + "devicePath": "249" } ], "livenessProbe": { "exec": { "command": [ - "247" + "250" ] }, "httpGet": { - "path": "248", + "path": "251", "port": -1821078703, - "host": "249", + "host": "252", "scheme": "萨zvt", "httpHeaders": [ { - "name": "250", - "value": "251" + "name": "253", + "value": "254" } ] }, "tcpSocket": { "port": 1182477686, - "host": "252" + "host": "255" }, "initialDelaySeconds": -503805926, "timeoutSeconds": 77312514, @@ -752,24 +755,24 @@ "readinessProbe": { "exec": { "command": [ - "253" + "256" ] }, "httpGet": { - "path": "254", - "port": "255", - "host": "256", + "path": "257", + "port": "258", + "host": "259", "scheme": "0矀Kʝ瘴I\\p[ħsĨɆâĺɗŹ倗S", "httpHeaders": [ { - "name": "257", - "value": "258" + "name": "260", + "value": "261" } ] }, "tcpSocket": { - "port": "259", - "host": "260" + "port": "262", + "host": "263" }, "initialDelaySeconds": 932904270, "timeoutSeconds": 1810980158, @@ -781,51 +784,51 @@ "postStart": { "exec": { "command": [ - "261" + "264" ] }, "httpGet": { - "path": "262", + "path": "265", "port": -498930176, - "host": "263", + "host": "266", "scheme": " R§耶Ff", "httpHeaders": [ { - "name": "264", - "value": "265" + "name": "267", + "value": "268" } ] }, "tcpSocket": { - "port": "266", - "host": "267" + "port": "269", + "host": "270" } }, "preStop": { "exec": { "command": [ - "268" + "271" ] }, "httpGet": { - "path": "269", + "path": "272", "port": -331283026, - "host": "270", + "host": "273", "scheme": "ȉ", "httpHeaders": [ { - "name": "271", - "value": "272" + "name": "274", + "value": "275" } ] }, "tcpSocket": { "port": 714088955, - "host": "273" + "host": "276" } } }, - "terminationMessagePath": "274", + "terminationMessagePath": "277", "terminationMessagePolicy": "źȰ?$矡ȶ网棊ʢ=wǕɳ", "imagePullPolicy": "#yV'WKw(ğ儴Ůĺ}", "securityContext": { @@ -839,15 +842,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "275", - "role": "276", - "type": "277", - "level": "278" + "user": "278", + "role": "279", + "type": "280", + "level": "281" }, "windowsOptions": { - "gmsaCredentialSpecName": "279", - "gmsaCredentialSpec": "280", - "runAsUserName": "281" + "gmsaCredentialSpecName": "282", + "gmsaCredentialSpec": "283", + "runAsUserName": "284" }, "runAsUser": -7735837526010191986, "runAsGroup": -3460863886200664373, @@ -861,59 +864,59 @@ ], "ephemeralContainers": [ { - "name": "282", - "image": "283", + "name": "285", + "image": "286", "command": [ - "284" + "287" ], "args": [ - "285" + "288" ], - "workingDir": "286", + "workingDir": "289", "ports": [ { - "name": "287", + "name": "290", "hostPort": -602419938, "containerPort": 1040396664, "protocol": "爻ƙt叀碧闳ȩr嚧ʣq埄", - "hostIP": "288" + "hostIP": "291" } ], "envFrom": [ { - "prefix": "289", + "prefix": "292", "configMapRef": { - "name": "290", + "name": "293", "optional": true }, "secretRef": { - "name": "291", + "name": "294", "optional": true } } ], "env": [ { - "name": "292", - "value": "293", + "name": "295", + "value": "296", "valueFrom": { "fieldRef": { - "apiVersion": "294", - "fieldPath": "295" + "apiVersion": "297", + "fieldPath": "298" }, "resourceFieldRef": { - "containerName": "296", - "resource": "297", + "containerName": "299", + "resource": "300", "divisor": "340" }, "configMapKeyRef": { - "name": "298", - "key": "299", + "name": "301", + "key": "302", "optional": false }, "secretKeyRef": { - "name": "300", - "key": "301", + "name": "303", + "key": "304", "optional": true } } @@ -929,41 +932,41 @@ }, "volumeMounts": [ { - "name": "302", + "name": "305", "readOnly": true, - "mountPath": "303", - "subPath": "304", + "mountPath": "306", + "subPath": "307", "mountPropagation": "敄lu|", - "subPathExpr": "305" + "subPathExpr": "308" } ], "volumeDevices": [ { - "name": "306", - "devicePath": "307" + "name": "309", + "devicePath": "310" } ], "livenessProbe": { "exec": { "command": [ - "308" + "311" ] }, "httpGet": { - "path": "309", - "port": "310", - "host": "311", + "path": "312", + "port": "313", + "host": "314", "scheme": "忊|E剒", "httpHeaders": [ { - "name": "312", - "value": "313" + "name": "315", + "value": "316" } ] }, "tcpSocket": { "port": 1004325340, - "host": "314" + "host": "317" }, "initialDelaySeconds": -1313320434, "timeoutSeconds": 14304392, @@ -974,23 +977,23 @@ "readinessProbe": { "exec": { "command": [ - "315" + "318" ] }, "httpGet": { - "path": "316", + "path": "319", "port": 432291364, - "host": "317", + "host": "320", "httpHeaders": [ { - "name": "318", - "value": "319" + "name": "321", + "value": "322" } ] }, "tcpSocket": { - "port": "320", - "host": "321" + "port": "323", + "host": "324" }, "initialDelaySeconds": -677617960, "timeoutSeconds": 383015301, @@ -1002,51 +1005,51 @@ "postStart": { "exec": { "command": [ - "322" + "325" ] }, "httpGet": { - "path": "323", - "port": "324", - "host": "325", + "path": "326", + "port": "327", + "host": "328", "scheme": "%皧V垾现葢ŵ橨鬶l獕;跣Hǝcw媀瓄", "httpHeaders": [ { - "name": "326", - "value": "327" + "name": "329", + "value": "330" } ] }, "tcpSocket": { - "port": "328", - "host": "329" + "port": "331", + "host": "332" } }, "preStop": { "exec": { "command": [ - "330" + "333" ] }, "httpGet": { - "path": "331", - "port": "332", - "host": "333", + "path": "334", + "port": "335", + "host": "336", "scheme": "锏ɟ4Ǒ輂,ŕĪĠM蘇KŅ/»頸", "httpHeaders": [ { - "name": "334", - "value": "335" + "name": "337", + "value": "338" } ] }, "tcpSocket": { "port": 1315054653, - "host": "336" + "host": "339" } } }, - "terminationMessagePath": "337", + "terminationMessagePath": "340", "terminationMessagePolicy": "蚃ɣľ)酊龨δ摖ȱ", "imagePullPolicy": "冓鍓贯", "securityContext": { @@ -1060,15 +1063,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "338", - "role": "339", - "type": "340", - "level": "341" + "user": "341", + "role": "342", + "type": "343", + "level": "344" }, "windowsOptions": { - "gmsaCredentialSpecName": "342", - "gmsaCredentialSpec": "343", - "runAsUserName": "344" + "gmsaCredentialSpecName": "345", + "gmsaCredentialSpec": "346", + "runAsUserName": "347" }, "runAsUser": -500234369132816308, "runAsGroup": 1006111877741141889, @@ -1080,7 +1083,7 @@ "stdin": true, "stdinOnce": true, "tty": true, - "targetContainerName": "345" + "targetContainerName": "348" } ], "restartPolicy": "ǦŐnj汰8ŕİi騎C\"", @@ -1088,26 +1091,26 @@ "activeDeadlineSeconds": 3168496047243051519, "dnsPolicy": "Ǒ", "nodeSelector": { - "346": "347" + "349": "350" }, - "serviceAccountName": "348", - "serviceAccount": "349", + "serviceAccountName": "351", + "serviceAccount": "352", "automountServiceAccountToken": false, - "nodeName": "350", + "nodeName": "353", "hostPID": true, "hostIPC": true, "shareProcessNamespace": false, "securityContext": { "seLinuxOptions": { - "user": "351", - "role": "352", - "type": "353", - "level": "354" + "user": "354", + "role": "355", + "type": "356", + "level": "357" }, "windowsOptions": { - "gmsaCredentialSpecName": "355", - "gmsaCredentialSpec": "356", - "runAsUserName": "357" + "gmsaCredentialSpecName": "358", + "gmsaCredentialSpec": "359", + "runAsUserName": "360" }, "runAsUser": 4608737617101049023, "runAsGroup": 3557544419897236324, @@ -1118,18 +1121,18 @@ "fsGroup": -1335795712555820375, "sysctls": [ { - "name": "358", - "value": "359" + "name": "361", + "value": "362" } ] }, "imagePullSecrets": [ { - "name": "360" + "name": "363" } ], - "hostname": "361", - "subdomain": "362", + "hostname": "364", + "subdomain": "365", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1137,19 +1140,19 @@ { "matchExpressions": [ { - "key": "363", + "key": "366", "operator": "", "values": [ - "364" + "367" ] } ], "matchFields": [ { - "key": "365", + "key": "368", "operator": "{WOŭW灬pȭCV擭銆jʒǚ鍰", "values": [ - "366" + "369" ] } ] @@ -1162,19 +1165,19 @@ "preference": { "matchExpressions": [ { - "key": "367", + "key": "370", "operator": "撑¼蠾8餑噭", "values": [ - "368" + "371" ] } ], "matchFields": [ { - "key": "369", + "key": "372", "operator": "ɪǹ0衷,ƷƣMț譎懚XW疪鑳w", "values": [ - "370" + "373" ] } ] @@ -1200,9 +1203,9 @@ ] }, "namespaces": [ - "377" + "380" ], - "topologyKey": "378" + "topologyKey": "381" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1221,9 +1224,9 @@ ] }, "namespaces": [ - "385" + "388" ], - "topologyKey": "386" + "topologyKey": "389" } } ] @@ -1243,9 +1246,9 @@ ] }, "namespaces": [ - "393" + "396" ], - "topologyKey": "394" + "topologyKey": "397" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1267,45 +1270,45 @@ ] }, "namespaces": [ - "401" + "404" ], - "topologyKey": "402" + "topologyKey": "405" } } ] } }, - "schedulerName": "403", + "schedulerName": "406", "tolerations": [ { - "key": "404", + "key": "407", "operator": "堺ʣ", - "value": "405", + "value": "408", "effect": "ŽɣB矗E¸乾", "tolerationSeconds": -3532804738923434397 } ], "hostAliases": [ { - "ip": "406", + "ip": "409", "hostnames": [ - "407" + "410" ] } ], - "priorityClassName": "408", + "priorityClassName": "411", "priority": -1852730577, "dnsConfig": { "nameservers": [ - "409" + "412" ], "searches": [ - "410" + "413" ], "options": [ { - "name": "411", - "value": "412" + "name": "414", + "value": "415" } ] }, @@ -1314,7 +1317,7 @@ "conditionType": "ź魊塾ɖ$rolȋɶuɋ5r儉ɩ柀ɨ鴅" } ], - "runtimeClassName": "413", + "runtimeClassName": "416", "enableServiceLinks": false, "preemptionPolicy": "!ń1ċƹ|慼櫁色苆试揯遐", "overhead": { @@ -1323,7 +1326,7 @@ "topologySpreadConstraints": [ { "maxSkew": -150478704, - "topologyKey": "414", + "topologyKey": "417", "whenUnsatisfiable": ";鹡鑓侅闍ŏŃŋŏ}ŀ", "labelSelector": { "matchLabels": { diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.pb b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.pb index fba545274a1..ecf2431ca28 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.pb and b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.yaml b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.yaml index 3c8dea0743f..16816d66ae2 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/batch.v1beta1.JobTemplate.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -31,31 +32,32 @@ metadata: template: metadata: annotations: - "25": "26" - clusterName: "31" + "26": "27" + clusterName: "32" creationTimestamp: null deletionGracePeriodSeconds: 4075183944016503389 finalizers: - - "30" - generateName: "19" + - "31" + generateName: "20" generation: 5259823216098853135 labels: - "23": "24" + "24": "25" managedFields: - - apiVersion: "33" - manager: "32" + - apiVersion: "34" + fieldsType: "35" + manager: "33" operation: ěĂ凗蓏Ŋ蛊ĉy緅縕 - name: "18" - namespace: "20" + name: "19" + namespace: "21" ownerReferences: - - apiVersion: "27" + - apiVersion: "28" blockOwnerDeletion: false controller: true - kind: "28" - name: "29" + kind: "29" + name: "30" uid: ɑ resourceVersion: "17916580954637291219" - selfLink: "21" + selfLink: "22" uid: SǡƏ spec: activeDeadlineSeconds: -9086179100394185427 @@ -74,31 +76,32 @@ template: template: metadata: annotations: - "47": "48" - clusterName: "53" + "49": "50" + clusterName: "55" creationTimestamp: null deletionGracePeriodSeconds: -2901856114738744973 finalizers: - - "52" - generateName: "41" + - "54" + generateName: "43" generation: 9213888658033954596 labels: - "45": "46" + "47": "48" managedFields: - - apiVersion: "55" - manager: "54" + - apiVersion: "57" + fieldsType: "58" + manager: "56" operation: ö嗏ʑ>季Cʖ畬x骀Šĸů - name: "40" - namespace: "42" + name: "42" + namespace: "44" ownerReferences: - - apiVersion: "49" + - apiVersion: "51" blockOwnerDeletion: false controller: false - kind: "50" - name: "51" + kind: "52" + name: "53" uid: I拍N嚳ķȗɊ捵TwMȗ礼 resourceVersion: "5994087412557504692" - selfLink: "43" + selfLink: "45" uid: Ȗ脵鴈Ō spec: activeDeadlineSeconds: 3168496047243051519 @@ -107,28 +110,28 @@ template: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "367" + - key: "370" operator: 撑¼蠾8餑噭 values: - - "368" + - "371" matchFields: - - key: "369" + - key: "372" operator: ɪǹ0衷,ƷƣMț譎懚XW疪鑳w values: - - "370" + - "373" weight: -1330095135 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "363" + - key: "366" operator: "" values: - - "364" + - "367" matchFields: - - key: "365" + - key: "368" operator: '{WOŭW灬pȭCV擭銆jʒǚ鍰' values: - - "366" + - "369" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -139,8 +142,8 @@ template: matchLabels: 4-yy28-38xmu5nx4s--41-7--6m/271-_-9_._X-D---k6: Q.-s.H.Hu-k-_-0-T1mel--F......3_t_-l..-.DG7r-3.----._4__XOnP namespaces: - - "385" - topologyKey: "386" + - "388" + topologyKey: "389" weight: -217760519 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -152,8 +155,8 @@ template: matchLabels: 4--883d-v3j4-7y-p---up52--sjo7799-skj5---r-t.sumf7ew/u-5mj_9.M.134-5-.q6H_.--_---.M.U_-m.-P.yPS: 1Tvw39F_C-rtSY.g._2F7.-_e..r namespaces: - - "377" - topologyKey: "378" + - "380" + topologyKey: "381" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -166,8 +169,8 @@ template: matchLabels: 6V1-rU.___06.eqk5E_-4-.XH-.k.7.l_-W8o._xJ1-lFA_X3: V0H2-.zHw.H__V.VT namespaces: - - "401" - topologyKey: "402" + - "404" + topologyKey: "405" weight: -1851436166 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -177,120 +180,120 @@ template: matchLabels: 7F3p2_-_AmD-.0AP.1: A--.F5_x.KNC0-.-m_0-m-6Sp_N-S..O-BZ..n namespaces: - - "393" - topologyKey: "394" + - "396" + topologyKey: "397" automountServiceAccountToken: false containers: - args: - - "224" + - "227" command: - - "223" + - "226" env: - - name: "231" - value: "232" + - name: "234" + value: "235" valueFrom: configMapKeyRef: - key: "238" - name: "237" + key: "241" + name: "240" optional: false fieldRef: - apiVersion: "233" - fieldPath: "234" + apiVersion: "236" + fieldPath: "237" resourceFieldRef: - containerName: "235" + containerName: "238" divisor: "103" - resource: "236" + resource: "239" secretKeyRef: - key: "240" - name: "239" + key: "243" + name: "242" optional: false envFrom: - configMapRef: - name: "229" + name: "232" optional: true - prefix: "228" + prefix: "231" secretRef: - name: "230" + name: "233" optional: true - image: "222" + image: "225" imagePullPolicy: '#yV''WKw(ğ儴Ůĺ}' lifecycle: postStart: exec: command: - - "261" + - "264" httpGet: - host: "263" + host: "266" httpHeaders: - - name: "264" - value: "265" - path: "262" + - name: "267" + value: "268" + path: "265" port: -498930176 scheme: ' R§耶Ff' tcpSocket: - host: "267" - port: "266" + host: "270" + port: "269" preStop: exec: command: - - "268" + - "271" httpGet: - host: "270" + host: "273" httpHeaders: - - name: "271" - value: "272" - path: "269" + - name: "274" + value: "275" + path: "272" port: -331283026 scheme: ȉ tcpSocket: - host: "273" + host: "276" port: 714088955 livenessProbe: exec: command: - - "247" + - "250" failureThreshold: 10098903 httpGet: - host: "249" + host: "252" httpHeaders: - - name: "250" - value: "251" - path: "248" + - name: "253" + value: "254" + path: "251" port: -1821078703 scheme: 萨zvt initialDelaySeconds: -503805926 periodSeconds: -763687725 successThreshold: -246563990 tcpSocket: - host: "252" + host: "255" port: 1182477686 timeoutSeconds: 77312514 - name: "221" + name: "224" ports: - containerPort: 1024248645 - hostIP: "227" + hostIP: "230" hostPort: -321513994 - name: "226" + name: "229" protocol: 籘Àǒɿʒ刽ʼn readinessProbe: exec: command: - - "253" + - "256" failureThreshold: 1255258741 httpGet: - host: "256" + host: "259" httpHeaders: - - name: "257" - value: "258" - path: "254" - port: "255" + - name: "260" + value: "261" + path: "257" + port: "258" scheme: 0矀Kʝ瘴I\p[ħsĨɆâĺɗŹ倗S initialDelaySeconds: 932904270 periodSeconds: 100356493 successThreshold: -110792150 tcpSocket: - host: "260" - port: "259" + host: "263" + port: "262" timeoutSeconds: 1810980158 resources: limits: @@ -311,148 +314,148 @@ template: runAsNonRoot: false runAsUser: -7735837526010191986 seLinuxOptions: - level: "278" - role: "276" - type: "277" - user: "275" + level: "281" + role: "279" + type: "280" + user: "278" windowsOptions: - gmsaCredentialSpec: "280" - gmsaCredentialSpecName: "279" - runAsUserName: "281" + gmsaCredentialSpec: "283" + gmsaCredentialSpecName: "282" + runAsUserName: "284" stdin: true - terminationMessagePath: "274" + terminationMessagePath: "277" terminationMessagePolicy: źȰ?$矡ȶ网棊ʢ=wǕɳ volumeDevices: - - devicePath: "246" - name: "245" + - devicePath: "249" + name: "248" volumeMounts: - - mountPath: "242" + - mountPath: "245" mountPropagation: '>懔%熷谟þ蛯ɰ荶ljʁ揆ɘȌ脾嚏吐' - name: "241" + name: "244" readOnly: true - subPath: "243" - subPathExpr: "244" - workingDir: "225" + subPath: "246" + subPathExpr: "247" + workingDir: "228" dnsConfig: nameservers: - - "409" + - "412" options: - - name: "411" - value: "412" + - name: "414" + value: "415" searches: - - "410" + - "413" dnsPolicy: Ǒ enableServiceLinks: false ephemeralContainers: - args: - - "285" + - "288" command: - - "284" + - "287" env: - - name: "292" - value: "293" + - name: "295" + value: "296" valueFrom: configMapKeyRef: - key: "299" - name: "298" + key: "302" + name: "301" optional: false fieldRef: - apiVersion: "294" - fieldPath: "295" + apiVersion: "297" + fieldPath: "298" resourceFieldRef: - containerName: "296" + containerName: "299" divisor: "340" - resource: "297" + resource: "300" secretKeyRef: - key: "301" - name: "300" + key: "304" + name: "303" optional: true envFrom: - configMapRef: - name: "290" + name: "293" optional: true - prefix: "289" + prefix: "292" secretRef: - name: "291" + name: "294" optional: true - image: "283" + image: "286" imagePullPolicy: 冓鍓贯 lifecycle: postStart: exec: command: - - "322" + - "325" httpGet: - host: "325" + host: "328" httpHeaders: - - name: "326" - value: "327" - path: "323" - port: "324" + - name: "329" + value: "330" + path: "326" + port: "327" scheme: '%皧V垾现葢ŵ橨鬶l獕;跣Hǝcw媀瓄' tcpSocket: - host: "329" - port: "328" + host: "332" + port: "331" preStop: exec: command: - - "330" + - "333" httpGet: - host: "333" + host: "336" httpHeaders: - - name: "334" - value: "335" - path: "331" - port: "332" + - name: "337" + value: "338" + path: "334" + port: "335" scheme: 锏ɟ4Ǒ輂,ŕĪĠM蘇KŅ/»頸 tcpSocket: - host: "336" + host: "339" port: 1315054653 livenessProbe: exec: command: - - "308" + - "311" failureThreshold: 1941923625 httpGet: - host: "311" + host: "314" httpHeaders: - - name: "312" - value: "313" - path: "309" - port: "310" + - name: "315" + value: "316" + path: "312" + port: "313" scheme: 忊|E剒 initialDelaySeconds: -1313320434 periodSeconds: 465972736 successThreshold: -1784617397 tcpSocket: - host: "314" + host: "317" port: 1004325340 timeoutSeconds: 14304392 - name: "282" + name: "285" ports: - containerPort: 1040396664 - hostIP: "288" + hostIP: "291" hostPort: -602419938 - name: "287" + name: "290" protocol: 爻ƙt叀碧闳ȩr嚧ʣq埄 readinessProbe: exec: command: - - "315" + - "318" failureThreshold: 656200799 httpGet: - host: "317" + host: "320" httpHeaders: - - name: "318" - value: "319" - path: "316" + - name: "321" + value: "322" + path: "319" port: 432291364 initialDelaySeconds: -677617960 periodSeconds: -1717997927 successThreshold: 1533365989 tcpSocket: - host: "321" - port: "320" + host: "324" + port: "323" timeoutSeconds: 383015301 resources: limits: @@ -473,150 +476,150 @@ template: runAsNonRoot: false runAsUser: -500234369132816308 seLinuxOptions: - level: "341" - role: "339" - type: "340" - user: "338" + level: "344" + role: "342" + type: "343" + user: "341" windowsOptions: - gmsaCredentialSpec: "343" - gmsaCredentialSpecName: "342" - runAsUserName: "344" + gmsaCredentialSpec: "346" + gmsaCredentialSpecName: "345" + runAsUserName: "347" stdin: true stdinOnce: true - targetContainerName: "345" - terminationMessagePath: "337" + targetContainerName: "348" + terminationMessagePath: "340" terminationMessagePolicy: 蚃ɣľ)酊龨δ摖ȱ tty: true volumeDevices: - - devicePath: "307" - name: "306" + - devicePath: "310" + name: "309" volumeMounts: - - mountPath: "303" + - mountPath: "306" mountPropagation: 敄lu| - name: "302" + name: "305" readOnly: true - subPath: "304" - subPathExpr: "305" - workingDir: "286" + subPath: "307" + subPathExpr: "308" + workingDir: "289" hostAliases: - hostnames: - - "407" - ip: "406" + - "410" + ip: "409" hostIPC: true hostPID: true - hostname: "361" + hostname: "364" imagePullSecrets: - - name: "360" + - name: "363" initContainers: - args: - - "164" + - "167" command: - - "163" + - "166" env: - - name: "171" - value: "172" + - name: "174" + value: "175" valueFrom: configMapKeyRef: - key: "178" - name: "177" + key: "181" + name: "180" optional: false fieldRef: - apiVersion: "173" - fieldPath: "174" + apiVersion: "176" + fieldPath: "177" resourceFieldRef: - containerName: "175" + containerName: "178" divisor: "618" - resource: "176" + resource: "179" secretKeyRef: - key: "180" - name: "179" + key: "183" + name: "182" optional: false envFrom: - configMapRef: - name: "169" + name: "172" optional: false - prefix: "168" + prefix: "171" secretRef: - name: "170" + name: "173" optional: true - image: "162" + image: "165" imagePullPolicy: 4y£軶ǃ*ʙ嫙&蒒5 lifecycle: postStart: exec: command: - - "199" + - "202" httpGet: - host: "202" + host: "205" httpHeaders: - - name: "203" - value: "204" - path: "200" - port: "201" + - name: "206" + value: "207" + path: "203" + port: "204" scheme: Ɖ立hdz緄Ú|dk_瀹鞎 tcpSocket: - host: "205" + host: "208" port: 1150375229 preStop: exec: command: - - "206" + - "209" httpGet: - host: "209" + host: "212" httpHeaders: - - name: "210" - value: "211" - path: "207" - port: "208" + - name: "213" + value: "214" + path: "210" + port: "211" scheme: '鲡:' tcpSocket: - host: "212" + host: "215" port: -2037320199 livenessProbe: exec: command: - - "187" + - "190" failureThreshold: -559252309 httpGet: - host: "189" + host: "192" httpHeaders: - - name: "190" - value: "191" - path: "188" + - name: "193" + value: "194" + path: "191" port: -575512248 scheme: ɨ銦妰黖ȓƇ$缔獵偐ę腬瓷碑=ɉ initialDelaySeconds: -1846991380 periodSeconds: -1398498492 successThreshold: -2035009296 tcpSocket: - host: "192" + host: "195" port: 1180382332 timeoutSeconds: 325236550 - name: "161" + name: "164" ports: - containerPort: 38897467 - hostIP: "167" + hostIP: "170" hostPort: 580681683 - name: "166" + name: "169" protocol: h0åȂ町恰nj揠 readinessProbe: exec: command: - - "193" + - "196" failureThreshold: 1427781619 httpGet: - host: "195" + host: "198" httpHeaders: - - name: "196" - value: "197" - path: "194" + - name: "199" + value: "200" + path: "197" port: 1403721475 scheme: ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳 initialDelaySeconds: -1327537699 periodSeconds: -1941847253 successThreshold: 1596028039 tcpSocket: - host: "198" + host: "201" port: -2064174383 timeoutSeconds: 483512911 resources: @@ -638,72 +641,72 @@ template: runAsNonRoot: true runAsUser: -3150075726777852858 seLinuxOptions: - level: "217" - role: "215" - type: "216" - user: "214" + level: "220" + role: "218" + type: "219" + user: "217" windowsOptions: - gmsaCredentialSpec: "219" - gmsaCredentialSpecName: "218" - runAsUserName: "220" + gmsaCredentialSpec: "222" + gmsaCredentialSpecName: "221" + runAsUserName: "223" stdinOnce: true - terminationMessagePath: "213" + terminationMessagePath: "216" terminationMessagePolicy: '@Ȗs«öʮĀ<é瞾' tty: true volumeDevices: - - devicePath: "186" - name: "185" + - devicePath: "189" + name: "188" volumeMounts: - - mountPath: "182" + - mountPath: "185" mountPropagation: 咻痗ȡmƴy綸_Ú8參遼ūPH炮掊° - name: "181" + name: "184" readOnly: true - subPath: "183" - subPathExpr: "184" - workingDir: "165" - nodeName: "350" + subPath: "186" + subPathExpr: "187" + workingDir: "168" + nodeName: "353" nodeSelector: - "346": "347" + "349": "350" overhead: 4'ď曕椐敛n湙: "310" preemptionPolicy: '!ń1ċƹ|慼櫁色苆试揯遐' priority: -1852730577 - priorityClassName: "408" + priorityClassName: "411" readinessGates: - conditionType: ź魊塾ɖ$rolȋɶuɋ5r儉ɩ柀ɨ鴅 restartPolicy: ǦŐnj汰8ŕİi騎C" - runtimeClassName: "413" - schedulerName: "403" + runtimeClassName: "416" + schedulerName: "406" securityContext: fsGroup: -1335795712555820375 runAsGroup: 3557544419897236324 runAsNonRoot: true runAsUser: 4608737617101049023 seLinuxOptions: - level: "354" - role: "352" - type: "353" - user: "351" + level: "357" + role: "355" + type: "356" + user: "354" supplementalGroups: - 5014869561632118364 sysctls: - - name: "358" - value: "359" + - name: "361" + value: "362" windowsOptions: - gmsaCredentialSpec: "356" - gmsaCredentialSpecName: "355" - runAsUserName: "357" - serviceAccount: "349" - serviceAccountName: "348" + gmsaCredentialSpec: "359" + gmsaCredentialSpecName: "358" + runAsUserName: "360" + serviceAccount: "352" + serviceAccountName: "351" shareProcessNamespace: false - subdomain: "362" + subdomain: "365" terminationGracePeriodSeconds: 2582126978155733738 tolerations: - effect: ŽɣB矗E¸乾 - key: "404" + key: "407" operator: 堺ʣ tolerationSeconds: -3532804738923434397 - value: "405" + value: "408" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -714,207 +717,207 @@ template: matchLabels: p2djmscp--ac8u23-k----26u5--72n-5.j8-0020-1-5/t5W_._._-2M2._i: wvU maxSkew: -150478704 - topologyKey: "414" + topologyKey: "417" whenUnsatisfiable: ;鹡鑓侅闍ŏŃŋŏ}ŀ volumes: - awsElasticBlockStore: - fsType: "61" + fsType: "64" partition: -104666658 readOnly: true - volumeID: "60" + volumeID: "63" azureDisk: cachingMode: ʜǝ鿟ldg滠鼍ƭt - diskName: "124" - diskURI: "125" - fsType: "126" + diskName: "127" + diskURI: "128" + fsType: "129" kind: ȫşŇɜa readOnly: true azureFile: - secretName: "110" - shareName: "111" + secretName: "113" + shareName: "114" cephfs: monitors: - - "95" - path: "96" - secretFile: "98" + - "98" + path: "99" + secretFile: "101" secretRef: - name: "99" - user: "97" + name: "102" + user: "100" cinder: - fsType: "93" + fsType: "96" readOnly: true secretRef: - name: "94" - volumeID: "92" + name: "97" + volumeID: "95" configMap: defaultMode: -599608368 items: - - key: "113" + - key: "116" mode: -1194714697 - path: "114" - name: "112" + path: "117" + name: "115" optional: true csi: - driver: "156" - fsType: "157" + driver: "159" + fsType: "160" nodePublishSecretRef: - name: "160" + name: "163" readOnly: true volumeAttributes: - "158": "159" + "161": "162" downwardAPI: defaultMode: 1801487647 items: - fieldRef: - apiVersion: "103" - fieldPath: "104" + apiVersion: "106" + fieldPath: "107" mode: 1322858613 - path: "102" + path: "105" resourceFieldRef: - containerName: "105" + containerName: "108" divisor: "889" - resource: "106" + resource: "109" emptyDir: medium: 踓Ǻǧ湬淊kŪ睴鸏:ɥ³ƞsɁ8^ʥ sizeLimit: "681" fc: - fsType: "108" + fsType: "111" lun: 1169718433 targetWWNs: - - "107" + - "110" wwids: - - "109" + - "112" flexVolume: - driver: "87" - fsType: "88" + driver: "90" + fsType: "91" options: - "90": "91" + "93": "94" readOnly: true secretRef: - name: "89" + name: "92" flocker: - datasetName: "100" - datasetUUID: "101" + datasetName: "103" + datasetUUID: "104" gcePersistentDisk: - fsType: "59" + fsType: "62" partition: 2065358741 - pdName: "58" + pdName: "61" readOnly: true gitRepo: - directory: "64" - repository: "62" - revision: "63" + directory: "67" + repository: "65" + revision: "66" glusterfs: - endpoints: "77" - path: "78" + endpoints: "80" + path: "81" hostPath: - path: "57" + path: "60" type: /淹\韲翁&ʢsɜ曢\%枅:=ǛƓ iscsi: chapAuthSession: true - fsType: "73" - initiatorName: "76" - iqn: "71" - iscsiInterface: "72" + fsType: "76" + initiatorName: "79" + iqn: "74" + iscsiInterface: "75" lun: -663180249 portals: - - "74" + - "77" readOnly: true secretRef: - name: "75" - targetPortal: "70" - name: "56" + name: "78" + targetPortal: "73" + name: "59" nfs: - path: "69" - server: "68" + path: "72" + server: "71" persistentVolumeClaim: - claimName: "79" + claimName: "82" photonPersistentDisk: - fsType: "128" - pdID: "127" + fsType: "131" + pdID: "130" portworxVolume: - fsType: "143" + fsType: "146" readOnly: true - volumeID: "142" + volumeID: "145" projected: defaultMode: -1980941277 sources: - configMap: items: - - key: "138" + - key: "141" mode: 1730325900 - path: "139" - name: "137" + path: "142" + name: "140" optional: true downwardAPI: items: - fieldRef: - apiVersion: "133" - fieldPath: "134" + apiVersion: "136" + fieldPath: "137" mode: -555780268 - path: "132" + path: "135" resourceFieldRef: - containerName: "135" + containerName: "138" divisor: "952" - resource: "136" + resource: "139" secret: items: - - key: "130" + - key: "133" mode: 782113097 - path: "131" - name: "129" + path: "134" + name: "132" optional: true serviceAccountToken: - audience: "140" + audience: "143" expirationSeconds: -2937394236764575757 - path: "141" + path: "144" quobyte: - group: "122" + group: "125" readOnly: true - registry: "119" - tenant: "123" - user: "121" - volume: "120" + registry: "122" + tenant: "126" + user: "124" + volume: "123" rbd: - fsType: "82" - image: "81" - keyring: "85" + fsType: "85" + image: "84" + keyring: "88" monitors: - - "80" - pool: "83" + - "83" + pool: "86" readOnly: true secretRef: - name: "86" - user: "84" + name: "89" + user: "87" scaleIO: - fsType: "151" - gateway: "144" - protectionDomain: "147" + fsType: "154" + gateway: "147" + protectionDomain: "150" secretRef: - name: "146" + name: "149" sslEnabled: true - storageMode: "149" - storagePool: "148" - system: "145" - volumeName: "150" + storageMode: "152" + storagePool: "151" + system: "148" + volumeName: "153" secret: defaultMode: 1655406148 items: - - key: "66" + - key: "69" mode: 1648350164 - path: "67" + path: "70" optional: true - secretName: "65" + secretName: "68" storageos: - fsType: "154" + fsType: "157" readOnly: true secretRef: - name: "155" - volumeName: "152" - volumeNamespace: "153" + name: "158" + volumeName: "155" + volumeNamespace: "156" vsphereVolume: - fsType: "116" - storagePolicyID: "118" - storagePolicyName: "117" - volumePath: "115" + fsType: "119" + storagePolicyID: "121" + storagePolicyName: "120" + volumePath: "118" ttlSecondsAfterFinished: 920774957 diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.json b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.json index 33b479ae05b..6eedd44660e 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.json +++ b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.json @@ -35,51 +35,53 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { - "schedule": "18", + "schedule": "19", "startingDeadlineSeconds": -2555947251840004808, "concurrencyPolicy": "Hr鯹)晿\u003co,c鮽ort昍řČ扷5Ɨ", "suspend": true, "jobTemplate": { "metadata": { - "name": "19", - "generateName": "20", - "namespace": "21", - "selfLink": "22", + "name": "20", + "generateName": "21", + "namespace": "22", + "selfLink": "23", "uid": "^苣", "resourceVersion": "1092536316763508004", "generation": 3798025802092444428, "creationTimestamp": null, "deletionGracePeriodSeconds": -6114802437535409255, "labels": { - "24": "25" + "25": "26" }, "annotations": { - "26": "27" + "27": "28" }, "ownerReferences": [ { - "apiVersion": "28", - "kind": "29", - "name": "30", + "apiVersion": "29", + "kind": "30", + "name": "31", "uid": "憍峕?狱³-Ǐ忄*", "controller": false, "blockOwnerDeletion": false } ], "finalizers": [ - "31" + "32" ], - "clusterName": "32", + "clusterName": "33", "managedFields": [ { - "manager": "33", + "manager": "34", "operation": "ȎțêɘIJ斬³;Ơ歿", - "apiVersion": "34" + "apiVersion": "35", + "fieldsType": "36" } ] }, @@ -102,49 +104,50 @@ "manualSelector": true, "template": { "metadata": { - "name": "41", - "generateName": "42", - "namespace": "43", - "selfLink": "44", + "name": "43", + "generateName": "44", + "namespace": "45", + "selfLink": "46", "uid": "A", "resourceVersion": "13282108741396501211", "generation": -1988464041375677738, "creationTimestamp": null, "deletionGracePeriodSeconds": -961038652544818647, "labels": { - "46": "47" + "48": "49" }, "annotations": { - "48": "49" + "50": "51" }, "ownerReferences": [ { - "apiVersion": "50", - "kind": "51", - "name": "52", + "apiVersion": "52", + "kind": "53", + "name": "54", "uid": "a縳讋ɮ衺勽Ƙq/Ź u衲\u003c¿燥ǖ_è", "controller": false, "blockOwnerDeletion": false } ], "finalizers": [ - "53" + "55" ], - "clusterName": "54", + "clusterName": "56", "managedFields": [ { - "manager": "55", + "manager": "57", "operation": "聻鎥ʟ\u003c$洅ɹ7\\弌Þ帺萸", - "apiVersion": "56" + "apiVersion": "58", + "fieldsType": "59" } ] }, "spec": { "volumes": [ { - "name": "57", + "name": "60", "hostPath": { - "path": "58", + "path": "61", "type": "j剐'宣I拍N嚳ķȗ" }, "emptyDir": { @@ -152,27 +155,27 @@ "sizeLimit": "347" }, "gcePersistentDisk": { - "pdName": "59", - "fsType": "60", + "pdName": "62", + "fsType": "63", "partition": 1399152294, "readOnly": true }, "awsElasticBlockStore": { - "volumeID": "61", - "fsType": "62", + "volumeID": "64", + "fsType": "65", "partition": -1853411528 }, "gitRepo": { - "repository": "63", - "revision": "64", - "directory": "65" + "repository": "66", + "revision": "67", + "directory": "68" }, "secret": { - "secretName": "66", + "secretName": "69", "items": [ { - "key": "67", - "path": "68", + "key": "70", + "path": "71", "mode": 1395607230 } ], @@ -180,90 +183,90 @@ "optional": true }, "nfs": { - "server": "69", - "path": "70" + "server": "72", + "path": "73" }, "iscsi": { - "targetPortal": "71", - "iqn": "72", + "targetPortal": "74", + "iqn": "75", "lun": -1483417237, - "iscsiInterface": "73", - "fsType": "74", + "iscsiInterface": "76", + "fsType": "77", "portals": [ - "75" + "78" ], "secretRef": { - "name": "76" + "name": "79" }, - "initiatorName": "77" + "initiatorName": "80" }, "glusterfs": { - "endpoints": "78", - "path": "79", + "endpoints": "81", + "path": "82", "readOnly": true }, "persistentVolumeClaim": { - "claimName": "80", + "claimName": "83", "readOnly": true }, "rbd": { "monitors": [ - "81" + "84" ], - "image": "82", - "fsType": "83", - "pool": "84", - "user": "85", - "keyring": "86", + "image": "85", + "fsType": "86", + "pool": "87", + "user": "88", + "keyring": "89", "secretRef": { - "name": "87" + "name": "90" }, "readOnly": true }, "flexVolume": { - "driver": "88", - "fsType": "89", + "driver": "91", + "fsType": "92", "secretRef": { - "name": "90" + "name": "93" }, "options": { - "91": "92" + "94": "95" } }, "cinder": { - "volumeID": "93", - "fsType": "94", + "volumeID": "96", + "fsType": "97", "secretRef": { - "name": "95" + "name": "98" } }, "cephfs": { "monitors": [ - "96" + "99" ], - "path": "97", - "user": "98", - "secretFile": "99", + "path": "100", + "user": "101", + "secretFile": "102", "secretRef": { - "name": "100" + "name": "103" }, "readOnly": true }, "flocker": { - "datasetName": "101", - "datasetUUID": "102" + "datasetName": "104", + "datasetUUID": "105" }, "downwardAPI": { "items": [ { - "path": "103", + "path": "106", "fieldRef": { - "apiVersion": "104", - "fieldPath": "105" + "apiVersion": "107", + "fieldPath": "108" }, "resourceFieldRef": { - "containerName": "106", - "resource": "107", + "containerName": "109", + "resource": "110", "divisor": "52" }, "mode": -1011172037 @@ -273,24 +276,24 @@ }, "fc": { "targetWWNs": [ - "108" + "111" ], "lun": -740816174, - "fsType": "109", + "fsType": "112", "wwids": [ - "110" + "113" ] }, "azureFile": { - "secretName": "111", - "shareName": "112" + "secretName": "114", + "shareName": "115" }, "configMap": { - "name": "113", + "name": "116", "items": [ { - "key": "114", - "path": "115", + "key": "117", + "path": "118", "mode": 1793473487 } ], @@ -298,40 +301,40 @@ "optional": false }, "vsphereVolume": { - "volumePath": "116", - "fsType": "117", - "storagePolicyName": "118", - "storagePolicyID": "119" + "volumePath": "119", + "fsType": "120", + "storagePolicyName": "121", + "storagePolicyID": "122" }, "quobyte": { - "registry": "120", - "volume": "121", + "registry": "123", + "volume": "124", "readOnly": true, - "user": "122", - "group": "123", - "tenant": "124" + "user": "125", + "group": "126", + "tenant": "127" }, "azureDisk": { - "diskName": "125", - "diskURI": "126", + "diskName": "128", + "diskURI": "129", "cachingMode": "A3fƻfʣ繡楙¯", - "fsType": "127", + "fsType": "130", "readOnly": true, "kind": "勗E濞偘1ɩÅ議Ǹ轺@)蓳嗘TʡȂ" }, "photonPersistentDisk": { - "pdID": "128", - "fsType": "129" + "pdID": "131", + "fsType": "132" }, "projected": { "sources": [ { "secret": { - "name": "130", + "name": "133", "items": [ { - "key": "131", - "path": "132", + "key": "134", + "path": "135", "mode": 550215822 } ], @@ -340,14 +343,14 @@ "downwardAPI": { "items": [ { - "path": "133", + "path": "136", "fieldRef": { - "apiVersion": "134", - "fieldPath": "135" + "apiVersion": "137", + "fieldPath": "138" }, "resourceFieldRef": { - "containerName": "136", - "resource": "137", + "containerName": "139", + "resource": "140", "divisor": "618" }, "mode": 1525389481 @@ -355,119 +358,119 @@ ] }, "configMap": { - "name": "138", + "name": "141", "items": [ { - "key": "139", - "path": "140", + "key": "142", + "path": "143", "mode": -1249460160 } ], "optional": false }, "serviceAccountToken": { - "audience": "141", + "audience": "144", "expirationSeconds": -8988970531898753887, - "path": "142" + "path": "145" } } ], "defaultMode": -1332301579 }, "portworxVolume": { - "volumeID": "143", - "fsType": "144" + "volumeID": "146", + "fsType": "147" }, "scaleIO": { - "gateway": "145", - "system": "146", + "gateway": "148", + "system": "149", "secretRef": { - "name": "147" + "name": "150" }, - "protectionDomain": "148", - "storagePool": "149", - "storageMode": "150", - "volumeName": "151", - "fsType": "152", + "protectionDomain": "151", + "storagePool": "152", + "storageMode": "153", + "volumeName": "154", + "fsType": "155", "readOnly": true }, "storageos": { - "volumeName": "153", - "volumeNamespace": "154", - "fsType": "155", + "volumeName": "156", + "volumeNamespace": "157", + "fsType": "158", "readOnly": true, "secretRef": { - "name": "156" + "name": "159" } }, "csi": { - "driver": "157", + "driver": "160", "readOnly": false, - "fsType": "158", + "fsType": "161", "volumeAttributes": { - "159": "160" + "162": "163" }, "nodePublishSecretRef": { - "name": "161" + "name": "164" } } } ], "initContainers": [ { - "name": "162", - "image": "163", + "name": "165", + "image": "166", "command": [ - "164" + "167" ], "args": [ - "165" + "168" ], - "workingDir": "166", + "workingDir": "169", "ports": [ { - "name": "167", + "name": "170", "hostPort": 1632959949, "containerPort": 487826951, "protocol": "ldg滠鼍ƭt?", - "hostIP": "168" + "hostIP": "171" } ], "envFrom": [ { - "prefix": "169", + "prefix": "172", "configMapRef": { - "name": "170", + "name": "173", "optional": false }, "secretRef": { - "name": "171", + "name": "174", "optional": false } } ], "env": [ { - "name": "172", - "value": "173", + "name": "175", + "value": "176", "valueFrom": { "fieldRef": { - "apiVersion": "174", - "fieldPath": "175" + "apiVersion": "177", + "fieldPath": "178" }, "resourceFieldRef": { - "containerName": "176", - "resource": "177", + "containerName": "179", + "resource": "180", "divisor": "597" }, "configMapKeyRef": { - "name": "178", - "key": "179", + "name": "181", + "key": "182", "optional": false }, "secretKeyRef": { - "name": "180", - "key": "181", + "name": "183", + "key": "184", "optional": false } } @@ -483,41 +486,41 @@ }, "volumeMounts": [ { - "name": "182", + "name": "185", "readOnly": true, - "mountPath": "183", - "subPath": "184", + "mountPath": "186", + "subPath": "187", "mountPropagation": "瑥A", - "subPathExpr": "185" + "subPathExpr": "188" } ], "volumeDevices": [ { - "name": "186", - "devicePath": "187" + "name": "189", + "devicePath": "190" } ], "livenessProbe": { "exec": { "command": [ - "188" + "191" ] }, "httpGet": { - "path": "189", - "port": "190", - "host": "191", + "path": "192", + "port": "193", + "host": "194", "scheme": "0åȂ町恰nj揠8lj", "httpHeaders": [ { - "name": "192", - "value": "193" + "name": "195", + "value": "196" } ] }, "tcpSocket": { "port": -2049272966, - "host": "194" + "host": "197" }, "initialDelaySeconds": -1188153605, "timeoutSeconds": -427769948, @@ -528,23 +531,23 @@ "readinessProbe": { "exec": { "command": [ - "195" + "198" ] }, "httpGet": { - "path": "196", - "port": "197", - "host": "198", + "path": "199", + "port": "200", + "host": "201", "httpHeaders": [ { - "name": "199", - "value": "200" + "name": "202", + "value": "203" } ] }, "tcpSocket": { "port": 675406340, - "host": "201" + "host": "204" }, "initialDelaySeconds": 994527057, "timeoutSeconds": -1482763519, @@ -556,51 +559,51 @@ "postStart": { "exec": { "command": [ - "202" + "205" ] }, "httpGet": { - "path": "203", - "port": "204", - "host": "205", + "path": "206", + "port": "207", + "host": "208", "scheme": "%:;栍dʪīT捘ɍi", "httpHeaders": [ { - "name": "206", - "value": "207" + "name": "209", + "value": "210" } ] }, "tcpSocket": { - "port": "208", - "host": "209" + "port": "211", + "host": "212" } }, "preStop": { "exec": { "command": [ - "210" + "213" ] }, "httpGet": { - "path": "211", + "path": "214", "port": -1171060347, - "host": "212", + "host": "215", "scheme": "咻痗ȡmƴy綸_Ú8參遼ūPH炮掊°", "httpHeaders": [ { - "name": "213", - "value": "214" + "name": "216", + "value": "217" } ] }, "tcpSocket": { - "port": "215", - "host": "216" + "port": "218", + "host": "219" } } }, - "terminationMessagePath": "217", + "terminationMessagePath": "220", "terminationMessagePolicy": "閼咎櫸eʔŊ", "imagePullPolicy": "ȓƇ$缔獵偐ę腬瓷碑=ɉ鎷卩蝾H韹寬", "securityContext": { @@ -614,15 +617,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "218", - "role": "219", - "type": "220", - "level": "221" + "user": "221", + "role": "222", + "type": "223", + "level": "224" }, "windowsOptions": { - "gmsaCredentialSpecName": "222", - "gmsaCredentialSpec": "223", - "runAsUserName": "224" + "gmsaCredentialSpecName": "225", + "gmsaCredentialSpec": "226", + "runAsUserName": "227" }, "runAsUser": -4642229086806245627, "runAsGroup": 6165457529064596376, @@ -637,59 +640,59 @@ ], "containers": [ { - "name": "225", - "image": "226", + "name": "228", + "image": "229", "command": [ - "227" + "230" ], "args": [ - "228" + "231" ], - "workingDir": "229", + "workingDir": "232", "ports": [ { - "name": "230", + "name": "233", "hostPort": -1703360754, "containerPort": -1569009987, "protocol": "ɢǵʭd鲡:贅wE@Ȗs«öʮĀ\u003c", - "hostIP": "231" + "hostIP": "234" } ], "envFrom": [ { - "prefix": "232", + "prefix": "235", "configMapRef": { - "name": "233", + "name": "236", "optional": true }, "secretRef": { - "name": "234", + "name": "237", "optional": false } } ], "env": [ { - "name": "235", - "value": "236", + "name": "238", + "value": "239", "valueFrom": { "fieldRef": { - "apiVersion": "237", - "fieldPath": "238" + "apiVersion": "240", + "fieldPath": "241" }, "resourceFieldRef": { - "containerName": "239", - "resource": "240", + "containerName": "242", + "resource": "243", "divisor": "405" }, "configMapKeyRef": { - "name": "241", - "key": "242", + "name": "244", + "key": "245", "optional": false }, "secretKeyRef": { - "name": "243", - "key": "244", + "name": "246", + "key": "247", "optional": false } } @@ -705,40 +708,40 @@ }, "volumeMounts": [ { - "name": "245", - "mountPath": "246", - "subPath": "247", + "name": "248", + "mountPath": "249", + "subPath": "250", "mountPropagation": "@ùƸʋŀ樺ȃv", - "subPathExpr": "248" + "subPathExpr": "251" } ], "volumeDevices": [ { - "name": "249", - "devicePath": "250" + "name": "252", + "devicePath": "253" } ], "livenessProbe": { "exec": { "command": [ - "251" + "254" ] }, "httpGet": { - "path": "252", - "port": "253", - "host": "254", + "path": "255", + "port": "256", + "host": "257", "scheme": "Źʣy豎@ɀ羭,铻O", "httpHeaders": [ { - "name": "255", - "value": "256" + "name": "258", + "value": "259" } ] }, "tcpSocket": { - "port": "257", - "host": "258" + "port": "260", + "host": "261" }, "initialDelaySeconds": 1424053148, "timeoutSeconds": 747521320, @@ -749,24 +752,24 @@ "readinessProbe": { "exec": { "command": [ - "259" + "262" ] }, "httpGet": { - "path": "260", + "path": "263", "port": -1710454086, - "host": "261", + "host": "264", "scheme": "mɩC[ó瓧", "httpHeaders": [ { - "name": "262", - "value": "263" + "name": "265", + "value": "266" } ] }, "tcpSocket": { "port": -122979840, - "host": "264" + "host": "267" }, "initialDelaySeconds": 915577348, "timeoutSeconds": -590798124, @@ -778,51 +781,51 @@ "postStart": { "exec": { "command": [ - "265" + "268" ] }, "httpGet": { - "path": "266", + "path": "269", "port": 1385030458, - "host": "267", + "host": "270", "scheme": "Ao/樝fw[Řż丩ŽoǠŻ", "httpHeaders": [ { - "name": "268", - "value": "269" + "name": "271", + "value": "272" } ] }, "tcpSocket": { - "port": "270", - "host": "271" + "port": "273", + "host": "274" } }, "preStop": { "exec": { "command": [ - "272" + "275" ] }, "httpGet": { - "path": "273", + "path": "276", "port": -1589303862, - "host": "274", + "host": "277", "scheme": "ľǎɳ,ǿ飏騀呣ǎ", "httpHeaders": [ { - "name": "275", - "value": "276" + "name": "278", + "value": "279" } ] }, "tcpSocket": { - "port": "277", - "host": "278" + "port": "280", + "host": "281" } } }, - "terminationMessagePath": "279", + "terminationMessagePath": "282", "terminationMessagePolicy": "萭旿@掇lNdǂ\u003e5姣", "securityContext": { "capabilities": { @@ -835,15 +838,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "280", - "role": "281", - "type": "282", - "level": "283" + "user": "283", + "role": "284", + "type": "285", + "level": "286" }, "windowsOptions": { - "gmsaCredentialSpecName": "284", - "gmsaCredentialSpec": "285", - "runAsUserName": "286" + "gmsaCredentialSpecName": "287", + "gmsaCredentialSpec": "288", + "runAsUserName": "289" }, "runAsUser": -5738810661106213940, "runAsGroup": 3195567116206635190, @@ -858,59 +861,59 @@ ], "ephemeralContainers": [ { - "name": "287", - "image": "288", + "name": "290", + "image": "291", "command": [ - "289" + "292" ], "args": [ - "290" + "293" ], - "workingDir": "291", + "workingDir": "294", "ports": [ { - "name": "292", + "name": "295", "hostPort": -1097611426, "containerPort": 1871952835, "protocol": "D剂讼ɓȌʟni酛3ƁÀ*", - "hostIP": "293" + "hostIP": "296" } ], "envFrom": [ { - "prefix": "294", + "prefix": "297", "configMapRef": { - "name": "295", + "name": "298", "optional": false }, "secretRef": { - "name": "296", + "name": "299", "optional": true } } ], "env": [ { - "name": "297", - "value": "298", + "name": "300", + "value": "301", "valueFrom": { "fieldRef": { - "apiVersion": "299", - "fieldPath": "300" + "apiVersion": "302", + "fieldPath": "303" }, "resourceFieldRef": { - "containerName": "301", - "resource": "302", + "containerName": "304", + "resource": "305", "divisor": "19" }, "configMapKeyRef": { - "name": "303", - "key": "304", + "name": "306", + "key": "307", "optional": false }, "secretKeyRef": { - "name": "305", - "key": "306", + "name": "308", + "key": "309", "optional": true } } @@ -926,40 +929,40 @@ }, "volumeMounts": [ { - "name": "307", - "mountPath": "308", - "subPath": "309", + "name": "310", + "mountPath": "311", + "subPath": "312", "mountPropagation": "¿", - "subPathExpr": "310" + "subPathExpr": "313" } ], "volumeDevices": [ { - "name": "311", - "devicePath": "312" + "name": "314", + "devicePath": "315" } ], "livenessProbe": { "exec": { "command": [ - "313" + "316" ] }, "httpGet": { - "path": "314", + "path": "317", "port": -534498506, - "host": "315", + "host": "318", "scheme": "儴Ůĺ}潷ʒ胵輓Ɔȓ蹣ɐ", "httpHeaders": [ { - "name": "316", - "value": "317" + "name": "319", + "value": "320" } ] }, "tcpSocket": { - "port": "318", - "host": "319" + "port": "321", + "host": "322" }, "initialDelaySeconds": -805795167, "timeoutSeconds": 1791615594, @@ -970,24 +973,24 @@ "readinessProbe": { "exec": { "command": [ - "320" + "323" ] }, "httpGet": { - "path": "321", - "port": "322", - "host": "323", + "path": "324", + "port": "325", + "host": "326", "scheme": "更偢ɇ卷荙JLĹ]佱¿\u003e犵殇ŕ-Ɂ", "httpHeaders": [ { - "name": "324", - "value": "325" + "name": "327", + "value": "328" } ] }, "tcpSocket": { "port": 467291328, - "host": "326" + "host": "329" }, "initialDelaySeconds": -1664778008, "timeoutSeconds": -1191528701, @@ -999,51 +1002,51 @@ "postStart": { "exec": { "command": [ - "327" + "330" ] }, "httpGet": { - "path": "328", + "path": "331", "port": -467985423, - "host": "329", + "host": "332", "scheme": "ē鐭#嬀ơŸ8T 苧yñKJɐ", "httpHeaders": [ { - "name": "330", - "value": "331" + "name": "333", + "value": "334" } ] }, "tcpSocket": { - "port": "332", - "host": "333" + "port": "335", + "host": "336" } }, "preStop": { "exec": { "command": [ - "334" + "337" ] }, "httpGet": { - "path": "335", + "path": "338", "port": 591440053, - "host": "336", + "host": "339", "scheme": "\u003c敄lu|榝$î.Ȏ蝪ʜ5遰=E埄", "httpHeaders": [ { - "name": "337", - "value": "338" + "name": "340", + "value": "341" } ] }, "tcpSocket": { - "port": "339", - "host": "340" + "port": "342", + "host": "343" } } }, - "terminationMessagePath": "341", + "terminationMessagePath": "344", "terminationMessagePolicy": " wƯ貾坢'跩aŕ", "imagePullPolicy": "Ļǟi\u0026", "securityContext": { @@ -1057,15 +1060,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "342", - "role": "343", - "type": "344", - "level": "345" + "user": "345", + "role": "346", + "type": "347", + "level": "348" }, "windowsOptions": { - "gmsaCredentialSpecName": "346", - "gmsaCredentialSpec": "347", - "runAsUserName": "348" + "gmsaCredentialSpecName": "349", + "gmsaCredentialSpec": "350", + "runAsUserName": "351" }, "runAsUser": -7971724279034955974, "runAsGroup": 2011630253582325853, @@ -1075,7 +1078,7 @@ "procMount": ",ŕ" }, "stdinOnce": true, - "targetContainerName": "349" + "targetContainerName": "352" } ], "restartPolicy": "M蘇KŅ/»頸+SÄ蚃ɣľ)酊龨δ", @@ -1083,25 +1086,25 @@ "activeDeadlineSeconds": 1968932441807931700, "dnsPolicy": "鍓贯澔 ƺ蛜6Ɖ飴", "nodeSelector": { - "350": "351" + "353": "354" }, - "serviceAccountName": "352", - "serviceAccount": "353", + "serviceAccountName": "355", + "serviceAccount": "356", "automountServiceAccountToken": false, - "nodeName": "354", + "nodeName": "357", "hostNetwork": true, "shareProcessNamespace": true, "securityContext": { "seLinuxOptions": { - "user": "355", - "role": "356", - "type": "357", - "level": "358" + "user": "358", + "role": "359", + "type": "360", + "level": "361" }, "windowsOptions": { - "gmsaCredentialSpecName": "359", - "gmsaCredentialSpec": "360", - "runAsUserName": "361" + "gmsaCredentialSpecName": "362", + "gmsaCredentialSpec": "363", + "runAsUserName": "364" }, "runAsUser": -6241205430888228274, "runAsGroup": 3716388262106582789, @@ -1112,18 +1115,18 @@ "fsGroup": -500234369132816308, "sysctls": [ { - "name": "362", - "value": "363" + "name": "365", + "value": "366" } ] }, "imagePullSecrets": [ { - "name": "364" + "name": "367" } ], - "hostname": "365", - "subdomain": "366", + "hostname": "368", + "subdomain": "369", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1131,19 +1134,19 @@ { "matchExpressions": [ { - "key": "367", + "key": "370", "operator": "鱎ƙ;Nŕ璻Ji", "values": [ - "368" + "371" ] } ], "matchFields": [ { - "key": "369", + "key": "372", "operator": "J", "values": [ - "370" + "373" ] } ] @@ -1156,19 +1159,19 @@ "preference": { "matchExpressions": [ { - "key": "371", + "key": "374", "operator": "H鯂²静ƲǦŐnj汰8ŕİi騎C\"6", "values": [ - "372" + "375" ] } ], "matchFields": [ { - "key": "373", + "key": "376", "operator": "ʎǑyZ涬P­", "values": [ - "374" + "377" ] } ] @@ -1194,9 +1197,9 @@ ] }, "namespaces": [ - "381" + "384" ], - "topologyKey": "382" + "topologyKey": "385" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1218,9 +1221,9 @@ ] }, "namespaces": [ - "389" + "392" ], - "topologyKey": "390" + "topologyKey": "393" } } ] @@ -1243,9 +1246,9 @@ ] }, "namespaces": [ - "397" + "400" ], - "topologyKey": "398" + "topologyKey": "401" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1267,45 +1270,45 @@ ] }, "namespaces": [ - "405" + "408" ], - "topologyKey": "406" + "topologyKey": "409" } } ] } }, - "schedulerName": "407", + "schedulerName": "410", "tolerations": [ { - "key": "408", + "key": "411", "operator": "抷qTfZȻ干m謆7", - "value": "409", + "value": "412", "effect": "儉ɩ柀", "tolerationSeconds": -7411984641310969236 } ], "hostAliases": [ { - "ip": "410", + "ip": "413", "hostnames": [ - "411" + "414" ] } ], - "priorityClassName": "412", + "priorityClassName": "415", "priority": -895317190, "dnsConfig": { "nameservers": [ - "413" + "416" ], "searches": [ - "414" + "417" ], "options": [ { - "name": "415", - "value": "416" + "name": "418", + "value": "419" } ] }, @@ -1314,7 +1317,7 @@ "conditionType": "ċƹ|慼櫁色苆试揯遐e4'ď曕椐敛n" } ], - "runtimeClassName": "417", + "runtimeClassName": "420", "enableServiceLinks": true, "preemptionPolicy": "qiǙĞǠ", "overhead": { @@ -1323,7 +1326,7 @@ "topologySpreadConstraints": [ { "maxSkew": 44905239, - "topologyKey": "418", + "topologyKey": "421", "whenUnsatisfiable": "NRNJ丧鴻ĿW癜鞤A馱z芀¿l磶Bb偃", "labelSelector": { "matchLabels": { @@ -1349,12 +1352,12 @@ "status": { "active": [ { - "kind": "425", - "namespace": "426", - "name": "427", - "apiVersion": "428", - "resourceVersion": "429", - "fieldPath": "430" + "kind": "428", + "namespace": "429", + "name": "430", + "apiVersion": "431", + "resourceVersion": "432", + "fieldPath": "433" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.pb b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.pb index 80cc70ff156..6900090cbc0 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.pb and b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.yaml b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.yaml index f84f8a70985..3d8aed07c02 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.CronJob.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -34,31 +35,32 @@ spec: jobTemplate: metadata: annotations: - "26": "27" - clusterName: "32" + "27": "28" + clusterName: "33" creationTimestamp: null deletionGracePeriodSeconds: -6114802437535409255 finalizers: - - "31" - generateName: "20" + - "32" + generateName: "21" generation: 3798025802092444428 labels: - "24": "25" + "25": "26" managedFields: - - apiVersion: "34" - manager: "33" + - apiVersion: "35" + fieldsType: "36" + manager: "34" operation: ȎțêɘIJ斬³;Ơ歿 - name: "19" - namespace: "21" + name: "20" + namespace: "22" ownerReferences: - - apiVersion: "28" + - apiVersion: "29" blockOwnerDeletion: false controller: false - kind: "29" - name: "30" + kind: "30" + name: "31" uid: 憍峕?狱³-Ǐ忄* resourceVersion: "1092536316763508004" - selfLink: "22" + selfLink: "23" uid: ^苣 spec: activeDeadlineSeconds: -1483125035702892746 @@ -75,31 +77,32 @@ spec: template: metadata: annotations: - "48": "49" - clusterName: "54" + "50": "51" + clusterName: "56" creationTimestamp: null deletionGracePeriodSeconds: -961038652544818647 finalizers: - - "53" - generateName: "42" + - "55" + generateName: "44" generation: -1988464041375677738 labels: - "46": "47" + "48": "49" managedFields: - - apiVersion: "56" - manager: "55" + - apiVersion: "58" + fieldsType: "59" + manager: "57" operation: 聻鎥ʟ<$洅ɹ7\弌Þ帺萸 - name: "41" - namespace: "43" + name: "43" + namespace: "45" ownerReferences: - - apiVersion: "50" + - apiVersion: "52" blockOwnerDeletion: false controller: false - kind: "51" - name: "52" + kind: "53" + name: "54" uid: a縳讋ɮ衺勽Ƙq/Ź u衲<¿燥ǖ_è resourceVersion: "13282108741396501211" - selfLink: "44" + selfLink: "46" uid: A spec: activeDeadlineSeconds: 1968932441807931700 @@ -108,28 +111,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "371" + - key: "374" operator: H鯂²静ƲǦŐnj汰8ŕİi騎C"6 values: - - "372" + - "375" matchFields: - - key: "373" + - key: "376" operator: ʎǑyZ涬P­ values: - - "374" + - "377" weight: 902978249 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "367" + - key: "370" operator: 鱎ƙ;Nŕ璻Ji values: - - "368" + - "371" matchFields: - - key: "369" + - key: "372" operator: J values: - - "370" + - "373" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -142,8 +145,8 @@ spec: matchLabels: 26-k8-c2---2etfh41ca-z-5g2wco280.ka-6-31g--z-o-3bz6-8-0-1-z--271s-p9-8--m-cbck561-7n/VC..7o_x3..-.8J: 28_38xm-.nx.sEK4B namespaces: - - "389" - topologyKey: "390" + - "392" + topologyKey: "393" weight: -3478003 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -155,8 +158,8 @@ spec: matchLabels: 05mj-94-8134i5k6q6--5tu-0/j_.-.6GA26C-s.Nj-d-4_4--.-_Z4.LA3HVG3: 0-8-.M-.-.-v namespaces: - - "381" - topologyKey: "382" + - "384" + topologyKey: "385" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -169,8 +172,8 @@ spec: matchLabels: H__V.Vz_6.Hz_V_.r_v_._e_-78o_6Z..11_7pX_.-mLlx...w_j: 35.40Rw4gD.._.-x6db-L7.-__-G_2kCpS_1 namespaces: - - "405" - topologyKey: "406" + - "408" + topologyKey: "409" weight: -1078366610 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -182,118 +185,118 @@ spec: matchLabels: O.Um.-__k.j._g-G-7--p9.-0: 1-_-3_L_2--_v2.5p_..Y-.wg_-b8a_6_.0Q4_.84.K_-_0_..u.F.pq..-3 namespaces: - - "397" - topologyKey: "398" + - "400" + topologyKey: "401" automountServiceAccountToken: false containers: - args: - - "228" + - "231" command: - - "227" + - "230" env: - - name: "235" - value: "236" + - name: "238" + value: "239" valueFrom: configMapKeyRef: - key: "242" - name: "241" + key: "245" + name: "244" optional: false fieldRef: - apiVersion: "237" - fieldPath: "238" + apiVersion: "240" + fieldPath: "241" resourceFieldRef: - containerName: "239" + containerName: "242" divisor: "405" - resource: "240" + resource: "243" secretKeyRef: - key: "244" - name: "243" + key: "247" + name: "246" optional: false envFrom: - configMapRef: - name: "233" + name: "236" optional: true - prefix: "232" + prefix: "235" secretRef: - name: "234" + name: "237" optional: false - image: "226" + image: "229" lifecycle: postStart: exec: command: - - "265" + - "268" httpGet: - host: "267" + host: "270" httpHeaders: - - name: "268" - value: "269" - path: "266" + - name: "271" + value: "272" + path: "269" port: 1385030458 scheme: Ao/樝fw[Řż丩ŽoǠŻ tcpSocket: - host: "271" - port: "270" + host: "274" + port: "273" preStop: exec: command: - - "272" + - "275" httpGet: - host: "274" + host: "277" httpHeaders: - - name: "275" - value: "276" - path: "273" + - name: "278" + value: "279" + path: "276" port: -1589303862 scheme: ľǎɳ,ǿ飏騀呣ǎ tcpSocket: - host: "278" - port: "277" + host: "281" + port: "280" livenessProbe: exec: command: - - "251" + - "254" failureThreshold: -1131820775 httpGet: - host: "254" + host: "257" httpHeaders: - - name: "255" - value: "256" - path: "252" - port: "253" + - name: "258" + value: "259" + path: "255" + port: "256" scheme: Źʣy豎@ɀ羭,铻O initialDelaySeconds: 1424053148 periodSeconds: 859639931 successThreshold: -1663149700 tcpSocket: - host: "258" - port: "257" + host: "261" + port: "260" timeoutSeconds: 747521320 - name: "225" + name: "228" ports: - containerPort: -1569009987 - hostIP: "231" + hostIP: "234" hostPort: -1703360754 - name: "230" + name: "233" protocol: ɢǵʭd鲡:贅wE@Ȗs«öʮĀ< readinessProbe: exec: command: - - "259" + - "262" failureThreshold: -233378149 httpGet: - host: "261" + host: "264" httpHeaders: - - name: "262" - value: "263" - path: "260" + - name: "265" + value: "266" + path: "263" port: -1710454086 scheme: mɩC[ó瓧 initialDelaySeconds: 915577348 periodSeconds: -1386967282 successThreshold: -2030286732 tcpSocket: - host: "264" + host: "267" port: -122979840 timeoutSeconds: -590798124 resources: @@ -315,148 +318,148 @@ spec: runAsNonRoot: true runAsUser: -5738810661106213940 seLinuxOptions: - level: "283" - role: "281" - type: "282" - user: "280" + level: "286" + role: "284" + type: "285" + user: "283" windowsOptions: - gmsaCredentialSpec: "285" - gmsaCredentialSpecName: "284" - runAsUserName: "286" + gmsaCredentialSpec: "288" + gmsaCredentialSpecName: "287" + runAsUserName: "289" stdin: true - terminationMessagePath: "279" + terminationMessagePath: "282" terminationMessagePolicy: 萭旿@掇lNdǂ>5姣 tty: true volumeDevices: - - devicePath: "250" - name: "249" + - devicePath: "253" + name: "252" volumeMounts: - - mountPath: "246" + - mountPath: "249" mountPropagation: '@ùƸʋŀ樺ȃv' - name: "245" - subPath: "247" - subPathExpr: "248" - workingDir: "229" + name: "248" + subPath: "250" + subPathExpr: "251" + workingDir: "232" dnsConfig: nameservers: - - "413" + - "416" options: - - name: "415" - value: "416" + - name: "418" + value: "419" searches: - - "414" + - "417" dnsPolicy: 鍓贯澔 ƺ蛜6Ɖ飴 enableServiceLinks: true ephemeralContainers: - args: - - "290" + - "293" command: - - "289" + - "292" env: - - name: "297" - value: "298" + - name: "300" + value: "301" valueFrom: configMapKeyRef: - key: "304" - name: "303" + key: "307" + name: "306" optional: false fieldRef: - apiVersion: "299" - fieldPath: "300" + apiVersion: "302" + fieldPath: "303" resourceFieldRef: - containerName: "301" + containerName: "304" divisor: "19" - resource: "302" + resource: "305" secretKeyRef: - key: "306" - name: "305" + key: "309" + name: "308" optional: true envFrom: - configMapRef: - name: "295" + name: "298" optional: false - prefix: "294" + prefix: "297" secretRef: - name: "296" + name: "299" optional: true - image: "288" + image: "291" imagePullPolicy: Ļǟi& lifecycle: postStart: exec: command: - - "327" + - "330" httpGet: - host: "329" + host: "332" httpHeaders: - - name: "330" - value: "331" - path: "328" + - name: "333" + value: "334" + path: "331" port: -467985423 scheme: ē鐭#嬀ơŸ8T 苧yñKJɐ tcpSocket: - host: "333" - port: "332" + host: "336" + port: "335" preStop: exec: command: - - "334" + - "337" httpGet: - host: "336" + host: "339" httpHeaders: - - name: "337" - value: "338" - path: "335" + - name: "340" + value: "341" + path: "338" port: 591440053 scheme: <敄lu|榝$î.Ȏ蝪ʜ5遰=E埄 tcpSocket: - host: "340" - port: "339" + host: "343" + port: "342" livenessProbe: exec: command: - - "313" + - "316" failureThreshold: 1831208885 httpGet: - host: "315" + host: "318" httpHeaders: - - name: "316" - value: "317" - path: "314" + - name: "319" + value: "320" + path: "317" port: -534498506 scheme: 儴Ůĺ}潷ʒ胵輓Ɔȓ蹣ɐ initialDelaySeconds: -805795167 periodSeconds: 785984384 successThreshold: 193463975 tcpSocket: - host: "319" - port: "318" + host: "322" + port: "321" timeoutSeconds: 1791615594 - name: "287" + name: "290" ports: - containerPort: 1871952835 - hostIP: "293" + hostIP: "296" hostPort: -1097611426 - name: "292" + name: "295" protocol: D剂讼ɓȌʟni酛3ƁÀ* readinessProbe: exec: command: - - "320" + - "323" failureThreshold: 18113448 httpGet: - host: "323" + host: "326" httpHeaders: - - name: "324" - value: "325" - path: "321" - port: "322" + - name: "327" + value: "328" + path: "324" + port: "325" scheme: 更偢ɇ卷荙JLĹ]佱¿>犵殇ŕ-Ɂ initialDelaySeconds: -1664778008 periodSeconds: -978176982 successThreshold: 415947324 tcpSocket: - host: "326" + host: "329" port: 467291328 timeoutSeconds: -1191528701 resources: @@ -478,145 +481,145 @@ spec: runAsNonRoot: false runAsUser: -7971724279034955974 seLinuxOptions: - level: "345" - role: "343" - type: "344" - user: "342" + level: "348" + role: "346" + type: "347" + user: "345" windowsOptions: - gmsaCredentialSpec: "347" - gmsaCredentialSpecName: "346" - runAsUserName: "348" + gmsaCredentialSpec: "350" + gmsaCredentialSpecName: "349" + runAsUserName: "351" stdinOnce: true - targetContainerName: "349" - terminationMessagePath: "341" + targetContainerName: "352" + terminationMessagePath: "344" terminationMessagePolicy: ' wƯ貾坢''跩aŕ' volumeDevices: - - devicePath: "312" - name: "311" + - devicePath: "315" + name: "314" volumeMounts: - - mountPath: "308" + - mountPath: "311" mountPropagation: ¿ - name: "307" - subPath: "309" - subPathExpr: "310" - workingDir: "291" + name: "310" + subPath: "312" + subPathExpr: "313" + workingDir: "294" hostAliases: - hostnames: - - "411" - ip: "410" + - "414" + ip: "413" hostNetwork: true - hostname: "365" + hostname: "368" imagePullSecrets: - - name: "364" + - name: "367" initContainers: - args: - - "165" + - "168" command: - - "164" + - "167" env: - - name: "172" - value: "173" + - name: "175" + value: "176" valueFrom: configMapKeyRef: - key: "179" - name: "178" + key: "182" + name: "181" optional: false fieldRef: - apiVersion: "174" - fieldPath: "175" + apiVersion: "177" + fieldPath: "178" resourceFieldRef: - containerName: "176" + containerName: "179" divisor: "597" - resource: "177" + resource: "180" secretKeyRef: - key: "181" - name: "180" + key: "184" + name: "183" optional: false envFrom: - configMapRef: - name: "170" + name: "173" optional: false - prefix: "169" + prefix: "172" secretRef: - name: "171" + name: "174" optional: false - image: "163" + image: "166" imagePullPolicy: ȓƇ$缔獵偐ę腬瓷碑=ɉ鎷卩蝾H韹寬 lifecycle: postStart: exec: command: - - "202" + - "205" httpGet: - host: "205" + host: "208" httpHeaders: - - name: "206" - value: "207" - path: "203" - port: "204" + - name: "209" + value: "210" + path: "206" + port: "207" scheme: '%:;栍dʪīT捘ɍi' tcpSocket: - host: "209" - port: "208" + host: "212" + port: "211" preStop: exec: command: - - "210" + - "213" httpGet: - host: "212" + host: "215" httpHeaders: - - name: "213" - value: "214" - path: "211" + - name: "216" + value: "217" + path: "214" port: -1171060347 scheme: 咻痗ȡmƴy綸_Ú8參遼ūPH炮掊° tcpSocket: - host: "216" - port: "215" + host: "219" + port: "218" livenessProbe: exec: command: - - "188" + - "191" failureThreshold: 1231820696 httpGet: - host: "191" + host: "194" httpHeaders: - - name: "192" - value: "193" - path: "189" - port: "190" + - name: "195" + value: "196" + path: "192" + port: "193" scheme: 0åȂ町恰nj揠8lj initialDelaySeconds: -1188153605 periodSeconds: 912004803 successThreshold: -2098817064 tcpSocket: - host: "194" + host: "197" port: -2049272966 timeoutSeconds: -427769948 - name: "162" + name: "165" ports: - containerPort: 487826951 - hostIP: "168" + hostIP: "171" hostPort: 1632959949 - name: "167" + name: "170" protocol: ldg滠鼍ƭt? readinessProbe: exec: command: - - "195" + - "198" failureThreshold: -1618937335 httpGet: - host: "198" + host: "201" httpHeaders: - - name: "199" - value: "200" - path: "196" - port: "197" + - name: "202" + value: "203" + path: "199" + port: "200" initialDelaySeconds: 994527057 periodSeconds: -1346458591 successThreshold: 1234551517 tcpSocket: - host: "201" + host: "204" port: 675406340 timeoutSeconds: -1482763519 resources: @@ -638,72 +641,72 @@ spec: runAsNonRoot: false runAsUser: -4642229086806245627 seLinuxOptions: - level: "221" - role: "219" - type: "220" - user: "218" + level: "224" + role: "222" + type: "223" + user: "221" windowsOptions: - gmsaCredentialSpec: "223" - gmsaCredentialSpecName: "222" - runAsUserName: "224" + gmsaCredentialSpec: "226" + gmsaCredentialSpecName: "225" + runAsUserName: "227" stdinOnce: true - terminationMessagePath: "217" + terminationMessagePath: "220" terminationMessagePolicy: 閼咎櫸eʔŊ tty: true volumeDevices: - - devicePath: "187" - name: "186" + - devicePath: "190" + name: "189" volumeMounts: - - mountPath: "183" + - mountPath: "186" mountPropagation: 瑥A - name: "182" + name: "185" readOnly: true - subPath: "184" - subPathExpr: "185" - workingDir: "166" - nodeName: "354" + subPath: "187" + subPathExpr: "188" + workingDir: "169" + nodeName: "357" nodeSelector: - "350": "351" + "353": "354" overhead: 锒鿦Ršțb贇髪č: "840" preemptionPolicy: qiǙĞǠ priority: -895317190 - priorityClassName: "412" + priorityClassName: "415" readinessGates: - conditionType: ċƹ|慼櫁色苆试揯遐e4'ď曕椐敛n restartPolicy: M蘇KŅ/»頸+SÄ蚃ɣľ)酊龨δ - runtimeClassName: "417" - schedulerName: "407" + runtimeClassName: "420" + schedulerName: "410" securityContext: fsGroup: -500234369132816308 runAsGroup: 3716388262106582789 runAsNonRoot: true runAsUser: -6241205430888228274 seLinuxOptions: - level: "358" - role: "356" - type: "357" - user: "355" + level: "361" + role: "359" + type: "360" + user: "358" supplementalGroups: - 2706433733228765005 sysctls: - - name: "362" - value: "363" + - name: "365" + value: "366" windowsOptions: - gmsaCredentialSpec: "360" - gmsaCredentialSpecName: "359" - runAsUserName: "361" - serviceAccount: "353" - serviceAccountName: "352" + gmsaCredentialSpec: "363" + gmsaCredentialSpecName: "362" + runAsUserName: "364" + serviceAccount: "356" + serviceAccountName: "355" shareProcessNamespace: true - subdomain: "366" + subdomain: "369" terminationGracePeriodSeconds: -1027492015449357669 tolerations: - effect: 儉ɩ柀 - key: "408" + key: "411" operator: 抷qTfZȻ干m謆7 tolerationSeconds: -7411984641310969236 - value: "409" + value: "412" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -712,216 +715,216 @@ spec: matchLabels: 54-br5r---r8oh782-u---76g---h-4-lx-0-2qg-4.94s-6-k57/8..-__--.k47M7y-Dy__3wc.q.8_00.0_._.-_L-_b: E_8-7_-YD-Q9_-__..YNFu7Pg-.814e-_07-ht-E6___-X__H.-39-A_-_l67Qa maxSkew: 44905239 - topologyKey: "418" + topologyKey: "421" whenUnsatisfiable: NRNJ丧鴻ĿW癜鞤A馱z芀¿l磶Bb偃 volumes: - awsElasticBlockStore: - fsType: "62" + fsType: "65" partition: -1853411528 - volumeID: "61" + volumeID: "64" azureDisk: cachingMode: A3fƻfʣ繡楙¯ - diskName: "125" - diskURI: "126" - fsType: "127" + diskName: "128" + diskURI: "129" + fsType: "130" kind: 勗E濞偘1ɩÅ議Ǹ轺@)蓳嗘TʡȂ readOnly: true azureFile: - secretName: "111" - shareName: "112" + secretName: "114" + shareName: "115" cephfs: monitors: - - "96" - path: "97" + - "99" + path: "100" readOnly: true - secretFile: "99" + secretFile: "102" secretRef: - name: "100" - user: "98" + name: "103" + user: "101" cinder: - fsType: "94" + fsType: "97" secretRef: - name: "95" - volumeID: "93" + name: "98" + volumeID: "96" configMap: defaultMode: -347579237 items: - - key: "114" + - key: "117" mode: 1793473487 - path: "115" - name: "113" + path: "118" + name: "116" optional: false csi: - driver: "157" - fsType: "158" + driver: "160" + fsType: "161" nodePublishSecretRef: - name: "161" + name: "164" readOnly: false volumeAttributes: - "159": "160" + "162": "163" downwardAPI: defaultMode: -1775926229 items: - fieldRef: - apiVersion: "104" - fieldPath: "105" + apiVersion: "107" + fieldPath: "108" mode: -1011172037 - path: "103" + path: "106" resourceFieldRef: - containerName: "106" + containerName: "109" divisor: "52" - resource: "107" + resource: "110" emptyDir: medium: 捵TwMȗ礼2ħ籦ö嗏ʑ>季Cʖ畬 sizeLimit: "347" fc: - fsType: "109" + fsType: "112" lun: -740816174 targetWWNs: - - "108" + - "111" wwids: - - "110" + - "113" flexVolume: - driver: "88" - fsType: "89" + driver: "91" + fsType: "92" options: - "91": "92" + "94": "95" secretRef: - name: "90" + name: "93" flocker: - datasetName: "101" - datasetUUID: "102" + datasetName: "104" + datasetUUID: "105" gcePersistentDisk: - fsType: "60" + fsType: "63" partition: 1399152294 - pdName: "59" + pdName: "62" readOnly: true gitRepo: - directory: "65" - repository: "63" - revision: "64" + directory: "68" + repository: "66" + revision: "67" glusterfs: - endpoints: "78" - path: "79" + endpoints: "81" + path: "82" readOnly: true hostPath: - path: "58" + path: "61" type: j剐'宣I拍N嚳ķȗ iscsi: - fsType: "74" - initiatorName: "77" - iqn: "72" - iscsiInterface: "73" + fsType: "77" + initiatorName: "80" + iqn: "75" + iscsiInterface: "76" lun: -1483417237 portals: - - "75" + - "78" secretRef: - name: "76" - targetPortal: "71" - name: "57" + name: "79" + targetPortal: "74" + name: "60" nfs: - path: "70" - server: "69" + path: "73" + server: "72" persistentVolumeClaim: - claimName: "80" + claimName: "83" readOnly: true photonPersistentDisk: - fsType: "129" - pdID: "128" + fsType: "132" + pdID: "131" portworxVolume: - fsType: "144" - volumeID: "143" + fsType: "147" + volumeID: "146" projected: defaultMode: -1332301579 sources: - configMap: items: - - key: "139" + - key: "142" mode: -1249460160 - path: "140" - name: "138" + path: "143" + name: "141" optional: false downwardAPI: items: - fieldRef: - apiVersion: "134" - fieldPath: "135" + apiVersion: "137" + fieldPath: "138" mode: 1525389481 - path: "133" + path: "136" resourceFieldRef: - containerName: "136" + containerName: "139" divisor: "618" - resource: "137" + resource: "140" secret: items: - - key: "131" + - key: "134" mode: 550215822 - path: "132" - name: "130" + path: "135" + name: "133" optional: false serviceAccountToken: - audience: "141" + audience: "144" expirationSeconds: -8988970531898753887 - path: "142" + path: "145" quobyte: - group: "123" + group: "126" readOnly: true - registry: "120" - tenant: "124" - user: "122" - volume: "121" + registry: "123" + tenant: "127" + user: "125" + volume: "124" rbd: - fsType: "83" - image: "82" - keyring: "86" + fsType: "86" + image: "85" + keyring: "89" monitors: - - "81" - pool: "84" + - "84" + pool: "87" readOnly: true secretRef: - name: "87" - user: "85" + name: "90" + user: "88" scaleIO: - fsType: "152" - gateway: "145" - protectionDomain: "148" + fsType: "155" + gateway: "148" + protectionDomain: "151" readOnly: true secretRef: - name: "147" - storageMode: "150" - storagePool: "149" - system: "146" - volumeName: "151" + name: "150" + storageMode: "153" + storagePool: "152" + system: "149" + volumeName: "154" secret: defaultMode: -1852451720 items: - - key: "67" + - key: "70" mode: 1395607230 - path: "68" + path: "71" optional: true - secretName: "66" + secretName: "69" storageos: - fsType: "155" + fsType: "158" readOnly: true secretRef: - name: "156" - volumeName: "153" - volumeNamespace: "154" + name: "159" + volumeName: "156" + volumeNamespace: "157" vsphereVolume: - fsType: "117" - storagePolicyID: "119" - storagePolicyName: "118" - volumePath: "116" + fsType: "120" + storagePolicyID: "122" + storagePolicyName: "121" + volumePath: "119" ttlSecondsAfterFinished: -37906634 - schedule: "18" + schedule: "19" startingDeadlineSeconds: -2555947251840004808 successfulJobsHistoryLimit: 1893057016 suspend: true status: active: - - apiVersion: "428" - fieldPath: "430" - kind: "425" - name: "427" - namespace: "426" - resourceVersion: "429" + - apiVersion: "431" + fieldPath: "433" + kind: "428" + name: "430" + namespace: "429" + resourceVersion: "432" diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.json b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.json index 118f7885cff..da387c7cbe7 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.json +++ b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.json @@ -35,46 +35,48 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "template": { "metadata": { - "name": "18", - "generateName": "19", - "namespace": "20", - "selfLink": "21", + "name": "19", + "generateName": "20", + "namespace": "21", + "selfLink": "22", "uid": "SǡƏ", "resourceVersion": "17916580954637291219", "generation": 5259823216098853135, "creationTimestamp": null, "deletionGracePeriodSeconds": 4075183944016503389, "labels": { - "23": "24" + "24": "25" }, "annotations": { - "25": "26" + "26": "27" }, "ownerReferences": [ { - "apiVersion": "27", - "kind": "28", - "name": "29", + "apiVersion": "28", + "kind": "29", + "name": "30", "uid": "ɑ", "controller": true, "blockOwnerDeletion": false } ], "finalizers": [ - "30" + "31" ], - "clusterName": "31", + "clusterName": "32", "managedFields": [ { - "manager": "32", + "manager": "33", "operation": "ěĂ凗蓏Ŋ蛊ĉy緅縕", - "apiVersion": "33" + "apiVersion": "34", + "fieldsType": "35" } ] }, @@ -100,49 +102,50 @@ "manualSelector": false, "template": { "metadata": { - "name": "40", - "generateName": "41", - "namespace": "42", - "selfLink": "43", + "name": "42", + "generateName": "43", + "namespace": "44", + "selfLink": "45", "uid": "Ȗ脵鴈Ō", "resourceVersion": "5994087412557504692", "generation": 9213888658033954596, "creationTimestamp": null, "deletionGracePeriodSeconds": -2901856114738744973, "labels": { - "45": "46" + "47": "48" }, "annotations": { - "47": "48" + "49": "50" }, "ownerReferences": [ { - "apiVersion": "49", - "kind": "50", - "name": "51", + "apiVersion": "51", + "kind": "52", + "name": "53", "uid": "I拍N嚳ķȗɊ捵TwMȗ礼", "controller": false, "blockOwnerDeletion": false } ], "finalizers": [ - "52" + "54" ], - "clusterName": "53", + "clusterName": "55", "managedFields": [ { - "manager": "54", + "manager": "56", "operation": "ö嗏ʑ\u003e季Cʖ畬x骀Šĸů", - "apiVersion": "55" + "apiVersion": "57", + "fieldsType": "58" } ] }, "spec": { "volumes": [ { - "name": "56", + "name": "59", "hostPath": { - "path": "57", + "path": "60", "type": "/淹\\韲翁\u0026ʢsɜ曢\\%枅:=ǛƓ" }, "emptyDir": { @@ -150,28 +153,28 @@ "sizeLimit": "681" }, "gcePersistentDisk": { - "pdName": "58", - "fsType": "59", + "pdName": "61", + "fsType": "62", "partition": 2065358741, "readOnly": true }, "awsElasticBlockStore": { - "volumeID": "60", - "fsType": "61", + "volumeID": "63", + "fsType": "64", "partition": -104666658, "readOnly": true }, "gitRepo": { - "repository": "62", - "revision": "63", - "directory": "64" + "repository": "65", + "revision": "66", + "directory": "67" }, "secret": { - "secretName": "65", + "secretName": "68", "items": [ { - "key": "66", - "path": "67", + "key": "69", + "path": "70", "mode": 1648350164 } ], @@ -179,91 +182,91 @@ "optional": true }, "nfs": { - "server": "68", - "path": "69" + "server": "71", + "path": "72" }, "iscsi": { - "targetPortal": "70", - "iqn": "71", + "targetPortal": "73", + "iqn": "74", "lun": -663180249, - "iscsiInterface": "72", - "fsType": "73", + "iscsiInterface": "75", + "fsType": "76", "readOnly": true, "portals": [ - "74" + "77" ], "chapAuthSession": true, "secretRef": { - "name": "75" + "name": "78" }, - "initiatorName": "76" + "initiatorName": "79" }, "glusterfs": { - "endpoints": "77", - "path": "78" + "endpoints": "80", + "path": "81" }, "persistentVolumeClaim": { - "claimName": "79" + "claimName": "82" }, "rbd": { "monitors": [ - "80" + "83" ], - "image": "81", - "fsType": "82", - "pool": "83", - "user": "84", - "keyring": "85", + "image": "84", + "fsType": "85", + "pool": "86", + "user": "87", + "keyring": "88", "secretRef": { - "name": "86" + "name": "89" }, "readOnly": true }, "flexVolume": { - "driver": "87", - "fsType": "88", + "driver": "90", + "fsType": "91", "secretRef": { - "name": "89" + "name": "92" }, "readOnly": true, "options": { - "90": "91" + "93": "94" } }, "cinder": { - "volumeID": "92", - "fsType": "93", + "volumeID": "95", + "fsType": "96", "readOnly": true, "secretRef": { - "name": "94" + "name": "97" } }, "cephfs": { "monitors": [ - "95" + "98" ], - "path": "96", - "user": "97", - "secretFile": "98", + "path": "99", + "user": "100", + "secretFile": "101", "secretRef": { - "name": "99" + "name": "102" } }, "flocker": { - "datasetName": "100", - "datasetUUID": "101" + "datasetName": "103", + "datasetUUID": "104" }, "downwardAPI": { "items": [ { - "path": "102", + "path": "105", "fieldRef": { - "apiVersion": "103", - "fieldPath": "104" + "apiVersion": "106", + "fieldPath": "107" }, "resourceFieldRef": { - "containerName": "105", - "resource": "106", + "containerName": "108", + "resource": "109", "divisor": "889" }, "mode": 1322858613 @@ -273,24 +276,24 @@ }, "fc": { "targetWWNs": [ - "107" + "110" ], "lun": 1169718433, - "fsType": "108", + "fsType": "111", "wwids": [ - "109" + "112" ] }, "azureFile": { - "secretName": "110", - "shareName": "111" + "secretName": "113", + "shareName": "114" }, "configMap": { - "name": "112", + "name": "115", "items": [ { - "key": "113", - "path": "114", + "key": "116", + "path": "117", "mode": -1194714697 } ], @@ -298,40 +301,40 @@ "optional": true }, "vsphereVolume": { - "volumePath": "115", - "fsType": "116", - "storagePolicyName": "117", - "storagePolicyID": "118" + "volumePath": "118", + "fsType": "119", + "storagePolicyName": "120", + "storagePolicyID": "121" }, "quobyte": { - "registry": "119", - "volume": "120", + "registry": "122", + "volume": "123", "readOnly": true, - "user": "121", - "group": "122", - "tenant": "123" + "user": "124", + "group": "125", + "tenant": "126" }, "azureDisk": { - "diskName": "124", - "diskURI": "125", + "diskName": "127", + "diskURI": "128", "cachingMode": "ʜǝ鿟ldg滠鼍ƭt", - "fsType": "126", + "fsType": "129", "readOnly": true, "kind": "ȫşŇɜa" }, "photonPersistentDisk": { - "pdID": "127", - "fsType": "128" + "pdID": "130", + "fsType": "131" }, "projected": { "sources": [ { "secret": { - "name": "129", + "name": "132", "items": [ { - "key": "130", - "path": "131", + "key": "133", + "path": "134", "mode": 782113097 } ], @@ -340,14 +343,14 @@ "downwardAPI": { "items": [ { - "path": "132", + "path": "135", "fieldRef": { - "apiVersion": "133", - "fieldPath": "134" + "apiVersion": "136", + "fieldPath": "137" }, "resourceFieldRef": { - "containerName": "135", - "resource": "136", + "containerName": "138", + "resource": "139", "divisor": "952" }, "mode": -555780268 @@ -355,120 +358,120 @@ ] }, "configMap": { - "name": "137", + "name": "140", "items": [ { - "key": "138", - "path": "139", + "key": "141", + "path": "142", "mode": 1730325900 } ], "optional": true }, "serviceAccountToken": { - "audience": "140", + "audience": "143", "expirationSeconds": -2937394236764575757, - "path": "141" + "path": "144" } } ], "defaultMode": -1980941277 }, "portworxVolume": { - "volumeID": "142", - "fsType": "143", + "volumeID": "145", + "fsType": "146", "readOnly": true }, "scaleIO": { - "gateway": "144", - "system": "145", + "gateway": "147", + "system": "148", "secretRef": { - "name": "146" + "name": "149" }, "sslEnabled": true, - "protectionDomain": "147", - "storagePool": "148", - "storageMode": "149", - "volumeName": "150", - "fsType": "151" + "protectionDomain": "150", + "storagePool": "151", + "storageMode": "152", + "volumeName": "153", + "fsType": "154" }, "storageos": { - "volumeName": "152", - "volumeNamespace": "153", - "fsType": "154", + "volumeName": "155", + "volumeNamespace": "156", + "fsType": "157", "readOnly": true, "secretRef": { - "name": "155" + "name": "158" } }, "csi": { - "driver": "156", + "driver": "159", "readOnly": true, - "fsType": "157", + "fsType": "160", "volumeAttributes": { - "158": "159" + "161": "162" }, "nodePublishSecretRef": { - "name": "160" + "name": "163" } } } ], "initContainers": [ { - "name": "161", - "image": "162", + "name": "164", + "image": "165", "command": [ - "163" + "166" ], "args": [ - "164" + "167" ], - "workingDir": "165", + "workingDir": "168", "ports": [ { - "name": "166", + "name": "169", "hostPort": 580681683, "containerPort": 38897467, "protocol": "h0åȂ町恰nj揠", - "hostIP": "167" + "hostIP": "170" } ], "envFrom": [ { - "prefix": "168", + "prefix": "171", "configMapRef": { - "name": "169", + "name": "172", "optional": false }, "secretRef": { - "name": "170", + "name": "173", "optional": true } } ], "env": [ { - "name": "171", - "value": "172", + "name": "174", + "value": "175", "valueFrom": { "fieldRef": { - "apiVersion": "173", - "fieldPath": "174" + "apiVersion": "176", + "fieldPath": "177" }, "resourceFieldRef": { - "containerName": "175", - "resource": "176", + "containerName": "178", + "resource": "179", "divisor": "618" }, "configMapKeyRef": { - "name": "177", - "key": "178", + "name": "180", + "key": "181", "optional": false }, "secretKeyRef": { - "name": "179", - "key": "180", + "name": "182", + "key": "183", "optional": false } } @@ -484,41 +487,41 @@ }, "volumeMounts": [ { - "name": "181", + "name": "184", "readOnly": true, - "mountPath": "182", - "subPath": "183", + "mountPath": "185", + "subPath": "186", "mountPropagation": "咻痗ȡmƴy綸_Ú8參遼ūPH炮掊°", - "subPathExpr": "184" + "subPathExpr": "187" } ], "volumeDevices": [ { - "name": "185", - "devicePath": "186" + "name": "188", + "devicePath": "189" } ], "livenessProbe": { "exec": { "command": [ - "187" + "190" ] }, "httpGet": { - "path": "188", + "path": "191", "port": -575512248, - "host": "189", + "host": "192", "scheme": "ɨ銦妰黖ȓƇ$缔獵偐ę腬瓷碑=ɉ", "httpHeaders": [ { - "name": "190", - "value": "191" + "name": "193", + "value": "194" } ] }, "tcpSocket": { "port": 1180382332, - "host": "192" + "host": "195" }, "initialDelaySeconds": -1846991380, "timeoutSeconds": 325236550, @@ -529,24 +532,24 @@ "readinessProbe": { "exec": { "command": [ - "193" + "196" ] }, "httpGet": { - "path": "194", + "path": "197", "port": 1403721475, - "host": "195", + "host": "198", "scheme": "ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳", "httpHeaders": [ { - "name": "196", - "value": "197" + "name": "199", + "value": "200" } ] }, "tcpSocket": { "port": -2064174383, - "host": "198" + "host": "201" }, "initialDelaySeconds": -1327537699, "timeoutSeconds": 483512911, @@ -558,51 +561,51 @@ "postStart": { "exec": { "command": [ - "199" + "202" ] }, "httpGet": { - "path": "200", - "port": "201", - "host": "202", + "path": "203", + "port": "204", + "host": "205", "scheme": "Ɖ立hdz緄Ú|dk_瀹鞎", "httpHeaders": [ { - "name": "203", - "value": "204" + "name": "206", + "value": "207" } ] }, "tcpSocket": { "port": 1150375229, - "host": "205" + "host": "208" } }, "preStop": { "exec": { "command": [ - "206" + "209" ] }, "httpGet": { - "path": "207", - "port": "208", - "host": "209", + "path": "210", + "port": "211", + "host": "212", "scheme": "鲡:", "httpHeaders": [ { - "name": "210", - "value": "211" + "name": "213", + "value": "214" } ] }, "tcpSocket": { "port": -2037320199, - "host": "212" + "host": "215" } } }, - "terminationMessagePath": "213", + "terminationMessagePath": "216", "terminationMessagePolicy": "@Ȗs«öʮĀ\u003cé瞾", "imagePullPolicy": "4y£軶ǃ*ʙ嫙\u0026蒒5", "securityContext": { @@ -616,15 +619,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "214", - "role": "215", - "type": "216", - "level": "217" + "user": "217", + "role": "218", + "type": "219", + "level": "220" }, "windowsOptions": { - "gmsaCredentialSpecName": "218", - "gmsaCredentialSpec": "219", - "runAsUserName": "220" + "gmsaCredentialSpecName": "221", + "gmsaCredentialSpec": "222", + "runAsUserName": "223" }, "runAsUser": -3150075726777852858, "runAsGroup": -4491268618106522555, @@ -639,59 +642,59 @@ ], "containers": [ { - "name": "221", - "image": "222", + "name": "224", + "image": "225", "command": [ - "223" + "226" ], "args": [ - "224" + "227" ], - "workingDir": "225", + "workingDir": "228", "ports": [ { - "name": "226", + "name": "229", "hostPort": -321513994, "containerPort": 1024248645, "protocol": "籘Àǒɿʒ刽ʼn", - "hostIP": "227" + "hostIP": "230" } ], "envFrom": [ { - "prefix": "228", + "prefix": "231", "configMapRef": { - "name": "229", + "name": "232", "optional": true }, "secretRef": { - "name": "230", + "name": "233", "optional": true } } ], "env": [ { - "name": "231", - "value": "232", + "name": "234", + "value": "235", "valueFrom": { "fieldRef": { - "apiVersion": "233", - "fieldPath": "234" + "apiVersion": "236", + "fieldPath": "237" }, "resourceFieldRef": { - "containerName": "235", - "resource": "236", + "containerName": "238", + "resource": "239", "divisor": "103" }, "configMapKeyRef": { - "name": "237", - "key": "238", + "name": "240", + "key": "241", "optional": false }, "secretKeyRef": { - "name": "239", - "key": "240", + "name": "242", + "key": "243", "optional": false } } @@ -707,41 +710,41 @@ }, "volumeMounts": [ { - "name": "241", + "name": "244", "readOnly": true, - "mountPath": "242", - "subPath": "243", + "mountPath": "245", + "subPath": "246", "mountPropagation": "\u003e懔%熷谟þ蛯ɰ荶ljʁ揆ɘȌ脾嚏吐", - "subPathExpr": "244" + "subPathExpr": "247" } ], "volumeDevices": [ { - "name": "245", - "devicePath": "246" + "name": "248", + "devicePath": "249" } ], "livenessProbe": { "exec": { "command": [ - "247" + "250" ] }, "httpGet": { - "path": "248", + "path": "251", "port": -1821078703, - "host": "249", + "host": "252", "scheme": "萨zvt", "httpHeaders": [ { - "name": "250", - "value": "251" + "name": "253", + "value": "254" } ] }, "tcpSocket": { "port": 1182477686, - "host": "252" + "host": "255" }, "initialDelaySeconds": -503805926, "timeoutSeconds": 77312514, @@ -752,24 +755,24 @@ "readinessProbe": { "exec": { "command": [ - "253" + "256" ] }, "httpGet": { - "path": "254", - "port": "255", - "host": "256", + "path": "257", + "port": "258", + "host": "259", "scheme": "0矀Kʝ瘴I\\p[ħsĨɆâĺɗŹ倗S", "httpHeaders": [ { - "name": "257", - "value": "258" + "name": "260", + "value": "261" } ] }, "tcpSocket": { - "port": "259", - "host": "260" + "port": "262", + "host": "263" }, "initialDelaySeconds": 932904270, "timeoutSeconds": 1810980158, @@ -781,51 +784,51 @@ "postStart": { "exec": { "command": [ - "261" + "264" ] }, "httpGet": { - "path": "262", + "path": "265", "port": -498930176, - "host": "263", + "host": "266", "scheme": " R§耶Ff", "httpHeaders": [ { - "name": "264", - "value": "265" + "name": "267", + "value": "268" } ] }, "tcpSocket": { - "port": "266", - "host": "267" + "port": "269", + "host": "270" } }, "preStop": { "exec": { "command": [ - "268" + "271" ] }, "httpGet": { - "path": "269", + "path": "272", "port": -331283026, - "host": "270", + "host": "273", "scheme": "ȉ", "httpHeaders": [ { - "name": "271", - "value": "272" + "name": "274", + "value": "275" } ] }, "tcpSocket": { "port": 714088955, - "host": "273" + "host": "276" } } }, - "terminationMessagePath": "274", + "terminationMessagePath": "277", "terminationMessagePolicy": "źȰ?$矡ȶ网棊ʢ=wǕɳ", "imagePullPolicy": "#yV'WKw(ğ儴Ůĺ}", "securityContext": { @@ -839,15 +842,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "275", - "role": "276", - "type": "277", - "level": "278" + "user": "278", + "role": "279", + "type": "280", + "level": "281" }, "windowsOptions": { - "gmsaCredentialSpecName": "279", - "gmsaCredentialSpec": "280", - "runAsUserName": "281" + "gmsaCredentialSpecName": "282", + "gmsaCredentialSpec": "283", + "runAsUserName": "284" }, "runAsUser": -7735837526010191986, "runAsGroup": -3460863886200664373, @@ -861,59 +864,59 @@ ], "ephemeralContainers": [ { - "name": "282", - "image": "283", + "name": "285", + "image": "286", "command": [ - "284" + "287" ], "args": [ - "285" + "288" ], - "workingDir": "286", + "workingDir": "289", "ports": [ { - "name": "287", + "name": "290", "hostPort": -602419938, "containerPort": 1040396664, "protocol": "爻ƙt叀碧闳ȩr嚧ʣq埄", - "hostIP": "288" + "hostIP": "291" } ], "envFrom": [ { - "prefix": "289", + "prefix": "292", "configMapRef": { - "name": "290", + "name": "293", "optional": true }, "secretRef": { - "name": "291", + "name": "294", "optional": true } } ], "env": [ { - "name": "292", - "value": "293", + "name": "295", + "value": "296", "valueFrom": { "fieldRef": { - "apiVersion": "294", - "fieldPath": "295" + "apiVersion": "297", + "fieldPath": "298" }, "resourceFieldRef": { - "containerName": "296", - "resource": "297", + "containerName": "299", + "resource": "300", "divisor": "340" }, "configMapKeyRef": { - "name": "298", - "key": "299", + "name": "301", + "key": "302", "optional": false }, "secretKeyRef": { - "name": "300", - "key": "301", + "name": "303", + "key": "304", "optional": true } } @@ -929,41 +932,41 @@ }, "volumeMounts": [ { - "name": "302", + "name": "305", "readOnly": true, - "mountPath": "303", - "subPath": "304", + "mountPath": "306", + "subPath": "307", "mountPropagation": "敄lu|", - "subPathExpr": "305" + "subPathExpr": "308" } ], "volumeDevices": [ { - "name": "306", - "devicePath": "307" + "name": "309", + "devicePath": "310" } ], "livenessProbe": { "exec": { "command": [ - "308" + "311" ] }, "httpGet": { - "path": "309", - "port": "310", - "host": "311", + "path": "312", + "port": "313", + "host": "314", "scheme": "忊|E剒", "httpHeaders": [ { - "name": "312", - "value": "313" + "name": "315", + "value": "316" } ] }, "tcpSocket": { "port": 1004325340, - "host": "314" + "host": "317" }, "initialDelaySeconds": -1313320434, "timeoutSeconds": 14304392, @@ -974,23 +977,23 @@ "readinessProbe": { "exec": { "command": [ - "315" + "318" ] }, "httpGet": { - "path": "316", + "path": "319", "port": 432291364, - "host": "317", + "host": "320", "httpHeaders": [ { - "name": "318", - "value": "319" + "name": "321", + "value": "322" } ] }, "tcpSocket": { - "port": "320", - "host": "321" + "port": "323", + "host": "324" }, "initialDelaySeconds": -677617960, "timeoutSeconds": 383015301, @@ -1002,51 +1005,51 @@ "postStart": { "exec": { "command": [ - "322" + "325" ] }, "httpGet": { - "path": "323", - "port": "324", - "host": "325", + "path": "326", + "port": "327", + "host": "328", "scheme": "%皧V垾现葢ŵ橨鬶l獕;跣Hǝcw媀瓄", "httpHeaders": [ { - "name": "326", - "value": "327" + "name": "329", + "value": "330" } ] }, "tcpSocket": { - "port": "328", - "host": "329" + "port": "331", + "host": "332" } }, "preStop": { "exec": { "command": [ - "330" + "333" ] }, "httpGet": { - "path": "331", - "port": "332", - "host": "333", + "path": "334", + "port": "335", + "host": "336", "scheme": "锏ɟ4Ǒ輂,ŕĪĠM蘇KŅ/»頸", "httpHeaders": [ { - "name": "334", - "value": "335" + "name": "337", + "value": "338" } ] }, "tcpSocket": { "port": 1315054653, - "host": "336" + "host": "339" } } }, - "terminationMessagePath": "337", + "terminationMessagePath": "340", "terminationMessagePolicy": "蚃ɣľ)酊龨δ摖ȱ", "imagePullPolicy": "冓鍓贯", "securityContext": { @@ -1060,15 +1063,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "338", - "role": "339", - "type": "340", - "level": "341" + "user": "341", + "role": "342", + "type": "343", + "level": "344" }, "windowsOptions": { - "gmsaCredentialSpecName": "342", - "gmsaCredentialSpec": "343", - "runAsUserName": "344" + "gmsaCredentialSpecName": "345", + "gmsaCredentialSpec": "346", + "runAsUserName": "347" }, "runAsUser": -500234369132816308, "runAsGroup": 1006111877741141889, @@ -1080,7 +1083,7 @@ "stdin": true, "stdinOnce": true, "tty": true, - "targetContainerName": "345" + "targetContainerName": "348" } ], "restartPolicy": "ǦŐnj汰8ŕİi騎C\"", @@ -1088,26 +1091,26 @@ "activeDeadlineSeconds": 3168496047243051519, "dnsPolicy": "Ǒ", "nodeSelector": { - "346": "347" + "349": "350" }, - "serviceAccountName": "348", - "serviceAccount": "349", + "serviceAccountName": "351", + "serviceAccount": "352", "automountServiceAccountToken": false, - "nodeName": "350", + "nodeName": "353", "hostPID": true, "hostIPC": true, "shareProcessNamespace": false, "securityContext": { "seLinuxOptions": { - "user": "351", - "role": "352", - "type": "353", - "level": "354" + "user": "354", + "role": "355", + "type": "356", + "level": "357" }, "windowsOptions": { - "gmsaCredentialSpecName": "355", - "gmsaCredentialSpec": "356", - "runAsUserName": "357" + "gmsaCredentialSpecName": "358", + "gmsaCredentialSpec": "359", + "runAsUserName": "360" }, "runAsUser": 4608737617101049023, "runAsGroup": 3557544419897236324, @@ -1118,18 +1121,18 @@ "fsGroup": -1335795712555820375, "sysctls": [ { - "name": "358", - "value": "359" + "name": "361", + "value": "362" } ] }, "imagePullSecrets": [ { - "name": "360" + "name": "363" } ], - "hostname": "361", - "subdomain": "362", + "hostname": "364", + "subdomain": "365", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1137,19 +1140,19 @@ { "matchExpressions": [ { - "key": "363", + "key": "366", "operator": "", "values": [ - "364" + "367" ] } ], "matchFields": [ { - "key": "365", + "key": "368", "operator": "{WOŭW灬pȭCV擭銆jʒǚ鍰", "values": [ - "366" + "369" ] } ] @@ -1162,19 +1165,19 @@ "preference": { "matchExpressions": [ { - "key": "367", + "key": "370", "operator": "撑¼蠾8餑噭", "values": [ - "368" + "371" ] } ], "matchFields": [ { - "key": "369", + "key": "372", "operator": "ɪǹ0衷,ƷƣMț譎懚XW疪鑳w", "values": [ - "370" + "373" ] } ] @@ -1200,9 +1203,9 @@ ] }, "namespaces": [ - "377" + "380" ], - "topologyKey": "378" + "topologyKey": "381" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1221,9 +1224,9 @@ ] }, "namespaces": [ - "385" + "388" ], - "topologyKey": "386" + "topologyKey": "389" } } ] @@ -1243,9 +1246,9 @@ ] }, "namespaces": [ - "393" + "396" ], - "topologyKey": "394" + "topologyKey": "397" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1267,45 +1270,45 @@ ] }, "namespaces": [ - "401" + "404" ], - "topologyKey": "402" + "topologyKey": "405" } } ] } }, - "schedulerName": "403", + "schedulerName": "406", "tolerations": [ { - "key": "404", + "key": "407", "operator": "堺ʣ", - "value": "405", + "value": "408", "effect": "ŽɣB矗E¸乾", "tolerationSeconds": -3532804738923434397 } ], "hostAliases": [ { - "ip": "406", + "ip": "409", "hostnames": [ - "407" + "410" ] } ], - "priorityClassName": "408", + "priorityClassName": "411", "priority": -1852730577, "dnsConfig": { "nameservers": [ - "409" + "412" ], "searches": [ - "410" + "413" ], "options": [ { - "name": "411", - "value": "412" + "name": "414", + "value": "415" } ] }, @@ -1314,7 +1317,7 @@ "conditionType": "ź魊塾ɖ$rolȋɶuɋ5r儉ɩ柀ɨ鴅" } ], - "runtimeClassName": "413", + "runtimeClassName": "416", "enableServiceLinks": false, "preemptionPolicy": "!ń1ċƹ|慼櫁色苆试揯遐", "overhead": { @@ -1323,7 +1326,7 @@ "topologySpreadConstraints": [ { "maxSkew": -150478704, - "topologyKey": "414", + "topologyKey": "417", "whenUnsatisfiable": ";鹡鑓侅闍ŏŃŋŏ}ŀ", "labelSelector": { "matchLabels": { diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.pb b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.pb index f328e17ff2d..64574f34f4b 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.pb and b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.yaml b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.yaml index f2f866c013a..dd545b560e8 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/batch.v2alpha1.JobTemplate.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -31,31 +32,32 @@ metadata: template: metadata: annotations: - "25": "26" - clusterName: "31" + "26": "27" + clusterName: "32" creationTimestamp: null deletionGracePeriodSeconds: 4075183944016503389 finalizers: - - "30" - generateName: "19" + - "31" + generateName: "20" generation: 5259823216098853135 labels: - "23": "24" + "24": "25" managedFields: - - apiVersion: "33" - manager: "32" + - apiVersion: "34" + fieldsType: "35" + manager: "33" operation: ěĂ凗蓏Ŋ蛊ĉy緅縕 - name: "18" - namespace: "20" + name: "19" + namespace: "21" ownerReferences: - - apiVersion: "27" + - apiVersion: "28" blockOwnerDeletion: false controller: true - kind: "28" - name: "29" + kind: "29" + name: "30" uid: ɑ resourceVersion: "17916580954637291219" - selfLink: "21" + selfLink: "22" uid: SǡƏ spec: activeDeadlineSeconds: -9086179100394185427 @@ -74,31 +76,32 @@ template: template: metadata: annotations: - "47": "48" - clusterName: "53" + "49": "50" + clusterName: "55" creationTimestamp: null deletionGracePeriodSeconds: -2901856114738744973 finalizers: - - "52" - generateName: "41" + - "54" + generateName: "43" generation: 9213888658033954596 labels: - "45": "46" + "47": "48" managedFields: - - apiVersion: "55" - manager: "54" + - apiVersion: "57" + fieldsType: "58" + manager: "56" operation: ö嗏ʑ>季Cʖ畬x骀Šĸů - name: "40" - namespace: "42" + name: "42" + namespace: "44" ownerReferences: - - apiVersion: "49" + - apiVersion: "51" blockOwnerDeletion: false controller: false - kind: "50" - name: "51" + kind: "52" + name: "53" uid: I拍N嚳ķȗɊ捵TwMȗ礼 resourceVersion: "5994087412557504692" - selfLink: "43" + selfLink: "45" uid: Ȗ脵鴈Ō spec: activeDeadlineSeconds: 3168496047243051519 @@ -107,28 +110,28 @@ template: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "367" + - key: "370" operator: 撑¼蠾8餑噭 values: - - "368" + - "371" matchFields: - - key: "369" + - key: "372" operator: ɪǹ0衷,ƷƣMț譎懚XW疪鑳w values: - - "370" + - "373" weight: -1330095135 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "363" + - key: "366" operator: "" values: - - "364" + - "367" matchFields: - - key: "365" + - key: "368" operator: '{WOŭW灬pȭCV擭銆jʒǚ鍰' values: - - "366" + - "369" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -139,8 +142,8 @@ template: matchLabels: 4-yy28-38xmu5nx4s--41-7--6m/271-_-9_._X-D---k6: Q.-s.H.Hu-k-_-0-T1mel--F......3_t_-l..-.DG7r-3.----._4__XOnP namespaces: - - "385" - topologyKey: "386" + - "388" + topologyKey: "389" weight: -217760519 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -152,8 +155,8 @@ template: matchLabels: 4--883d-v3j4-7y-p---up52--sjo7799-skj5---r-t.sumf7ew/u-5mj_9.M.134-5-.q6H_.--_---.M.U_-m.-P.yPS: 1Tvw39F_C-rtSY.g._2F7.-_e..r namespaces: - - "377" - topologyKey: "378" + - "380" + topologyKey: "381" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -166,8 +169,8 @@ template: matchLabels: 6V1-rU.___06.eqk5E_-4-.XH-.k.7.l_-W8o._xJ1-lFA_X3: V0H2-.zHw.H__V.VT namespaces: - - "401" - topologyKey: "402" + - "404" + topologyKey: "405" weight: -1851436166 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -177,120 +180,120 @@ template: matchLabels: 7F3p2_-_AmD-.0AP.1: A--.F5_x.KNC0-.-m_0-m-6Sp_N-S..O-BZ..n namespaces: - - "393" - topologyKey: "394" + - "396" + topologyKey: "397" automountServiceAccountToken: false containers: - args: - - "224" + - "227" command: - - "223" + - "226" env: - - name: "231" - value: "232" + - name: "234" + value: "235" valueFrom: configMapKeyRef: - key: "238" - name: "237" + key: "241" + name: "240" optional: false fieldRef: - apiVersion: "233" - fieldPath: "234" + apiVersion: "236" + fieldPath: "237" resourceFieldRef: - containerName: "235" + containerName: "238" divisor: "103" - resource: "236" + resource: "239" secretKeyRef: - key: "240" - name: "239" + key: "243" + name: "242" optional: false envFrom: - configMapRef: - name: "229" + name: "232" optional: true - prefix: "228" + prefix: "231" secretRef: - name: "230" + name: "233" optional: true - image: "222" + image: "225" imagePullPolicy: '#yV''WKw(ğ儴Ůĺ}' lifecycle: postStart: exec: command: - - "261" + - "264" httpGet: - host: "263" + host: "266" httpHeaders: - - name: "264" - value: "265" - path: "262" + - name: "267" + value: "268" + path: "265" port: -498930176 scheme: ' R§耶Ff' tcpSocket: - host: "267" - port: "266" + host: "270" + port: "269" preStop: exec: command: - - "268" + - "271" httpGet: - host: "270" + host: "273" httpHeaders: - - name: "271" - value: "272" - path: "269" + - name: "274" + value: "275" + path: "272" port: -331283026 scheme: ȉ tcpSocket: - host: "273" + host: "276" port: 714088955 livenessProbe: exec: command: - - "247" + - "250" failureThreshold: 10098903 httpGet: - host: "249" + host: "252" httpHeaders: - - name: "250" - value: "251" - path: "248" + - name: "253" + value: "254" + path: "251" port: -1821078703 scheme: 萨zvt initialDelaySeconds: -503805926 periodSeconds: -763687725 successThreshold: -246563990 tcpSocket: - host: "252" + host: "255" port: 1182477686 timeoutSeconds: 77312514 - name: "221" + name: "224" ports: - containerPort: 1024248645 - hostIP: "227" + hostIP: "230" hostPort: -321513994 - name: "226" + name: "229" protocol: 籘Àǒɿʒ刽ʼn readinessProbe: exec: command: - - "253" + - "256" failureThreshold: 1255258741 httpGet: - host: "256" + host: "259" httpHeaders: - - name: "257" - value: "258" - path: "254" - port: "255" + - name: "260" + value: "261" + path: "257" + port: "258" scheme: 0矀Kʝ瘴I\p[ħsĨɆâĺɗŹ倗S initialDelaySeconds: 932904270 periodSeconds: 100356493 successThreshold: -110792150 tcpSocket: - host: "260" - port: "259" + host: "263" + port: "262" timeoutSeconds: 1810980158 resources: limits: @@ -311,148 +314,148 @@ template: runAsNonRoot: false runAsUser: -7735837526010191986 seLinuxOptions: - level: "278" - role: "276" - type: "277" - user: "275" + level: "281" + role: "279" + type: "280" + user: "278" windowsOptions: - gmsaCredentialSpec: "280" - gmsaCredentialSpecName: "279" - runAsUserName: "281" + gmsaCredentialSpec: "283" + gmsaCredentialSpecName: "282" + runAsUserName: "284" stdin: true - terminationMessagePath: "274" + terminationMessagePath: "277" terminationMessagePolicy: źȰ?$矡ȶ网棊ʢ=wǕɳ volumeDevices: - - devicePath: "246" - name: "245" + - devicePath: "249" + name: "248" volumeMounts: - - mountPath: "242" + - mountPath: "245" mountPropagation: '>懔%熷谟þ蛯ɰ荶ljʁ揆ɘȌ脾嚏吐' - name: "241" + name: "244" readOnly: true - subPath: "243" - subPathExpr: "244" - workingDir: "225" + subPath: "246" + subPathExpr: "247" + workingDir: "228" dnsConfig: nameservers: - - "409" + - "412" options: - - name: "411" - value: "412" + - name: "414" + value: "415" searches: - - "410" + - "413" dnsPolicy: Ǒ enableServiceLinks: false ephemeralContainers: - args: - - "285" + - "288" command: - - "284" + - "287" env: - - name: "292" - value: "293" + - name: "295" + value: "296" valueFrom: configMapKeyRef: - key: "299" - name: "298" + key: "302" + name: "301" optional: false fieldRef: - apiVersion: "294" - fieldPath: "295" + apiVersion: "297" + fieldPath: "298" resourceFieldRef: - containerName: "296" + containerName: "299" divisor: "340" - resource: "297" + resource: "300" secretKeyRef: - key: "301" - name: "300" + key: "304" + name: "303" optional: true envFrom: - configMapRef: - name: "290" + name: "293" optional: true - prefix: "289" + prefix: "292" secretRef: - name: "291" + name: "294" optional: true - image: "283" + image: "286" imagePullPolicy: 冓鍓贯 lifecycle: postStart: exec: command: - - "322" + - "325" httpGet: - host: "325" + host: "328" httpHeaders: - - name: "326" - value: "327" - path: "323" - port: "324" + - name: "329" + value: "330" + path: "326" + port: "327" scheme: '%皧V垾现葢ŵ橨鬶l獕;跣Hǝcw媀瓄' tcpSocket: - host: "329" - port: "328" + host: "332" + port: "331" preStop: exec: command: - - "330" + - "333" httpGet: - host: "333" + host: "336" httpHeaders: - - name: "334" - value: "335" - path: "331" - port: "332" + - name: "337" + value: "338" + path: "334" + port: "335" scheme: 锏ɟ4Ǒ輂,ŕĪĠM蘇KŅ/»頸 tcpSocket: - host: "336" + host: "339" port: 1315054653 livenessProbe: exec: command: - - "308" + - "311" failureThreshold: 1941923625 httpGet: - host: "311" + host: "314" httpHeaders: - - name: "312" - value: "313" - path: "309" - port: "310" + - name: "315" + value: "316" + path: "312" + port: "313" scheme: 忊|E剒 initialDelaySeconds: -1313320434 periodSeconds: 465972736 successThreshold: -1784617397 tcpSocket: - host: "314" + host: "317" port: 1004325340 timeoutSeconds: 14304392 - name: "282" + name: "285" ports: - containerPort: 1040396664 - hostIP: "288" + hostIP: "291" hostPort: -602419938 - name: "287" + name: "290" protocol: 爻ƙt叀碧闳ȩr嚧ʣq埄 readinessProbe: exec: command: - - "315" + - "318" failureThreshold: 656200799 httpGet: - host: "317" + host: "320" httpHeaders: - - name: "318" - value: "319" - path: "316" + - name: "321" + value: "322" + path: "319" port: 432291364 initialDelaySeconds: -677617960 periodSeconds: -1717997927 successThreshold: 1533365989 tcpSocket: - host: "321" - port: "320" + host: "324" + port: "323" timeoutSeconds: 383015301 resources: limits: @@ -473,150 +476,150 @@ template: runAsNonRoot: false runAsUser: -500234369132816308 seLinuxOptions: - level: "341" - role: "339" - type: "340" - user: "338" + level: "344" + role: "342" + type: "343" + user: "341" windowsOptions: - gmsaCredentialSpec: "343" - gmsaCredentialSpecName: "342" - runAsUserName: "344" + gmsaCredentialSpec: "346" + gmsaCredentialSpecName: "345" + runAsUserName: "347" stdin: true stdinOnce: true - targetContainerName: "345" - terminationMessagePath: "337" + targetContainerName: "348" + terminationMessagePath: "340" terminationMessagePolicy: 蚃ɣľ)酊龨δ摖ȱ tty: true volumeDevices: - - devicePath: "307" - name: "306" + - devicePath: "310" + name: "309" volumeMounts: - - mountPath: "303" + - mountPath: "306" mountPropagation: 敄lu| - name: "302" + name: "305" readOnly: true - subPath: "304" - subPathExpr: "305" - workingDir: "286" + subPath: "307" + subPathExpr: "308" + workingDir: "289" hostAliases: - hostnames: - - "407" - ip: "406" + - "410" + ip: "409" hostIPC: true hostPID: true - hostname: "361" + hostname: "364" imagePullSecrets: - - name: "360" + - name: "363" initContainers: - args: - - "164" + - "167" command: - - "163" + - "166" env: - - name: "171" - value: "172" + - name: "174" + value: "175" valueFrom: configMapKeyRef: - key: "178" - name: "177" + key: "181" + name: "180" optional: false fieldRef: - apiVersion: "173" - fieldPath: "174" + apiVersion: "176" + fieldPath: "177" resourceFieldRef: - containerName: "175" + containerName: "178" divisor: "618" - resource: "176" + resource: "179" secretKeyRef: - key: "180" - name: "179" + key: "183" + name: "182" optional: false envFrom: - configMapRef: - name: "169" + name: "172" optional: false - prefix: "168" + prefix: "171" secretRef: - name: "170" + name: "173" optional: true - image: "162" + image: "165" imagePullPolicy: 4y£軶ǃ*ʙ嫙&蒒5 lifecycle: postStart: exec: command: - - "199" + - "202" httpGet: - host: "202" + host: "205" httpHeaders: - - name: "203" - value: "204" - path: "200" - port: "201" + - name: "206" + value: "207" + path: "203" + port: "204" scheme: Ɖ立hdz緄Ú|dk_瀹鞎 tcpSocket: - host: "205" + host: "208" port: 1150375229 preStop: exec: command: - - "206" + - "209" httpGet: - host: "209" + host: "212" httpHeaders: - - name: "210" - value: "211" - path: "207" - port: "208" + - name: "213" + value: "214" + path: "210" + port: "211" scheme: '鲡:' tcpSocket: - host: "212" + host: "215" port: -2037320199 livenessProbe: exec: command: - - "187" + - "190" failureThreshold: -559252309 httpGet: - host: "189" + host: "192" httpHeaders: - - name: "190" - value: "191" - path: "188" + - name: "193" + value: "194" + path: "191" port: -575512248 scheme: ɨ銦妰黖ȓƇ$缔獵偐ę腬瓷碑=ɉ initialDelaySeconds: -1846991380 periodSeconds: -1398498492 successThreshold: -2035009296 tcpSocket: - host: "192" + host: "195" port: 1180382332 timeoutSeconds: 325236550 - name: "161" + name: "164" ports: - containerPort: 38897467 - hostIP: "167" + hostIP: "170" hostPort: 580681683 - name: "166" + name: "169" protocol: h0åȂ町恰nj揠 readinessProbe: exec: command: - - "193" + - "196" failureThreshold: 1427781619 httpGet: - host: "195" + host: "198" httpHeaders: - - name: "196" - value: "197" - path: "194" + - name: "199" + value: "200" + path: "197" port: 1403721475 scheme: ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳 initialDelaySeconds: -1327537699 periodSeconds: -1941847253 successThreshold: 1596028039 tcpSocket: - host: "198" + host: "201" port: -2064174383 timeoutSeconds: 483512911 resources: @@ -638,72 +641,72 @@ template: runAsNonRoot: true runAsUser: -3150075726777852858 seLinuxOptions: - level: "217" - role: "215" - type: "216" - user: "214" + level: "220" + role: "218" + type: "219" + user: "217" windowsOptions: - gmsaCredentialSpec: "219" - gmsaCredentialSpecName: "218" - runAsUserName: "220" + gmsaCredentialSpec: "222" + gmsaCredentialSpecName: "221" + runAsUserName: "223" stdinOnce: true - terminationMessagePath: "213" + terminationMessagePath: "216" terminationMessagePolicy: '@Ȗs«öʮĀ<é瞾' tty: true volumeDevices: - - devicePath: "186" - name: "185" + - devicePath: "189" + name: "188" volumeMounts: - - mountPath: "182" + - mountPath: "185" mountPropagation: 咻痗ȡmƴy綸_Ú8參遼ūPH炮掊° - name: "181" + name: "184" readOnly: true - subPath: "183" - subPathExpr: "184" - workingDir: "165" - nodeName: "350" + subPath: "186" + subPathExpr: "187" + workingDir: "168" + nodeName: "353" nodeSelector: - "346": "347" + "349": "350" overhead: 4'ď曕椐敛n湙: "310" preemptionPolicy: '!ń1ċƹ|慼櫁色苆试揯遐' priority: -1852730577 - priorityClassName: "408" + priorityClassName: "411" readinessGates: - conditionType: ź魊塾ɖ$rolȋɶuɋ5r儉ɩ柀ɨ鴅 restartPolicy: ǦŐnj汰8ŕİi騎C" - runtimeClassName: "413" - schedulerName: "403" + runtimeClassName: "416" + schedulerName: "406" securityContext: fsGroup: -1335795712555820375 runAsGroup: 3557544419897236324 runAsNonRoot: true runAsUser: 4608737617101049023 seLinuxOptions: - level: "354" - role: "352" - type: "353" - user: "351" + level: "357" + role: "355" + type: "356" + user: "354" supplementalGroups: - 5014869561632118364 sysctls: - - name: "358" - value: "359" + - name: "361" + value: "362" windowsOptions: - gmsaCredentialSpec: "356" - gmsaCredentialSpecName: "355" - runAsUserName: "357" - serviceAccount: "349" - serviceAccountName: "348" + gmsaCredentialSpec: "359" + gmsaCredentialSpecName: "358" + runAsUserName: "360" + serviceAccount: "352" + serviceAccountName: "351" shareProcessNamespace: false - subdomain: "362" + subdomain: "365" terminationGracePeriodSeconds: 2582126978155733738 tolerations: - effect: ŽɣB矗E¸乾 - key: "404" + key: "407" operator: 堺ʣ tolerationSeconds: -3532804738923434397 - value: "405" + value: "408" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -714,207 +717,207 @@ template: matchLabels: p2djmscp--ac8u23-k----26u5--72n-5.j8-0020-1-5/t5W_._._-2M2._i: wvU maxSkew: -150478704 - topologyKey: "414" + topologyKey: "417" whenUnsatisfiable: ;鹡鑓侅闍ŏŃŋŏ}ŀ volumes: - awsElasticBlockStore: - fsType: "61" + fsType: "64" partition: -104666658 readOnly: true - volumeID: "60" + volumeID: "63" azureDisk: cachingMode: ʜǝ鿟ldg滠鼍ƭt - diskName: "124" - diskURI: "125" - fsType: "126" + diskName: "127" + diskURI: "128" + fsType: "129" kind: ȫşŇɜa readOnly: true azureFile: - secretName: "110" - shareName: "111" + secretName: "113" + shareName: "114" cephfs: monitors: - - "95" - path: "96" - secretFile: "98" + - "98" + path: "99" + secretFile: "101" secretRef: - name: "99" - user: "97" + name: "102" + user: "100" cinder: - fsType: "93" + fsType: "96" readOnly: true secretRef: - name: "94" - volumeID: "92" + name: "97" + volumeID: "95" configMap: defaultMode: -599608368 items: - - key: "113" + - key: "116" mode: -1194714697 - path: "114" - name: "112" + path: "117" + name: "115" optional: true csi: - driver: "156" - fsType: "157" + driver: "159" + fsType: "160" nodePublishSecretRef: - name: "160" + name: "163" readOnly: true volumeAttributes: - "158": "159" + "161": "162" downwardAPI: defaultMode: 1801487647 items: - fieldRef: - apiVersion: "103" - fieldPath: "104" + apiVersion: "106" + fieldPath: "107" mode: 1322858613 - path: "102" + path: "105" resourceFieldRef: - containerName: "105" + containerName: "108" divisor: "889" - resource: "106" + resource: "109" emptyDir: medium: 踓Ǻǧ湬淊kŪ睴鸏:ɥ³ƞsɁ8^ʥ sizeLimit: "681" fc: - fsType: "108" + fsType: "111" lun: 1169718433 targetWWNs: - - "107" + - "110" wwids: - - "109" + - "112" flexVolume: - driver: "87" - fsType: "88" + driver: "90" + fsType: "91" options: - "90": "91" + "93": "94" readOnly: true secretRef: - name: "89" + name: "92" flocker: - datasetName: "100" - datasetUUID: "101" + datasetName: "103" + datasetUUID: "104" gcePersistentDisk: - fsType: "59" + fsType: "62" partition: 2065358741 - pdName: "58" + pdName: "61" readOnly: true gitRepo: - directory: "64" - repository: "62" - revision: "63" + directory: "67" + repository: "65" + revision: "66" glusterfs: - endpoints: "77" - path: "78" + endpoints: "80" + path: "81" hostPath: - path: "57" + path: "60" type: /淹\韲翁&ʢsɜ曢\%枅:=ǛƓ iscsi: chapAuthSession: true - fsType: "73" - initiatorName: "76" - iqn: "71" - iscsiInterface: "72" + fsType: "76" + initiatorName: "79" + iqn: "74" + iscsiInterface: "75" lun: -663180249 portals: - - "74" + - "77" readOnly: true secretRef: - name: "75" - targetPortal: "70" - name: "56" + name: "78" + targetPortal: "73" + name: "59" nfs: - path: "69" - server: "68" + path: "72" + server: "71" persistentVolumeClaim: - claimName: "79" + claimName: "82" photonPersistentDisk: - fsType: "128" - pdID: "127" + fsType: "131" + pdID: "130" portworxVolume: - fsType: "143" + fsType: "146" readOnly: true - volumeID: "142" + volumeID: "145" projected: defaultMode: -1980941277 sources: - configMap: items: - - key: "138" + - key: "141" mode: 1730325900 - path: "139" - name: "137" + path: "142" + name: "140" optional: true downwardAPI: items: - fieldRef: - apiVersion: "133" - fieldPath: "134" + apiVersion: "136" + fieldPath: "137" mode: -555780268 - path: "132" + path: "135" resourceFieldRef: - containerName: "135" + containerName: "138" divisor: "952" - resource: "136" + resource: "139" secret: items: - - key: "130" + - key: "133" mode: 782113097 - path: "131" - name: "129" + path: "134" + name: "132" optional: true serviceAccountToken: - audience: "140" + audience: "143" expirationSeconds: -2937394236764575757 - path: "141" + path: "144" quobyte: - group: "122" + group: "125" readOnly: true - registry: "119" - tenant: "123" - user: "121" - volume: "120" + registry: "122" + tenant: "126" + user: "124" + volume: "123" rbd: - fsType: "82" - image: "81" - keyring: "85" + fsType: "85" + image: "84" + keyring: "88" monitors: - - "80" - pool: "83" + - "83" + pool: "86" readOnly: true secretRef: - name: "86" - user: "84" + name: "89" + user: "87" scaleIO: - fsType: "151" - gateway: "144" - protectionDomain: "147" + fsType: "154" + gateway: "147" + protectionDomain: "150" secretRef: - name: "146" + name: "149" sslEnabled: true - storageMode: "149" - storagePool: "148" - system: "145" - volumeName: "150" + storageMode: "152" + storagePool: "151" + system: "148" + volumeName: "153" secret: defaultMode: 1655406148 items: - - key: "66" + - key: "69" mode: 1648350164 - path: "67" + path: "70" optional: true - secretName: "65" + secretName: "68" storageos: - fsType: "154" + fsType: "157" readOnly: true secretRef: - name: "155" - volumeName: "152" - volumeNamespace: "153" + name: "158" + volumeName: "155" + volumeNamespace: "156" vsphereVolume: - fsType: "116" - storagePolicyID: "118" - storagePolicyName: "117" - volumePath: "115" + fsType: "119" + storagePolicyID: "121" + storagePolicyName: "120" + volumePath: "118" ttlSecondsAfterFinished: 920774957 diff --git a/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.json b/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.json index 078971e29a1..8b5940d5698 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.json +++ b/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -44,14 +45,14 @@ "usages": [ "J枊a" ], - "username": "18", - "uid": "19", + "username": "19", + "uid": "20", "groups": [ - "20" + "21" ], "extra": { - "21": [ - "22" + "22": [ + "23" ] } }, @@ -59,8 +60,8 @@ "conditions": [ { "type": "o,c鮽ort昍řČ扷5Ɨ", - "reason": "23", - "message": "24", + "reason": "24", + "message": "25", "lastUpdateTime": "2901-11-14T22:54:07Z" } ], diff --git a/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.pb b/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.pb index dee8b798a0b..c04fd179299 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.pb and b/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.yaml b/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.yaml index d0b3eafb5e8..166322dcd90 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/certificates.k8s.io.v1beta1.CertificateSigningRequest.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -30,19 +31,19 @@ metadata: uid: "7" spec: extra: - "21": - - "22" + "22": + - "23" groups: - - "20" + - "21" request: OA== - uid: "19" + uid: "20" usages: - J枊a - username: "18" + username: "19" status: certificate: 9Q== conditions: - lastUpdateTime: "2901-11-14T22:54:07Z" - message: "24" - reason: "23" + message: "25" + reason: "24" type: o,c鮽ort昍řČ扷5Ɨ diff --git a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.json b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.json index 028dafedec8..062943538d6 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.json +++ b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.json @@ -35,12 +35,13 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { - "holderIdentity": "18", + "holderIdentity": "19", "leaseDurationSeconds": 896585016, "leaseTransitions": 1305381319 } diff --git a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.pb b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.pb index c71d5c32296..a97de023e68 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.pb and b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.yaml b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.yaml index 64858d90311..5af1769990b 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,6 +30,6 @@ metadata: selfLink: "5" uid: "7" spec: - holderIdentity: "18" + holderIdentity: "19" leaseDurationSeconds: 896585016 leaseTransitions: 1305381319 diff --git a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.json b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.json index 522a2ad9d2f..2361dd18c1d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.json +++ b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.json @@ -35,12 +35,13 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { - "holderIdentity": "18", + "holderIdentity": "19", "leaseDurationSeconds": 896585016, "leaseTransitions": 1305381319 } diff --git a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.pb b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.pb index 04665a5d8aa..f33af86899f 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.pb and b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.yaml b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.yaml index f01d1c3bba4..a529937f768 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1beta1.Lease.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,6 +30,6 @@ metadata: selfLink: "5" uid: "7" spec: - holderIdentity: "18" + holderIdentity: "19" leaseDurationSeconds: 896585016 leaseTransitions: 1305381319 diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.json index 3f613c9709b..509608107a8 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.json @@ -35,17 +35,18 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "target": { - "kind": "18", - "namespace": "19", - "name": "20", + "kind": "19", + "namespace": "20", + "name": "21", "uid": "īqJ枊a8衍`Ĩɘ.蘯", - "apiVersion": "21", - "resourceVersion": "22", - "fieldPath": "23" + "apiVersion": "22", + "resourceVersion": "23", + "fieldPath": "24" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.pb index 967727fa4be..5eb7775ffeb 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.yaml index 9899d27bfe1..b66bc4dae74 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Binding.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,10 +30,10 @@ metadata: selfLink: "5" uid: "7" target: - apiVersion: "21" - fieldPath: "23" - kind: "18" - name: "20" - namespace: "19" - resourceVersion: "22" + apiVersion: "22" + fieldPath: "24" + kind: "19" + name: "21" + namespace: "20" + resourceVersion: "23" uid: īqJ枊a8衍`Ĩɘ.蘯 diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.json index b46a0bfd70d..c1064a19e9b 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -43,8 +44,8 @@ { "type": "@Hr鯹)晿", "status": "`Ĩɘ.蘯6ċ", - "message": "18", - "error": "19" + "message": "19", + "error": "20" } ] } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.pb index c59d3029adf..6a92a2a1be2 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.yaml index e0a585f0f36..376a732b083 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ComponentStatus.yaml @@ -1,7 +1,7 @@ apiVersion: v1 conditions: -- error: "19" - message: "18" +- error: "20" + message: "19" status: '`Ĩɘ.蘯6ċ' type: '@Hr鯹)晿' kind: ComponentStatus @@ -19,6 +19,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.json index e782b3b0439..a91df63f34c 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.json @@ -35,14 +35,15 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "data": { - "18": "19" + "19": "20" }, "binaryData": { - "20": "Dg==" + "21": "Dg==" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.pb index bb5ca377275..cffad0fbe14 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.yaml index 943600d0681..33a2fc3fb7b 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ConfigMap.yaml @@ -1,8 +1,8 @@ apiVersion: v1 binaryData: - "20": Dg== + "21": Dg== data: - "18": "19" + "19": "20" kind: ConfigMap metadata: annotations: @@ -18,6 +18,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.json index 6585f4e7295..48a7dddca4e 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -43,39 +44,39 @@ { "addresses": [ { - "ip": "18", - "hostname": "19", - "nodeName": "20", + "ip": "19", + "hostname": "20", + "nodeName": "21", "targetRef": { - "kind": "21", - "namespace": "22", - "name": "23", + "kind": "22", + "namespace": "23", + "name": "24", "uid": "Hr鯹)晿\u003co,c鮽ort昍řČ扷5Ɨ", - "apiVersion": "24", - "resourceVersion": "25", - "fieldPath": "26" + "apiVersion": "25", + "resourceVersion": "26", + "fieldPath": "27" } } ], "notReadyAddresses": [ { - "ip": "27", - "hostname": "28", - "nodeName": "29", + "ip": "28", + "hostname": "29", + "nodeName": "30", "targetRef": { - "kind": "30", - "namespace": "31", - "name": "32", + "kind": "31", + "namespace": "32", + "name": "33", "uid": "Ă凗蓏Ŋ蛊ĉy", - "apiVersion": "33", - "resourceVersion": "34", - "fieldPath": "35" + "apiVersion": "34", + "resourceVersion": "35", + "fieldPath": "36" } } ], "ports": [ { - "name": "36", + "name": "37", "port": 1546792211, "protocol": "\u003eŽ燹憍峕?狱³-Ǐ忄*" } diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.pb index 4efe9a73386..6156ed64db0 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.yaml index a9ccfda3275..9a4cf7bbc8d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Endpoints.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -30,30 +31,30 @@ metadata: uid: "7" subsets: - addresses: - - hostname: "19" - ip: "18" - nodeName: "20" + - hostname: "20" + ip: "19" + nodeName: "21" targetRef: - apiVersion: "24" - fieldPath: "26" - kind: "21" - name: "23" - namespace: "22" - resourceVersion: "25" + apiVersion: "25" + fieldPath: "27" + kind: "22" + name: "24" + namespace: "23" + resourceVersion: "26" uid: Hr鯹)晿Ž燹憍峕?狱³-Ǐ忄*' diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.json index 4cf3c2fba8e..50727b8df17 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.json @@ -35,64 +35,65 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "ephemeralContainers": [ { - "name": "18", - "image": "19", + "name": "19", + "image": "20", "command": [ - "20" - ], - "args": [ "21" ], - "workingDir": "22", + "args": [ + "22" + ], + "workingDir": "23", "ports": [ { - "name": "23", + "name": "24", "hostPort": 1305381319, "containerPort": -1300313567, - "hostIP": "24" + "hostIP": "25" } ], "envFrom": [ { - "prefix": "25", + "prefix": "26", "configMapRef": { - "name": "26", + "name": "27", "optional": false }, "secretRef": { - "name": "27", + "name": "28", "optional": false } } ], "env": [ { - "name": "28", - "value": "29", + "name": "29", + "value": "30", "valueFrom": { "fieldRef": { - "apiVersion": "30", - "fieldPath": "31" + "apiVersion": "31", + "fieldPath": "32" }, "resourceFieldRef": { - "containerName": "32", - "resource": "33", + "containerName": "33", + "resource": "34", "divisor": "12" }, "configMapKeyRef": { - "name": "34", - "key": "35", + "name": "35", + "key": "36", "optional": false }, "secretKeyRef": { - "name": "36", - "key": "37", + "name": "37", + "key": "38", "optional": false } } @@ -108,40 +109,40 @@ }, "volumeMounts": [ { - "name": "38", - "mountPath": "39", - "subPath": "40", + "name": "39", + "mountPath": "40", + "subPath": "41", "mountPropagation": "憍峕?狱³-Ǐ忄*", - "subPathExpr": "41" + "subPathExpr": "42" } ], "volumeDevices": [ { - "name": "42", - "devicePath": "43" + "name": "43", + "devicePath": "44" } ], "livenessProbe": { "exec": { "command": [ - "44" + "45" ] }, "httpGet": { - "path": "45", - "port": "46", - "host": "47", + "path": "46", + "port": "47", + "host": "48", "scheme": "亞螩B峅x4%a鯿rŎǀ朲^苣fƼ@h", "httpHeaders": [ { - "name": "48", - "value": "49" + "name": "49", + "value": "50" } ] }, "tcpSocket": { "port": 1366345526, - "host": "50" + "host": "51" }, "initialDelaySeconds": 1392988974, "timeoutSeconds": 1563658126, @@ -152,24 +153,24 @@ "readinessProbe": { "exec": { "command": [ - "51" + "52" ] }, "httpGet": { - "path": "52", - "port": "53", - "host": "54", + "path": "53", + "port": "54", + "host": "55", "scheme": "OŖ樅尷", "httpHeaders": [ { - "name": "55", - "value": "56" + "name": "56", + "value": "57" } ] }, "tcpSocket": { "port": 2136826132, - "host": "57" + "host": "58" }, "initialDelaySeconds": 819364842, "timeoutSeconds": 933484239, @@ -181,50 +182,50 @@ "postStart": { "exec": { "command": [ - "58" + "59" ] }, "httpGet": { - "path": "59", + "path": "60", "port": 1114837452, - "host": "60", + "host": "61", "httpHeaders": [ { - "name": "61", - "value": "62" + "name": "62", + "value": "63" } ] }, "tcpSocket": { "port": 672648281, - "host": "63" + "host": "64" } }, "preStop": { "exec": { "command": [ - "64" + "65" ] }, "httpGet": { - "path": "65", - "port": "66", - "host": "67", + "path": "66", + "port": "67", + "host": "68", "scheme": "魋Ď儇击3ƆìQ喞艋涽", "httpHeaders": [ { - "name": "68", - "value": "69" + "name": "69", + "value": "70" } ] }, "tcpSocket": { - "port": "70", - "host": "71" + "port": "71", + "host": "72" } } }, - "terminationMessagePath": "72", + "terminationMessagePath": "73", "terminationMessagePolicy": "w-檮Ǣ冖ž琔n宂¬轚9Ȏ瀮", "imagePullPolicy": "/", "securityContext": { @@ -238,15 +239,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "73", - "role": "74", - "type": "75", - "level": "76" + "user": "74", + "role": "75", + "type": "76", + "level": "77" }, "windowsOptions": { - "gmsaCredentialSpecName": "77", - "gmsaCredentialSpec": "78", - "runAsUserName": "79" + "gmsaCredentialSpecName": "78", + "gmsaCredentialSpec": "79", + "runAsUserName": "80" }, "runAsUser": -2195720433245498980, "runAsGroup": -3031446704001093654, @@ -256,7 +257,7 @@ "procMount": "1ZƜ/C龷" }, "stdinOnce": true, - "targetContainerName": "80" + "targetContainerName": "81" } ] } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.pb index 2217dcf96b5..4f85c0c4d86 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.yaml index 0fe4be5eef6..4aaeaaa09c2 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.EphemeralContainers.yaml @@ -1,112 +1,112 @@ apiVersion: v1 ephemeralContainers: - args: - - "21" + - "22" command: - - "20" + - "21" env: - - name: "28" - value: "29" + - name: "29" + value: "30" valueFrom: configMapKeyRef: - key: "35" - name: "34" + key: "36" + name: "35" optional: false fieldRef: - apiVersion: "30" - fieldPath: "31" + apiVersion: "31" + fieldPath: "32" resourceFieldRef: - containerName: "32" + containerName: "33" divisor: "12" - resource: "33" + resource: "34" secretKeyRef: - key: "37" - name: "36" + key: "38" + name: "37" optional: false envFrom: - configMapRef: - name: "26" - optional: false - prefix: "25" - secretRef: name: "27" optional: false - image: "19" + prefix: "26" + secretRef: + name: "28" + optional: false + image: "20" imagePullPolicy: / lifecycle: postStart: exec: command: - - "58" + - "59" httpGet: - host: "60" + host: "61" httpHeaders: - - name: "61" - value: "62" - path: "59" + - name: "62" + value: "63" + path: "60" port: 1114837452 tcpSocket: - host: "63" + host: "64" port: 672648281 preStop: exec: command: - - "64" + - "65" httpGet: - host: "67" + host: "68" httpHeaders: - - name: "68" - value: "69" - path: "65" - port: "66" + - name: "69" + value: "70" + path: "66" + port: "67" scheme: 魋Ď儇击3ƆìQ喞艋涽 tcpSocket: - host: "71" - port: "70" + host: "72" + port: "71" livenessProbe: exec: command: - - "44" + - "45" failureThreshold: -54954325 httpGet: - host: "47" + host: "48" httpHeaders: - - name: "48" - value: "49" - path: "45" - port: "46" + - name: "49" + value: "50" + path: "46" + port: "47" scheme: 亞螩B峅x4%a鯿rŎǀ朲^苣fƼ@h initialDelaySeconds: 1392988974 periodSeconds: -1771047449 successThreshold: -1280107919 tcpSocket: - host: "50" + host: "51" port: 1366345526 timeoutSeconds: 1563658126 - name: "18" + name: "19" ports: - containerPort: -1300313567 - hostIP: "24" + hostIP: "25" hostPort: 1305381319 - name: "23" + name: "24" readinessProbe: exec: command: - - "51" + - "52" failureThreshold: -833209928 httpGet: - host: "54" + host: "55" httpHeaders: - - name: "55" - value: "56" - path: "52" - port: "53" + - name: "56" + value: "57" + path: "53" + port: "54" scheme: OŖ樅尷 initialDelaySeconds: 819364842 periodSeconds: -983896210 successThreshold: 552512122 tcpSocket: - host: "57" + host: "58" port: 2136826132 timeoutSeconds: 933484239 resources: @@ -128,28 +128,28 @@ ephemeralContainers: runAsNonRoot: true runAsUser: -2195720433245498980 seLinuxOptions: - level: "76" - role: "74" - type: "75" - user: "73" + level: "77" + role: "75" + type: "76" + user: "74" windowsOptions: - gmsaCredentialSpec: "78" - gmsaCredentialSpecName: "77" - runAsUserName: "79" + gmsaCredentialSpec: "79" + gmsaCredentialSpecName: "78" + runAsUserName: "80" stdinOnce: true - targetContainerName: "80" - terminationMessagePath: "72" + targetContainerName: "81" + terminationMessagePath: "73" terminationMessagePolicy: w-檮Ǣ冖ž琔n宂¬轚9Ȏ瀮 volumeDevices: - - devicePath: "43" - name: "42" + - devicePath: "44" + name: "43" volumeMounts: - - mountPath: "39" + - mountPath: "40" mountPropagation: 憍峕?狱³-Ǐ忄* - name: "38" - subPath: "40" - subPathExpr: "41" - workingDir: "22" + name: "39" + subPath: "41" + subPathExpr: "42" + workingDir: "23" kind: EphemeralContainers metadata: annotations: @@ -165,6 +165,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.json index 3ff145aeb92..06616c570d7 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.json @@ -35,44 +35,45 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "involvedObject": { - "kind": "18", - "namespace": "19", - "name": "20", + "kind": "19", + "namespace": "20", + "name": "21", "uid": "īqJ枊a8衍`Ĩɘ.蘯", - "apiVersion": "21", - "resourceVersion": "22", - "fieldPath": "23" + "apiVersion": "22", + "resourceVersion": "23", + "fieldPath": "24" }, - "reason": "24", - "message": "25", + "reason": "25", + "message": "26", "source": { - "component": "26", - "host": "27" + "component": "27", + "host": "28" }, "firstTimestamp": "2958-05-23T21:23:39Z", "lastTimestamp": "2907-12-28T01:19:18Z", "count": -1492226764, - "type": "28", + "type": "29", "eventTime": "2530-04-08T07:06:28.046544Z", "series": { "count": 1266076158, "lastObservedTime": "2951-04-21T20:18:51.456715Z" }, - "action": "29", + "action": "30", "related": { - "kind": "30", - "namespace": "31", - "name": "32", + "kind": "31", + "namespace": "32", + "name": "33", "uid": "ʤ脽ěĂ凗蓏Ŋ蛊ĉy緅縕\u003eŽ", - "apiVersion": "33", - "resourceVersion": "34", - "fieldPath": "35" + "apiVersion": "34", + "resourceVersion": "35", + "fieldPath": "36" }, - "reportingComponent": "36", - "reportingInstance": "37" + "reportingComponent": "37", + "reportingInstance": "38" } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.pb index 5fcac4e219a..f059eb7195e 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.yaml index b57f62740a4..e3f26f31b6e 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Event.yaml @@ -1,19 +1,19 @@ -action: "29" +action: "30" apiVersion: v1 count: -1492226764 eventTime: "2530-04-08T07:06:28.046544Z" firstTimestamp: "2958-05-23T21:23:39Z" involvedObject: - apiVersion: "21" - fieldPath: "23" - kind: "18" - name: "20" - namespace: "19" - resourceVersion: "22" + apiVersion: "22" + fieldPath: "24" + kind: "19" + name: "21" + namespace: "20" + resourceVersion: "23" uid: īqJ枊a8衍`Ĩɘ.蘯 kind: Event lastTimestamp: "2907-12-28T01:19:18Z" -message: "25" +message: "26" metadata: annotations: "9": "10" @@ -28,6 +28,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -42,21 +43,21 @@ metadata: resourceVersion: "11042405498087606203" selfLink: "5" uid: "7" -reason: "24" +reason: "25" related: - apiVersion: "33" - fieldPath: "35" - kind: "30" - name: "32" - namespace: "31" - resourceVersion: "34" + apiVersion: "34" + fieldPath: "36" + kind: "31" + name: "33" + namespace: "32" + resourceVersion: "35" uid: ʤ脽ěĂ凗蓏Ŋ蛊ĉy緅縕>Ž -reportingComponent: "36" -reportingInstance: "37" +reportingComponent: "37" +reportingInstance: "38" series: count: 1266076158 lastObservedTime: "2951-04-21T20:18:51.456715Z" source: - component: "26" - host: "27" -type: "28" + component: "27" + host: "28" +type: "29" diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.json index 898a3322bf9..5c7e2b0ffc4 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.pb index 294e65c9c6d..51520e2be20 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.yaml index cedab4a9a6d..e71ffd35092 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.LimitRange.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.json index dcbc4f9be15..5f04ce62e34 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.pb index 5e973494879..ffa9566d23e 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.yaml index e855ef2a337..82b15606605 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Namespace.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.json index 81c487d5436..3acd7885b91 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.json @@ -35,33 +35,34 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { - "podCIDR": "18", + "podCIDR": "19", "podCIDRs": [ - "19" + "20" ], - "providerID": "20", + "providerID": "21", "taints": [ { - "key": "21", - "value": "22", + "key": "22", + "value": "23", "effect": "Hr鯹)晿\u003co,c鮽ort昍řČ扷5Ɨ" } ], "configSource": { "configMap": { - "namespace": "23", - "name": "24", + "namespace": "24", + "name": "25", "uid": "Ă凗蓏Ŋ蛊ĉy", - "resourceVersion": "25", - "kubeletConfigKey": "26" + "resourceVersion": "26", + "kubeletConfigKey": "27" } }, - "externalID": "27" + "externalID": "28" }, "status": { "capacity": { @@ -77,14 +78,14 @@ "status": "P$Iņɖ橙9ȫŚʒ", "lastHeartbeatTime": "2339-08-25T14:46:58Z", "lastTransitionTime": "2681-06-13T05:43:15Z", - "reason": "28", - "message": "29" + "reason": "29", + "message": "30" } ], "addresses": [ { "type": "OŖ樅尷", - "address": "30" + "address": "31" } ], "daemonEndpoints": { @@ -93,21 +94,21 @@ } }, "nodeInfo": { - "machineID": "31", - "systemUUID": "32", - "bootID": "33", - "kernelVersion": "34", - "osImage": "35", - "containerRuntimeVersion": "36", - "kubeletVersion": "37", - "kubeProxyVersion": "38", - "operatingSystem": "39", - "architecture": "40" + "machineID": "32", + "systemUUID": "33", + "bootID": "34", + "kernelVersion": "35", + "osImage": "36", + "containerRuntimeVersion": "37", + "kubeletVersion": "38", + "kubeProxyVersion": "39", + "operatingSystem": "40", + "architecture": "41" }, "images": [ { "names": [ - "41" + "42" ], "sizeBytes": 9177598355370950419 } @@ -118,38 +119,38 @@ "volumesAttached": [ { "name": "ȭ%ƎÜ掸8½£.vǴʌ鴜Ł%ŨȈ", - "devicePath": "42" + "devicePath": "43" } ], "config": { "assigned": { "configMap": { - "namespace": "43", - "name": "44", + "namespace": "44", + "name": "45", "uid": "£趕ã/鈱$-议}ȧ外ĺ", - "resourceVersion": "45", - "kubeletConfigKey": "46" + "resourceVersion": "46", + "kubeletConfigKey": "47" } }, "active": { "configMap": { - "namespace": "47", - "name": "48", + "namespace": "48", + "name": "49", "uid": "譋娲瘹ɭȊɚɎ(", - "resourceVersion": "49", - "kubeletConfigKey": "50" + "resourceVersion": "50", + "kubeletConfigKey": "51" } }, "lastKnownGood": { "configMap": { - "namespace": "51", - "name": "52", + "namespace": "52", + "name": "53", "uid": "ėf倐ȓ圬剴扲ȿQZ{ʁgɸ", - "resourceVersion": "53", - "kubeletConfigKey": "54" + "resourceVersion": "54", + "kubeletConfigKey": "55" } }, - "error": "55" + "error": "56" } } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.pb index 09f0dd59b0a..32335935df6 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.yaml index cf12c83ad25..e17d86f8193 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Node.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -31,23 +32,23 @@ metadata: spec: configSource: configMap: - kubeletConfigKey: "26" - name: "24" - namespace: "23" - resourceVersion: "25" + kubeletConfigKey: "27" + name: "25" + namespace: "24" + resourceVersion: "26" uid: Ă凗蓏Ŋ蛊ĉy - externalID: "27" - podCIDR: "18" + externalID: "28" + podCIDR: "19" podCIDRs: - - "19" - providerID: "20" + - "20" + providerID: "21" taints: - effect: Hr鯹)晿,趐V曡88 u怞荊ù灹8緔Tj - key: "368" + key: "369" operator: Ź黷`嵐;Ƭ婦d%蹶/ʗp壥Ƥ揤郡ɑ鮽 tolerationSeconds: -5478084374918590218 - value: "369" + value: "370" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -634,322 +635,322 @@ spec: matchLabels: 1rhm-5y--z-0/5eQ9: dU-_s-mtA.W5_-5_.V1-rU.___06.eqk5E_-4-.XH-.k.7.l_-W8o._xJ1-lFAX maxSkew: 558113557 - topologyKey: "378" + topologyKey: "379" whenUnsatisfiable: ĵ'o儿Ƭ銭u裡_Ơ9oÕęȄ怈 volumes: - awsElasticBlockStore: - fsType: "23" + fsType: "24" partition: 1001983654 - volumeID: "22" + volumeID: "23" azureDisk: cachingMode: ƕP喂ƈ - diskName: "86" - diskURI: "87" - fsType: "88" + diskName: "87" + diskURI: "88" + fsType: "89" kind: "" readOnly: false azureFile: - secretName: "72" - shareName: "73" + secretName: "73" + shareName: "74" cephfs: monitors: - - "57" - path: "58" - secretFile: "60" + - "58" + path: "59" + secretFile: "61" secretRef: - name: "61" - user: "59" + name: "62" + user: "60" cinder: - fsType: "55" + fsType: "56" readOnly: true secretRef: - name: "56" - volumeID: "54" + name: "57" + volumeID: "55" configMap: defaultMode: 172857432 items: - - key: "75" + - key: "76" mode: 1392988974 - path: "76" - name: "74" + path: "77" + name: "75" optional: true csi: - driver: "118" - fsType: "119" + driver: "119" + fsType: "120" nodePublishSecretRef: - name: "122" + name: "123" readOnly: true volumeAttributes: - "120": "121" + "121": "122" downwardAPI: defaultMode: 1246233319 items: - fieldRef: - apiVersion: "65" - fieldPath: "66" + apiVersion: "66" + fieldPath: "67" mode: -1639873916 - path: "64" + path: "65" resourceFieldRef: - containerName: "67" + containerName: "68" divisor: "387" - resource: "68" + resource: "69" emptyDir: medium: Ƣ6/ʕVŚ(ĿȊ甞 sizeLimit: "776" fc: - fsType: "70" + fsType: "71" lun: -1876826602 targetWWNs: - - "69" + - "70" wwids: - - "71" + - "72" flexVolume: - driver: "49" - fsType: "50" + driver: "50" + fsType: "51" options: - "52": "53" + "53": "54" secretRef: - name: "51" + name: "52" flocker: - datasetName: "62" - datasetUUID: "63" + datasetName: "63" + datasetUUID: "64" gcePersistentDisk: - fsType: "21" + fsType: "22" partition: -123438221 - pdName: "20" + pdName: "21" readOnly: true gitRepo: - directory: "26" - repository: "24" - revision: "25" + directory: "27" + repository: "25" + revision: "26" glusterfs: - endpoints: "39" - path: "40" + endpoints: "40" + path: "41" hostPath: - path: "19" + path: "20" type: Hr鯹)晿 priority: 1792673033 - priorityClassName: "389" + priorityClassName: "391" readinessGates: - conditionType: q塨Ý-扚聧扈4ƫZɀȩ愉BʟƮƙ2詃 restartPolicy: U髷裎$MVȟ@7飣奺Ȋ - runtimeClassName: "394" - schedulerName: "384" + runtimeClassName: "396" + schedulerName: "386" securityContext: fsGroup: -609644235388870309 runAsGroup: 43374460844024823 runAsNonRoot: false runAsUser: 6546717103134456682 seLinuxOptions: - level: "335" - role: "333" - type: "334" - user: "332" + level: "337" + role: "335" + type: "336" + user: "334" supplementalGroups: - -5030126702697967530 sysctls: - - name: "339" - value: "340" + - name: "341" + value: "342" windowsOptions: - gmsaCredentialSpec: "337" - gmsaCredentialSpecName: "336" - runAsUserName: "338" - serviceAccount: "330" - serviceAccountName: "329" + gmsaCredentialSpec: "339" + gmsaCredentialSpecName: "338" + runAsUserName: "340" + serviceAccount: "332" + serviceAccountName: "331" shareProcessNamespace: false - subdomain: "343" + subdomain: "345" terminationGracePeriodSeconds: -1448436097540110204 tolerations: - effect: ʗp壥Ƥ揤郡ɑ鮽ǍJB膾扉A­ - key: "385" + key: "387" operator: $|gɳ礬.b屏ɧe tolerationSeconds: -6703183907837349431 - value: "386" + value: "388" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -671,202 +673,202 @@ template: ? l-d-8o1-x-1wl----f31-0-2t3z-w5----7-z-63-z---5r-v-5-e-m8.o-20st4-7--i1-8miw-7a-2404/5y_AzOBW.9oE9_6.--v17r__.2bIZ___._6..tf-_u-3-_n0..KpS : "5.0" maxSkew: -1676200318 - topologyKey: "395" + topologyKey: "397" whenUnsatisfiable: 唞鹚蝉茲ʛ饊ɣKIJW volumes: - awsElasticBlockStore: - fsType: "39" + fsType: "41" partition: -1261508418 - volumeID: "38" + volumeID: "40" azureDisk: cachingMode: "" - diskName: "102" - diskURI: "103" - fsType: "104" + diskName: "104" + diskURI: "105" + fsType: "106" kind: ƺ魋Ď儇击3ƆìQ readOnly: false azureFile: - secretName: "88" - shareName: "89" + secretName: "90" + shareName: "91" cephfs: monitors: - - "73" - path: "74" - secretFile: "76" + - "75" + path: "76" + secretFile: "78" secretRef: - name: "77" - user: "75" + name: "79" + user: "77" cinder: - fsType: "71" + fsType: "73" secretRef: - name: "72" - volumeID: "70" + name: "74" + volumeID: "72" configMap: defaultMode: -1648533063 items: - - key: "91" + - key: "93" mode: 1913946997 - path: "92" - name: "90" + path: "94" + name: "92" optional: true csi: - driver: "134" - fsType: "135" + driver: "136" + fsType: "137" nodePublishSecretRef: - name: "138" + name: "140" readOnly: false volumeAttributes: - "136": "137" + "138": "139" downwardAPI: defaultMode: 1557090007 items: - fieldRef: - apiVersion: "81" - fieldPath: "82" + apiVersion: "83" + fieldPath: "84" mode: -1413529736 - path: "80" + path: "82" resourceFieldRef: - containerName: "83" + containerName: "85" divisor: "687" - resource: "84" + resource: "86" emptyDir: medium: x sizeLimit: "826" fc: - fsType: "86" + fsType: "88" lun: 933484239 targetWWNs: - - "85" - wwids: - "87" + wwids: + - "89" flexVolume: - driver: "65" - fsType: "66" + driver: "67" + fsType: "68" options: - "68": "69" + "70": "71" secretRef: - name: "67" + name: "69" flocker: - datasetName: "78" - datasetUUID: "79" + datasetName: "80" + datasetUUID: "81" gcePersistentDisk: - fsType: "37" + fsType: "39" partition: -1487653240 - pdName: "36" + pdName: "38" readOnly: true gitRepo: - directory: "42" - repository: "40" - revision: "41" + directory: "44" + repository: "42" + revision: "43" glusterfs: - endpoints: "55" - path: "56" + endpoints: "57" + path: "58" hostPath: - path: "35" + path: "37" type: H牗洝尿彀亞螩B iscsi: - fsType: "51" - initiatorName: "54" - iqn: "49" - iscsiInterface: "50" + fsType: "53" + initiatorName: "56" + iqn: "51" + iscsiInterface: "52" lun: -400609276 portals: - - "52" + - "54" secretRef: - name: "53" - targetPortal: "48" - name: "34" + name: "55" + targetPortal: "50" + name: "36" nfs: - path: "47" - server: "46" + path: "49" + server: "48" persistentVolumeClaim: - claimName: "57" + claimName: "59" readOnly: true photonPersistentDisk: - fsType: "106" - pdID: "105" + fsType: "108" + pdID: "107" portworxVolume: - fsType: "121" + fsType: "123" readOnly: true - volumeID: "120" + volumeID: "122" projected: defaultMode: -1880297089 sources: - configMap: items: - - key: "116" + - key: "118" mode: -1009864962 - path: "117" - name: "115" + path: "119" + name: "117" optional: true downwardAPI: items: - fieldRef: - apiVersion: "111" - fieldPath: "112" + apiVersion: "113" + fieldPath: "114" mode: 1167335696 - path: "110" + path: "112" resourceFieldRef: - containerName: "113" + containerName: "115" divisor: "546" - resource: "114" + resource: "116" secret: items: - - key: "108" + - key: "110" mode: 565864299 - path: "109" - name: "107" + path: "111" + name: "109" optional: true serviceAccountToken: - audience: "118" + audience: "120" expirationSeconds: -8033620543910768540 - path: "119" + path: "121" quobyte: - group: "100" - registry: "97" - tenant: "101" - user: "99" - volume: "98" + group: "102" + registry: "99" + tenant: "103" + user: "101" + volume: "100" rbd: - fsType: "60" - image: "59" - keyring: "63" + fsType: "62" + image: "61" + keyring: "65" monitors: - - "58" - pool: "61" + - "60" + pool: "63" readOnly: true secretRef: - name: "64" - user: "62" + name: "66" + user: "64" scaleIO: - fsType: "129" - gateway: "122" - protectionDomain: "125" + fsType: "131" + gateway: "124" + protectionDomain: "127" readOnly: true secretRef: - name: "124" + name: "126" sslEnabled: true - storageMode: "127" - storagePool: "126" - system: "123" - volumeName: "128" + storageMode: "129" + storagePool: "128" + system: "125" + volumeName: "130" secret: defaultMode: -1639873916 items: - - key: "44" + - key: "46" mode: -655946460 - path: "45" + path: "47" optional: true - secretName: "43" + secretName: "45" storageos: - fsType: "132" + fsType: "134" readOnly: true secretRef: - name: "133" - volumeName: "130" - volumeNamespace: "131" + name: "135" + volumeName: "132" + volumeNamespace: "133" vsphereVolume: - fsType: "94" - storagePolicyID: "96" - storagePolicyName: "95" - volumePath: "93" + fsType: "96" + storagePolicyID: "98" + storagePolicyName: "97" + volumePath: "95" diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.json index 061a3e2e897..5ed1d1aab5a 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.json @@ -35,10 +35,11 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, - "range": "18", + "range": "19", "data": "OA==" } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.pb index b2e0069564b..08ee3f1dc31 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.yaml index 4e2511ec557..1fb024dc9ec 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.RangeAllocation.yaml @@ -15,6 +15,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,4 +30,4 @@ metadata: resourceVersion: "11042405498087606203" selfLink: "5" uid: "7" -range: "18" +range: "19" diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.json index fa2aaa943e0..2e998a2f083 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -43,53 +44,54 @@ "replicas": 896585016, "minReadySeconds": -1971381490, "selector": { - "18": "19" + "19": "20" }, "template": { "metadata": { - "name": "20", - "generateName": "21", - "namespace": "22", - "selfLink": "23", + "name": "21", + "generateName": "22", + "namespace": "23", + "selfLink": "24", "uid": "*齧獚敆Ȏțêɘ", "resourceVersion": "16543582549249245065", "generation": 3782003332368514395, "creationTimestamp": null, "deletionGracePeriodSeconds": -1450892537694813345, "labels": { - "25": "26" + "26": "27" }, "annotations": { - "27": "28" + "28": "29" }, "ownerReferences": [ { - "apiVersion": "29", - "kind": "30", - "name": "31", + "apiVersion": "30", + "kind": "31", + "name": "32", "uid": "rt昍řČ扷5ƗǸƢ6/", "controller": true, "blockOwnerDeletion": false } ], "finalizers": [ - "32" + "33" ], - "clusterName": "33", + "clusterName": "34", "managedFields": [ { - "manager": "34", + "manager": "35", "operation": "(ĿȊ甞谐颋DžSǡƏS", - "apiVersion": "35" + "apiVersion": "36", + "fieldsType": "37" } ] }, "spec": { "volumes": [ { - "name": "36", + "name": "38", "hostPath": { - "path": "37", + "path": "39", "type": "Ơ歿:狞夌碕ʂɭîcP$I" }, "emptyDir": { @@ -97,26 +99,26 @@ "sizeLimit": "481" }, "gcePersistentDisk": { - "pdName": "38", - "fsType": "39", + "pdName": "40", + "fsType": "41", "partition": -54954325 }, "awsElasticBlockStore": { - "volumeID": "40", - "fsType": "41", + "volumeID": "42", + "fsType": "43", "partition": -1095687535 }, "gitRepo": { - "repository": "42", - "revision": "43", - "directory": "44" + "repository": "44", + "revision": "45", + "directory": "46" }, "secret": { - "secretName": "45", + "secretName": "47", "items": [ { - "key": "46", - "path": "47", + "key": "48", + "path": "49", "mode": 13677460 } ], @@ -124,89 +126,89 @@ "optional": false }, "nfs": { - "server": "48", - "path": "49" + "server": "50", + "path": "51" }, "iscsi": { - "targetPortal": "50", - "iqn": "51", + "targetPortal": "52", + "iqn": "53", "lun": 819364842, - "iscsiInterface": "52", - "fsType": "53", + "iscsiInterface": "54", + "fsType": "55", "readOnly": true, "portals": [ - "54" + "56" ], "secretRef": { - "name": "55" + "name": "57" }, - "initiatorName": "56" + "initiatorName": "58" }, "glusterfs": { - "endpoints": "57", - "path": "58" + "endpoints": "59", + "path": "60" }, "persistentVolumeClaim": { - "claimName": "59" + "claimName": "61" }, "rbd": { "monitors": [ - "60" + "62" ], - "image": "61", - "fsType": "62", - "pool": "63", - "user": "64", - "keyring": "65", + "image": "63", + "fsType": "64", + "pool": "65", + "user": "66", + "keyring": "67", "secretRef": { - "name": "66" + "name": "68" }, "readOnly": true }, "flexVolume": { - "driver": "67", - "fsType": "68", + "driver": "69", + "fsType": "70", "secretRef": { - "name": "69" + "name": "71" }, "readOnly": true, "options": { - "70": "71" + "72": "73" } }, "cinder": { - "volumeID": "72", - "fsType": "73", + "volumeID": "74", + "fsType": "75", "secretRef": { - "name": "74" + "name": "76" } }, "cephfs": { "monitors": [ - "75" + "77" ], - "path": "76", - "user": "77", - "secretFile": "78", + "path": "78", + "user": "79", + "secretFile": "80", "secretRef": { - "name": "79" + "name": "81" } }, "flocker": { - "datasetName": "80", - "datasetUUID": "81" + "datasetName": "82", + "datasetUUID": "83" }, "downwardAPI": { "items": [ { - "path": "82", + "path": "84", "fieldRef": { - "apiVersion": "83", - "fieldPath": "84" + "apiVersion": "85", + "fieldPath": "86" }, "resourceFieldRef": { - "containerName": "85", - "resource": "86", + "containerName": "87", + "resource": "88", "divisor": "558" }, "mode": -816398166 @@ -216,25 +218,25 @@ }, "fc": { "targetWWNs": [ - "87" + "89" ], "lun": 13573196, - "fsType": "88", + "fsType": "90", "wwids": [ - "89" + "91" ] }, "azureFile": { - "secretName": "90", - "shareName": "91", + "secretName": "92", + "shareName": "93", "readOnly": true }, "configMap": { - "name": "92", + "name": "94", "items": [ { - "key": "93", - "path": "94", + "key": "95", + "path": "96", "mode": -818470612 } ], @@ -242,40 +244,40 @@ "optional": false }, "vsphereVolume": { - "volumePath": "95", - "fsType": "96", - "storagePolicyName": "97", - "storagePolicyID": "98" + "volumePath": "97", + "fsType": "98", + "storagePolicyName": "99", + "storagePolicyID": "100" }, "quobyte": { - "registry": "99", - "volume": "100", + "registry": "101", + "volume": "102", "readOnly": true, - "user": "101", - "group": "102", - "tenant": "103" + "user": "103", + "group": "104", + "tenant": "105" }, "azureDisk": { - "diskName": "104", - "diskURI": "105", + "diskName": "106", + "diskURI": "107", "cachingMode": "ʌ鴜", - "fsType": "106", + "fsType": "108", "readOnly": true, "kind": "ŨȈ\u003eŅ£趕ã/鈱$-议" }, "photonPersistentDisk": { - "pdID": "107", - "fsType": "108" + "pdID": "109", + "fsType": "110" }, "projected": { "sources": [ { "secret": { - "name": "109", + "name": "111", "items": [ { - "key": "110", - "path": "111", + "key": "112", + "path": "113", "mode": 33624773 } ], @@ -284,14 +286,14 @@ "downwardAPI": { "items": [ { - "path": "112", + "path": "114", "fieldRef": { - "apiVersion": "113", - "fieldPath": "114" + "apiVersion": "115", + "fieldPath": "116" }, "resourceFieldRef": { - "containerName": "115", - "resource": "116", + "containerName": "117", + "resource": "118", "divisor": "691" }, "mode": 1258015454 @@ -299,118 +301,118 @@ ] }, "configMap": { - "name": "117", + "name": "119", "items": [ { - "key": "118", - "path": "119", + "key": "120", + "path": "121", "mode": -1706790766 } ], "optional": true }, "serviceAccountToken": { - "audience": "120", + "audience": "122", "expirationSeconds": 4844518680130446070, - "path": "121" + "path": "123" } } ], "defaultMode": 808527238 }, "portworxVolume": { - "volumeID": "122", - "fsType": "123" + "volumeID": "124", + "fsType": "125" }, "scaleIO": { - "gateway": "124", - "system": "125", + "gateway": "126", + "system": "127", "secretRef": { - "name": "126" + "name": "128" }, - "protectionDomain": "127", - "storagePool": "128", - "storageMode": "129", - "volumeName": "130", - "fsType": "131" + "protectionDomain": "129", + "storagePool": "130", + "storageMode": "131", + "volumeName": "132", + "fsType": "133" }, "storageos": { - "volumeName": "132", - "volumeNamespace": "133", - "fsType": "134", + "volumeName": "134", + "volumeNamespace": "135", + "fsType": "136", "readOnly": true, "secretRef": { - "name": "135" + "name": "137" } }, "csi": { - "driver": "136", + "driver": "138", "readOnly": true, - "fsType": "137", + "fsType": "139", "volumeAttributes": { - "138": "139" + "140": "141" }, "nodePublishSecretRef": { - "name": "140" + "name": "142" } } } ], "initContainers": [ { - "name": "141", - "image": "142", + "name": "143", + "image": "144", "command": [ - "143" + "145" ], "args": [ - "144" + "146" ], - "workingDir": "145", + "workingDir": "147", "ports": [ { - "name": "146", + "name": "148", "hostPort": 977590852, "containerPort": -1849057428, "protocol": "壩卄", - "hostIP": "147" + "hostIP": "149" } ], "envFrom": [ { - "prefix": "148", + "prefix": "150", "configMapRef": { - "name": "149", + "name": "151", "optional": true }, "secretRef": { - "name": "150", + "name": "152", "optional": true } } ], "env": [ { - "name": "151", - "value": "152", + "name": "153", + "value": "154", "valueFrom": { "fieldRef": { - "apiVersion": "153", - "fieldPath": "154" + "apiVersion": "155", + "fieldPath": "156" }, "resourceFieldRef": { - "containerName": "155", - "resource": "156", + "containerName": "157", + "resource": "158", "divisor": "433" }, "configMapKeyRef": { - "name": "157", - "key": "158", + "name": "159", + "key": "160", "optional": false }, "secretKeyRef": { - "name": "159", - "key": "160", + "name": "161", + "key": "162", "optional": true } } @@ -426,40 +428,40 @@ }, "volumeMounts": [ { - "name": "161", - "mountPath": "162", - "subPath": "163", + "name": "163", + "mountPath": "164", + "subPath": "165", "mountPropagation": ")İ笓珣筩ƐP_痸荎僋bŭDz鯰硰", - "subPathExpr": "164" + "subPathExpr": "166" } ], "volumeDevices": [ { - "name": "165", - "devicePath": "166" + "name": "167", + "devicePath": "168" } ], "livenessProbe": { "exec": { "command": [ - "167" + "169" ] }, "httpGet": { - "path": "168", - "port": "169", - "host": "170", + "path": "170", + "port": "171", + "host": "172", "scheme": "ɋ聻鎥ʟ\u003c$洅ɹ7\\弌Þ帺萸Do©", "httpHeaders": [ { - "name": "171", - "value": "172" + "name": "173", + "value": "174" } ] }, "tcpSocket": { "port": 1637061888, - "host": "173" + "host": "175" }, "initialDelaySeconds": 1843642426, "timeoutSeconds": 1331061766, @@ -470,24 +472,24 @@ "readinessProbe": { "exec": { "command": [ - "174" + "176" ] }, "httpGet": { - "path": "175", - "port": "176", - "host": "177", + "path": "177", + "port": "178", + "host": "179", "scheme": "拍N嚳ķȗɊ捵TwMȗ礼2ħ籦ö嗏", "httpHeaders": [ { - "name": "178", - "value": "179" + "name": "180", + "value": "181" } ] }, "tcpSocket": { "port": 468716734, - "host": "180" + "host": "182" }, "initialDelaySeconds": 1274480280, "timeoutSeconds": 1914313083, @@ -499,51 +501,51 @@ "postStart": { "exec": { "command": [ - "181" + "183" ] }, "httpGet": { - "path": "182", - "port": "183", - "host": "184", + "path": "184", + "port": "185", + "host": "186", "scheme": "湙騘", "httpHeaders": [ { - "name": "185", - "value": "186" + "name": "187", + "value": "188" } ] }, "tcpSocket": { "port": -1291315853, - "host": "187" + "host": "189" } }, "preStop": { "exec": { "command": [ - "188" + "190" ] }, "httpGet": { - "path": "189", + "path": "191", "port": -156457987, - "host": "190", + "host": "192", "scheme": "焁yǠ/淹\\韲翁\u0026ʢ", "httpHeaders": [ { - "name": "191", - "value": "192" + "name": "193", + "value": "194" } ] }, "tcpSocket": { "port": -1617414299, - "host": "193" + "host": "195" } } }, - "terminationMessagePath": "194", + "terminationMessagePath": "196", "terminationMessagePolicy": "\\%枅:=ǛƓɥ踓Ǻǧ湬淊kŪ", "imagePullPolicy": "聡A3fƻfʣ繡楙¯ĦE勗E濞偘1ɩÅ", "securityContext": { @@ -557,15 +559,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "195", - "role": "196", - "type": "197", - "level": "198" + "user": "197", + "role": "198", + "type": "199", + "level": "200" }, "windowsOptions": { - "gmsaCredentialSpecName": "199", - "gmsaCredentialSpec": "200", - "runAsUserName": "201" + "gmsaCredentialSpecName": "201", + "gmsaCredentialSpec": "202", + "runAsUserName": "203" }, "runAsUser": -5663998255416893194, "runAsGroup": -7635256509062757120, @@ -581,59 +583,59 @@ ], "containers": [ { - "name": "202", - "image": "203", + "name": "204", + "image": "205", "command": [ - "204" + "206" ], "args": [ - "205" + "207" ], - "workingDir": "206", + "workingDir": "208", "ports": [ { - "name": "207", + "name": "209", "hostPort": -1351421716, "containerPort": 798141673, "protocol": "ɰVzÏ抴", - "hostIP": "208" + "hostIP": "210" } ], "envFrom": [ { - "prefix": "209", + "prefix": "211", "configMapRef": { - "name": "210", + "name": "212", "optional": false }, "secretRef": { - "name": "211", + "name": "213", "optional": false } } ], "env": [ { - "name": "212", - "value": "213", + "name": "214", + "value": "215", "valueFrom": { "fieldRef": { - "apiVersion": "214", - "fieldPath": "215" + "apiVersion": "216", + "fieldPath": "217" }, "resourceFieldRef": { - "containerName": "216", - "resource": "217", + "containerName": "218", + "resource": "219", "divisor": "931" }, "configMapKeyRef": { - "name": "218", - "key": "219", + "name": "220", + "key": "221", "optional": true }, "secretKeyRef": { - "name": "220", - "key": "221", + "name": "222", + "key": "223", "optional": true } } @@ -649,41 +651,41 @@ }, "volumeMounts": [ { - "name": "222", + "name": "224", "readOnly": true, - "mountPath": "223", - "subPath": "224", + "mountPath": "225", + "subPath": "226", "mountPropagation": "lj黳鈫ʕ禒Ƙá腿ħ缶", - "subPathExpr": "225" + "subPathExpr": "227" } ], "volumeDevices": [ { - "name": "226", - "devicePath": "227" + "name": "228", + "devicePath": "229" } ], "livenessProbe": { "exec": { "command": [ - "228" + "230" ] }, "httpGet": { - "path": "229", + "path": "231", "port": 675406340, - "host": "230", + "host": "232", "scheme": "ð»ųKĵ", "httpHeaders": [ { - "name": "231", - "value": "232" + "name": "233", + "value": "234" } ] }, "tcpSocket": { "port": -540225644, - "host": "233" + "host": "235" }, "initialDelaySeconds": -2047333312, "timeoutSeconds": -1477511050, @@ -694,24 +696,24 @@ "readinessProbe": { "exec": { "command": [ - "234" + "236" ] }, "httpGet": { - "path": "235", - "port": "236", - "host": "237", + "path": "237", + "port": "238", + "host": "239", "scheme": "唼Ģ猇õǶț鹎ğ#咻痗ȡmƴy綸_", "httpHeaders": [ { - "name": "238", - "value": "239" + "name": "240", + "value": "241" } ] }, "tcpSocket": { "port": -1222594476, - "host": "240" + "host": "242" }, "initialDelaySeconds": 657298936, "timeoutSeconds": -1231552123, @@ -723,51 +725,51 @@ "postStart": { "exec": { "command": [ - "241" + "243" ] }, "httpGet": { - "path": "242", + "path": "244", "port": 446829537, - "host": "243", + "host": "245", "scheme": "閼咎櫸eʔŊ", "httpHeaders": [ { - "name": "244", - "value": "245" + "name": "246", + "value": "247" } ] }, "tcpSocket": { "port": 731879508, - "host": "246" + "host": "248" } }, "preStop": { "exec": { "command": [ - "247" + "249" ] }, "httpGet": { - "path": "248", + "path": "250", "port": -1350331007, - "host": "249", + "host": "251", "scheme": "ę腬瓷碑=ɉ鎷卩蝾H韹寬", "httpHeaders": [ { - "name": "250", - "value": "251" + "name": "252", + "value": "253" } ] }, "tcpSocket": { - "port": "252", - "host": "253" + "port": "254", + "host": "255" } } }, - "terminationMessagePath": "254", + "terminationMessagePath": "256", "terminationMessagePolicy": "瓼猀2:öY鶪5w垁鷌辪", "imagePullPolicy": "ɑ龫`劳\u0026¼傭Ȟ1酃=6}ɡŇƉ立h", "securityContext": { @@ -781,15 +783,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "255", - "role": "256", - "type": "257", - "level": "258" + "user": "257", + "role": "258", + "type": "259", + "level": "260" }, "windowsOptions": { - "gmsaCredentialSpecName": "259", - "gmsaCredentialSpec": "260", - "runAsUserName": "261" + "gmsaCredentialSpecName": "261", + "gmsaCredentialSpec": "262", + "runAsUserName": "263" }, "runAsUser": -8450215029913275287, "runAsGroup": 4528195653674047608, @@ -804,58 +806,58 @@ ], "ephemeralContainers": [ { - "name": "262", - "image": "263", + "name": "264", + "image": "265", "command": [ - "264" + "266" ], "args": [ - "265" + "267" ], - "workingDir": "266", + "workingDir": "268", "ports": [ { - "name": "267", + "name": "269", "hostPort": 1428858742, "containerPort": -1169420648, - "hostIP": "268" + "hostIP": "270" } ], "envFrom": [ { - "prefix": "269", + "prefix": "271", "configMapRef": { - "name": "270", + "name": "272", "optional": true }, "secretRef": { - "name": "271", + "name": "273", "optional": false } } ], "env": [ { - "name": "272", - "value": "273", + "name": "274", + "value": "275", "valueFrom": { "fieldRef": { - "apiVersion": "274", - "fieldPath": "275" + "apiVersion": "276", + "fieldPath": "277" }, "resourceFieldRef": { - "containerName": "276", - "resource": "277", + "containerName": "278", + "resource": "279", "divisor": "398" }, "configMapKeyRef": { - "name": "278", - "key": "279", + "name": "280", + "key": "281", "optional": false }, "secretKeyRef": { - "name": "280", - "key": "281", + "name": "282", + "key": "283", "optional": true } } @@ -871,41 +873,41 @@ }, "volumeMounts": [ { - "name": "282", + "name": "284", "readOnly": true, - "mountPath": "283", - "subPath": "284", + "mountPath": "285", + "subPath": "286", "mountPropagation": "嵔棂p儼Ƿ裚瓶釆Ɗ+j忊Ŗȫ焗捏ĨFħ", - "subPathExpr": "285" + "subPathExpr": "287" } ], "volumeDevices": [ { - "name": "286", - "devicePath": "287" + "name": "288", + "devicePath": "289" } ], "livenessProbe": { "exec": { "command": [ - "288" + "290" ] }, "httpGet": { - "path": "289", - "port": "290", - "host": "291", + "path": "291", + "port": "292", + "host": "293", "scheme": "ɟ踡肒Ao/樝fw[Řż丩Ž", "httpHeaders": [ { - "name": "292", - "value": "293" + "name": "294", + "value": "295" } ] }, "tcpSocket": { - "port": "294", - "host": "295" + "port": "296", + "host": "297" }, "initialDelaySeconds": 988932710, "timeoutSeconds": -1537700150, @@ -916,24 +918,24 @@ "readinessProbe": { "exec": { "command": [ - "296" + "298" ] }, "httpGet": { - "path": "297", + "path": "299", "port": 1908572031, - "host": "298", + "host": "300", "scheme": "ɳ,ǿ飏騀呣ǎfǣ萭旿@掇l", "httpHeaders": [ { - "name": "299", - "value": "300" + "name": "301", + "value": "302" } ] }, "tcpSocket": { - "port": "301", - "host": "302" + "port": "303", + "host": "304" }, "initialDelaySeconds": 1584001904, "timeoutSeconds": -839281354, @@ -945,50 +947,50 @@ "postStart": { "exec": { "command": [ - "303" + "305" ] }, "httpGet": { - "path": "304", + "path": "306", "port": 1447898632, - "host": "305", + "host": "307", "scheme": "þ蛯ɰ荶lj", "httpHeaders": [ { - "name": "306", - "value": "307" + "name": "308", + "value": "309" } ] }, "tcpSocket": { "port": -1180080716, - "host": "308" + "host": "310" } }, "preStop": { "exec": { "command": [ - "309" + "311" ] }, "httpGet": { - "path": "310", + "path": "312", "port": 1428207963, - "host": "311", + "host": "313", "httpHeaders": [ { - "name": "312", - "value": "313" + "name": "314", + "value": "315" } ] }, "tcpSocket": { "port": 270599701, - "host": "314" + "host": "316" } } }, - "terminationMessagePath": "315", + "terminationMessagePath": "317", "terminationMessagePolicy": "ʤî萨zvt莭", "imagePullPolicy": "悮坮Ȣ幟ļ腻ŬƩȿ0矀Kʝ瘴I\\p", "securityContext": { @@ -1002,15 +1004,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "316", - "role": "317", - "type": "318", - "level": "319" + "user": "318", + "role": "319", + "type": "320", + "level": "321" }, "windowsOptions": { - "gmsaCredentialSpecName": "320", - "gmsaCredentialSpec": "321", - "runAsUserName": "322" + "gmsaCredentialSpecName": "322", + "gmsaCredentialSpec": "323", + "runAsUserName": "324" }, "runAsUser": -1422849761759913573, "runAsGroup": -4227284644269939905, @@ -1021,7 +1023,7 @@ }, "stdinOnce": true, "tty": true, - "targetContainerName": "323" + "targetContainerName": "325" } ], "restartPolicy": "ğ儴Ůĺ}潷ʒ胵輓", @@ -1029,25 +1031,25 @@ "activeDeadlineSeconds": 3749749117130745391, "dnsPolicy": "œȠƬQg鄠[颐o啛更偢ɇ卷荙JLĹ]", "nodeSelector": { - "324": "325" + "326": "327" }, - "serviceAccountName": "326", - "serviceAccount": "327", + "serviceAccountName": "328", + "serviceAccount": "329", "automountServiceAccountToken": true, - "nodeName": "328", + "nodeName": "330", "hostNetwork": true, "shareProcessNamespace": false, "securityContext": { "seLinuxOptions": { - "user": "329", - "role": "330", - "type": "331", - "level": "332" + "user": "331", + "role": "332", + "type": "333", + "level": "334" }, "windowsOptions": { - "gmsaCredentialSpecName": "333", - "gmsaCredentialSpec": "334", - "runAsUserName": "335" + "gmsaCredentialSpecName": "335", + "gmsaCredentialSpec": "336", + "runAsUserName": "337" }, "runAsUser": 3785971062093853048, "runAsGroup": -4207281854510634861, @@ -1058,18 +1060,18 @@ "fsGroup": -6090661315121334525, "sysctls": [ { - "name": "336", - "value": "337" + "name": "338", + "value": "339" } ] }, "imagePullSecrets": [ { - "name": "338" + "name": "340" } ], - "hostname": "339", - "subdomain": "340", + "hostname": "341", + "subdomain": "342", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1077,19 +1079,19 @@ { "matchExpressions": [ { - "key": "341", + "key": "343", "operator": "", "values": [ - "342" + "344" ] } ], "matchFields": [ { - "key": "343", + "key": "345", "operator": "Ȃ4", "values": [ - "344" + "346" ] } ] @@ -1102,19 +1104,19 @@ "preference": { "matchExpressions": [ { - "key": "345", + "key": "347", "operator": "", "values": [ - "346" + "348" ] } ], "matchFields": [ { - "key": "347", + "key": "349", "operator": "ĬÇó藢xɮĵȑ6L*Z", "values": [ - "348" + "350" ] } ] @@ -1140,9 +1142,9 @@ ] }, "namespaces": [ - "355" + "357" ], - "topologyKey": "356" + "topologyKey": "358" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1164,9 +1166,9 @@ ] }, "namespaces": [ - "363" + "365" ], - "topologyKey": "364" + "topologyKey": "366" } } ] @@ -1186,9 +1188,9 @@ ] }, "namespaces": [ - "371" + "373" ], - "topologyKey": "372" + "topologyKey": "374" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1210,45 +1212,45 @@ ] }, "namespaces": [ - "379" + "381" ], - "topologyKey": "380" + "topologyKey": "382" } } ] } }, - "schedulerName": "381", + "schedulerName": "383", "tolerations": [ { - "key": "382", + "key": "384", "operator": "!蘋`翾'ųŎ", - "value": "383", + "value": "385", "effect": "亦輯\u003e肸H5fŮƛƛ龢ÄƤU", "tolerationSeconds": -1346654761106639569 } ], "hostAliases": [ { - "ip": "384", + "ip": "386", "hostnames": [ - "385" + "387" ] } ], - "priorityClassName": "386", + "priorityClassName": "388", "priority": -418556976, "dnsConfig": { "nameservers": [ - "387" + "389" ], "searches": [ - "388" + "390" ], "options": [ { - "name": "389", - "value": "390" + "name": "391", + "value": "392" } ] }, @@ -1257,7 +1259,7 @@ "conditionType": "ĄÇ稕Eɒ杞¹t骳ɰɰUʜʔŜ0¢啥Ƶ" } ], - "runtimeClassName": "391", + "runtimeClassName": "393", "enableServiceLinks": true, "preemptionPolicy": "啾閥óƒ", "overhead": { @@ -1266,7 +1268,7 @@ "topologySpreadConstraints": [ { "maxSkew": 1831585697, - "topologyKey": "392", + "topologyKey": "394", "whenUnsatisfiable": "U駯Ĕ驢.'", "labelSelector": { "matchLabels": { @@ -1298,8 +1300,8 @@ "type": "Ŭ尌eáNRNJ丧鴻ĿW癜鞤A馱z芀", "status": "璻攜", "lastTransitionTime": "2519-06-20T10:43:36Z", - "reason": "399", - "message": "400" + "reason": "401", + "message": "402" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.pb index 157ca7208a9..1a84c3f1789 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.yaml index b905b9be351..a2fc2d434b2 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ReplicationController.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -32,35 +33,36 @@ spec: minReadySeconds: -1971381490 replicas: 896585016 selector: - "18": "19" + "19": "20" template: metadata: annotations: - "27": "28" - clusterName: "33" + "28": "29" + clusterName: "34" creationTimestamp: null deletionGracePeriodSeconds: -1450892537694813345 finalizers: - - "32" - generateName: "21" + - "33" + generateName: "22" generation: 3782003332368514395 labels: - "25": "26" + "26": "27" managedFields: - - apiVersion: "35" - manager: "34" + - apiVersion: "36" + fieldsType: "37" + manager: "35" operation: (ĿȊ甞谐颋DžSǡƏS - name: "20" - namespace: "22" + name: "21" + namespace: "23" ownerReferences: - - apiVersion: "29" + - apiVersion: "30" blockOwnerDeletion: false controller: true - kind: "30" - name: "31" + kind: "31" + name: "32" uid: rt昍řČ扷5ƗǸƢ6/ resourceVersion: "16543582549249245065" - selfLink: "23" + selfLink: "24" uid: '*齧獚敆Ȏțêɘ' spec: activeDeadlineSeconds: 3749749117130745391 @@ -69,28 +71,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "345" + - key: "347" operator: "" values: - - "346" + - "348" matchFields: - - key: "347" + - key: "349" operator: ĬÇó藢xɮĵȑ6L*Z values: - - "348" + - "350" weight: 508868877 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "341" + - key: "343" operator: "" values: - - "342" + - "344" matchFields: - - key: "343" + - key: "345" operator: Ȃ4 values: - - "344" + - "346" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -103,8 +105,8 @@ spec: matchLabels: 43---93-2-2-37--e00uz-z0sn-8hx-qa--0o8m3-d0w3/32K_2qu_0S-CqW.D_8--21kF-c026n: yP9S--858LI__.8____rO-S-P_-...07 namespaces: - - "363" - topologyKey: "364" + - "365" + topologyKey: "366" weight: -1449289597 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -116,8 +118,8 @@ spec: matchLabels: O_.J_-G_--d: 2E_--o90G_A4..-L..-__0N_N.O0 namespaces: - - "355" - topologyKey: "356" + - "357" + topologyKey: "358" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -130,8 +132,8 @@ spec: matchLabels: 8.--w0_1V7: r-8S5--_7_-Zp_._.-miJ4x-_0_5-_.7F3p2_-_AmD-.0AP.-.Cc namespaces: - - "379" - topologyKey: "380" + - "381" + topologyKey: "382" weight: -1000831922 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -141,119 +143,119 @@ spec: matchLabels: 3--j2---2--82--cj-1-s--op34-yw/g_I-A-_3bz._M: 4_Q.6.I--2_9.v.--_.--4QQ.-s.H.Hu-k-_-0-T1mel--F......3_t_l namespaces: - - "371" - topologyKey: "372" + - "373" + topologyKey: "374" automountServiceAccountToken: true containers: - args: - - "205" + - "207" command: - - "204" + - "206" env: - - name: "212" - value: "213" + - name: "214" + value: "215" valueFrom: configMapKeyRef: - key: "219" - name: "218" - optional: true - fieldRef: - apiVersion: "214" - fieldPath: "215" - resourceFieldRef: - containerName: "216" - divisor: "931" - resource: "217" - secretKeyRef: key: "221" name: "220" optional: true + fieldRef: + apiVersion: "216" + fieldPath: "217" + resourceFieldRef: + containerName: "218" + divisor: "931" + resource: "219" + secretKeyRef: + key: "223" + name: "222" + optional: true envFrom: - configMapRef: - name: "210" + name: "212" optional: false - prefix: "209" + prefix: "211" secretRef: - name: "211" + name: "213" optional: false - image: "203" + image: "205" imagePullPolicy: ɑ龫`劳&¼傭Ȟ1酃=6}ɡŇƉ立h lifecycle: postStart: exec: command: - - "241" + - "243" httpGet: - host: "243" + host: "245" httpHeaders: - - name: "244" - value: "245" - path: "242" + - name: "246" + value: "247" + path: "244" port: 446829537 scheme: 閼咎櫸eʔŊ tcpSocket: - host: "246" + host: "248" port: 731879508 preStop: exec: command: - - "247" + - "249" httpGet: - host: "249" + host: "251" httpHeaders: - - name: "250" - value: "251" - path: "248" + - name: "252" + value: "253" + path: "250" port: -1350331007 scheme: ę腬瓷碑=ɉ鎷卩蝾H韹寬 tcpSocket: - host: "253" - port: "252" + host: "255" + port: "254" livenessProbe: exec: command: - - "228" + - "230" failureThreshold: -199511133 httpGet: - host: "230" + host: "232" httpHeaders: - - name: "231" - value: "232" - path: "229" + - name: "233" + value: "234" + path: "231" port: 675406340 scheme: ð»ųKĵ initialDelaySeconds: -2047333312 periodSeconds: -1373541406 successThreshold: 480521693 tcpSocket: - host: "233" + host: "235" port: -540225644 timeoutSeconds: -1477511050 - name: "202" + name: "204" ports: - containerPort: 798141673 - hostIP: "208" + hostIP: "210" hostPort: -1351421716 - name: "207" + name: "209" protocol: ɰVzÏ抴 readinessProbe: exec: command: - - "234" + - "236" failureThreshold: -935589762 httpGet: - host: "237" + host: "239" httpHeaders: - - name: "238" - value: "239" - path: "235" - port: "236" + - name: "240" + value: "241" + path: "237" + port: "238" scheme: 唼Ģ猇õǶț鹎ğ#咻痗ȡmƴy綸_ initialDelaySeconds: 657298936 periodSeconds: 2058961339 successThreshold: -997191789 tcpSocket: - host: "240" + host: "242" port: -1222594476 timeoutSeconds: -1231552123 resources: @@ -275,148 +277,148 @@ spec: runAsNonRoot: true runAsUser: -8450215029913275287 seLinuxOptions: - level: "258" - role: "256" - type: "257" - user: "255" + level: "260" + role: "258" + type: "259" + user: "257" windowsOptions: - gmsaCredentialSpec: "260" - gmsaCredentialSpecName: "259" - runAsUserName: "261" + gmsaCredentialSpec: "262" + gmsaCredentialSpecName: "261" + runAsUserName: "263" stdin: true stdinOnce: true - terminationMessagePath: "254" + terminationMessagePath: "256" terminationMessagePolicy: 瓼猀2:öY鶪5w垁鷌辪 volumeDevices: - - devicePath: "227" - name: "226" + - devicePath: "229" + name: "228" volumeMounts: - - mountPath: "223" + - mountPath: "225" mountPropagation: lj黳鈫ʕ禒Ƙá腿ħ缶 - name: "222" + name: "224" readOnly: true - subPath: "224" - subPathExpr: "225" - workingDir: "206" + subPath: "226" + subPathExpr: "227" + workingDir: "208" dnsConfig: nameservers: - - "387" + - "389" options: - - name: "389" - value: "390" + - name: "391" + value: "392" searches: - - "388" + - "390" dnsPolicy: œȠƬQg鄠[颐o啛更偢ɇ卷荙JLĹ] enableServiceLinks: true ephemeralContainers: - args: - - "265" + - "267" command: - - "264" + - "266" env: - - name: "272" - value: "273" + - name: "274" + value: "275" valueFrom: configMapKeyRef: - key: "279" - name: "278" - optional: false - fieldRef: - apiVersion: "274" - fieldPath: "275" - resourceFieldRef: - containerName: "276" - divisor: "398" - resource: "277" - secretKeyRef: key: "281" name: "280" + optional: false + fieldRef: + apiVersion: "276" + fieldPath: "277" + resourceFieldRef: + containerName: "278" + divisor: "398" + resource: "279" + secretKeyRef: + key: "283" + name: "282" optional: true envFrom: - configMapRef: - name: "270" + name: "272" optional: true - prefix: "269" + prefix: "271" secretRef: - name: "271" + name: "273" optional: false - image: "263" + image: "265" imagePullPolicy: 悮坮Ȣ幟ļ腻ŬƩȿ0矀Kʝ瘴I\p lifecycle: postStart: exec: command: - - "303" + - "305" httpGet: - host: "305" + host: "307" httpHeaders: - - name: "306" - value: "307" - path: "304" + - name: "308" + value: "309" + path: "306" port: 1447898632 scheme: þ蛯ɰ荶lj tcpSocket: - host: "308" + host: "310" port: -1180080716 preStop: exec: command: - - "309" + - "311" httpGet: - host: "311" + host: "313" httpHeaders: - - name: "312" - value: "313" - path: "310" + - name: "314" + value: "315" + path: "312" port: 1428207963 tcpSocket: - host: "314" + host: "316" port: 270599701 livenessProbe: exec: command: - - "288" + - "290" failureThreshold: -188803670 httpGet: - host: "291" + host: "293" httpHeaders: - - name: "292" - value: "293" - path: "289" - port: "290" + - name: "294" + value: "295" + path: "291" + port: "292" scheme: ɟ踡肒Ao/樝fw[Řż丩Ž initialDelaySeconds: 988932710 periodSeconds: -1815868713 successThreshold: 105707873 tcpSocket: - host: "295" - port: "294" + host: "297" + port: "296" timeoutSeconds: -1537700150 - name: "262" + name: "264" ports: - containerPort: -1169420648 - hostIP: "268" + hostIP: "270" hostPort: 1428858742 - name: "267" + name: "269" readinessProbe: exec: command: - - "296" + - "298" failureThreshold: -150133456 httpGet: - host: "298" + host: "300" httpHeaders: - - name: "299" - value: "300" - path: "297" + - name: "301" + value: "302" + path: "299" port: 1908572031 scheme: ɳ,ǿ飏騀呣ǎfǣ萭旿@掇l initialDelaySeconds: 1584001904 periodSeconds: 2035347577 successThreshold: -819723498 tcpSocket: - host: "302" - port: "301" + host: "304" + port: "303" timeoutSeconds: -839281354 resources: limits: @@ -437,148 +439,148 @@ spec: runAsNonRoot: true runAsUser: -1422849761759913573 seLinuxOptions: - level: "319" - role: "317" - type: "318" - user: "316" + level: "321" + role: "319" + type: "320" + user: "318" windowsOptions: - gmsaCredentialSpec: "321" - gmsaCredentialSpecName: "320" - runAsUserName: "322" + gmsaCredentialSpec: "323" + gmsaCredentialSpecName: "322" + runAsUserName: "324" stdinOnce: true - targetContainerName: "323" - terminationMessagePath: "315" + targetContainerName: "325" + terminationMessagePath: "317" terminationMessagePolicy: ʤî萨zvt莭 tty: true volumeDevices: - - devicePath: "287" - name: "286" + - devicePath: "289" + name: "288" volumeMounts: - - mountPath: "283" + - mountPath: "285" mountPropagation: 嵔棂p儼Ƿ裚瓶釆Ɗ+j忊Ŗȫ焗捏ĨFħ - name: "282" + name: "284" readOnly: true - subPath: "284" - subPathExpr: "285" - workingDir: "266" + subPath: "286" + subPathExpr: "287" + workingDir: "268" hostAliases: - hostnames: - - "385" - ip: "384" + - "387" + ip: "386" hostNetwork: true - hostname: "339" + hostname: "341" imagePullSecrets: - - name: "338" + - name: "340" initContainers: - args: - - "144" + - "146" command: - - "143" + - "145" env: - - name: "151" - value: "152" + - name: "153" + value: "154" valueFrom: configMapKeyRef: - key: "158" - name: "157" - optional: false - fieldRef: - apiVersion: "153" - fieldPath: "154" - resourceFieldRef: - containerName: "155" - divisor: "433" - resource: "156" - secretKeyRef: key: "160" name: "159" + optional: false + fieldRef: + apiVersion: "155" + fieldPath: "156" + resourceFieldRef: + containerName: "157" + divisor: "433" + resource: "158" + secretKeyRef: + key: "162" + name: "161" optional: true envFrom: - configMapRef: - name: "149" + name: "151" optional: true - prefix: "148" + prefix: "150" secretRef: - name: "150" + name: "152" optional: true - image: "142" + image: "144" imagePullPolicy: 聡A3fƻfʣ繡楙¯ĦE勗E濞偘1ɩÅ lifecycle: postStart: exec: command: - - "181" + - "183" httpGet: - host: "184" + host: "186" httpHeaders: - - name: "185" - value: "186" - path: "182" - port: "183" + - name: "187" + value: "188" + path: "184" + port: "185" scheme: 湙騘 tcpSocket: - host: "187" + host: "189" port: -1291315853 preStop: exec: command: - - "188" + - "190" httpGet: - host: "190" + host: "192" httpHeaders: - - name: "191" - value: "192" - path: "189" + - name: "193" + value: "194" + path: "191" port: -156457987 scheme: 焁yǠ/淹\韲翁&ʢ tcpSocket: - host: "193" + host: "195" port: -1617414299 livenessProbe: exec: command: - - "167" + - "169" failureThreshold: 62108019 httpGet: - host: "170" + host: "172" httpHeaders: - - name: "171" - value: "172" - path: "168" - port: "169" + - name: "173" + value: "174" + path: "170" + port: "171" scheme: ɋ聻鎥ʟ<$洅ɹ7\弌Þ帺萸Do© initialDelaySeconds: 1843642426 periodSeconds: -836939996 successThreshold: -1147975588 tcpSocket: - host: "173" + host: "175" port: 1637061888 timeoutSeconds: 1331061766 - name: "141" + name: "143" ports: - containerPort: -1849057428 - hostIP: "147" + hostIP: "149" hostPort: 977590852 - name: "146" + name: "148" protocol: 壩卄 readinessProbe: exec: command: - - "174" + - "176" failureThreshold: -27219570 httpGet: - host: "177" + host: "179" httpHeaders: - - name: "178" - value: "179" - path: "175" - port: "176" + - name: "180" + value: "181" + path: "177" + port: "178" scheme: 拍N嚳ķȗɊ捵TwMȗ礼2ħ籦ö嗏 initialDelaySeconds: 1274480280 periodSeconds: 620421257 successThreshold: 1899367104 tcpSocket: - host: "180" + host: "182" port: 468716734 timeoutSeconds: 1914313083 resources: @@ -600,72 +602,72 @@ spec: runAsNonRoot: false runAsUser: -5663998255416893194 seLinuxOptions: - level: "198" - role: "196" - type: "197" - user: "195" + level: "200" + role: "198" + type: "199" + user: "197" windowsOptions: - gmsaCredentialSpec: "200" - gmsaCredentialSpecName: "199" - runAsUserName: "201" + gmsaCredentialSpec: "202" + gmsaCredentialSpecName: "201" + runAsUserName: "203" stdin: true stdinOnce: true - terminationMessagePath: "194" + terminationMessagePath: "196" terminationMessagePolicy: \%枅:=ǛƓɥ踓Ǻǧ湬淊kŪ tty: true volumeDevices: - - devicePath: "166" - name: "165" + - devicePath: "168" + name: "167" volumeMounts: - - mountPath: "162" + - mountPath: "164" mountPropagation: )İ笓珣筩ƐP_痸荎僋bŭDz鯰硰 - name: "161" - subPath: "163" - subPathExpr: "164" - workingDir: "145" - nodeName: "328" + name: "163" + subPath: "165" + subPathExpr: "166" + workingDir: "147" + nodeName: "330" nodeSelector: - "324": "325" + "326": "327" overhead: Üɉ愂,wa纝佯fɞ: "823" preemptionPolicy: 啾閥óƒ priority: -418556976 - priorityClassName: "386" + priorityClassName: "388" readinessGates: - conditionType: ĄÇ稕Eɒ杞¹t骳ɰɰUʜʔŜ0¢啥Ƶ restartPolicy: ğ儴Ůĺ}潷ʒ胵輓 - runtimeClassName: "391" - schedulerName: "381" + runtimeClassName: "393" + schedulerName: "383" securityContext: fsGroup: -6090661315121334525 runAsGroup: -4207281854510634861 runAsNonRoot: true runAsUser: 3785971062093853048 seLinuxOptions: - level: "332" - role: "330" - type: "331" - user: "329" + level: "334" + role: "332" + type: "333" + user: "331" supplementalGroups: - 2007000972845989054 sysctls: - - name: "336" - value: "337" + - name: "338" + value: "339" windowsOptions: - gmsaCredentialSpec: "334" - gmsaCredentialSpecName: "333" - runAsUserName: "335" - serviceAccount: "327" - serviceAccountName: "326" + gmsaCredentialSpec: "336" + gmsaCredentialSpecName: "335" + runAsUserName: "337" + serviceAccount: "329" + serviceAccountName: "328" shareProcessNamespace: false - subdomain: "340" + subdomain: "342" terminationGracePeriodSeconds: 1616645369356252673 tolerations: - effect: 亦輯>肸H5fŮƛƛ龢ÄƤU - key: "382" + key: "384" operator: '!蘋`翾''ųŎ' tolerationSeconds: -1346654761106639569 - value: "383" + value: "385" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -676,210 +678,210 @@ spec: matchLabels: 8o_66: 11_7pX_.-mLlx...w_t-_.5.40Rw4gD.._.-x6db-L7.-__-G_2C maxSkew: 1831585697 - topologyKey: "392" + topologyKey: "394" whenUnsatisfiable: U駯Ĕ驢.' volumes: - awsElasticBlockStore: - fsType: "41" + fsType: "43" partition: -1095687535 - volumeID: "40" + volumeID: "42" azureDisk: cachingMode: ʌ鴜 - diskName: "104" - diskURI: "105" - fsType: "106" + diskName: "106" + diskURI: "107" + fsType: "108" kind: ŨȈ>Ņ£趕ã/鈱$-议 readOnly: true azureFile: readOnly: true - secretName: "90" - shareName: "91" + secretName: "92" + shareName: "93" cephfs: monitors: - - "75" - path: "76" - secretFile: "78" + - "77" + path: "78" + secretFile: "80" secretRef: - name: "79" - user: "77" + name: "81" + user: "79" cinder: - fsType: "73" + fsType: "75" secretRef: - name: "74" - volumeID: "72" + name: "76" + volumeID: "74" configMap: defaultMode: 1945687018 items: - - key: "93" + - key: "95" mode: -818470612 - path: "94" - name: "92" + path: "96" + name: "94" optional: false csi: - driver: "136" - fsType: "137" + driver: "138" + fsType: "139" nodePublishSecretRef: - name: "140" + name: "142" readOnly: true volumeAttributes: - "138": "139" + "140": "141" downwardAPI: defaultMode: -1449552038 items: - fieldRef: - apiVersion: "83" - fieldPath: "84" + apiVersion: "85" + fieldPath: "86" mode: -816398166 - path: "82" + path: "84" resourceFieldRef: - containerName: "85" + containerName: "87" divisor: "558" - resource: "86" + resource: "88" emptyDir: medium: ɖ橙9 sizeLimit: "481" fc: - fsType: "88" + fsType: "90" lun: 13573196 targetWWNs: - - "87" - wwids: - "89" + wwids: + - "91" flexVolume: - driver: "67" - fsType: "68" + driver: "69" + fsType: "70" options: - "70": "71" + "72": "73" readOnly: true secretRef: - name: "69" + name: "71" flocker: - datasetName: "80" - datasetUUID: "81" + datasetName: "82" + datasetUUID: "83" gcePersistentDisk: - fsType: "39" + fsType: "41" partition: -54954325 - pdName: "38" + pdName: "40" gitRepo: - directory: "44" - repository: "42" - revision: "43" + directory: "46" + repository: "44" + revision: "45" glusterfs: - endpoints: "57" - path: "58" + endpoints: "59" + path: "60" hostPath: - path: "37" + path: "39" type: Ơ歿:狞夌碕ʂɭîcP$I iscsi: - fsType: "53" - initiatorName: "56" - iqn: "51" - iscsiInterface: "52" + fsType: "55" + initiatorName: "58" + iqn: "53" + iscsiInterface: "54" lun: 819364842 portals: - - "54" + - "56" readOnly: true secretRef: - name: "55" - targetPortal: "50" - name: "36" + name: "57" + targetPortal: "52" + name: "38" nfs: - path: "49" - server: "48" + path: "51" + server: "50" persistentVolumeClaim: - claimName: "59" + claimName: "61" photonPersistentDisk: - fsType: "108" - pdID: "107" + fsType: "110" + pdID: "109" portworxVolume: - fsType: "123" - volumeID: "122" + fsType: "125" + volumeID: "124" projected: defaultMode: 808527238 sources: - configMap: items: - - key: "118" + - key: "120" mode: -1706790766 - path: "119" - name: "117" + path: "121" + name: "119" optional: true downwardAPI: items: - fieldRef: - apiVersion: "113" - fieldPath: "114" + apiVersion: "115" + fieldPath: "116" mode: 1258015454 - path: "112" + path: "114" resourceFieldRef: - containerName: "115" + containerName: "117" divisor: "691" - resource: "116" + resource: "118" secret: items: - - key: "110" + - key: "112" mode: 33624773 - path: "111" - name: "109" + path: "113" + name: "111" optional: false serviceAccountToken: - audience: "120" + audience: "122" expirationSeconds: 4844518680130446070 - path: "121" + path: "123" quobyte: - group: "102" + group: "104" readOnly: true - registry: "99" - tenant: "103" - user: "101" - volume: "100" + registry: "101" + tenant: "105" + user: "103" + volume: "102" rbd: - fsType: "62" - image: "61" - keyring: "65" + fsType: "64" + image: "63" + keyring: "67" monitors: - - "60" - pool: "63" + - "62" + pool: "65" readOnly: true secretRef: - name: "66" - user: "64" + name: "68" + user: "66" scaleIO: - fsType: "131" - gateway: "124" - protectionDomain: "127" + fsType: "133" + gateway: "126" + protectionDomain: "129" secretRef: - name: "126" - storageMode: "129" - storagePool: "128" - system: "125" - volumeName: "130" + name: "128" + storageMode: "131" + storagePool: "130" + system: "127" + volumeName: "132" secret: defaultMode: 712024464 items: - - key: "46" + - key: "48" mode: 13677460 - path: "47" + path: "49" optional: false - secretName: "45" + secretName: "47" storageos: - fsType: "134" + fsType: "136" readOnly: true secretRef: - name: "135" - volumeName: "132" - volumeNamespace: "133" + name: "137" + volumeName: "134" + volumeNamespace: "135" vsphereVolume: - fsType: "96" - storagePolicyID: "98" - storagePolicyName: "97" - volumePath: "95" + fsType: "98" + storagePolicyID: "100" + storagePolicyName: "99" + volumePath: "97" status: availableReplicas: 1309129044 conditions: - lastTransitionTime: "2519-06-20T10:43:36Z" - message: "400" - reason: "399" + message: "402" + reason: "401" status: 璻攜 type: Ŭ尌eáNRNJ丧鴻ĿW癜鞤A馱z芀 fullyLabeledReplicas: 1648811301 diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.json index 39627afadee..ef308ef7d54 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -52,7 +53,7 @@ "scopeName": "ʕVŚ(ĿȊ甞谐颋DžSǡƏS$+½H牗", "operator": "獚敆ȎțêɘIJ斬³;Ơ歿:狞夌碕ʂɭ", "values": [ - "18" + "19" ] } ] diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.pb index 6efc48835ca..147f732f9b8 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.yaml index e7e9a7eecce..fb3a44486cd 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ResourceQuota.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -36,7 +37,7 @@ spec: - operator: 獚敆ȎțêɘIJ斬³;Ơ歿:狞夌碕ʂɭ scopeName: ʕVŚ(ĿȊ甞谐颋DžSǡƏS$+½H牗 values: - - "18" + - "19" scopes: - Ĩɘ.蘯6ċV夸eɑeʤ脽ěĂ status: diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.json index 472e970a50b..df981496cab 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.json @@ -35,15 +35,16 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "data": { - "18": "Hg==" + "19": "Hg==" }, "stringData": { - "19": "20" + "20": "21" }, "type": "r鯹)晿\u003co,c鮽ort昍řČ扷5ƗǸ" } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.pb index b936bb82e8d..8da983d7165 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.yaml index 148ebb40bbf..5061e1e4e5d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.Secret.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - "18": Hg== + "19": Hg== kind: Secret metadata: annotations: @@ -16,6 +16,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -31,5 +32,5 @@ metadata: selfLink: "5" uid: "7" stringData: - "19": "20" + "20": "21" type: r鯹)晿Ž healthCheckNodePort: -1095807277 - loadBalancerIP: "24" + loadBalancerIP: "25" loadBalancerSourceRanges: - - "25" + - "26" ports: - - name: "18" + - name: "19" nodePort: -474380055 port: 202283346 protocol: '@Hr鯹)晿' - targetPort: "19" + targetPort: "20" publishNotReadyAddresses: true selector: - "20": "21" + "21": "22" sessionAffinity: ɑ sessionAffinityConfig: clientIP: @@ -55,5 +56,5 @@ spec: status: loadBalancer: ingress: - - hostname: "28" - ip: "27" + - hostname: "29" + ip: "28" diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.json b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.json index d3fbb5ed385..74c3b1a513e 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.json +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.json @@ -35,24 +35,25 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "secrets": [ { - "kind": "18", - "namespace": "19", - "name": "20", + "kind": "19", + "namespace": "20", + "name": "21", "uid": "@Hr鯹)晿", - "apiVersion": "21", - "resourceVersion": "22", - "fieldPath": "23" + "apiVersion": "22", + "resourceVersion": "23", + "fieldPath": "24" } ], "imagePullSecrets": [ { - "name": "24" + "name": "25" } ], "automountServiceAccountToken": false diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.pb b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.pb index 8951b6dbcdc..54f4b07fa1b 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.pb and b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.yaml b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.yaml index ba373be7d77..a84d2880006 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/core.v1.ServiceAccount.yaml @@ -1,7 +1,7 @@ apiVersion: v1 automountServiceAccountToken: false imagePullSecrets: -- name: "24" +- name: "25" kind: ServiceAccount metadata: annotations: @@ -17,6 +17,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -32,10 +33,10 @@ metadata: selfLink: "5" uid: "7" secrets: -- apiVersion: "21" - fieldPath: "23" - kind: "18" - name: "20" - namespace: "19" - resourceVersion: "22" +- apiVersion: "22" + fieldPath: "24" + kind: "19" + name: "21" + namespace: "20" + resourceVersion: "23" uid: '@Hr鯹)晿' diff --git a/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.json b/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.json index f9fb38c10ba..e12af7ef75f 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.json +++ b/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -45,33 +46,33 @@ "lastObservedTime": "2429-02-18T17:57:56.343118Z", "state": "鯹)晿\u003c" }, - "reportingController": "18", - "reportingInstance": "19", - "action": "20", - "reason": "21", + "reportingController": "19", + "reportingInstance": "20", + "action": "21", + "reason": "22", "regarding": { - "kind": "22", - "namespace": "23", - "name": "24", + "kind": "23", + "namespace": "24", + "name": "25", "uid": "Ĩɘ.蘯6ċV夸eɑeʤ脽ěĂ", - "apiVersion": "25", - "resourceVersion": "26", - "fieldPath": "27" + "apiVersion": "26", + "resourceVersion": "27", + "fieldPath": "28" }, "related": { - "kind": "28", - "namespace": "29", - "name": "30", + "kind": "29", + "namespace": "30", + "name": "31", "uid": "蓏Ŋ", - "apiVersion": "31", - "resourceVersion": "32", - "fieldPath": "33" + "apiVersion": "32", + "resourceVersion": "33", + "fieldPath": "34" }, - "note": "34", - "type": "35", + "note": "35", + "type": "36", "deprecatedSource": { - "component": "36", - "host": "37" + "component": "37", + "host": "38" }, "deprecatedFirstTimestamp": "2964-12-12T12:04:40Z", "deprecatedLastTimestamp": "2452-08-27T22:01:15Z", diff --git a/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.pb b/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.pb index 1096df469ab..dd6fa6cd910 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.pb and b/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.yaml b/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.yaml index 6bf845e4d74..62bba948a5e 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/events.k8s.io.v1beta1.Event.yaml @@ -1,11 +1,11 @@ -action: "20" +action: "21" apiVersion: events.k8s.io/v1beta1 deprecatedCount: 1804227960 deprecatedFirstTimestamp: "2964-12-12T12:04:40Z" deprecatedLastTimestamp: "2452-08-27T22:01:15Z" deprecatedSource: - component: "36" - host: "37" + component: "37" + host: "38" eventTime: "2482-03-20T23:11:25.602224Z" kind: Event metadata: @@ -22,6 +22,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -36,28 +37,28 @@ metadata: resourceVersion: "11042405498087606203" selfLink: "5" uid: "7" -note: "34" -reason: "21" +note: "35" +reason: "22" regarding: - apiVersion: "25" - fieldPath: "27" - kind: "22" - name: "24" - namespace: "23" - resourceVersion: "26" + apiVersion: "26" + fieldPath: "28" + kind: "23" + name: "25" + namespace: "24" + resourceVersion: "27" uid: Ĩɘ.蘯6ċV夸eɑeʤ脽ěĂ related: - apiVersion: "31" - fieldPath: "33" - kind: "28" - name: "30" - namespace: "29" - resourceVersion: "32" + apiVersion: "32" + fieldPath: "34" + kind: "29" + name: "31" + namespace: "30" + resourceVersion: "33" uid: 蓏Ŋ -reportingController: "18" -reportingInstance: "19" +reportingController: "19" +reportingInstance: "20" series: count: -1971381490 lastObservedTime: "2429-02-18T17:57:56.343118Z" state: 鯹)晿< -type: "35" +type: "36" diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.json b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.json index 71127879585..95abdcf907a 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.json +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -56,49 +57,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "TʡȂŏ{sǡƟ", "resourceVersion": "1698285396218902212", "generation": -4139900758039117471, "creationTimestamp": null, "deletionGracePeriodSeconds": 7534629739119643351, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "^", "controller": false, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "ĪȸŹăȲĻ¤Ħʅ芝", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "" }, "emptyDir": { @@ -106,26 +108,26 @@ "sizeLimit": "804" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1318752360 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": -2007808768 }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": 228756891 } ], @@ -133,93 +135,93 @@ "optional": false }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 408756018, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "readOnly": true, "portals": [ - "58" + "60" ], "chapAuthDiscovery": true, "chapAuthSession": true, "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62" + "endpoints": "63", + "path": "64" }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" }, "readOnly": true }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "readOnly": true, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "915" }, "mode": -1768075156 @@ -229,25 +231,25 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": 570501002, - "fsType": "92", + "fsType": "94", "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95", + "secretName": "96", + "shareName": "97", "readOnly": true }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": 2020789772 } ], @@ -255,39 +257,39 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", - "user": "105", - "group": "106", - "tenant": "107" + "registry": "105", + "volume": "106", + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "k ź贩j瀉ǚrǜnh0åȂ", - "fsType": "110", + "fsType": "112", "readOnly": false, "kind": "nj揠8lj黳鈫ʕ禒Ƙá腿ħ缶" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": 675406340 } ], @@ -296,14 +298,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "461" }, "mode": -1618937335 @@ -311,118 +313,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": -1126738259 } ], "optional": true }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": -6345861634934949644, - "path": "125" + "path": "127" } } ], "defaultMode": 480521693 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127" + "volumeID": "128", + "fsType": "129" }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, "sslEnabled": true, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": true, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -1510026905, "containerPort": 437857734, "protocol": "Rƥ贫d飼$俊跾|@?鷅b", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": false }, "secretRef": { - "name": "154", + "name": "156", "optional": false } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "468" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": false }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": true } } @@ -438,40 +440,40 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "卩蝾", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", - "port": "173", - "host": "174", + "path": "174", + "port": "175", + "host": "176", "httpHeaders": [ { - "name": "175", - "value": "176" + "name": "177", + "value": "178" } ] }, "tcpSocket": { - "port": "177", - "host": "178" + "port": "179", + "host": "180" }, "initialDelaySeconds": 1805144649, "timeoutSeconds": -606111218, @@ -482,24 +484,24 @@ "readinessProbe": { "exec": { "command": [ - "179" + "181" ] }, "httpGet": { - "path": "180", - "port": "181", - "host": "182", + "path": "182", + "port": "183", + "host": "184", "scheme": "w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ", "httpHeaders": [ { - "name": "183", - "value": "184" + "name": "185", + "value": "186" } ] }, "tcpSocket": { "port": -337353552, - "host": "185" + "host": "187" }, "initialDelaySeconds": -1724160601, "timeoutSeconds": -1158840571, @@ -511,50 +513,50 @@ "postStart": { "exec": { "command": [ - "186" + "188" ] }, "httpGet": { - "path": "187", - "port": "188", - "host": "189", + "path": "189", + "port": "190", + "host": "191", "httpHeaders": [ { - "name": "190", - "value": "191" + "name": "192", + "value": "193" } ] }, "tcpSocket": { "port": 559781916, - "host": "192" + "host": "194" } }, "preStop": { "exec": { "command": [ - "193" + "195" ] }, "httpGet": { - "path": "194", + "path": "196", "port": 1150375229, - "host": "195", + "host": "197", "scheme": "QÄȻȊ+?ƭ峧Y栲茇竛吲蚛隖\u003cǶ", "httpHeaders": [ { - "name": "196", - "value": "197" + "name": "198", + "value": "199" } ] }, "tcpSocket": { "port": -1696471293, - "host": "198" + "host": "200" } } }, - "terminationMessagePath": "199", + "terminationMessagePath": "201", "terminationMessagePolicy": "£軶ǃ*ʙ嫙\u0026蒒5靇C'ɵK.Q貇", "imagePullPolicy": "Ŵ廷s{Ⱦdz@", "securityContext": { @@ -568,15 +570,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "200", - "role": "201", - "type": "202", - "level": "203" + "user": "202", + "role": "203", + "type": "204", + "level": "205" }, "windowsOptions": { - "gmsaCredentialSpecName": "204", - "gmsaCredentialSpec": "205", - "runAsUserName": "206" + "gmsaCredentialSpecName": "206", + "gmsaCredentialSpec": "207", + "runAsUserName": "208" }, "runAsUser": 4181787587415673530, "runAsGroup": 825262458636305509, @@ -591,59 +593,59 @@ ], "containers": [ { - "name": "207", - "image": "208", + "name": "209", + "image": "210", "command": [ - "209" + "211" ], "args": [ - "210" + "212" ], - "workingDir": "211", + "workingDir": "213", "ports": [ { - "name": "212", + "name": "214", "hostPort": 1385030458, "containerPort": 427196286, "protocol": "o/樝fw[Řż丩Ž", - "hostIP": "213" + "hostIP": "215" } ], "envFrom": [ { - "prefix": "214", + "prefix": "216", "configMapRef": { - "name": "215", + "name": "217", "optional": false }, "secretRef": { - "name": "216", + "name": "218", "optional": true } } ], "env": [ { - "name": "217", - "value": "218", + "name": "219", + "value": "220", "valueFrom": { "fieldRef": { - "apiVersion": "219", - "fieldPath": "220" + "apiVersion": "221", + "fieldPath": "222" }, "resourceFieldRef": { - "containerName": "221", - "resource": "222", + "containerName": "223", + "resource": "224", "divisor": "932" }, "configMapKeyRef": { - "name": "223", - "key": "224", + "name": "225", + "key": "226", "optional": false }, "secretKeyRef": { - "name": "225", - "key": "226", + "name": "227", + "key": "228", "optional": true } } @@ -659,41 +661,41 @@ }, "volumeMounts": [ { - "name": "227", + "name": "229", "readOnly": true, - "mountPath": "228", - "subPath": "229", + "mountPath": "230", + "subPath": "231", "mountPropagation": "奺Ȋ礶惇¸t颟.鵫ǚ", - "subPathExpr": "230" + "subPathExpr": "232" } ], "volumeDevices": [ { - "name": "231", - "devicePath": "232" + "name": "233", + "devicePath": "234" } ], "livenessProbe": { "exec": { "command": [ - "233" + "235" ] }, "httpGet": { - "path": "234", - "port": "235", - "host": "236", + "path": "236", + "port": "237", + "host": "238", "scheme": "Ȥ藠3.", "httpHeaders": [ { - "name": "237", - "value": "238" + "name": "239", + "value": "240" } ] }, "tcpSocket": { - "port": "239", - "host": "240" + "port": "241", + "host": "242" }, "initialDelaySeconds": -1389418722, "timeoutSeconds": 851018015, @@ -704,24 +706,24 @@ "readinessProbe": { "exec": { "command": [ - "241" + "243" ] }, "httpGet": { - "path": "242", - "port": "243", - "host": "244", + "path": "244", + "port": "245", + "host": "246", "scheme": "«丯Ƙ枛牐ɺ皚", "httpHeaders": [ { - "name": "245", - "value": "246" + "name": "247", + "value": "248" } ] }, "tcpSocket": { "port": -1934111455, - "host": "247" + "host": "249" }, "initialDelaySeconds": 766864314, "timeoutSeconds": 1146016612, @@ -733,51 +735,51 @@ "postStart": { "exec": { "command": [ - "248" + "250" ] }, "httpGet": { - "path": "249", - "port": "250", - "host": "251", + "path": "251", + "port": "252", + "host": "253", "scheme": "'", "httpHeaders": [ { - "name": "252", - "value": "253" + "name": "254", + "value": "255" } ] }, "tcpSocket": { "port": -801430937, - "host": "254" + "host": "256" } }, "preStop": { "exec": { "command": [ - "255" + "257" ] }, "httpGet": { - "path": "256", + "path": "258", "port": 1810980158, - "host": "257", + "host": "259", "scheme": "_ƮA攤/ɸɎ R§耶FfBl", "httpHeaders": [ { - "name": "258", - "value": "259" + "name": "260", + "value": "261" } ] }, "tcpSocket": { "port": 1074486306, - "host": "260" + "host": "262" } } }, - "terminationMessagePath": "261", + "terminationMessagePath": "263", "terminationMessagePolicy": "Zɾģ毋Ó6dz娝嘚庎D}埽uʎ", "imagePullPolicy": "Ǖɳɷ9Ì崟¿瘦ɖ緕", "securityContext": { @@ -791,15 +793,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "262", - "role": "263", - "type": "264", - "level": "265" + "user": "264", + "role": "265", + "type": "266", + "level": "267" }, "windowsOptions": { - "gmsaCredentialSpecName": "266", - "gmsaCredentialSpec": "267", - "runAsUserName": "268" + "gmsaCredentialSpecName": "268", + "gmsaCredentialSpec": "269", + "runAsUserName": "270" }, "runAsUser": -6470941481344047265, "runAsGroup": 1373384864388370080, @@ -813,59 +815,59 @@ ], "ephemeralContainers": [ { - "name": "269", - "image": "270", + "name": "271", + "image": "272", "command": [ - "271" + "273" ], "args": [ - "272" + "274" ], - "workingDir": "273", + "workingDir": "275", "ports": [ { - "name": "274", + "name": "276", "hostPort": 2058122084, "containerPort": -379385405, "protocol": "#嬀ơŸ8T 苧yñKJɐ扵Gƚ绤f", - "hostIP": "275" + "hostIP": "277" } ], "envFrom": [ { - "prefix": "276", + "prefix": "278", "configMapRef": { - "name": "277", + "name": "279", "optional": true }, "secretRef": { - "name": "278", + "name": "280", "optional": false } } ], "env": [ { - "name": "279", - "value": "280", + "name": "281", + "value": "282", "valueFrom": { "fieldRef": { - "apiVersion": "281", - "fieldPath": "282" + "apiVersion": "283", + "fieldPath": "284" }, "resourceFieldRef": { - "containerName": "283", - "resource": "284", + "containerName": "285", + "resource": "286", "divisor": "355" }, "configMapKeyRef": { - "name": "285", - "key": "286", + "name": "287", + "key": "288", "optional": false }, "secretKeyRef": { - "name": "287", - "key": "288", + "name": "289", + "key": "290", "optional": true } } @@ -881,40 +883,40 @@ }, "volumeMounts": [ { - "name": "289", - "mountPath": "290", - "subPath": "291", + "name": "291", + "mountPath": "292", + "subPath": "293", "mountPropagation": "簳°Ļǟi\u0026皥贸", - "subPathExpr": "292" + "subPathExpr": "294" } ], "volumeDevices": [ { - "name": "293", - "devicePath": "294" + "name": "295", + "devicePath": "296" } ], "livenessProbe": { "exec": { "command": [ - "295" + "297" ] }, "httpGet": { - "path": "296", - "port": "297", - "host": "298", + "path": "298", + "port": "299", + "host": "300", "scheme": "现葢ŵ橨鬶l獕;跣Hǝcw媀瓄\u0026翜舞拉", "httpHeaders": [ { - "name": "299", - "value": "300" + "name": "301", + "value": "302" } ] }, "tcpSocket": { - "port": "301", - "host": "302" + "port": "303", + "host": "304" }, "initialDelaySeconds": 2066735093, "timeoutSeconds": -190183379, @@ -925,24 +927,24 @@ "readinessProbe": { "exec": { "command": [ - "303" + "305" ] }, "httpGet": { - "path": "304", - "port": "305", - "host": "306", + "path": "306", + "port": "307", + "host": "308", "scheme": "M蘇KŅ/»頸+SÄ蚃ɣľ)酊龨δ", "httpHeaders": [ { - "name": "307", - "value": "308" + "name": "309", + "value": "310" } ] }, "tcpSocket": { "port": 458427807, - "host": "309" + "host": "311" }, "initialDelaySeconds": -1971421078, "timeoutSeconds": 1905181464, @@ -954,51 +956,51 @@ "postStart": { "exec": { "command": [ - "310" + "312" ] }, "httpGet": { - "path": "311", - "port": "312", - "host": "313", + "path": "313", + "port": "314", + "host": "315", "scheme": "鶫:顇ə娯Ȱ囌{屿oiɥ嵐sC", "httpHeaders": [ { - "name": "314", - "value": "315" + "name": "316", + "value": "317" } ] }, "tcpSocket": { - "port": "316", - "host": "317" + "port": "318", + "host": "319" } }, "preStop": { "exec": { "command": [ - "318" + "320" ] }, "httpGet": { - "path": "319", - "port": "320", - "host": "321", + "path": "321", + "port": "322", + "host": "323", "scheme": "鬍熖B芭花ª瘡蟦JBʟ鍏H鯂²", "httpHeaders": [ { - "name": "322", - "value": "323" + "name": "324", + "value": "325" } ] }, "tcpSocket": { "port": -1187301925, - "host": "324" + "host": "326" } } }, - "terminationMessagePath": "325", + "terminationMessagePath": "327", "terminationMessagePolicy": "Őnj汰8ŕ", "imagePullPolicy": "邻爥蹔ŧOǨ繫ʎǑyZ涬P­蜷ɔ幩", "securityContext": { @@ -1012,15 +1014,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "326", - "role": "327", - "type": "328", - "level": "329" + "user": "328", + "role": "329", + "type": "330", + "level": "331" }, "windowsOptions": { - "gmsaCredentialSpecName": "330", - "gmsaCredentialSpec": "331", - "runAsUserName": "332" + "gmsaCredentialSpecName": "332", + "gmsaCredentialSpec": "333", + "runAsUserName": "334" }, "runAsUser": 6726836758549163621, "runAsGroup": 741362943076737213, @@ -1032,7 +1034,7 @@ "stdin": true, "stdinOnce": true, "tty": true, - "targetContainerName": "333" + "targetContainerName": "335" } ], "restartPolicy": "åe躒訙", @@ -1040,25 +1042,25 @@ "activeDeadlineSeconds": 9212087462729867542, "dnsPolicy": "娕uE增猍ǵ xǨŴ壶ƵfȽÃ茓pȓɻ", "nodeSelector": { - "334": "335" + "336": "337" }, - "serviceAccountName": "336", - "serviceAccount": "337", + "serviceAccountName": "338", + "serviceAccount": "339", "automountServiceAccountToken": false, - "nodeName": "338", + "nodeName": "340", "hostPID": true, "shareProcessNamespace": false, "securityContext": { "seLinuxOptions": { - "user": "339", - "role": "340", - "type": "341", - "level": "342" + "user": "341", + "role": "342", + "type": "343", + "level": "344" }, "windowsOptions": { - "gmsaCredentialSpecName": "343", - "gmsaCredentialSpec": "344", - "runAsUserName": "345" + "gmsaCredentialSpecName": "345", + "gmsaCredentialSpec": "346", + "runAsUserName": "347" }, "runAsUser": 7747616967629081728, "runAsGroup": 2548453080315983269, @@ -1069,18 +1071,18 @@ "fsGroup": -7117039988160665426, "sysctls": [ { - "name": "346", - "value": "347" + "name": "348", + "value": "349" } ] }, "imagePullSecrets": [ { - "name": "348" + "name": "350" } ], - "hostname": "349", - "subdomain": "350", + "hostname": "351", + "subdomain": "352", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1088,19 +1090,19 @@ { "matchExpressions": [ { - "key": "351", + "key": "353", "operator": "", "values": [ - "352" + "354" ] } ], "matchFields": [ { - "key": "353", + "key": "355", "operator": "ƽ眝{æ盪泙", "values": [ - "354" + "356" ] } ] @@ -1113,19 +1115,19 @@ "preference": { "matchExpressions": [ { - "key": "355", + "key": "357", "operator": "}Ñ蠂Ü[ƛ^輅9ɛ棕ƈ眽炊", "values": [ - "356" + "358" ] } ], "matchFields": [ { - "key": "357", + "key": "359", "operator": "ʨIk(dŊiɢzĮ蛋I滞", "values": [ - "358" + "360" ] } ] @@ -1148,9 +1150,9 @@ ] }, "namespaces": [ - "365" + "367" ], - "topologyKey": "366" + "topologyKey": "368" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1172,9 +1174,9 @@ ] }, "namespaces": [ - "373" + "375" ], - "topologyKey": "374" + "topologyKey": "376" } } ] @@ -1194,9 +1196,9 @@ ] }, "namespaces": [ - "381" + "383" ], - "topologyKey": "382" + "topologyKey": "384" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1215,45 +1217,45 @@ ] }, "namespaces": [ - "389" + "391" ], - "topologyKey": "390" + "topologyKey": "392" } } ] } }, - "schedulerName": "391", + "schedulerName": "393", "tolerations": [ { - "key": "392", + "key": "394", "operator": "ƹ|", - "value": "393", + "value": "395", "effect": "料ȭzV镜籬ƽ", "tolerationSeconds": 935587338391120947 } ], "hostAliases": [ { - "ip": "394", + "ip": "396", "hostnames": [ - "395" + "397" ] } ], - "priorityClassName": "396", + "priorityClassName": "398", "priority": 1690570439, "dnsConfig": { "nameservers": [ - "397" + "399" ], "searches": [ - "398" + "400" ], "options": [ { - "name": "399", - "value": "400" + "name": "401", + "value": "402" } ] }, @@ -1262,7 +1264,7 @@ "conditionType": "梑ʀŖ鱓;鹡鑓侅闍ŏŃŋŏ}ŀ姳" } ], - "runtimeClassName": "401", + "runtimeClassName": "403", "enableServiceLinks": true, "preemptionPolicy": "eáNRNJ丧鴻Ŀ", "overhead": { @@ -1271,7 +1273,7 @@ "topologySpreadConstraints": [ { "maxSkew": -137402083, - "topologyKey": "402", + "topologyKey": "404", "whenUnsatisfiable": "Ȩç捌聮ŃŻ@ǮJ=礏ƴ磳藷曥", "labelSelector": { "matchLabels": { @@ -1316,8 +1318,8 @@ "type": "Ƅ抄3昞财Î嘝zʄ", "status": "\u003ec緍k¢茤Ƣǟ½灶du汎mō6µɑ", "lastTransitionTime": "2196-03-13T21:02:11Z", - "reason": "409", - "message": "410" + "reason": "411", + "message": "412" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.pb b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.pb index c964542742f..0f01ea76542 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.pb and b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.yaml b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.yaml index 126aa6949d2..f4250224725 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.DaemonSet.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -42,31 +43,32 @@ spec: template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: 7534629739119643351 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -4139900758039117471 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: ĪȸŹăȲĻ¤Ħʅ芝 - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: false - kind: "34" - name: "35" + kind: "35" + name: "36" uid: ^ resourceVersion: "1698285396218902212" - selfLink: "27" + selfLink: "28" uid: TʡȂŏ{sǡƟ spec: activeDeadlineSeconds: 9212087462729867542 @@ -75,28 +77,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "355" + - key: "357" operator: '}Ñ蠂Ü[ƛ^輅9ɛ棕ƈ眽炊' values: - - "356" + - "358" matchFields: - - key: "357" + - key: "359" operator: ʨIk(dŊiɢzĮ蛋I滞 values: - - "358" + - "360" weight: 646133945 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "351" + - key: "353" operator: "" values: - - "352" + - "354" matchFields: - - key: "353" + - key: "355" operator: ƽ眝{æ盪泙 values: - - "354" + - "356" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -109,8 +111,8 @@ spec: matchLabels: w--162-gk2-99v22.g-65m8-1x129-9d8-s7-t7--336-11k9-8609a-e0--1----v8-4--558n1asz5/BD8.TS-jJ.Ys_Mop34_y: f_ZN.-_--r.E__-.8_e_l2.._8s--7_3x_-J5 namespaces: - - "373" - topologyKey: "374" + - "375" + topologyKey: "376" weight: -855547676 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -120,8 +122,8 @@ spec: matchLabels: 3.csh-3--Z1Tvw39FC: rtSY.g._2F7.-_e..Or_-.3OHgt._6 namespaces: - - "365" - topologyKey: "366" + - "367" + topologyKey: "368" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -132,8 +134,8 @@ spec: matchLabels: 3-mLlx...w_t-_.5.40Rw4gD.._.-x6db-L7.-__-G2: CpS__.39g_.--_-_ve5.m_2_--XZx namespaces: - - "389" - topologyKey: "390" + - "391" + topologyKey: "392" weight: 808399187 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -143,119 +145,119 @@ spec: matchLabels: 4-m_0-m-6Sp_N-S..O-BZ..6-1.S-B33: 17ca-_p-y.eQZ9p_1 namespaces: - - "381" - topologyKey: "382" + - "383" + topologyKey: "384" automountServiceAccountToken: false containers: - args: - - "210" + - "212" command: - - "209" + - "211" env: - - name: "217" - value: "218" + - name: "219" + value: "220" valueFrom: configMapKeyRef: - key: "224" - name: "223" - optional: false - fieldRef: - apiVersion: "219" - fieldPath: "220" - resourceFieldRef: - containerName: "221" - divisor: "932" - resource: "222" - secretKeyRef: key: "226" name: "225" + optional: false + fieldRef: + apiVersion: "221" + fieldPath: "222" + resourceFieldRef: + containerName: "223" + divisor: "932" + resource: "224" + secretKeyRef: + key: "228" + name: "227" optional: true envFrom: - configMapRef: - name: "215" + name: "217" optional: false - prefix: "214" + prefix: "216" secretRef: - name: "216" + name: "218" optional: true - image: "208" + image: "210" imagePullPolicy: Ǖɳɷ9Ì崟¿瘦ɖ緕 lifecycle: postStart: exec: command: - - "248" + - "250" httpGet: - host: "251" + host: "253" httpHeaders: - - name: "252" - value: "253" - path: "249" - port: "250" + - name: "254" + value: "255" + path: "251" + port: "252" scheme: '''' tcpSocket: - host: "254" + host: "256" port: -801430937 preStop: exec: command: - - "255" + - "257" httpGet: - host: "257" + host: "259" httpHeaders: - - name: "258" - value: "259" - path: "256" + - name: "260" + value: "261" + path: "258" port: 1810980158 scheme: _ƮA攤/ɸɎ R§耶FfBl tcpSocket: - host: "260" + host: "262" port: 1074486306 livenessProbe: exec: command: - - "233" + - "235" failureThreshold: -161485752 httpGet: - host: "236" + host: "238" httpHeaders: - - name: "237" - value: "238" - path: "234" - port: "235" + - name: "239" + value: "240" + path: "236" + port: "237" scheme: Ȥ藠3. initialDelaySeconds: -1389418722 periodSeconds: 596942561 successThreshold: -1880980172 tcpSocket: - host: "240" - port: "239" + host: "242" + port: "241" timeoutSeconds: 851018015 - name: "207" + name: "209" ports: - containerPort: 427196286 - hostIP: "213" + hostIP: "215" hostPort: 1385030458 - name: "212" + name: "214" protocol: o/樝fw[Řż丩Ž readinessProbe: exec: command: - - "241" + - "243" failureThreshold: 59664438 httpGet: - host: "244" + host: "246" httpHeaders: - - name: "245" - value: "246" - path: "242" - port: "243" + - name: "247" + value: "248" + path: "244" + port: "245" scheme: «丯Ƙ枛牐ɺ皚 initialDelaySeconds: 766864314 periodSeconds: 1495880465 successThreshold: -1032967081 tcpSocket: - host: "247" + host: "249" port: -1934111455 timeoutSeconds: 1146016612 resources: @@ -277,148 +279,148 @@ spec: runAsNonRoot: false runAsUser: -6470941481344047265 seLinuxOptions: - level: "265" - role: "263" - type: "264" - user: "262" + level: "267" + role: "265" + type: "266" + user: "264" windowsOptions: - gmsaCredentialSpec: "267" - gmsaCredentialSpecName: "266" - runAsUserName: "268" - terminationMessagePath: "261" + gmsaCredentialSpec: "269" + gmsaCredentialSpecName: "268" + runAsUserName: "270" + terminationMessagePath: "263" terminationMessagePolicy: Zɾģ毋Ó6dz娝嘚庎D}埽uʎ tty: true volumeDevices: - - devicePath: "232" - name: "231" + - devicePath: "234" + name: "233" volumeMounts: - - mountPath: "228" + - mountPath: "230" mountPropagation: 奺Ȋ礶惇¸t颟.鵫ǚ - name: "227" + name: "229" readOnly: true - subPath: "229" - subPathExpr: "230" - workingDir: "211" + subPath: "231" + subPathExpr: "232" + workingDir: "213" dnsConfig: nameservers: - - "397" + - "399" options: - - name: "399" - value: "400" + - name: "401" + value: "402" searches: - - "398" + - "400" dnsPolicy: 娕uE增猍ǵ xǨŴ壶ƵfȽÃ茓pȓɻ enableServiceLinks: true ephemeralContainers: - args: - - "272" + - "274" command: - - "271" + - "273" env: - - name: "279" - value: "280" + - name: "281" + value: "282" valueFrom: configMapKeyRef: - key: "286" - name: "285" - optional: false - fieldRef: - apiVersion: "281" - fieldPath: "282" - resourceFieldRef: - containerName: "283" - divisor: "355" - resource: "284" - secretKeyRef: key: "288" name: "287" + optional: false + fieldRef: + apiVersion: "283" + fieldPath: "284" + resourceFieldRef: + containerName: "285" + divisor: "355" + resource: "286" + secretKeyRef: + key: "290" + name: "289" optional: true envFrom: - configMapRef: - name: "277" + name: "279" optional: true - prefix: "276" + prefix: "278" secretRef: - name: "278" + name: "280" optional: false - image: "270" + image: "272" imagePullPolicy: 邻爥蹔ŧOǨ繫ʎǑyZ涬P­蜷ɔ幩 lifecycle: postStart: exec: command: - - "310" + - "312" httpGet: - host: "313" + host: "315" httpHeaders: - - name: "314" - value: "315" - path: "311" - port: "312" + - name: "316" + value: "317" + path: "313" + port: "314" scheme: 鶫:顇ə娯Ȱ囌{屿oiɥ嵐sC tcpSocket: - host: "317" - port: "316" + host: "319" + port: "318" preStop: exec: command: - - "318" + - "320" httpGet: - host: "321" + host: "323" httpHeaders: - - name: "322" - value: "323" - path: "319" - port: "320" + - name: "324" + value: "325" + path: "321" + port: "322" scheme: 鬍熖B芭花ª瘡蟦JBʟ鍏H鯂² tcpSocket: - host: "324" + host: "326" port: -1187301925 livenessProbe: exec: command: - - "295" + - "297" failureThreshold: 2030115750 httpGet: - host: "298" + host: "300" httpHeaders: - - name: "299" - value: "300" - path: "296" - port: "297" + - name: "301" + value: "302" + path: "298" + port: "299" scheme: 现葢ŵ橨鬶l獕;跣Hǝcw媀瓄&翜舞拉 initialDelaySeconds: 2066735093 periodSeconds: -940334911 successThreshold: -341287812 tcpSocket: - host: "302" - port: "301" + host: "304" + port: "303" timeoutSeconds: -190183379 - name: "269" + name: "271" ports: - containerPort: -379385405 - hostIP: "275" + hostIP: "277" hostPort: 2058122084 - name: "274" + name: "276" protocol: '#嬀ơŸ8T 苧yñKJɐ扵Gƚ绤f' readinessProbe: exec: command: - - "303" + - "305" failureThreshold: -385597677 httpGet: - host: "306" + host: "308" httpHeaders: - - name: "307" - value: "308" - path: "304" - port: "305" + - name: "309" + value: "310" + path: "306" + port: "307" scheme: M蘇KŅ/»頸+SÄ蚃ɣľ)酊龨δ initialDelaySeconds: -1971421078 periodSeconds: -1730959016 successThreshold: 1272940694 tcpSocket: - host: "309" + host: "311" port: 458427807 timeoutSeconds: 1905181464 resources: @@ -440,146 +442,146 @@ spec: runAsNonRoot: false runAsUser: 6726836758549163621 seLinuxOptions: - level: "329" - role: "327" - type: "328" - user: "326" + level: "331" + role: "329" + type: "330" + user: "328" windowsOptions: - gmsaCredentialSpec: "331" - gmsaCredentialSpecName: "330" - runAsUserName: "332" + gmsaCredentialSpec: "333" + gmsaCredentialSpecName: "332" + runAsUserName: "334" stdin: true stdinOnce: true - targetContainerName: "333" - terminationMessagePath: "325" + targetContainerName: "335" + terminationMessagePath: "327" terminationMessagePolicy: Őnj汰8ŕ tty: true volumeDevices: - - devicePath: "294" - name: "293" + - devicePath: "296" + name: "295" volumeMounts: - - mountPath: "290" + - mountPath: "292" mountPropagation: 簳°Ļǟi&皥贸 - name: "289" - subPath: "291" - subPathExpr: "292" - workingDir: "273" + name: "291" + subPath: "293" + subPathExpr: "294" + workingDir: "275" hostAliases: - hostnames: - - "395" - ip: "394" + - "397" + ip: "396" hostPID: true - hostname: "349" + hostname: "351" imagePullSecrets: - - name: "348" + - name: "350" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "468" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "468" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: true envFrom: - configMapRef: - name: "153" + name: "155" optional: false - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: false - image: "146" + image: "148" imagePullPolicy: Ŵ廷s{Ⱦdz@ lifecycle: postStart: exec: command: - - "186" + - "188" httpGet: - host: "189" + host: "191" httpHeaders: - - name: "190" - value: "191" - path: "187" - port: "188" + - name: "192" + value: "193" + path: "189" + port: "190" tcpSocket: - host: "192" + host: "194" port: 559781916 preStop: exec: command: - - "193" + - "195" httpGet: - host: "195" + host: "197" httpHeaders: - - name: "196" - value: "197" - path: "194" + - name: "198" + value: "199" + path: "196" port: 1150375229 scheme: QÄȻȊ+?ƭ峧Y栲茇竛吲蚛隖<Ƕ tcpSocket: - host: "198" + host: "200" port: -1696471293 livenessProbe: exec: command: - - "171" + - "173" failureThreshold: 1466047181 httpGet: - host: "174" + host: "176" httpHeaders: - - name: "175" - value: "176" - path: "172" - port: "173" + - name: "177" + value: "178" + path: "174" + port: "175" initialDelaySeconds: 1805144649 periodSeconds: 1403721475 successThreshold: 519906483 tcpSocket: - host: "178" - port: "177" + host: "180" + port: "179" timeoutSeconds: -606111218 - name: "145" + name: "147" ports: - containerPort: 437857734 - hostIP: "151" + hostIP: "153" hostPort: -1510026905 - name: "150" + name: "152" protocol: Rƥ贫d飼$俊跾|@?鷅b readinessProbe: exec: command: - - "179" + - "181" failureThreshold: 524249411 httpGet: - host: "182" + host: "184" httpHeaders: - - name: "183" - value: "184" - path: "180" - port: "181" + - name: "185" + value: "186" + path: "182" + port: "183" scheme: w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ initialDelaySeconds: -1724160601 periodSeconds: 1435507444 successThreshold: -1430577593 tcpSocket: - host: "185" + host: "187" port: -337353552 timeoutSeconds: -1158840571 resources: @@ -601,72 +603,72 @@ spec: runAsNonRoot: true runAsUser: 4181787587415673530 seLinuxOptions: - level: "203" - role: "201" - type: "202" - user: "200" + level: "205" + role: "203" + type: "204" + user: "202" windowsOptions: - gmsaCredentialSpec: "205" - gmsaCredentialSpecName: "204" - runAsUserName: "206" + gmsaCredentialSpec: "207" + gmsaCredentialSpecName: "206" + runAsUserName: "208" stdin: true stdinOnce: true - terminationMessagePath: "199" + terminationMessagePath: "201" terminationMessagePolicy: £軶ǃ*ʙ嫙&蒒5靇C'ɵK.Q貇 volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: 卩蝾 - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "338" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "340" nodeSelector: - "334": "335" + "336": "337" overhead: 癜鞤A馱z芀¿l磶Bb偃礳Ȭ痍脉PPö: "607" preemptionPolicy: eáNRNJ丧鴻Ŀ priority: 1690570439 - priorityClassName: "396" + priorityClassName: "398" readinessGates: - conditionType: 梑ʀŖ鱓;鹡鑓侅闍ŏŃŋŏ}ŀ姳 restartPolicy: åe躒訙 - runtimeClassName: "401" - schedulerName: "391" + runtimeClassName: "403" + schedulerName: "393" securityContext: fsGroup: -7117039988160665426 runAsGroup: 2548453080315983269 runAsNonRoot: false runAsUser: 7747616967629081728 seLinuxOptions: - level: "342" - role: "340" - type: "341" - user: "339" + level: "344" + role: "342" + type: "343" + user: "341" supplementalGroups: - -1193643752264108019 sysctls: - - name: "346" - value: "347" + - name: "348" + value: "349" windowsOptions: - gmsaCredentialSpec: "344" - gmsaCredentialSpecName: "343" - runAsUserName: "345" - serviceAccount: "337" - serviceAccountName: "336" + gmsaCredentialSpec: "346" + gmsaCredentialSpecName: "345" + runAsUserName: "347" + serviceAccount: "339" + serviceAccountName: "338" shareProcessNamespace: false - subdomain: "350" + subdomain: "352" terminationGracePeriodSeconds: 6942343986058351509 tolerations: - effect: 料ȭzV镜籬ƽ - key: "392" + key: "394" operator: ƹ| tolerationSeconds: 935587338391120947 - value: "393" + value: "395" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -677,207 +679,207 @@ spec: matchLabels: E--pT751: mV__1-wv3UDf.-4D-r.-F__r.oh..2_uGGP..X maxSkew: -137402083 - topologyKey: "402" + topologyKey: "404" whenUnsatisfiable: Ȩç捌聮ŃŻ@ǮJ=礏ƴ磳藷曥 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: -2007808768 - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: k ź贩j瀉ǚrǜnh0åȂ - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: nj揠8lj黳鈫ʕ禒Ƙá腿ħ缶 readOnly: false azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 952979935 items: - - key: "97" + - key: "99" mode: 2020789772 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: true volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: -868808281 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: -1768075156 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "915" - resource: "90" + resource: "92" emptyDir: medium: ɹ坼É/pȿ sizeLimit: "804" fc: - fsType: "92" + fsType: "94" lun: 570501002 targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" readOnly: true secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1318752360 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" hostPath: - path: "41" + path: "43" type: "" iscsi: chapAuthDiscovery: true chapAuthSession: true - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 408756018 portals: - - "58" + - "60" readOnly: true secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" - volumeID: "126" + fsType: "129" + volumeID: "128" projected: defaultMode: 480521693 sources: - configMap: items: - - key: "122" + - key: "124" mode: -1126738259 - path: "123" - name: "121" + path: "125" + name: "123" optional: true downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: -1618937335 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "461" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: 675406340 - path: "115" - name: "113" + path: "117" + name: "115" optional: false serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: -6345861634934949644 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" readOnly: true secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" + name: "132" sslEnabled: true - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 1233814916 items: - - key: "50" + - key: "52" mode: 228756891 - path: "51" + path: "53" optional: false - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" templateGeneration: 8027668557984017414 updateStrategy: rollingUpdate: {} @@ -886,8 +888,8 @@ status: collisionCount: 2063260600 conditions: - lastTransitionTime: "2196-03-13T21:02:11Z" - message: "410" - reason: "409" + message: "412" + reason: "411" status: '>c緍k¢茤Ƣǟ½灶du汎mō6µɑ' type: Ƅ抄3昞财Î嘝zʄ currentNumberScheduled: -1707056814 diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.json b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.json index 0770f743be3..f0e8b7bfb74 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.json +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -54,49 +55,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "?Qȫş", "resourceVersion": "1736621709629422270", "generation": -8542870036622468681, "creationTimestamp": null, "deletionGracePeriodSeconds": -2575298329142810753, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "ƶȤ^}", "controller": true, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "躢", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱\u003c" }, "emptyDir": { @@ -104,27 +106,27 @@ "sizeLimit": "473" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1188153605 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": 912004803, "readOnly": true }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": -547518679 } ], @@ -132,91 +134,91 @@ "optional": true }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 994527057, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "portals": [ - "58" + "60" ], "chapAuthDiscovery": true, "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62", + "endpoints": "63", + "path": "64", "readOnly": true }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" } }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "readOnly": true, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "660" }, "mode": 1569992019 @@ -226,26 +228,26 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": -1740986684, - "fsType": "92", + "fsType": "94", "readOnly": true, "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95", + "secretName": "96", + "shareName": "97", "readOnly": true }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": 195263908 } ], @@ -253,39 +255,39 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", - "user": "105", - "group": "106", - "tenant": "107" + "registry": "105", + "volume": "106", + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "|@?鷅bȻN", - "fsType": "110", + "fsType": "112", "readOnly": true, "kind": "榱*Gưoɘ檲" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": -323584340 } ], @@ -294,14 +296,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "106" }, "mode": 173030157 @@ -309,118 +311,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": 2063799569 } ], "optional": false }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": 8357931971650847566, - "path": "125" + "path": "127" } } ], "defaultMode": -1334904807 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127", + "volumeID": "128", + "fsType": "129", "readOnly": true }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": false, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -606111218, "containerPort": 1403721475, "protocol": "ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": true }, "secretRef": { - "name": "154", + "name": "156", "optional": true } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "650" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": false }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": true } } @@ -436,41 +438,41 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", + "path": "174", "port": -152585895, - "host": "173", + "host": "175", "scheme": "E@Ȗs«ö", "httpHeaders": [ { - "name": "174", - "value": "175" + "name": "176", + "value": "177" } ] }, "tcpSocket": { "port": 1135182169, - "host": "176" + "host": "178" }, "initialDelaySeconds": 1843758068, "timeoutSeconds": -1967469005, @@ -481,24 +483,24 @@ "readinessProbe": { "exec": { "command": [ - "177" + "179" ] }, "httpGet": { - "path": "178", + "path": "180", "port": 386652373, - "host": "179", + "host": "181", "scheme": "ʙ嫙\u0026", "httpHeaders": [ { - "name": "180", - "value": "181" + "name": "182", + "value": "183" } ] }, "tcpSocket": { - "port": "182", - "host": "183" + "port": "184", + "host": "185" }, "initialDelaySeconds": -802585193, "timeoutSeconds": 1901330124, @@ -510,51 +512,51 @@ "postStart": { "exec": { "command": [ - "184" + "186" ] }, "httpGet": { - "path": "185", - "port": "186", - "host": "187", + "path": "187", + "port": "188", + "host": "189", "scheme": "£ȹ嫰ƹǔw÷nI粛E煹", "httpHeaders": [ { - "name": "188", - "value": "189" + "name": "190", + "value": "191" } ] }, "tcpSocket": { "port": 135036402, - "host": "190" + "host": "192" } }, "preStop": { "exec": { "command": [ - "191" + "193" ] }, "httpGet": { - "path": "192", + "path": "194", "port": -1188430996, - "host": "193", + "host": "195", "scheme": "djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪", "httpHeaders": [ { - "name": "194", - "value": "195" + "name": "196", + "value": "197" } ] }, "tcpSocket": { - "port": "196", - "host": "197" + "port": "198", + "host": "199" } } }, - "terminationMessagePath": "198", + "terminationMessagePath": "200", "terminationMessagePolicy": "ɩC", "securityContext": { "capabilities": { @@ -567,15 +569,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "199", - "role": "200", - "type": "201", - "level": "202" + "user": "201", + "role": "202", + "type": "203", + "level": "204" }, "windowsOptions": { - "gmsaCredentialSpecName": "203", - "gmsaCredentialSpec": "204", - "runAsUserName": "205" + "gmsaCredentialSpecName": "205", + "gmsaCredentialSpec": "206", + "runAsUserName": "207" }, "runAsUser": 7739117973959656085, "runAsGroup": 3747003978559617838, @@ -590,59 +592,59 @@ ], "containers": [ { - "name": "206", - "image": "207", + "name": "208", + "image": "209", "command": [ - "208" + "210" ], "args": [ - "209" + "211" ], - "workingDir": "210", + "workingDir": "212", "ports": [ { - "name": "211", + "name": "213", "hostPort": 474119379, "containerPort": 1923334396, "protocol": "旿@掇lNdǂ\u003e5姣\u003e懔%熷谟þ", - "hostIP": "212" + "hostIP": "214" } ], "envFrom": [ { - "prefix": "213", + "prefix": "215", "configMapRef": { - "name": "214", + "name": "216", "optional": false }, "secretRef": { - "name": "215", + "name": "217", "optional": true } } ], "env": [ { - "name": "216", - "value": "217", + "name": "218", + "value": "219", "valueFrom": { "fieldRef": { - "apiVersion": "218", - "fieldPath": "219" + "apiVersion": "220", + "fieldPath": "221" }, "resourceFieldRef": { - "containerName": "220", - "resource": "221", + "containerName": "222", + "resource": "223", "divisor": "771" }, "configMapKeyRef": { - "name": "222", - "key": "223", + "name": "224", + "key": "225", "optional": false }, "secretKeyRef": { - "name": "224", - "key": "225", + "name": "226", + "key": "227", "optional": true } } @@ -658,41 +660,41 @@ }, "volumeMounts": [ { - "name": "226", + "name": "228", "readOnly": true, - "mountPath": "227", - "subPath": "228", + "mountPath": "229", + "subPath": "230", "mountPropagation": "0矀Kʝ瘴I\\p[ħsĨɆâĺɗŹ倗S", - "subPathExpr": "229" + "subPathExpr": "231" } ], "volumeDevices": [ { - "name": "230", - "devicePath": "231" + "name": "232", + "devicePath": "233" } ], "livenessProbe": { "exec": { "command": [ - "232" + "234" ] }, "httpGet": { - "path": "233", + "path": "235", "port": -1285424066, - "host": "234", + "host": "236", "scheme": "ni酛3ƁÀ", "httpHeaders": [ { - "name": "235", - "value": "236" + "name": "237", + "value": "238" } ] }, "tcpSocket": { - "port": "237", - "host": "238" + "port": "239", + "host": "240" }, "initialDelaySeconds": -2036074491, "timeoutSeconds": -148216266, @@ -703,24 +705,24 @@ "readinessProbe": { "exec": { "command": [ - "239" + "241" ] }, "httpGet": { - "path": "240", - "port": "241", - "host": "242", + "path": "242", + "port": "243", + "host": "244", "scheme": "3!Zɾģ毋Ó6", "httpHeaders": [ { - "name": "243", - "value": "244" + "name": "245", + "value": "246" } ] }, "tcpSocket": { "port": -832805508, - "host": "245" + "host": "247" }, "initialDelaySeconds": -228822833, "timeoutSeconds": -970312425, @@ -732,51 +734,51 @@ "postStart": { "exec": { "command": [ - "246" + "248" ] }, "httpGet": { - "path": "247", + "path": "249", "port": -2013568185, - "host": "248", + "host": "250", "scheme": "#yV'WKw(ğ儴Ůĺ}", "httpHeaders": [ { - "name": "249", - "value": "250" + "name": "251", + "value": "252" } ] }, "tcpSocket": { "port": -20130017, - "host": "251" + "host": "253" } }, "preStop": { "exec": { "command": [ - "252" + "254" ] }, "httpGet": { - "path": "253", + "path": "255", "port": -661937776, - "host": "254", + "host": "256", "scheme": "ØœȠƬQg鄠[颐o", "httpHeaders": [ { - "name": "255", - "value": "256" + "name": "257", + "value": "258" } ] }, "tcpSocket": { "port": 461585849, - "host": "257" + "host": "259" } } }, - "terminationMessagePath": "258", + "terminationMessagePath": "260", "terminationMessagePolicy": "ɇ卷荙JLĹ]佱¿\u003e犵殇ŕ-Ɂ", "imagePullPolicy": "ƙt叀碧闳ȩr嚧ʣq埄趛屡", "securityContext": { @@ -790,15 +792,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "259", - "role": "260", - "type": "261", - "level": "262" + "user": "261", + "role": "262", + "type": "263", + "level": "264" }, "windowsOptions": { - "gmsaCredentialSpecName": "263", - "gmsaCredentialSpec": "264", - "runAsUserName": "265" + "gmsaCredentialSpecName": "265", + "gmsaCredentialSpec": "266", + "runAsUserName": "267" }, "runAsUser": -5835415947553716289, "runAsGroup": 2540215688947167763, @@ -812,59 +814,59 @@ ], "ephemeralContainers": [ { - "name": "266", - "image": "267", + "name": "268", + "image": "269", "command": [ - "268" + "270" ], "args": [ - "269" + "271" ], - "workingDir": "270", + "workingDir": "272", "ports": [ { - "name": "271", + "name": "273", "hostPort": -552281772, "containerPort": -677617960, "protocol": "ŕ翑0展}", - "hostIP": "272" + "hostIP": "274" } ], "envFrom": [ { - "prefix": "273", + "prefix": "275", "configMapRef": { - "name": "274", + "name": "276", "optional": false }, "secretRef": { - "name": "275", + "name": "277", "optional": false } } ], "env": [ { - "name": "276", - "value": "277", + "name": "278", + "value": "279", "valueFrom": { "fieldRef": { - "apiVersion": "278", - "fieldPath": "279" + "apiVersion": "280", + "fieldPath": "281" }, "resourceFieldRef": { - "containerName": "280", - "resource": "281", + "containerName": "282", + "resource": "283", "divisor": "185" }, "configMapKeyRef": { - "name": "282", - "key": "283", + "name": "284", + "key": "285", "optional": true }, "secretKeyRef": { - "name": "284", - "key": "285", + "name": "286", + "key": "287", "optional": false } } @@ -880,40 +882,40 @@ }, "volumeMounts": [ { - "name": "286", - "mountPath": "287", - "subPath": "288", + "name": "288", + "mountPath": "289", + "subPath": "290", "mountPropagation": "", - "subPathExpr": "289" + "subPathExpr": "291" } ], "volumeDevices": [ { - "name": "290", - "devicePath": "291" + "name": "292", + "devicePath": "293" } ], "livenessProbe": { "exec": { "command": [ - "292" + "294" ] }, "httpGet": { - "path": "293", - "port": "294", - "host": "295", + "path": "295", + "port": "296", + "host": "297", "scheme": "頸", "httpHeaders": [ { - "name": "296", - "value": "297" + "name": "298", + "value": "299" } ] }, "tcpSocket": { "port": 1315054653, - "host": "298" + "host": "300" }, "initialDelaySeconds": 711020087, "timeoutSeconds": 1103049140, @@ -924,24 +926,24 @@ "readinessProbe": { "exec": { "command": [ - "299" + "301" ] }, "httpGet": { - "path": "300", - "port": "301", - "host": "302", + "path": "302", + "port": "303", + "host": "304", "scheme": "ƿ頀\"冓鍓贯澔 ", "httpHeaders": [ { - "name": "303", - "value": "304" + "name": "305", + "value": "306" } ] }, "tcpSocket": { - "port": "305", - "host": "306" + "port": "307", + "host": "308" }, "initialDelaySeconds": 1058960779, "timeoutSeconds": -2133441986, @@ -953,51 +955,51 @@ "postStart": { "exec": { "command": [ - "307" + "309" ] }, "httpGet": { - "path": "308", + "path": "310", "port": -934378634, - "host": "309", + "host": "311", "scheme": "ɐ鰥", "httpHeaders": [ { - "name": "310", - "value": "311" + "name": "312", + "value": "313" } ] }, "tcpSocket": { "port": 630140708, - "host": "312" + "host": "314" } }, "preStop": { "exec": { "command": [ - "313" + "315" ] }, "httpGet": { - "path": "314", - "port": "315", - "host": "316", + "path": "316", + "port": "317", + "host": "318", "scheme": "8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録²", "httpHeaders": [ { - "name": "317", - "value": "318" + "name": "319", + "value": "320" } ] }, "tcpSocket": { "port": 2080874371, - "host": "319" + "host": "321" } } }, - "terminationMessagePath": "320", + "terminationMessagePath": "322", "terminationMessagePolicy": "灩聋3趐囨鏻砅邻", "imagePullPolicy": "騎C\"6x$1sȣ±p鋄", "securityContext": { @@ -1011,15 +1013,15 @@ }, "privileged": false, "seLinuxOptions": { - "user": "321", - "role": "322", - "type": "323", - "level": "324" + "user": "323", + "role": "324", + "type": "325", + "level": "326" }, "windowsOptions": { - "gmsaCredentialSpecName": "325", - "gmsaCredentialSpec": "326", - "runAsUserName": "327" + "gmsaCredentialSpecName": "327", + "gmsaCredentialSpec": "328", + "runAsUserName": "329" }, "runAsUser": 4288903380102217677, "runAsGroup": 6618112330449141397, @@ -1030,7 +1032,7 @@ }, "stdinOnce": true, "tty": true, - "targetContainerName": "328" + "targetContainerName": "330" } ], "restartPolicy": "w妕眵笭/9崍h趭(娕", @@ -1038,25 +1040,25 @@ "activeDeadlineSeconds": -3214891994203952546, "dnsPolicy": "晲T[irȎ3Ĕ\\", "nodeSelector": { - "329": "330" + "331": "332" }, - "serviceAccountName": "331", - "serviceAccount": "332", + "serviceAccountName": "333", + "serviceAccount": "334", "automountServiceAccountToken": true, - "nodeName": "333", + "nodeName": "335", "hostIPC": true, "shareProcessNamespace": true, "securityContext": { "seLinuxOptions": { - "user": "334", - "role": "335", - "type": "336", - "level": "337" + "user": "336", + "role": "337", + "type": "338", + "level": "339" }, "windowsOptions": { - "gmsaCredentialSpecName": "338", - "gmsaCredentialSpec": "339", - "runAsUserName": "340" + "gmsaCredentialSpecName": "340", + "gmsaCredentialSpec": "341", + "runAsUserName": "342" }, "runAsUser": 4430285638700927057, "runAsGroup": 7461098988156705429, @@ -1067,18 +1069,18 @@ "fsGroup": 7747616967629081728, "sysctls": [ { - "name": "341", - "value": "342" + "name": "343", + "value": "344" } ] }, "imagePullSecrets": [ { - "name": "343" + "name": "345" } ], - "hostname": "344", - "subdomain": "345", + "hostname": "346", + "subdomain": "347", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1086,19 +1088,19 @@ { "matchExpressions": [ { - "key": "346", + "key": "348", "operator": "Ǚ(", "values": [ - "347" + "349" ] } ], "matchFields": [ { - "key": "348", + "key": "350", "operator": "瘍Nʊ輔3璾ėȜv1b繐汚", "values": [ - "349" + "351" ] } ] @@ -1111,19 +1113,19 @@ "preference": { "matchExpressions": [ { - "key": "350", + "key": "352", "operator": "n覦灲閈誹ʅ蕉", "values": [ - "351" + "353" ] } ], "matchFields": [ { - "key": "352", + "key": "354", "operator": "", "values": [ - "353" + "355" ] } ] @@ -1146,9 +1148,9 @@ ] }, "namespaces": [ - "360" + "362" ], - "topologyKey": "361" + "topologyKey": "363" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1170,9 +1172,9 @@ ] }, "namespaces": [ - "368" + "370" ], - "topologyKey": "369" + "topologyKey": "371" } } ] @@ -1195,9 +1197,9 @@ ] }, "namespaces": [ - "376" + "378" ], - "topologyKey": "377" + "topologyKey": "379" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1219,45 +1221,45 @@ ] }, "namespaces": [ - "384" + "386" ], - "topologyKey": "385" + "topologyKey": "387" } } ] } }, - "schedulerName": "386", + "schedulerName": "388", "tolerations": [ { - "key": "387", + "key": "389", "operator": "抄3昞财Î嘝zʄ!ć", - "value": "388", + "value": "390", "effect": "緍k¢茤", "tolerationSeconds": 4096844323391966153 } ], "hostAliases": [ { - "ip": "389", + "ip": "391", "hostnames": [ - "390" + "392" ] } ], - "priorityClassName": "391", + "priorityClassName": "393", "priority": -1331113536, "dnsConfig": { "nameservers": [ - "392" + "394" ], "searches": [ - "393" + "395" ], "options": [ { - "name": "394", - "value": "395" + "name": "396", + "value": "397" } ] }, @@ -1266,7 +1268,7 @@ "conditionType": "mō6µɑ`ȗ\u003c8^翜" } ], - "runtimeClassName": "396", + "runtimeClassName": "398", "enableServiceLinks": false, "preemptionPolicy": "ý筞X", "overhead": { @@ -1275,7 +1277,7 @@ "topologySpreadConstraints": [ { "maxSkew": 1956797678, - "topologyKey": "397", + "topologyKey": "399", "whenUnsatisfiable": "ƀ+瑏eCmAȥ睙", "labelSelector": { "matchLabels": { @@ -1317,8 +1319,8 @@ "status": "2ț", "lastUpdateTime": "2733-02-09T15:36:31Z", "lastTransitionTime": "2615-10-02T05:14:27Z", - "reason": "404", - "message": "405" + "reason": "406", + "message": "407" } ], "collisionCount": -612321491 diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.pb b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.pb index bb2493e03e4..89a585bcfc8 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.pb and b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.yaml b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.yaml index 63b36291f6a..1473ebe951d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Deployment.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -46,31 +47,32 @@ spec: template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: -2575298329142810753 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -8542870036622468681 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: 躢 - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: true - kind: "34" - name: "35" + kind: "35" + name: "36" uid: ƶȤ^} resourceVersion: "1736621709629422270" - selfLink: "27" + selfLink: "28" uid: ?Qȫş spec: activeDeadlineSeconds: -3214891994203952546 @@ -79,28 +81,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "350" + - key: "352" operator: n覦灲閈誹ʅ蕉 values: - - "351" + - "353" matchFields: - - key: "352" + - key: "354" operator: "" values: - - "353" + - "355" weight: 702968201 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "346" + - key: "348" operator: Ǚ( values: - - "347" + - "349" matchFields: - - key: "348" + - key: "350" operator: 瘍Nʊ輔3璾ėȜv1b繐汚 values: - - "349" + - "351" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -113,8 +115,8 @@ spec: matchLabels: Bk.j._g-G-7--p9.-_0R.-_-3_L_2--_v2.5p_..Y-.wg_-b8a_68: Q4_.84.K_-_0_..u.F.pq..--Q namespaces: - - "368" - topologyKey: "369" + - "370" + topologyKey: "371" weight: 1195176401 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -124,8 +126,8 @@ spec: matchLabels: lm-e46-r-g63--gt1--6mx-r-927--m6-k8-c2---2etfh41ca-z-g/0p_3_J_SA995IKCR.s--f.-f.-zv._._.5-H.T.-.-.d: b_9_1o.w_aI._31-_I-A-_3bz._8M0U1_-__.71-_-9_._X-D---k..1Q7._l.I namespaces: - - "360" - topologyKey: "361" + - "362" + topologyKey: "363" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -138,8 +140,8 @@ spec: matchLabels: 3--rgvf3q-z-5z80n--t5--9-4-d2-22--i--40wv--in-870w--it6k47-7y1.h72n-cnp-75/c10KkQ-R_R.-.--4_IT_O__3.5h_XC0_-3: 20_._.-_L-__bf_9_-C-PfNx__-U_.Pn-W23-_.z_.._s--_F-BR-.h_-2-.F namespaces: - - "384" - topologyKey: "385" + - "386" + topologyKey: "387" weight: -1508769491 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -151,119 +153,119 @@ spec: matchLabels: H__V.Vz_6.Hz_V_.r_v_._e_-78o_6Z..11_7pX_.-mLlx...w_j: 35.40Rw4gD.._.-x6db-L7.-__-G_2kCpS_1 namespaces: - - "376" - topologyKey: "377" + - "378" + topologyKey: "379" automountServiceAccountToken: true containers: - args: - - "209" + - "211" command: - - "208" + - "210" env: - - name: "216" - value: "217" + - name: "218" + value: "219" valueFrom: configMapKeyRef: - key: "223" - name: "222" - optional: false - fieldRef: - apiVersion: "218" - fieldPath: "219" - resourceFieldRef: - containerName: "220" - divisor: "771" - resource: "221" - secretKeyRef: key: "225" name: "224" + optional: false + fieldRef: + apiVersion: "220" + fieldPath: "221" + resourceFieldRef: + containerName: "222" + divisor: "771" + resource: "223" + secretKeyRef: + key: "227" + name: "226" optional: true envFrom: - configMapRef: - name: "214" + name: "216" optional: false - prefix: "213" + prefix: "215" secretRef: - name: "215" + name: "217" optional: true - image: "207" + image: "209" imagePullPolicy: ƙt叀碧闳ȩr嚧ʣq埄趛屡 lifecycle: postStart: exec: command: - - "246" + - "248" httpGet: - host: "248" + host: "250" httpHeaders: - - name: "249" - value: "250" - path: "247" + - name: "251" + value: "252" + path: "249" port: -2013568185 scheme: '#yV''WKw(ğ儴Ůĺ}' tcpSocket: - host: "251" + host: "253" port: -20130017 preStop: exec: command: - - "252" + - "254" httpGet: - host: "254" + host: "256" httpHeaders: - - name: "255" - value: "256" - path: "253" + - name: "257" + value: "258" + path: "255" port: -661937776 scheme: ØœȠƬQg鄠[颐o tcpSocket: - host: "257" + host: "259" port: 461585849 livenessProbe: exec: command: - - "232" + - "234" failureThreshold: -93157681 httpGet: - host: "234" + host: "236" httpHeaders: - - name: "235" - value: "236" - path: "233" + - name: "237" + value: "238" + path: "235" port: -1285424066 scheme: ni酛3ƁÀ initialDelaySeconds: -2036074491 periodSeconds: 165047920 successThreshold: -393291312 tcpSocket: - host: "238" - port: "237" + host: "240" + port: "239" timeoutSeconds: -148216266 - name: "206" + name: "208" ports: - containerPort: 1923334396 - hostIP: "212" + hostIP: "214" hostPort: 474119379 - name: "211" + name: "213" protocol: 旿@掇lNdǂ>5姣>懔%熷谟þ readinessProbe: exec: command: - - "239" + - "241" failureThreshold: 267768240 httpGet: - host: "242" + host: "244" httpHeaders: - - name: "243" - value: "244" - path: "240" - port: "241" + - name: "245" + value: "246" + path: "242" + port: "243" scheme: 3!Zɾģ毋Ó6 initialDelaySeconds: -228822833 periodSeconds: -1213051101 successThreshold: 1451056156 tcpSocket: - host: "245" + host: "247" port: -832805508 timeoutSeconds: -970312425 resources: @@ -285,149 +287,149 @@ spec: runAsNonRoot: false runAsUser: -5835415947553716289 seLinuxOptions: - level: "262" - role: "260" - type: "261" - user: "259" + level: "264" + role: "262" + type: "263" + user: "261" windowsOptions: - gmsaCredentialSpec: "264" - gmsaCredentialSpecName: "263" - runAsUserName: "265" - terminationMessagePath: "258" + gmsaCredentialSpec: "266" + gmsaCredentialSpecName: "265" + runAsUserName: "267" + terminationMessagePath: "260" terminationMessagePolicy: ɇ卷荙JLĹ]佱¿>犵殇ŕ-Ɂ tty: true volumeDevices: - - devicePath: "231" - name: "230" + - devicePath: "233" + name: "232" volumeMounts: - - mountPath: "227" + - mountPath: "229" mountPropagation: 0矀Kʝ瘴I\p[ħsĨɆâĺɗŹ倗S - name: "226" + name: "228" readOnly: true - subPath: "228" - subPathExpr: "229" - workingDir: "210" + subPath: "230" + subPathExpr: "231" + workingDir: "212" dnsConfig: nameservers: - - "392" + - "394" options: - - name: "394" - value: "395" + - name: "396" + value: "397" searches: - - "393" + - "395" dnsPolicy: 晲T[irȎ3Ĕ\ enableServiceLinks: false ephemeralContainers: - args: - - "269" + - "271" command: - - "268" + - "270" env: - - name: "276" - value: "277" + - name: "278" + value: "279" valueFrom: configMapKeyRef: - key: "283" - name: "282" - optional: true - fieldRef: - apiVersion: "278" - fieldPath: "279" - resourceFieldRef: - containerName: "280" - divisor: "185" - resource: "281" - secretKeyRef: key: "285" name: "284" + optional: true + fieldRef: + apiVersion: "280" + fieldPath: "281" + resourceFieldRef: + containerName: "282" + divisor: "185" + resource: "283" + secretKeyRef: + key: "287" + name: "286" optional: false envFrom: - configMapRef: - name: "274" + name: "276" optional: false - prefix: "273" + prefix: "275" secretRef: - name: "275" + name: "277" optional: false - image: "267" + image: "269" imagePullPolicy: 騎C"6x$1sȣ±p鋄 lifecycle: postStart: exec: command: - - "307" + - "309" httpGet: - host: "309" + host: "311" httpHeaders: - - name: "310" - value: "311" - path: "308" + - name: "312" + value: "313" + path: "310" port: -934378634 scheme: ɐ鰥 tcpSocket: - host: "312" + host: "314" port: 630140708 preStop: exec: command: - - "313" + - "315" httpGet: - host: "316" + host: "318" httpHeaders: - - name: "317" - value: "318" - path: "314" - port: "315" + - name: "319" + value: "320" + path: "316" + port: "317" scheme: 8?Ǻ鱎ƙ;Nŕ璻Jih亏yƕ丆録² tcpSocket: - host: "319" + host: "321" port: 2080874371 livenessProbe: exec: command: - - "292" + - "294" failureThreshold: 1993268896 httpGet: - host: "295" + host: "297" httpHeaders: - - name: "296" - value: "297" - path: "293" - port: "294" + - name: "298" + value: "299" + path: "295" + port: "296" scheme: 頸 initialDelaySeconds: 711020087 periodSeconds: -1965247100 successThreshold: 218453478 tcpSocket: - host: "298" + host: "300" port: 1315054653 timeoutSeconds: 1103049140 - name: "266" + name: "268" ports: - containerPort: -677617960 - hostIP: "272" + hostIP: "274" hostPort: -552281772 - name: "271" + name: "273" protocol: ŕ翑0展} readinessProbe: exec: command: - - "299" + - "301" failureThreshold: -1250314365 httpGet: - host: "302" + host: "304" httpHeaders: - - name: "303" - value: "304" - path: "300" - port: "301" + - name: "305" + value: "306" + path: "302" + port: "303" scheme: 'ƿ頀"冓鍓贯澔 ' initialDelaySeconds: 1058960779 periodSeconds: 472742933 successThreshold: 50696420 tcpSocket: - host: "306" - port: "305" + host: "308" + port: "307" timeoutSeconds: -2133441986 resources: limits: @@ -448,147 +450,147 @@ spec: runAsNonRoot: false runAsUser: 4288903380102217677 seLinuxOptions: - level: "324" - role: "322" - type: "323" - user: "321" + level: "326" + role: "324" + type: "325" + user: "323" windowsOptions: - gmsaCredentialSpec: "326" - gmsaCredentialSpecName: "325" - runAsUserName: "327" + gmsaCredentialSpec: "328" + gmsaCredentialSpecName: "327" + runAsUserName: "329" stdinOnce: true - targetContainerName: "328" - terminationMessagePath: "320" + targetContainerName: "330" + terminationMessagePath: "322" terminationMessagePolicy: 灩聋3趐囨鏻砅邻 tty: true volumeDevices: - - devicePath: "291" - name: "290" + - devicePath: "293" + name: "292" volumeMounts: - - mountPath: "287" + - mountPath: "289" mountPropagation: "" - name: "286" - subPath: "288" - subPathExpr: "289" - workingDir: "270" + name: "288" + subPath: "290" + subPathExpr: "291" + workingDir: "272" hostAliases: - hostnames: - - "390" - ip: "389" + - "392" + ip: "391" hostIPC: true - hostname: "344" + hostname: "346" imagePullSecrets: - - name: "343" + - name: "345" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: false - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "650" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: false + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "650" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: true envFrom: - configMapRef: - name: "153" + name: "155" optional: true - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: true - image: "146" + image: "148" lifecycle: postStart: exec: command: - - "184" + - "186" httpGet: - host: "187" + host: "189" httpHeaders: - - name: "188" - value: "189" - path: "185" - port: "186" + - name: "190" + value: "191" + path: "187" + port: "188" scheme: £ȹ嫰ƹǔw÷nI粛E煹 tcpSocket: - host: "190" + host: "192" port: 135036402 preStop: exec: command: - - "191" + - "193" httpGet: - host: "193" + host: "195" httpHeaders: - - name: "194" - value: "195" - path: "192" + - name: "196" + value: "197" + path: "194" port: -1188430996 scheme: djƯĖ漘Z剚敍0)鈼¬麄p呝TG;邪 tcpSocket: - host: "197" - port: "196" + host: "199" + port: "198" livenessProbe: exec: command: - - "171" + - "173" failureThreshold: -1113628381 httpGet: - host: "173" + host: "175" httpHeaders: - - name: "174" - value: "175" - path: "172" + - name: "176" + value: "177" + path: "174" port: -152585895 scheme: E@Ȗs«ö initialDelaySeconds: 1843758068 periodSeconds: 1702578303 successThreshold: -1565157256 tcpSocket: - host: "176" + host: "178" port: 1135182169 timeoutSeconds: -1967469005 - name: "145" + name: "147" ports: - containerPort: 1403721475 - hostIP: "151" + hostIP: "153" hostPort: -606111218 - name: "150" + name: "152" protocol: ǰ溟ɴ扵閝ȝ鐵儣廡ɑ龫`劳 readinessProbe: exec: command: - - "177" + - "179" failureThreshold: -1167888910 httpGet: - host: "179" + host: "181" httpHeaders: - - name: "180" - value: "181" - path: "178" + - name: "182" + value: "183" + path: "180" port: 386652373 scheme: ʙ嫙& initialDelaySeconds: -802585193 periodSeconds: 1944205014 successThreshold: -2079582559 tcpSocket: - host: "183" - port: "182" + host: "185" + port: "184" timeoutSeconds: 1901330124 resources: limits: @@ -609,72 +611,72 @@ spec: runAsNonRoot: false runAsUser: 7739117973959656085 seLinuxOptions: - level: "202" - role: "200" - type: "201" - user: "199" + level: "204" + role: "202" + type: "203" + user: "201" windowsOptions: - gmsaCredentialSpec: "204" - gmsaCredentialSpecName: "203" - runAsUserName: "205" + gmsaCredentialSpec: "206" + gmsaCredentialSpecName: "205" + runAsUserName: "207" stdin: true stdinOnce: true - terminationMessagePath: "198" + terminationMessagePath: "200" terminationMessagePolicy: ɩC volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: "" - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "333" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "335" nodeSelector: - "329": "330" + "331": "332" overhead: tHǽ÷閂抰^窄CǙķȈ: "97" preemptionPolicy: ý筞X priority: -1331113536 - priorityClassName: "391" + priorityClassName: "393" readinessGates: - conditionType: mō6µɑ`ȗ<8^翜 restartPolicy: w妕眵笭/9崍h趭(娕 - runtimeClassName: "396" - schedulerName: "386" + runtimeClassName: "398" + schedulerName: "388" securityContext: fsGroup: 7747616967629081728 runAsGroup: 7461098988156705429 runAsNonRoot: false runAsUser: 4430285638700927057 seLinuxOptions: - level: "337" - role: "335" - type: "336" - user: "334" + level: "339" + role: "337" + type: "338" + user: "336" supplementalGroups: - 7866826580662861268 sysctls: - - name: "341" - value: "342" + - name: "343" + value: "344" windowsOptions: - gmsaCredentialSpec: "339" - gmsaCredentialSpecName: "338" - runAsUserName: "340" - serviceAccount: "332" - serviceAccountName: "331" + gmsaCredentialSpec: "341" + gmsaCredentialSpecName: "340" + runAsUserName: "342" + serviceAccount: "334" + serviceAccountName: "333" shareProcessNamespace: true - subdomain: "345" + subdomain: "347" terminationGracePeriodSeconds: 6245571390016329382 tolerations: - effect: 緍k¢茤 - key: "387" + key: "389" operator: 抄3昞财Î嘝zʄ!ć tolerationSeconds: 4096844323391966153 - value: "388" + value: "390" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -684,215 +686,215 @@ spec: ? zp22o4a-w----11rqy3eo79p-f4r1--7p--053--suu--98.y1s8-j-6j4uvf1-sdg--132bid-7x0u738--7w-tdt-u-0--v/Ied-0-i_zZsY_o8t5Vl6_..7CY-_dc__G6N-_-0o.0C_gV.9_G5 : x_.4dwFbuvEf55Y2k.F-4 maxSkew: 1956797678 - topologyKey: "397" + topologyKey: "399" whenUnsatisfiable: ƀ+瑏eCmAȥ睙 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: 912004803 readOnly: true - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: '|@?鷅bȻN' - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: 榱*Gưoɘ檲 readOnly: true azureFile: readOnly: true - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: 1593906314 items: - - key: "97" + - key: "99" mode: 195263908 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: false volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: 824682619 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 1569992019 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "660" - resource: "90" + resource: "92" emptyDir: medium: Xŋ朘瑥A徙ɶɊł/擇ɦĽ胚O醔ɍ厶耈 sizeLimit: "473" fc: - fsType: "92" + fsType: "94" lun: -1740986684 readOnly: true targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" readOnly: true secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1188153605 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" readOnly: true hostPath: - path: "41" + path: "43" type: ƛƟ)ÙæNǚ錯ƶRquA?瞲Ť倱< iscsi: chapAuthDiscovery: true - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 994527057 portals: - - "58" + - "60" secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" + fsType: "129" readOnly: true - volumeID: "126" + volumeID: "128" projected: defaultMode: -1334904807 sources: - configMap: items: - - key: "122" + - key: "124" mode: 2063799569 - path: "123" - name: "121" + path: "125" + name: "123" optional: false downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: 173030157 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "106" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: -323584340 - path: "115" - name: "113" + path: "117" + name: "115" optional: true serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: 8357931971650847566 - path: "125" + path: "127" quobyte: - group: "106" - registry: "103" - tenant: "107" - user: "105" - volume: "104" + group: "108" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + name: "132" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 332383000 items: - - key: "50" + - key: "52" mode: -547518679 - path: "51" + path: "53" optional: true - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" status: availableReplicas: -1521312599 collisionCount: -612321491 conditions: - lastTransitionTime: "2615-10-02T05:14:27Z" lastUpdateTime: "2733-02-09T15:36:31Z" - message: "405" - reason: "404" + message: "407" + reason: "406" status: 2ț type: '{ɦ!f親ʚ«Ǥ栌Ə侷ŧĞö' observedGeneration: -4950488263500864484 diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.json b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.json index c4fe4e80083..9bb4848ea84 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.json +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.json @@ -35,33 +35,34 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { "backend": { - "serviceName": "18", - "servicePort": "19" + "serviceName": "19", + "servicePort": "20" }, "tls": [ { "hosts": [ - "20" + "21" ], - "secretName": "21" + "secretName": "22" } ], "rules": [ { - "host": "22", + "host": "23", "http": { "paths": [ { - "path": "23", + "path": "24", "backend": { - "serviceName": "24", - "servicePort": "25" + "serviceName": "25", + "servicePort": "26" } } ] @@ -73,8 +74,8 @@ "loadBalancer": { "ingress": [ { - "ip": "26", - "hostname": "27" + "ip": "27", + "hostname": "28" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.pb b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.pb index 3664a0fdd52..ecb437de39c 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.pb and b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.yaml b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.yaml index 9e7617412d7..48aab026d26 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Ingress.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -30,22 +31,22 @@ metadata: uid: "7" spec: backend: - serviceName: "18" - servicePort: "19" + serviceName: "19" + servicePort: "20" rules: - - host: "22" + - host: "23" http: paths: - backend: - serviceName: "24" - servicePort: "25" - path: "23" + serviceName: "25" + servicePort: "26" + path: "24" tls: - hosts: - - "20" - secretName: "21" + - "21" + secretName: "22" status: loadBalancer: ingress: - - hostname: "27" - ip: "26" + - hostname: "28" + ip: "27" diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.json b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.json index 8643d30bfd5..b00c838511d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.json +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -86,9 +87,9 @@ ] }, "ipBlock": { - "cidr": "36", + "cidr": "37", "except": [ - "37" + "38" ] } } @@ -133,9 +134,9 @@ ] }, "ipBlock": { - "cidr": "50", + "cidr": "51", "except": [ - "51" + "52" ] } } diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.pb b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.pb index 4f1ff9d2327..15d0fe73f6b 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.pb and b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.yaml b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.yaml index 694ed20b4fd..cb934819ba3 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.NetworkPolicy.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -34,9 +35,9 @@ spec: - protocol: ɗ to: - ipBlock: - cidr: "50" + cidr: "51" except: - - "51" + - "52" namespaceSelector: matchExpressions: - key: 4a--0o8m3-d0w7p8vl-1z---883d-v3j4-7y-5.9-q390/niTl.1-.VT--5mj_9.M.134-5-.q6H5 @@ -57,9 +58,9 @@ spec: ingress: - from: - ipBlock: - cidr: "36" + cidr: "37" except: - - "37" + - "38" namespaceSelector: matchExpressions: - key: 2_28.-.7_8B.HF-U-_ik_--DSXr.n-A9..9__Y-H-Mqpt._.-_..051 diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.json b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.json index fbfe18551cf..cb4527d3de6 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.json +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -64,10 +65,10 @@ "seLinux": { "rule": "S", "seLinuxOptions": { - "user": "18", - "role": "19", - "type": "20", - "level": "21" + "user": "19", + "role": "20", + "type": "21", + "level": "22" } }, "runAsUser": { @@ -110,34 +111,34 @@ "allowPrivilegeEscalation": false, "allowedHostPaths": [ { - "pathPrefix": "22", + "pathPrefix": "23", "readOnly": true } ], "allowedFlexVolumes": [ { - "driver": "23" + "driver": "24" } ], "allowedCSIDrivers": [ { - "name": "24" + "name": "25" } ], "allowedUnsafeSysctls": [ - "25" + "26" ], "forbiddenSysctls": [ - "26" + "27" ], "allowedProcMountTypes": [ "ǣ偐圠=l畣潁" ], "runtimeClass": { "allowedRuntimeClassNames": [ - "27" + "28" ], - "defaultRuntimeClassName": "28" + "defaultRuntimeClassName": "29" } } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.pb b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.pb index c18467d688e..d15acee44d7 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.pb and b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.yaml b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.yaml index ff72fe4a16b..155e0ae4ab8 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.PodSecurityPolicy.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -31,23 +32,23 @@ metadata: spec: allowPrivilegeEscalation: false allowedCSIDrivers: - - name: "24" + - name: "25" allowedCapabilities: - ɑ allowedFlexVolumes: - - driver: "23" + - driver: "24" allowedHostPaths: - - pathPrefix: "22" + - pathPrefix: "23" readOnly: true allowedProcMountTypes: - ǣ偐圠=l畣潁 allowedUnsafeSysctls: - - "25" + - "26" defaultAddCapabilities: - qJ枊a8衍`Ĩ defaultAllowPrivilegeEscalation: false forbiddenSysctls: - - "26" + - "27" fsGroup: ranges: - max: 3058121789713366904 @@ -73,15 +74,15 @@ spec: rule: +½H牗洝尿彀亞螩 runtimeClass: allowedRuntimeClassNames: - - "27" - defaultRuntimeClassName: "28" + - "28" + defaultRuntimeClassName: "29" seLinux: rule: S seLinuxOptions: - level: "21" - role: "19" - type: "20" - user: "18" + level: "22" + role: "20" + type: "21" + user: "19" supplementalGroups: ranges: - max: -236027028483226507 diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.json b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.json index 732b1262cb8..12c744f9a53 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.json +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -58,49 +59,50 @@ }, "template": { "metadata": { - "name": "24", - "generateName": "25", - "namespace": "26", - "selfLink": "27", + "name": "25", + "generateName": "26", + "namespace": "27", + "selfLink": "28", "uid": "ʬ", "resourceVersion": "7336814125345800857", "generation": -6617020301190572172, "creationTimestamp": null, "deletionGracePeriodSeconds": -152893758082474859, "labels": { - "29": "30" + "30": "31" }, "annotations": { - "31": "32" + "32": "33" }, "ownerReferences": [ { - "apiVersion": "33", - "kind": "34", - "name": "35", + "apiVersion": "34", + "kind": "35", + "name": "36", "uid": "ɖgȏ哙ȍȂ揲ȼDDŽLŬp:", "controller": true, "blockOwnerDeletion": true } ], "finalizers": [ - "36" + "37" ], - "clusterName": "37", + "clusterName": "38", "managedFields": [ { - "manager": "38", + "manager": "39", "operation": "ƅS·Õüe0ɔȖ脵鴈Ō", - "apiVersion": "39" + "apiVersion": "40", + "fieldsType": "41" } ] }, "spec": { "volumes": [ { - "name": "40", + "name": "42", "hostPath": { - "path": "41", + "path": "43", "type": "6NJPM饣`诫z徃鷢6ȥ啕禗Ǐ2啗塧ȱ" }, "emptyDir": { @@ -108,27 +110,27 @@ "sizeLimit": "115" }, "gcePersistentDisk": { - "pdName": "42", - "fsType": "43", + "pdName": "44", + "fsType": "45", "partition": -1499132872 }, "awsElasticBlockStore": { - "volumeID": "44", - "fsType": "45", + "volumeID": "46", + "fsType": "47", "partition": -762366823, "readOnly": true }, "gitRepo": { - "repository": "46", - "revision": "47", - "directory": "48" + "repository": "48", + "revision": "49", + "directory": "50" }, "secret": { - "secretName": "49", + "secretName": "51", "items": [ { - "key": "50", - "path": "51", + "key": "52", + "path": "53", "mode": -104666658 } ], @@ -136,90 +138,90 @@ "optional": true }, "nfs": { - "server": "52", - "path": "53", + "server": "54", + "path": "55", "readOnly": true }, "iscsi": { - "targetPortal": "54", - "iqn": "55", + "targetPortal": "56", + "iqn": "57", "lun": 1655406148, - "iscsiInterface": "56", - "fsType": "57", + "iscsiInterface": "58", + "fsType": "59", "readOnly": true, "portals": [ - "58" + "60" ], "secretRef": { - "name": "59" + "name": "61" }, - "initiatorName": "60" + "initiatorName": "62" }, "glusterfs": { - "endpoints": "61", - "path": "62" + "endpoints": "63", + "path": "64" }, "persistentVolumeClaim": { - "claimName": "63", + "claimName": "65", "readOnly": true }, "rbd": { "monitors": [ - "64" + "66" ], - "image": "65", - "fsType": "66", - "pool": "67", - "user": "68", - "keyring": "69", + "image": "67", + "fsType": "68", + "pool": "69", + "user": "70", + "keyring": "71", "secretRef": { - "name": "70" + "name": "72" }, "readOnly": true }, "flexVolume": { - "driver": "71", - "fsType": "72", + "driver": "73", + "fsType": "74", "secretRef": { - "name": "73" + "name": "75" }, "options": { - "74": "75" + "76": "77" } }, "cinder": { - "volumeID": "76", - "fsType": "77", + "volumeID": "78", + "fsType": "79", "secretRef": { - "name": "78" + "name": "80" } }, "cephfs": { "monitors": [ - "79" + "81" ], - "path": "80", - "user": "81", - "secretFile": "82", + "path": "82", + "user": "83", + "secretFile": "84", "secretRef": { - "name": "83" + "name": "85" } }, "flocker": { - "datasetName": "84", - "datasetUUID": "85" + "datasetName": "86", + "datasetUUID": "87" }, "downwardAPI": { "items": [ { - "path": "86", + "path": "88", "fieldRef": { - "apiVersion": "87", - "fieldPath": "88" + "apiVersion": "89", + "fieldPath": "90" }, "resourceFieldRef": { - "containerName": "89", - "resource": "90", + "containerName": "91", + "resource": "92", "divisor": "457" }, "mode": 1235524154 @@ -229,25 +231,25 @@ }, "fc": { "targetWWNs": [ - "91" + "93" ], "lun": 441887498, - "fsType": "92", + "fsType": "94", "readOnly": true, "wwids": [ - "93" + "95" ] }, "azureFile": { - "secretName": "94", - "shareName": "95" + "secretName": "96", + "shareName": "97" }, "configMap": { - "name": "96", + "name": "98", "items": [ { - "key": "97", - "path": "98", + "key": "99", + "path": "100", "mode": -2039036935 } ], @@ -255,40 +257,40 @@ "optional": false }, "vsphereVolume": { - "volumePath": "99", - "fsType": "100", - "storagePolicyName": "101", - "storagePolicyID": "102" + "volumePath": "101", + "fsType": "102", + "storagePolicyName": "103", + "storagePolicyID": "104" }, "quobyte": { - "registry": "103", - "volume": "104", + "registry": "105", + "volume": "106", "readOnly": true, - "user": "105", - "group": "106", - "tenant": "107" + "user": "107", + "group": "108", + "tenant": "109" }, "azureDisk": { - "diskName": "108", - "diskURI": "109", + "diskName": "110", + "diskURI": "111", "cachingMode": "HǺƶȤ^}穠", - "fsType": "110", + "fsType": "112", "readOnly": true, "kind": "躢" }, "photonPersistentDisk": { - "pdID": "111", - "fsType": "112" + "pdID": "113", + "fsType": "114" }, "projected": { "sources": [ { "secret": { - "name": "113", + "name": "115", "items": [ { - "key": "114", - "path": "115", + "key": "116", + "path": "117", "mode": -1399063270 } ], @@ -297,14 +299,14 @@ "downwardAPI": { "items": [ { - "path": "116", + "path": "118", "fieldRef": { - "apiVersion": "117", - "fieldPath": "118" + "apiVersion": "119", + "fieldPath": "120" }, "resourceFieldRef": { - "containerName": "119", - "resource": "120", + "containerName": "121", + "resource": "122", "divisor": "746" }, "mode": 926891073 @@ -312,118 +314,118 @@ ] }, "configMap": { - "name": "121", + "name": "123", "items": [ { - "key": "122", - "path": "123", + "key": "124", + "path": "125", "mode": -1694464659 } ], "optional": true }, "serviceAccountToken": { - "audience": "124", + "audience": "126", "expirationSeconds": -7593824971107985079, - "path": "125" + "path": "127" } } ], "defaultMode": -522879476 }, "portworxVolume": { - "volumeID": "126", - "fsType": "127" + "volumeID": "128", + "fsType": "129" }, "scaleIO": { - "gateway": "128", - "system": "129", + "gateway": "130", + "system": "131", "secretRef": { - "name": "130" + "name": "132" }, - "protectionDomain": "131", - "storagePool": "132", - "storageMode": "133", - "volumeName": "134", - "fsType": "135" + "protectionDomain": "133", + "storagePool": "134", + "storageMode": "135", + "volumeName": "136", + "fsType": "137" }, "storageos": { - "volumeName": "136", - "volumeNamespace": "137", - "fsType": "138", + "volumeName": "138", + "volumeNamespace": "139", + "fsType": "140", "readOnly": true, "secretRef": { - "name": "139" + "name": "141" } }, "csi": { - "driver": "140", + "driver": "142", "readOnly": false, - "fsType": "141", + "fsType": "143", "volumeAttributes": { - "142": "143" + "144": "145" }, "nodePublishSecretRef": { - "name": "144" + "name": "146" } } } ], "initContainers": [ { - "name": "145", - "image": "146", + "name": "147", + "image": "148", "command": [ - "147" + "149" ], "args": [ - "148" + "150" ], - "workingDir": "149", + "workingDir": "151", "ports": [ { - "name": "150", + "name": "152", "hostPort": -1896921306, "containerPort": 715087892, "protocol": "倱\u003c", - "hostIP": "151" + "hostIP": "153" } ], "envFrom": [ { - "prefix": "152", + "prefix": "154", "configMapRef": { - "name": "153", + "name": "155", "optional": false }, "secretRef": { - "name": "154", + "name": "156", "optional": false } } ], "env": [ { - "name": "155", - "value": "156", + "name": "157", + "value": "158", "valueFrom": { "fieldRef": { - "apiVersion": "157", - "fieldPath": "158" + "apiVersion": "159", + "fieldPath": "160" }, "resourceFieldRef": { - "containerName": "159", - "resource": "160", + "containerName": "161", + "resource": "162", "divisor": "455" }, "configMapKeyRef": { - "name": "161", - "key": "162", + "name": "163", + "key": "164", "optional": true }, "secretKeyRef": { - "name": "163", - "key": "164", + "name": "165", + "key": "166", "optional": false } } @@ -439,41 +441,41 @@ }, "volumeMounts": [ { - "name": "165", + "name": "167", "readOnly": true, - "mountPath": "166", - "subPath": "167", + "mountPath": "168", + "subPath": "169", "mountPropagation": "dʪīT捘ɍi縱ù墴1Rƥ", - "subPathExpr": "168" + "subPathExpr": "170" } ], "volumeDevices": [ { - "name": "169", - "devicePath": "170" + "name": "171", + "devicePath": "172" } ], "livenessProbe": { "exec": { "command": [ - "171" + "173" ] }, "httpGet": { - "path": "172", - "port": "173", - "host": "174", + "path": "174", + "port": "175", + "host": "176", "scheme": "ƴy綸_Ú8參遼ūPH炮", "httpHeaders": [ { - "name": "175", - "value": "176" + "name": "177", + "value": "178" } ] }, "tcpSocket": { - "port": "177", - "host": "178" + "port": "179", + "host": "180" }, "initialDelaySeconds": 741871873, "timeoutSeconds": 446829537, @@ -484,24 +486,24 @@ "readinessProbe": { "exec": { "command": [ - "179" + "181" ] }, "httpGet": { - "path": "180", + "path": "182", "port": -1903685915, - "host": "181", + "host": "183", "scheme": "ȓƇ$缔獵偐ę腬瓷碑=ɉ鎷卩蝾H韹寬", "httpHeaders": [ { - "name": "182", - "value": "183" + "name": "184", + "value": "185" } ] }, "tcpSocket": { - "port": "184", - "host": "185" + "port": "186", + "host": "187" }, "initialDelaySeconds": 128019484, "timeoutSeconds": 431781335, @@ -513,51 +515,51 @@ "postStart": { "exec": { "command": [ - "186" + "188" ] }, "httpGet": { - "path": "187", - "port": "188", - "host": "189", + "path": "189", + "port": "190", + "host": "191", "scheme": "w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ", "httpHeaders": [ { - "name": "190", - "value": "191" + "name": "192", + "value": "193" } ] }, "tcpSocket": { "port": -337353552, - "host": "192" + "host": "194" } }, "preStop": { "exec": { "command": [ - "193" + "195" ] }, "httpGet": { - "path": "194", + "path": "196", "port": -374922344, - "host": "195", + "host": "197", "scheme": "緄Ú|dk_瀹鞎sn芞", "httpHeaders": [ { - "name": "196", - "value": "197" + "name": "198", + "value": "199" } ] }, "tcpSocket": { "port": 912103005, - "host": "198" + "host": "200" } } }, - "terminationMessagePath": "199", + "terminationMessagePath": "201", "terminationMessagePolicy": "Ȋ+?ƭ峧Y栲茇竛吲蚛", "imagePullPolicy": "\u003cé瞾", "securityContext": { @@ -571,15 +573,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "200", - "role": "201", - "type": "202", - "level": "203" + "user": "202", + "role": "203", + "type": "204", + "level": "205" }, "windowsOptions": { - "gmsaCredentialSpecName": "204", - "gmsaCredentialSpec": "205", - "runAsUserName": "206" + "gmsaCredentialSpecName": "206", + "gmsaCredentialSpec": "207", + "runAsUserName": "208" }, "runAsUser": -3447077152667955293, "runAsGroup": -6457174729896610090, @@ -593,59 +595,59 @@ ], "containers": [ { - "name": "207", - "image": "208", + "name": "209", + "image": "210", "command": [ - "209" + "211" ], "args": [ - "210" + "212" ], - "workingDir": "211", + "workingDir": "213", "ports": [ { - "name": "212", + "name": "214", "hostPort": 1065976533, "containerPort": -820119398, "protocol": "@ùƸʋŀ樺ȃv", - "hostIP": "213" + "hostIP": "215" } ], "envFrom": [ { - "prefix": "214", + "prefix": "216", "configMapRef": { - "name": "215", + "name": "217", "optional": true }, "secretRef": { - "name": "216", + "name": "218", "optional": true } } ], "env": [ { - "name": "217", - "value": "218", + "name": "219", + "value": "220", "valueFrom": { "fieldRef": { - "apiVersion": "219", - "fieldPath": "220" + "apiVersion": "221", + "fieldPath": "222" }, "resourceFieldRef": { - "containerName": "221", - "resource": "222", + "containerName": "223", + "resource": "224", "divisor": "508" }, "configMapKeyRef": { - "name": "223", - "key": "224", + "name": "225", + "key": "226", "optional": false }, "secretKeyRef": { - "name": "225", - "key": "226", + "name": "227", + "key": "228", "optional": true } } @@ -661,41 +663,41 @@ }, "volumeMounts": [ { - "name": "227", + "name": "229", "readOnly": true, - "mountPath": "228", - "subPath": "229", + "mountPath": "230", + "subPath": "231", "mountPropagation": "", - "subPathExpr": "230" + "subPathExpr": "232" } ], "volumeDevices": [ { - "name": "231", - "devicePath": "232" + "name": "233", + "devicePath": "234" } ], "livenessProbe": { "exec": { "command": [ - "233" + "235" ] }, "httpGet": { - "path": "234", - "port": "235", - "host": "236", + "path": "236", + "port": "237", + "host": "238", "scheme": "ȫ焗捏ĨFħ籘Àǒɿʒ刽", "httpHeaders": [ { - "name": "237", - "value": "238" + "name": "239", + "value": "240" } ] }, "tcpSocket": { "port": 1096174794, - "host": "239" + "host": "241" }, "initialDelaySeconds": 1591029717, "timeoutSeconds": 1255169591, @@ -706,24 +708,24 @@ "readinessProbe": { "exec": { "command": [ - "240" + "242" ] }, "httpGet": { - "path": "241", - "port": "242", - "host": "243", + "path": "243", + "port": "244", + "host": "245", "scheme": "ŽoǠŻʘY賃ɪ鐊瀑Ź9Ǖ", "httpHeaders": [ { - "name": "244", - "value": "245" + "name": "246", + "value": "247" } ] }, "tcpSocket": { - "port": "246", - "host": "247" + "port": "248", + "host": "249" }, "initialDelaySeconds": -394397948, "timeoutSeconds": 2040455355, @@ -735,51 +737,51 @@ "postStart": { "exec": { "command": [ - "248" + "250" ] }, "httpGet": { - "path": "249", - "port": "250", - "host": "251", + "path": "251", + "port": "252", + "host": "253", "scheme": "Ƹ[Ęİ榌U髷裎$MVȟ@7", "httpHeaders": [ { - "name": "252", - "value": "253" + "name": "254", + "value": "255" } ] }, "tcpSocket": { - "port": "254", - "host": "255" + "port": "256", + "host": "257" } }, "preStop": { "exec": { "command": [ - "256" + "258" ] }, "httpGet": { - "path": "257", + "path": "259", "port": -1675041613, - "host": "258", + "host": "260", "scheme": "揆ɘȌ脾嚏吐", "httpHeaders": [ { - "name": "259", - "value": "260" + "name": "261", + "value": "262" } ] }, "tcpSocket": { "port": -194343002, - "host": "261" + "host": "263" } } }, - "terminationMessagePath": "262", + "terminationMessagePath": "264", "terminationMessagePolicy": "Ȥ藠3.", "imagePullPolicy": "t莭琽§ć\\ ïì", "securityContext": { @@ -793,15 +795,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "263", - "role": "264", - "type": "265", - "level": "266" + "user": "265", + "role": "266", + "type": "267", + "level": "268" }, "windowsOptions": { - "gmsaCredentialSpecName": "267", - "gmsaCredentialSpec": "268", - "runAsUserName": "269" + "gmsaCredentialSpecName": "269", + "gmsaCredentialSpec": "270", + "runAsUserName": "271" }, "runAsUser": -2142888785755371163, "runAsGroup": -2879304435996142911, @@ -815,58 +817,58 @@ ], "ephemeralContainers": [ { - "name": "270", - "image": "271", + "name": "272", + "image": "273", "command": [ - "272" + "274" ], "args": [ - "273" + "275" ], - "workingDir": "274", + "workingDir": "276", "ports": [ { - "name": "275", + "name": "277", "hostPort": -1740959124, "containerPort": 158280212, - "hostIP": "276" + "hostIP": "278" } ], "envFrom": [ { - "prefix": "277", + "prefix": "279", "configMapRef": { - "name": "278", + "name": "280", "optional": true }, "secretRef": { - "name": "279", + "name": "281", "optional": true } } ], "env": [ { - "name": "280", - "value": "281", + "name": "282", + "value": "283", "valueFrom": { "fieldRef": { - "apiVersion": "282", - "fieldPath": "283" + "apiVersion": "284", + "fieldPath": "285" }, "resourceFieldRef": { - "containerName": "284", - "resource": "285", + "containerName": "286", + "resource": "287", "divisor": "985" }, "configMapKeyRef": { - "name": "286", - "key": "287", + "name": "288", + "key": "289", "optional": false }, "secretKeyRef": { - "name": "288", - "key": "289", + "name": "290", + "key": "291", "optional": false } } @@ -882,40 +884,40 @@ }, "volumeMounts": [ { - "name": "290", - "mountPath": "291", - "subPath": "292", + "name": "292", + "mountPath": "293", + "subPath": "294", "mountPropagation": "啛更", - "subPathExpr": "293" + "subPathExpr": "295" } ], "volumeDevices": [ { - "name": "294", - "devicePath": "295" + "name": "296", + "devicePath": "297" } ], "livenessProbe": { "exec": { "command": [ - "296" + "298" ] }, "httpGet": { - "path": "297", - "port": "298", - "host": "299", + "path": "299", + "port": "300", + "host": "301", "scheme": "Ů+朷Ǝ膯ljVX1虊", "httpHeaders": [ { - "name": "300", - "value": "301" + "name": "302", + "value": "303" } ] }, "tcpSocket": { "port": -979584143, - "host": "302" + "host": "304" }, "initialDelaySeconds": -1748648882, "timeoutSeconds": -239843014, @@ -926,24 +928,24 @@ "readinessProbe": { "exec": { "command": [ - "303" + "305" ] }, "httpGet": { - "path": "304", - "port": "305", - "host": "306", + "path": "306", + "port": "307", + "host": "308", "scheme": "铿ʩȂ4ē鐭#嬀ơŸ8T", "httpHeaders": [ { - "name": "307", - "value": "308" + "name": "309", + "value": "310" } ] }, "tcpSocket": { - "port": "309", - "host": "310" + "port": "311", + "host": "312" }, "initialDelaySeconds": 37514563, "timeoutSeconds": -1871050070, @@ -955,51 +957,51 @@ "postStart": { "exec": { "command": [ - "311" + "313" ] }, "httpGet": { - "path": "312", - "port": "313", - "host": "314", + "path": "314", + "port": "315", + "host": "316", "scheme": "绤fʀļ腩墺Ò媁荭g", "httpHeaders": [ { - "name": "315", - "value": "316" + "name": "317", + "value": "318" } ] }, "tcpSocket": { - "port": "317", - "host": "318" + "port": "319", + "host": "320" } }, "preStop": { "exec": { "command": [ - "319" + "321" ] }, "httpGet": { - "path": "320", + "path": "322", "port": -2133054549, - "host": "321", + "host": "323", "scheme": "遰=E", "httpHeaders": [ { - "name": "322", - "value": "323" + "name": "324", + "value": "325" } ] }, "tcpSocket": { - "port": "324", - "host": "325" + "port": "326", + "host": "327" } } }, - "terminationMessagePath": "326", + "terminationMessagePath": "328", "terminationMessagePolicy": "朦 wƯ貾坢'跩", "imagePullPolicy": "簳°Ļǟi\u0026皥贸", "securityContext": { @@ -1013,15 +1015,15 @@ }, "privileged": true, "seLinuxOptions": { - "user": "327", - "role": "328", - "type": "329", - "level": "330" + "user": "329", + "role": "330", + "type": "331", + "level": "332" }, "windowsOptions": { - "gmsaCredentialSpecName": "331", - "gmsaCredentialSpec": "332", - "runAsUserName": "333" + "gmsaCredentialSpecName": "333", + "gmsaCredentialSpec": "334", + "runAsUserName": "335" }, "runAsUser": 7933506142593743951, "runAsGroup": -8521633679555431923, @@ -1033,7 +1035,7 @@ "stdin": true, "stdinOnce": true, "tty": true, - "targetContainerName": "334" + "targetContainerName": "336" } ], "restartPolicy": "ȱğ_\u003cǬëJ橈'琕鶫:顇ə", @@ -1041,26 +1043,26 @@ "activeDeadlineSeconds": -499179336506637450, "dnsPolicy": "ɐ鰥", "nodeSelector": { - "335": "336" + "337": "338" }, - "serviceAccountName": "337", - "serviceAccount": "338", + "serviceAccountName": "339", + "serviceAccount": "340", "automountServiceAccountToken": true, - "nodeName": "339", + "nodeName": "341", "hostNetwork": true, "hostPID": true, "shareProcessNamespace": false, "securityContext": { "seLinuxOptions": { - "user": "340", - "role": "341", - "type": "342", - "level": "343" + "user": "342", + "role": "343", + "type": "344", + "level": "345" }, "windowsOptions": { - "gmsaCredentialSpecName": "344", - "gmsaCredentialSpec": "345", - "runAsUserName": "346" + "gmsaCredentialSpecName": "346", + "gmsaCredentialSpec": "347", + "runAsUserName": "348" }, "runAsUser": 3634773701753283428, "runAsGroup": -3042614092601658792, @@ -1071,18 +1073,18 @@ "fsGroup": -1778638259613624198, "sysctls": [ { - "name": "347", - "value": "348" + "name": "349", + "value": "350" } ] }, "imagePullSecrets": [ { - "name": "349" + "name": "351" } ], - "hostname": "350", - "subdomain": "351", + "hostname": "352", + "subdomain": "353", "affinity": { "nodeAffinity": { "requiredDuringSchedulingIgnoredDuringExecution": { @@ -1090,19 +1092,19 @@ { "matchExpressions": [ { - "key": "352", + "key": "354", "operator": "h亏yƕ丆録²Ŏ)/灩聋3趐囨鏻砅邻", "values": [ - "353" + "355" ] } ], "matchFields": [ { - "key": "354", + "key": "356", "operator": "C\"6x$1s", "values": [ - "355" + "357" ] } ] @@ -1115,19 +1117,19 @@ "preference": { "matchExpressions": [ { - "key": "356", + "key": "358", "operator": "鋄5弢ȹ均", "values": [ - "357" + "359" ] } ], "matchFields": [ { - "key": "358", + "key": "360", "operator": "SvEȤƏ埮p", "values": [ - "359" + "361" ] } ] @@ -1150,9 +1152,9 @@ ] }, "namespaces": [ - "366" + "368" ], - "topologyKey": "367" + "topologyKey": "369" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1174,9 +1176,9 @@ ] }, "namespaces": [ - "374" + "376" ], - "topologyKey": "375" + "topologyKey": "377" } } ] @@ -1199,9 +1201,9 @@ ] }, "namespaces": [ - "382" + "384" ], - "topologyKey": "383" + "topologyKey": "385" } ], "preferredDuringSchedulingIgnoredDuringExecution": [ @@ -1220,45 +1222,45 @@ ] }, "namespaces": [ - "390" + "392" ], - "topologyKey": "391" + "topologyKey": "393" } } ] } }, - "schedulerName": "392", + "schedulerName": "394", "tolerations": [ { - "key": "393", + "key": "395", "operator": "[L", - "value": "394", + "value": "396", "effect": "Ġ滔xvŗÑ\"虆k遚釾ʼn{朣Jɩɼ", "tolerationSeconds": 4456040724914385859 } ], "hostAliases": [ { - "ip": "395", + "ip": "397", "hostnames": [ - "396" + "398" ] } ], - "priorityClassName": "397", + "priorityClassName": "399", "priority": -1576968453, "dnsConfig": { "nameservers": [ - "398" + "400" ], "searches": [ - "399" + "401" ], "options": [ { - "name": "400", - "value": "401" + "name": "402", + "value": "403" } ] }, @@ -1267,7 +1269,7 @@ "conditionType": "v" } ], - "runtimeClassName": "402", + "runtimeClassName": "404", "enableServiceLinks": false, "preemptionPolicy": "忖p様", "overhead": { @@ -1276,7 +1278,7 @@ "topologySpreadConstraints": [ { "maxSkew": -782776982, - "topologyKey": "403", + "topologyKey": "405", "whenUnsatisfiable": "鈀", "labelSelector": { "matchLabels": { @@ -1305,8 +1307,8 @@ "type": "", "status": "'ƈoIǢ龞瞯å", "lastTransitionTime": "2469-07-10T03:20:34Z", - "reason": "410", - "message": "411" + "reason": "412", + "message": "413" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.pb b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.pb index 489132e6693..2425604a1bc 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.pb and b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.yaml b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.yaml index c6bffb0ba54..e1a2bc45469 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.ReplicaSet.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -42,31 +43,32 @@ spec: template: metadata: annotations: - "31": "32" - clusterName: "37" + "32": "33" + clusterName: "38" creationTimestamp: null deletionGracePeriodSeconds: -152893758082474859 finalizers: - - "36" - generateName: "25" + - "37" + generateName: "26" generation: -6617020301190572172 labels: - "29": "30" + "30": "31" managedFields: - - apiVersion: "39" - manager: "38" + - apiVersion: "40" + fieldsType: "41" + manager: "39" operation: ƅS·Õüe0ɔȖ脵鴈Ō - name: "24" - namespace: "26" + name: "25" + namespace: "27" ownerReferences: - - apiVersion: "33" + - apiVersion: "34" blockOwnerDeletion: true controller: true - kind: "34" - name: "35" + kind: "35" + name: "36" uid: 'ɖgȏ哙ȍȂ揲ȼDDŽLŬp:' resourceVersion: "7336814125345800857" - selfLink: "27" + selfLink: "28" uid: ʬ spec: activeDeadlineSeconds: -499179336506637450 @@ -75,28 +77,28 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: - preference: matchExpressions: - - key: "356" + - key: "358" operator: 鋄5弢ȹ均 values: - - "357" + - "359" matchFields: - - key: "358" + - key: "360" operator: SvEȤƏ埮p values: - - "359" + - "361" weight: -1292310438 requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: "352" + - key: "354" operator: h亏yƕ丆録²Ŏ)/灩聋3趐囨鏻砅邻 values: - - "353" + - "355" matchFields: - - key: "354" + - key: "356" operator: C"6x$1s values: - - "355" + - "357" podAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -109,8 +111,8 @@ spec: matchLabels: 1/dCv3j._.-_pP__up.2L_s-o7: k-5___-Qq..csh-3--Z1Tvw3F namespaces: - - "374" - topologyKey: "375" + - "376" + topologyKey: "377" weight: -531787516 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -120,8 +122,8 @@ spec: matchLabels: o.6GA2C: s.Nj-s namespaces: - - "366" - topologyKey: "367" + - "368" + topologyKey: "369" podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - podAffinityTerm: @@ -132,8 +134,8 @@ spec: matchLabels: t-u-4----q-x3w3dn5-1rhm-5y--z---69o-9-69mxv17r--32b-----4-67t.qk5--f4e4--r1k278l-d-8o1-x-1wl-r/a6Sp_N-S..O-BZ..6-1.b: L_gw_-z6 namespaces: - - "390" - topologyKey: "391" + - "392" + topologyKey: "393" weight: -1139477828 requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: @@ -145,120 +147,120 @@ spec: matchLabels: 4.B.__6m: J1-1.9_.-.Ms7_tP namespaces: - - "382" - topologyKey: "383" + - "384" + topologyKey: "385" automountServiceAccountToken: true containers: - args: - - "210" + - "212" command: - - "209" + - "211" env: - - name: "217" - value: "218" + - name: "219" + value: "220" valueFrom: configMapKeyRef: - key: "224" - name: "223" - optional: false - fieldRef: - apiVersion: "219" - fieldPath: "220" - resourceFieldRef: - containerName: "221" - divisor: "508" - resource: "222" - secretKeyRef: key: "226" name: "225" + optional: false + fieldRef: + apiVersion: "221" + fieldPath: "222" + resourceFieldRef: + containerName: "223" + divisor: "508" + resource: "224" + secretKeyRef: + key: "228" + name: "227" optional: true envFrom: - configMapRef: - name: "215" + name: "217" optional: true - prefix: "214" + prefix: "216" secretRef: - name: "216" + name: "218" optional: true - image: "208" + image: "210" imagePullPolicy: t莭琽§ć\ ïì lifecycle: postStart: exec: command: - - "248" + - "250" httpGet: - host: "251" + host: "253" httpHeaders: - - name: "252" - value: "253" - path: "249" - port: "250" + - name: "254" + value: "255" + path: "251" + port: "252" scheme: Ƹ[Ęİ榌U髷裎$MVȟ@7 tcpSocket: - host: "255" - port: "254" + host: "257" + port: "256" preStop: exec: command: - - "256" + - "258" httpGet: - host: "258" + host: "260" httpHeaders: - - name: "259" - value: "260" - path: "257" + - name: "261" + value: "262" + path: "259" port: -1675041613 scheme: 揆ɘȌ脾嚏吐 tcpSocket: - host: "261" + host: "263" port: -194343002 livenessProbe: exec: command: - - "233" + - "235" failureThreshold: 817152661 httpGet: - host: "236" + host: "238" httpHeaders: - - name: "237" - value: "238" - path: "234" - port: "235" + - name: "239" + value: "240" + path: "236" + port: "237" scheme: ȫ焗捏ĨFħ籘Àǒɿʒ刽 initialDelaySeconds: 1591029717 periodSeconds: 622473257 successThreshold: -966649167 tcpSocket: - host: "239" + host: "241" port: 1096174794 timeoutSeconds: 1255169591 - name: "207" + name: "209" ports: - containerPort: -820119398 - hostIP: "213" + hostIP: "215" hostPort: 1065976533 - name: "212" + name: "214" protocol: '@ùƸʋŀ樺ȃv' readinessProbe: exec: command: - - "240" + - "242" failureThreshold: 1214895765 httpGet: - host: "243" + host: "245" httpHeaders: - - name: "244" - value: "245" - path: "241" - port: "242" + - name: "246" + value: "247" + path: "243" + port: "244" scheme: ŽoǠŻʘY賃ɪ鐊瀑Ź9Ǖ initialDelaySeconds: -394397948 periodSeconds: 1505972335 successThreshold: -26910286 tcpSocket: - host: "247" - port: "246" + host: "249" + port: "248" timeoutSeconds: 2040455355 resources: limits: @@ -279,148 +281,148 @@ spec: runAsNonRoot: false runAsUser: -2142888785755371163 seLinuxOptions: - level: "266" - role: "264" - type: "265" - user: "263" + level: "268" + role: "266" + type: "267" + user: "265" windowsOptions: - gmsaCredentialSpec: "268" - gmsaCredentialSpecName: "267" - runAsUserName: "269" + gmsaCredentialSpec: "270" + gmsaCredentialSpecName: "269" + runAsUserName: "271" stdin: true - terminationMessagePath: "262" + terminationMessagePath: "264" terminationMessagePolicy: Ȥ藠3. volumeDevices: - - devicePath: "232" - name: "231" + - devicePath: "234" + name: "233" volumeMounts: - - mountPath: "228" + - mountPath: "230" mountPropagation: "" - name: "227" + name: "229" readOnly: true - subPath: "229" - subPathExpr: "230" - workingDir: "211" + subPath: "231" + subPathExpr: "232" + workingDir: "213" dnsConfig: nameservers: - - "398" + - "400" options: - - name: "400" - value: "401" + - name: "402" + value: "403" searches: - - "399" + - "401" dnsPolicy: ɐ鰥 enableServiceLinks: false ephemeralContainers: - args: - - "273" + - "275" command: - - "272" + - "274" env: - - name: "280" - value: "281" + - name: "282" + value: "283" valueFrom: configMapKeyRef: - key: "287" - name: "286" - optional: false - fieldRef: - apiVersion: "282" - fieldPath: "283" - resourceFieldRef: - containerName: "284" - divisor: "985" - resource: "285" - secretKeyRef: key: "289" name: "288" optional: false + fieldRef: + apiVersion: "284" + fieldPath: "285" + resourceFieldRef: + containerName: "286" + divisor: "985" + resource: "287" + secretKeyRef: + key: "291" + name: "290" + optional: false envFrom: - configMapRef: - name: "278" + name: "280" optional: true - prefix: "277" + prefix: "279" secretRef: - name: "279" + name: "281" optional: true - image: "271" + image: "273" imagePullPolicy: 簳°Ļǟi&皥贸 lifecycle: postStart: exec: command: - - "311" + - "313" httpGet: - host: "314" + host: "316" httpHeaders: - - name: "315" - value: "316" - path: "312" - port: "313" + - name: "317" + value: "318" + path: "314" + port: "315" scheme: 绤fʀļ腩墺Ò媁荭g tcpSocket: - host: "318" - port: "317" + host: "320" + port: "319" preStop: exec: command: - - "319" + - "321" httpGet: - host: "321" + host: "323" httpHeaders: - - name: "322" - value: "323" - path: "320" + - name: "324" + value: "325" + path: "322" port: -2133054549 scheme: 遰=E tcpSocket: - host: "325" - port: "324" + host: "327" + port: "326" livenessProbe: exec: command: - - "296" + - "298" failureThreshold: -1538905728 httpGet: - host: "299" + host: "301" httpHeaders: - - name: "300" - value: "301" - path: "297" - port: "298" + - name: "302" + value: "303" + path: "299" + port: "300" scheme: Ů+朷Ǝ膯ljVX1虊 initialDelaySeconds: -1748648882 periodSeconds: 1381579966 successThreshold: -1418092595 tcpSocket: - host: "302" + host: "304" port: -979584143 timeoutSeconds: -239843014 - name: "270" + name: "272" ports: - containerPort: 158280212 - hostIP: "276" + hostIP: "278" hostPort: -1740959124 - name: "275" + name: "277" readinessProbe: exec: command: - - "303" + - "305" failureThreshold: 522560228 httpGet: - host: "306" + host: "308" httpHeaders: - - name: "307" - value: "308" - path: "304" - port: "305" + - name: "309" + value: "310" + path: "306" + port: "307" scheme: 铿ʩȂ4ē鐭#嬀ơŸ8T initialDelaySeconds: 37514563 periodSeconds: 474715842 successThreshold: -1620315711 tcpSocket: - host: "310" - port: "309" + host: "312" + port: "311" timeoutSeconds: -1871050070 resources: limits: @@ -441,150 +443,150 @@ spec: runAsNonRoot: true runAsUser: 7933506142593743951 seLinuxOptions: - level: "330" - role: "328" - type: "329" - user: "327" + level: "332" + role: "330" + type: "331" + user: "329" windowsOptions: - gmsaCredentialSpec: "332" - gmsaCredentialSpecName: "331" - runAsUserName: "333" + gmsaCredentialSpec: "334" + gmsaCredentialSpecName: "333" + runAsUserName: "335" stdin: true stdinOnce: true - targetContainerName: "334" - terminationMessagePath: "326" + targetContainerName: "336" + terminationMessagePath: "328" terminationMessagePolicy: 朦 wƯ貾坢'跩 tty: true volumeDevices: - - devicePath: "295" - name: "294" + - devicePath: "297" + name: "296" volumeMounts: - - mountPath: "291" + - mountPath: "293" mountPropagation: 啛更 - name: "290" - subPath: "292" - subPathExpr: "293" - workingDir: "274" + name: "292" + subPath: "294" + subPathExpr: "295" + workingDir: "276" hostAliases: - hostnames: - - "396" - ip: "395" + - "398" + ip: "397" hostNetwork: true hostPID: true - hostname: "350" + hostname: "352" imagePullSecrets: - - name: "349" + - name: "351" initContainers: - args: - - "148" + - "150" command: - - "147" + - "149" env: - - name: "155" - value: "156" + - name: "157" + value: "158" valueFrom: configMapKeyRef: - key: "162" - name: "161" - optional: true - fieldRef: - apiVersion: "157" - fieldPath: "158" - resourceFieldRef: - containerName: "159" - divisor: "455" - resource: "160" - secretKeyRef: key: "164" name: "163" + optional: true + fieldRef: + apiVersion: "159" + fieldPath: "160" + resourceFieldRef: + containerName: "161" + divisor: "455" + resource: "162" + secretKeyRef: + key: "166" + name: "165" optional: false envFrom: - configMapRef: - name: "153" + name: "155" optional: false - prefix: "152" + prefix: "154" secretRef: - name: "154" + name: "156" optional: false - image: "146" + image: "148" imagePullPolicy: <é瞾 lifecycle: postStart: exec: command: - - "186" + - "188" httpGet: - host: "189" + host: "191" httpHeaders: - - name: "190" - value: "191" - path: "187" - port: "188" + - name: "192" + value: "193" + path: "189" + port: "190" scheme: w垁鷌辪虽U珝Żwʮ馜üNșƶ4ĩ tcpSocket: - host: "192" + host: "194" port: -337353552 preStop: exec: command: - - "193" + - "195" httpGet: - host: "195" + host: "197" httpHeaders: - - name: "196" - value: "197" - path: "194" + - name: "198" + value: "199" + path: "196" port: -374922344 scheme: 緄Ú|dk_瀹鞎sn芞 tcpSocket: - host: "198" + host: "200" port: 912103005 livenessProbe: exec: command: - - "171" + - "173" failureThreshold: 2053960192 httpGet: - host: "174" + host: "176" httpHeaders: - - name: "175" - value: "176" - path: "172" - port: "173" + - name: "177" + value: "178" + path: "174" + port: "175" scheme: ƴy綸_Ú8參遼ūPH炮 initialDelaySeconds: 741871873 periodSeconds: -1987044888 successThreshold: -1638339389 tcpSocket: - host: "178" - port: "177" + host: "180" + port: "179" timeoutSeconds: 446829537 - name: "145" + name: "147" ports: - containerPort: 715087892 - hostIP: "151" + hostIP: "153" hostPort: -1896921306 - name: "150" + name: "152" protocol: 倱< readinessProbe: exec: command: - - "179" + - "181" failureThreshold: -57352147 httpGet: - host: "181" + host: "183" httpHeaders: - - name: "182" - value: "183" - path: "180" + - name: "184" + value: "185" + path: "182" port: -1903685915 scheme: ȓƇ$缔獵偐ę腬瓷碑=ɉ鎷卩蝾H韹寬 initialDelaySeconds: 128019484 periodSeconds: -2130554644 successThreshold: 290736426 tcpSocket: - host: "185" - port: "184" + host: "187" + port: "186" timeoutSeconds: 431781335 resources: limits: @@ -605,71 +607,71 @@ spec: runAsNonRoot: true runAsUser: -3447077152667955293 seLinuxOptions: - level: "203" - role: "201" - type: "202" - user: "200" + level: "205" + role: "203" + type: "204" + user: "202" windowsOptions: - gmsaCredentialSpec: "205" - gmsaCredentialSpecName: "204" - runAsUserName: "206" + gmsaCredentialSpec: "207" + gmsaCredentialSpecName: "206" + runAsUserName: "208" stdinOnce: true - terminationMessagePath: "199" + terminationMessagePath: "201" terminationMessagePolicy: Ȋ+?ƭ峧Y栲茇竛吲蚛 volumeDevices: - - devicePath: "170" - name: "169" + - devicePath: "172" + name: "171" volumeMounts: - - mountPath: "166" + - mountPath: "168" mountPropagation: dʪīT捘ɍi縱ù墴1Rƥ - name: "165" + name: "167" readOnly: true - subPath: "167" - subPathExpr: "168" - workingDir: "149" - nodeName: "339" + subPath: "169" + subPathExpr: "170" + workingDir: "151" + nodeName: "341" nodeSelector: - "335": "336" + "337": "338" overhead: U凮: "684" preemptionPolicy: 忖p様 priority: -1576968453 - priorityClassName: "397" + priorityClassName: "399" readinessGates: - conditionType: v restartPolicy: ȱğ_<ǬëJ橈'琕鶫:顇ə - runtimeClassName: "402" - schedulerName: "392" + runtimeClassName: "404" + schedulerName: "394" securityContext: fsGroup: -1778638259613624198 runAsGroup: -3042614092601658792 runAsNonRoot: false runAsUser: 3634773701753283428 seLinuxOptions: - level: "343" - role: "341" - type: "342" - user: "340" + level: "345" + role: "343" + type: "344" + user: "342" supplementalGroups: - -2125560879532395341 sysctls: - - name: "347" - value: "348" + - name: "349" + value: "350" windowsOptions: - gmsaCredentialSpec: "345" - gmsaCredentialSpecName: "344" - runAsUserName: "346" - serviceAccount: "338" - serviceAccountName: "337" + gmsaCredentialSpec: "347" + gmsaCredentialSpecName: "346" + runAsUserName: "348" + serviceAccount: "340" + serviceAccountName: "339" shareProcessNamespace: false - subdomain: "351" + subdomain: "353" terminationGracePeriodSeconds: 5620818514944490121 tolerations: - effect: Ġ滔xvŗÑ"虆k遚釾ʼn{朣Jɩɼ - key: "393" + key: "395" operator: '[L' tolerationSeconds: 4456040724914385859 - value: "394" + value: "396" topologySpreadConstraints: - labelSelector: matchExpressions: @@ -679,212 +681,212 @@ spec: ? nw0-3i--a7-2--o--u0038mp9c10-k-r---3g7nz4-------385h---0-u73pj.brgvf3q-z-5z80n--t5--9-4-d2-22--i--40wv--in-870w--itk/kCpS__.39g_.--_-_ve5.m_2_--XZ-x.__.Y_2-n_5023Xl-3Pw_-r75--_A : BM.6-.Y_72-_--p7 maxSkew: -782776982 - topologyKey: "403" + topologyKey: "405" whenUnsatisfiable: 鈀 volumes: - awsElasticBlockStore: - fsType: "45" + fsType: "47" partition: -762366823 readOnly: true - volumeID: "44" + volumeID: "46" azureDisk: cachingMode: HǺƶȤ^}穠 - diskName: "108" - diskURI: "109" - fsType: "110" + diskName: "110" + diskURI: "111" + fsType: "112" kind: 躢 readOnly: true azureFile: - secretName: "94" - shareName: "95" + secretName: "96" + shareName: "97" cephfs: monitors: - - "79" - path: "80" - secretFile: "82" + - "81" + path: "82" + secretFile: "84" secretRef: - name: "83" - user: "81" + name: "85" + user: "83" cinder: - fsType: "77" + fsType: "79" secretRef: - name: "78" - volumeID: "76" + name: "80" + volumeID: "78" configMap: defaultMode: -460478410 items: - - key: "97" + - key: "99" mode: -2039036935 - path: "98" - name: "96" + path: "100" + name: "98" optional: false csi: - driver: "140" - fsType: "141" + driver: "142" + fsType: "143" nodePublishSecretRef: - name: "144" + name: "146" readOnly: false volumeAttributes: - "142": "143" + "144": "145" downwardAPI: defaultMode: -106644772 items: - fieldRef: - apiVersion: "87" - fieldPath: "88" + apiVersion: "89" + fieldPath: "90" mode: 1235524154 - path: "86" + path: "88" resourceFieldRef: - containerName: "89" + containerName: "91" divisor: "457" - resource: "90" + resource: "92" emptyDir: medium: 彭聡A3fƻfʣ sizeLimit: "115" fc: - fsType: "92" + fsType: "94" lun: 441887498 readOnly: true targetWWNs: - - "91" - wwids: - "93" + wwids: + - "95" flexVolume: - driver: "71" - fsType: "72" + driver: "73" + fsType: "74" options: - "74": "75" + "76": "77" secretRef: - name: "73" + name: "75" flocker: - datasetName: "84" - datasetUUID: "85" + datasetName: "86" + datasetUUID: "87" gcePersistentDisk: - fsType: "43" + fsType: "45" partition: -1499132872 - pdName: "42" + pdName: "44" gitRepo: - directory: "48" - repository: "46" - revision: "47" + directory: "50" + repository: "48" + revision: "49" glusterfs: - endpoints: "61" - path: "62" + endpoints: "63" + path: "64" hostPath: - path: "41" + path: "43" type: 6NJPM饣`诫z徃鷢6ȥ啕禗Ǐ2啗塧ȱ iscsi: - fsType: "57" - initiatorName: "60" - iqn: "55" - iscsiInterface: "56" + fsType: "59" + initiatorName: "62" + iqn: "57" + iscsiInterface: "58" lun: 1655406148 portals: - - "58" + - "60" readOnly: true secretRef: - name: "59" - targetPortal: "54" - name: "40" + name: "61" + targetPortal: "56" + name: "42" nfs: - path: "53" + path: "55" readOnly: true - server: "52" + server: "54" persistentVolumeClaim: - claimName: "63" + claimName: "65" readOnly: true photonPersistentDisk: - fsType: "112" - pdID: "111" + fsType: "114" + pdID: "113" portworxVolume: - fsType: "127" - volumeID: "126" + fsType: "129" + volumeID: "128" projected: defaultMode: -522879476 sources: - configMap: items: - - key: "122" + - key: "124" mode: -1694464659 - path: "123" - name: "121" + path: "125" + name: "123" optional: true downwardAPI: items: - fieldRef: - apiVersion: "117" - fieldPath: "118" + apiVersion: "119" + fieldPath: "120" mode: 926891073 - path: "116" + path: "118" resourceFieldRef: - containerName: "119" + containerName: "121" divisor: "746" - resource: "120" + resource: "122" secret: items: - - key: "114" + - key: "116" mode: -1399063270 - path: "115" - name: "113" + path: "117" + name: "115" optional: true serviceAccountToken: - audience: "124" + audience: "126" expirationSeconds: -7593824971107985079 - path: "125" + path: "127" quobyte: - group: "106" + group: "108" readOnly: true - registry: "103" - tenant: "107" - user: "105" - volume: "104" + registry: "105" + tenant: "109" + user: "107" + volume: "106" rbd: - fsType: "66" - image: "65" - keyring: "69" + fsType: "68" + image: "67" + keyring: "71" monitors: - - "64" - pool: "67" + - "66" + pool: "69" readOnly: true secretRef: - name: "70" - user: "68" + name: "72" + user: "70" scaleIO: - fsType: "135" - gateway: "128" - protectionDomain: "131" + fsType: "137" + gateway: "130" + protectionDomain: "133" secretRef: - name: "130" - storageMode: "133" - storagePool: "132" - system: "129" - volumeName: "134" + name: "132" + storageMode: "135" + storagePool: "134" + system: "131" + volumeName: "136" secret: defaultMode: 372704313 items: - - key: "50" + - key: "52" mode: -104666658 - path: "51" + path: "53" optional: true - secretName: "49" + secretName: "51" storageos: - fsType: "138" + fsType: "140" readOnly: true secretRef: - name: "139" - volumeName: "136" - volumeNamespace: "137" + name: "141" + volumeName: "138" + volumeNamespace: "139" vsphereVolume: - fsType: "100" - storagePolicyID: "102" - storagePolicyName: "101" - volumePath: "99" + fsType: "102" + storagePolicyID: "104" + storagePolicyName: "103" + volumePath: "101" status: availableReplicas: 740158871 conditions: - lastTransitionTime: "2469-07-10T03:20:34Z" - message: "411" - reason: "410" + message: "413" + reason: "412" status: '''ƈoIǢ龞瞯å' type: "" fullyLabeledReplicas: -929473748 diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Scale.json b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Scale.json index 85127efee5c..540b62a7472 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Scale.json +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.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" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Scale.pb b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Scale.pb index 3466a6e4931..ffdda998a51 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Scale.pb and b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Scale.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Scale.yaml b/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Scale.yaml index fd42aa69c41..ea58fe8c582 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/extensions.v1beta1.Scale.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/extensions.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" diff --git a/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.json b/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.json index acd5b15629f..ce63272356b 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.json +++ b/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.json @@ -35,26 +35,27 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { "containers": [ { - "image": "18" + "image": "19" } ], "annotations": { - "19": "20" + "20": "21" }, - "namespace": "21" + "namespace": "22" }, "status": { "allowed": true, - "reason": "22", + "reason": "23", "auditAnnotations": { - "23": "24" + "24": "25" } } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.pb b/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.pb index 38b7e870cb4..53b64109848 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.pb and b/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.yaml b/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.yaml index 930d65dc779..7466d1976bb 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/imagepolicy.k8s.io.v1alpha1.ImageReview.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -30,12 +31,12 @@ metadata: uid: "7" spec: annotations: - "19": "20" + "20": "21" containers: - - image: "18" - namespace: "21" + - image: "19" + namespace: "22" status: allowed: true auditAnnotations: - "23": "24" - reason: "22" + "24": "25" + reason: "23" diff --git a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.json b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.json index 5be03903e6c..5ffff9c455f 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.json +++ b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -86,9 +87,9 @@ ] }, "ipBlock": { - "cidr": "36", + "cidr": "37", "except": [ - "37" + "38" ] } } @@ -133,9 +134,9 @@ ] }, "ipBlock": { - "cidr": "50", + "cidr": "51", "except": [ - "51" + "52" ] } } diff --git a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.pb b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.pb index cbf43012adc..6392ec06017 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.pb and b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.yaml b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.yaml index 6493316c595..e8dffa53164 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1.NetworkPolicy.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -34,9 +35,9 @@ spec: - protocol: ɗ to: - ipBlock: - cidr: "50" + cidr: "51" except: - - "51" + - "52" namespaceSelector: matchExpressions: - key: 4a--0o8m3-d0w7p8vl-1z---883d-v3j4-7y-5.9-q390/niTl.1-.VT--5mj_9.M.134-5-.q6H5 @@ -57,9 +58,9 @@ spec: ingress: - from: - ipBlock: - cidr: "36" + cidr: "37" except: - - "37" + - "38" namespaceSelector: matchExpressions: - key: 2_28.-.7_8B.HF-U-_ik_--DSXr.n-A9..9__Y-H-Mqpt._.-_..051 diff --git a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.json b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.json index 17fb818889d..7c780d8ab8f 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.json +++ b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.json @@ -35,33 +35,34 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { "backend": { - "serviceName": "18", - "servicePort": "19" + "serviceName": "19", + "servicePort": "20" }, "tls": [ { "hosts": [ - "20" + "21" ], - "secretName": "21" + "secretName": "22" } ], "rules": [ { - "host": "22", + "host": "23", "http": { "paths": [ { - "path": "23", + "path": "24", "backend": { - "serviceName": "24", - "servicePort": "25" + "serviceName": "25", + "servicePort": "26" } } ] @@ -73,8 +74,8 @@ "loadBalancer": { "ingress": [ { - "ip": "26", - "hostname": "27" + "ip": "27", + "hostname": "28" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.pb b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.pb index 86326c1255a..74882b4df65 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.pb and b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.yaml b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.yaml index ea59d3f3d30..2c45557e2ed 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/networking.k8s.io.v1beta1.Ingress.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -30,22 +31,22 @@ metadata: uid: "7" spec: backend: - serviceName: "18" - servicePort: "19" + serviceName: "19" + servicePort: "20" rules: - - host: "22" + - host: "23" http: paths: - backend: - serviceName: "24" - servicePort: "25" - path: "23" + serviceName: "25" + servicePort: "26" + path: "24" tls: - hosts: - - "20" - secretName: "21" + - "21" + secretName: "22" status: loadBalancer: ingress: - - hostname: "27" - ip: "26" + - hostname: "28" + ip: "27" diff --git a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.json b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.json index 44878582d41..5625d089623 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.json +++ b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.json @@ -35,12 +35,13 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { - "runtimeHandler": "18", + "runtimeHandler": "19", "overhead": { "podFixed": { "qJ枊a8衍`Ĩ": "652" @@ -48,12 +49,12 @@ }, "scheduling": { "nodeSelector": { - "19": "20" + "20": "21" }, "tolerations": [ { - "key": "21", - "value": "22", + "key": "22", + "value": "23", "effect": "6ċ", "tolerationSeconds": -5658031457286093454 } diff --git a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.pb b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.pb index a113c9e72d0..584d00b4422 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.pb and b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.yaml b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.yaml index 68c37bfe23a..9728996b1d0 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1alpha1.RuntimeClass.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -32,12 +33,12 @@ spec: overhead: podFixed: qJ枊a8衍`Ĩ: "652" - runtimeHandler: "18" + runtimeHandler: "19" scheduling: nodeSelector: - "19": "20" + "20": "21" tolerations: - effect: 6ċ - key: "21" + key: "22" tolerationSeconds: -5658031457286093454 - value: "22" + value: "23" diff --git a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.json b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.json index ab33e7b0179..08d233e727a 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.json +++ b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.json @@ -35,11 +35,12 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, - "handler": "18", + "handler": "19", "overhead": { "podFixed": { "qJ枊a8衍`Ĩ": "652" @@ -47,12 +48,12 @@ }, "scheduling": { "nodeSelector": { - "19": "20" + "20": "21" }, "tolerations": [ { - "key": "21", - "value": "22", + "key": "22", + "value": "23", "effect": "6ċ", "tolerationSeconds": -5658031457286093454 } diff --git a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.pb b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.pb index 0afcf2b6f40..c50ae57abe3 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.pb and b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.yaml b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.yaml index 68d733b7335..014f2a463b6 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/node.k8s.io.v1beta1.RuntimeClass.yaml @@ -1,5 +1,5 @@ apiVersion: node.k8s.io/v1beta1 -handler: "18" +handler: "19" kind: RuntimeClass metadata: annotations: @@ -15,6 +15,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -34,9 +35,9 @@ overhead: qJ枊a8衍`Ĩ: "652" scheduling: nodeSelector: - "19": "20" + "20": "21" tolerations: - effect: 6ċ - key: "21" + key: "22" tolerationSeconds: -5658031457286093454 - value: "22" + value: "23" diff --git a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.json b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.json index 194a73b2bfa..da935721bf5 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.json +++ b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -43,12 +44,12 @@ "gracePeriodSeconds": 3850803321873644574, "preconditions": { "uid": "枊a8衍`Ĩɘ.蘯6ċV夸eɑeʤ脽ě", - "resourceVersion": "18" + "resourceVersion": "19" }, "orphanDependents": true, "propagationPolicy": "蓏Ŋ", "dryRun": [ - "19" + "20" ] } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.pb b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.pb index d7442b562b5..f23d153efe2 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.pb and b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.yaml b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.yaml index 4febf6efa9a..d7b27e3a213 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.Eviction.yaml @@ -1,11 +1,11 @@ apiVersion: policy/v1beta1 deleteOptions: dryRun: - - "19" + - "20" gracePeriodSeconds: 3850803321873644574 orphanDependents: true preconditions: - resourceVersion: "18" + resourceVersion: "19" uid: 枊a8衍`Ĩɘ.蘯6ċV夸eɑeʤ脽ě propagationPolicy: 蓏Ŋ kind: Eviction @@ -23,6 +23,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" diff --git a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.json b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.json index 6bf076fab0d..bb7e8106b70 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.json +++ b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -58,7 +59,7 @@ "status": { "observedGeneration": -6582200896939805980, "disruptedPods": { - "24": "2250-04-18T21:52:38Z" + "25": "2250-04-18T21:52:38Z" }, "disruptionsAllowed": -1942073618, "currentHealthy": -2037845840, diff --git a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.pb b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.pb index e550c5b8c06..480c815dda2 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.pb and b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.yaml b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.yaml index d8fdb79d276..3643bb936bd 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodDisruptionBudget.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -41,7 +42,7 @@ status: currentHealthy: -2037845840 desiredHealthy: -1965578645 disruptedPods: - "24": "2250-04-18T21:52:38Z" + "25": "2250-04-18T21:52:38Z" disruptionsAllowed: -1942073618 expectedPods: -347579237 observedGeneration: -6582200896939805980 diff --git a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.json b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.json index 6269829093e..a90fb247e1c 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.json +++ b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -64,10 +65,10 @@ "seLinux": { "rule": "S", "seLinuxOptions": { - "user": "18", - "role": "19", - "type": "20", - "level": "21" + "user": "19", + "role": "20", + "type": "21", + "level": "22" } }, "runAsUser": { @@ -110,34 +111,34 @@ "allowPrivilegeEscalation": false, "allowedHostPaths": [ { - "pathPrefix": "22", + "pathPrefix": "23", "readOnly": true } ], "allowedFlexVolumes": [ { - "driver": "23" + "driver": "24" } ], "allowedCSIDrivers": [ { - "name": "24" + "name": "25" } ], "allowedUnsafeSysctls": [ - "25" + "26" ], "forbiddenSysctls": [ - "26" + "27" ], "allowedProcMountTypes": [ "ǣ偐圠=l畣潁" ], "runtimeClass": { "allowedRuntimeClassNames": [ - "27" + "28" ], - "defaultRuntimeClassName": "28" + "defaultRuntimeClassName": "29" } } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.pb b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.pb index dd47fc18455..ad0737a8fb7 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.pb and b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.yaml b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.yaml index b1f6983a13c..2d20202fbb0 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/policy.v1beta1.PodSecurityPolicy.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -31,23 +32,23 @@ metadata: spec: allowPrivilegeEscalation: false allowedCSIDrivers: - - name: "24" + - name: "25" allowedCapabilities: - ɑ allowedFlexVolumes: - - driver: "23" + - driver: "24" allowedHostPaths: - - pathPrefix: "22" + - pathPrefix: "23" readOnly: true allowedProcMountTypes: - ǣ偐圠=l畣潁 allowedUnsafeSysctls: - - "25" + - "26" defaultAddCapabilities: - qJ枊a8衍`Ĩ defaultAllowPrivilegeEscalation: false forbiddenSysctls: - - "26" + - "27" fsGroup: ranges: - max: 3058121789713366904 @@ -73,15 +74,15 @@ spec: rule: +½H牗洝尿彀亞螩 runtimeClass: allowedRuntimeClassNames: - - "27" - defaultRuntimeClassName: "28" + - "28" + defaultRuntimeClassName: "29" seLinux: rule: S seLinuxOptions: - level: "21" - role: "19" - type: "20" - user: "18" + level: "22" + role: "20" + type: "21" + user: "19" supplementalGroups: ranges: - max: -236027028483226507 diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.json index 72a4ec1a1de..a491cca3181 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.json @@ -35,26 +35,27 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "rules": [ { "verbs": [ - "18" - ], - "apiGroups": [ "19" ], - "resources": [ + "apiGroups": [ "20" ], - "resourceNames": [ + "resources": [ "21" ], - "nonResourceURLs": [ + "resourceNames": [ "22" + ], + "nonResourceURLs": [ + "23" ] } ], diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.pb index e805cf862f7..150784b0348 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.yaml index 28a134c0e18..e33801fd7d1 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRole.yaml @@ -23,6 +23,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -39,12 +40,12 @@ metadata: uid: "7" rules: - apiGroups: - - "19" - nonResourceURLs: - - "22" - resourceNames: - - "21" - resources: - "20" + nonResourceURLs: + - "23" + resourceNames: + - "22" + resources: + - "21" verbs: - - "18" + - "19" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.json index f6ac580ac72..388e1319226 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.json @@ -35,21 +35,22 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "subjects": [ { - "kind": "18", - "apiGroup": "19", - "name": "20", - "namespace": "21" + "kind": "19", + "apiGroup": "20", + "name": "21", + "namespace": "22" } ], "roleRef": { - "apiGroup": "22", - "kind": "23", - "name": "24" + "apiGroup": "23", + "kind": "24", + "name": "25" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.pb index 622fcf92d51..95d9eca13c7 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.yaml index f7a056db7b9..0e61aefa171 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.ClusterRoleBinding.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,11 +30,11 @@ metadata: selfLink: "5" uid: "7" roleRef: - apiGroup: "22" - kind: "23" - name: "24" + apiGroup: "23" + kind: "24" + name: "25" subjects: -- apiGroup: "19" - kind: "18" - name: "20" - namespace: "21" +- apiGroup: "20" + kind: "19" + name: "21" + namespace: "22" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.json index 0e3859ad23d..05e0c55781d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.json @@ -35,26 +35,27 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "rules": [ { "verbs": [ - "18" - ], - "apiGroups": [ "19" ], - "resources": [ + "apiGroups": [ "20" ], - "resourceNames": [ + "resources": [ "21" ], - "nonResourceURLs": [ + "resourceNames": [ "22" + ], + "nonResourceURLs": [ + "23" ] } ] diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.pb index 77f6f514714..48614b9c926 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.yaml index e2b31d55c26..8435ab4c54f 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.Role.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -30,12 +31,12 @@ metadata: uid: "7" rules: - apiGroups: - - "19" - nonResourceURLs: - - "22" - resourceNames: - - "21" - resources: - "20" + nonResourceURLs: + - "23" + resourceNames: + - "22" + resources: + - "21" verbs: - - "18" + - "19" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.json index 4201e3ce40c..df6b5134802 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.json @@ -35,21 +35,22 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "subjects": [ { - "kind": "18", - "apiGroup": "19", - "name": "20", - "namespace": "21" + "kind": "19", + "apiGroup": "20", + "name": "21", + "namespace": "22" } ], "roleRef": { - "apiGroup": "22", - "kind": "23", - "name": "24" + "apiGroup": "23", + "kind": "24", + "name": "25" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.pb index ac6f6d7ba0c..1ed7b28211b 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.yaml index 8f388895f63..996d415a7c6 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1.RoleBinding.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,11 +30,11 @@ metadata: selfLink: "5" uid: "7" roleRef: - apiGroup: "22" - kind: "23" - name: "24" + apiGroup: "23" + kind: "24" + name: "25" subjects: -- apiGroup: "19" - kind: "18" - name: "20" - namespace: "21" +- apiGroup: "20" + kind: "19" + name: "21" + namespace: "22" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.json index 44370e9e971..bec4c90a0fe 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.json @@ -35,26 +35,27 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "rules": [ { "verbs": [ - "18" - ], - "apiGroups": [ "19" ], - "resources": [ + "apiGroups": [ "20" ], - "resourceNames": [ + "resources": [ "21" ], - "nonResourceURLs": [ + "resourceNames": [ "22" + ], + "nonResourceURLs": [ + "23" ] } ], diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.pb index 4e9527cb621..9490dd0f27a 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.yaml index 5eb1acffaca..77390e404e5 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRole.yaml @@ -23,6 +23,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -39,12 +40,12 @@ metadata: uid: "7" rules: - apiGroups: - - "19" - nonResourceURLs: - - "22" - resourceNames: - - "21" - resources: - "20" + nonResourceURLs: + - "23" + resourceNames: + - "22" + resources: + - "21" verbs: - - "18" + - "19" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.json index f14546c72d2..17b919d9dec 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.json @@ -35,21 +35,22 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "subjects": [ { - "kind": "18", - "apiVersion": "19", - "name": "20", - "namespace": "21" + "kind": "19", + "apiVersion": "20", + "name": "21", + "namespace": "22" } ], "roleRef": { - "apiGroup": "22", - "kind": "23", - "name": "24" + "apiGroup": "23", + "kind": "24", + "name": "25" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.pb index b8d3e2df8c3..552e768db9c 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.yaml index 2247b29ec04..26fd0ef238d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.ClusterRoleBinding.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,11 +30,11 @@ metadata: selfLink: "5" uid: "7" roleRef: - apiGroup: "22" - kind: "23" - name: "24" + apiGroup: "23" + kind: "24" + name: "25" subjects: -- apiVersion: "19" - kind: "18" - name: "20" - namespace: "21" +- apiVersion: "20" + kind: "19" + name: "21" + namespace: "22" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.json index 0dd0fa4dceb..2df5bb2e869 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.json @@ -35,26 +35,27 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "rules": [ { "verbs": [ - "18" - ], - "apiGroups": [ "19" ], - "resources": [ + "apiGroups": [ "20" ], - "resourceNames": [ + "resources": [ "21" ], - "nonResourceURLs": [ + "resourceNames": [ "22" + ], + "nonResourceURLs": [ + "23" ] } ] diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.pb index b140cce241a..b5dd3868c98 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.yaml index 06386c41bf5..a951ad06f3b 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.Role.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -30,12 +31,12 @@ metadata: uid: "7" rules: - apiGroups: - - "19" - nonResourceURLs: - - "22" - resourceNames: - - "21" - resources: - "20" + nonResourceURLs: + - "23" + resourceNames: + - "22" + resources: + - "21" verbs: - - "18" + - "19" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.json index c3cbfb3ca7b..57da7a375ae 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.json @@ -35,21 +35,22 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "subjects": [ { - "kind": "18", - "apiVersion": "19", - "name": "20", - "namespace": "21" + "kind": "19", + "apiVersion": "20", + "name": "21", + "namespace": "22" } ], "roleRef": { - "apiGroup": "22", - "kind": "23", - "name": "24" + "apiGroup": "23", + "kind": "24", + "name": "25" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.pb index d26ab09036f..ad9b39e2b73 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.yaml index 4a5fb799ce7..e82c4c2f00b 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1alpha1.RoleBinding.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,11 +30,11 @@ metadata: selfLink: "5" uid: "7" roleRef: - apiGroup: "22" - kind: "23" - name: "24" + apiGroup: "23" + kind: "24" + name: "25" subjects: -- apiVersion: "19" - kind: "18" - name: "20" - namespace: "21" +- apiVersion: "20" + kind: "19" + name: "21" + namespace: "22" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.json index 6416aaab7db..2e96bc779ff 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.json @@ -35,26 +35,27 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "rules": [ { "verbs": [ - "18" - ], - "apiGroups": [ "19" ], - "resources": [ + "apiGroups": [ "20" ], - "resourceNames": [ + "resources": [ "21" ], - "nonResourceURLs": [ + "resourceNames": [ "22" + ], + "nonResourceURLs": [ + "23" ] } ], diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.pb index cc5318fcae5..f40dbff6a50 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.yaml index b4b95edc31f..39b03f169ef 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRole.yaml @@ -23,6 +23,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -39,12 +40,12 @@ metadata: uid: "7" rules: - apiGroups: - - "19" - nonResourceURLs: - - "22" - resourceNames: - - "21" - resources: - "20" + nonResourceURLs: + - "23" + resourceNames: + - "22" + resources: + - "21" verbs: - - "18" + - "19" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.json index 29f3af20c72..b1bbef81a83 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.json @@ -35,21 +35,22 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "subjects": [ { - "kind": "18", - "apiGroup": "19", - "name": "20", - "namespace": "21" + "kind": "19", + "apiGroup": "20", + "name": "21", + "namespace": "22" } ], "roleRef": { - "apiGroup": "22", - "kind": "23", - "name": "24" + "apiGroup": "23", + "kind": "24", + "name": "25" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.pb index 27a3451e97b..2ad9e05e983 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.yaml index 6646524d5d1..7a3c8a8f42a 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.ClusterRoleBinding.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,11 +30,11 @@ metadata: selfLink: "5" uid: "7" roleRef: - apiGroup: "22" - kind: "23" - name: "24" + apiGroup: "23" + kind: "24" + name: "25" subjects: -- apiGroup: "19" - kind: "18" - name: "20" - namespace: "21" +- apiGroup: "20" + kind: "19" + name: "21" + namespace: "22" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.json index 5aa2d437c8d..f3d7aff0c31 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.json @@ -35,26 +35,27 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "rules": [ { "verbs": [ - "18" - ], - "apiGroups": [ "19" ], - "resources": [ + "apiGroups": [ "20" ], - "resourceNames": [ + "resources": [ "21" ], - "nonResourceURLs": [ + "resourceNames": [ "22" + ], + "nonResourceURLs": [ + "23" ] } ] diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.pb index 0070f9d0003..1935bbd76ab 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.yaml index ac3da7d7fd0..05919896094 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.Role.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -30,12 +31,12 @@ metadata: uid: "7" rules: - apiGroups: - - "19" - nonResourceURLs: - - "22" - resourceNames: - - "21" - resources: - "20" + nonResourceURLs: + - "23" + resourceNames: + - "22" + resources: + - "21" verbs: - - "18" + - "19" diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.json b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.json index 50b2b5df3aa..45723e17b1c 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.json +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.json @@ -35,21 +35,22 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "subjects": [ { - "kind": "18", - "apiGroup": "19", - "name": "20", - "namespace": "21" + "kind": "19", + "apiGroup": "20", + "name": "21", + "namespace": "22" } ], "roleRef": { - "apiGroup": "22", - "kind": "23", - "name": "24" + "apiGroup": "23", + "kind": "24", + "name": "25" } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.pb b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.pb index 5434bc83d38..e398cd51c45 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.pb and b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.yaml b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.yaml index a1aab827207..47d6669973e 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/rbac.authorization.k8s.io.v1beta1.RoleBinding.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,11 +30,11 @@ metadata: selfLink: "5" uid: "7" roleRef: - apiGroup: "22" - kind: "23" - name: "24" + apiGroup: "23" + kind: "24" + name: "25" subjects: -- apiGroup: "19" - kind: "18" - name: "20" - namespace: "21" +- apiGroup: "20" + kind: "19" + name: "21" + namespace: "22" diff --git a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.json b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.json index 52d601ce4a9..a578404c99b 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.json +++ b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.json @@ -35,12 +35,13 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "value": -595102844, "globalDefault": true, - "description": "18", + "description": "19", "preemptionPolicy": "J枊a" } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.pb b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.pb index c2481fd012e..f0c038d3c5b 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.pb and b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.yaml b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.yaml index 8a2dbd1f904..e3645677dda 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1.PriorityClass.yaml @@ -1,5 +1,5 @@ apiVersion: scheduling.k8s.io/v1 -description: "18" +description: "19" globalDefault: true kind: PriorityClass metadata: @@ -16,6 +16,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" diff --git a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.json b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.json index 4846caec9f8..9b02c32b56b 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.json +++ b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.json @@ -35,12 +35,13 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "value": -595102844, "globalDefault": true, - "description": "18", + "description": "19", "preemptionPolicy": "J枊a" } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.pb b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.pb index e9da0789e47..00bc5d8e8f1 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.pb and b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.yaml b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.yaml index 6ba469cf267..dd5b5656065 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1alpha1.PriorityClass.yaml @@ -1,5 +1,5 @@ apiVersion: scheduling.k8s.io/v1alpha1 -description: "18" +description: "19" globalDefault: true kind: PriorityClass metadata: @@ -16,6 +16,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" diff --git a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.json b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.json index 7aea14275d2..c0be49e3f1d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.json +++ b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.json @@ -35,12 +35,13 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "value": -595102844, "globalDefault": true, - "description": "18", + "description": "19", "preemptionPolicy": "J枊a" } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.pb b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.pb index 982bfe37906..7313a234d9f 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.pb and b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.yaml b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.yaml index 759665023ed..89818f2eceb 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/scheduling.k8s.io.v1beta1.PriorityClass.yaml @@ -1,5 +1,5 @@ apiVersion: scheduling.k8s.io/v1beta1 -description: "18" +description: "19" globalDefault: true kind: PriorityClass metadata: @@ -16,6 +16,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" diff --git a/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.json b/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.json index 5ac3d7dd027..bf00393d390 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.json +++ b/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, @@ -56,26 +57,26 @@ }, "env": [ { - "name": "24", - "value": "25", + "name": "25", + "value": "26", "valueFrom": { "fieldRef": { - "apiVersion": "26", - "fieldPath": "27" + "apiVersion": "27", + "fieldPath": "28" }, "resourceFieldRef": { - "containerName": "28", - "resource": "29", + "containerName": "29", + "resource": "30", "divisor": "91" }, "configMapKeyRef": { - "name": "30", - "key": "31", + "name": "31", + "key": "32", "optional": false }, "secretKeyRef": { - "name": "32", - "key": "33", + "name": "33", + "key": "34", "optional": true } } @@ -83,50 +84,50 @@ ], "envFrom": [ { - "prefix": "34", + "prefix": "35", "configMapRef": { - "name": "35", + "name": "36", "optional": true }, "secretRef": { - "name": "36", + "name": "37", "optional": false } } ], "volumes": [ { - "name": "37", + "name": "38", "hostPath": { - "path": "38", + "path": "39", "type": "3fƻfʣ繡楙¯ĦE" }, "emptyDir": { "sizeLimit": "700" }, "gcePersistentDisk": { - "pdName": "39", - "fsType": "40", + "pdName": "40", + "fsType": "41", "partition": -1215463021, "readOnly": true }, "awsElasticBlockStore": { - "volumeID": "41", - "fsType": "42", + "volumeID": "42", + "fsType": "43", "partition": 1686297225, "readOnly": true }, "gitRepo": { - "repository": "43", - "revision": "44", - "directory": "45" + "repository": "44", + "revision": "45", + "directory": "46" }, "secret": { - "secretName": "46", + "secretName": "47", "items": [ { - "key": "47", - "path": "48", + "key": "48", + "path": "49", "mode": -815194340 } ], @@ -134,90 +135,90 @@ "optional": false }, "nfs": { - "server": "49", - "path": "50", + "server": "50", + "path": "51", "readOnly": true }, "iscsi": { - "targetPortal": "51", - "iqn": "52", + "targetPortal": "52", + "iqn": "53", "lun": -388204860, - "iscsiInterface": "53", - "fsType": "54", + "iscsiInterface": "54", + "fsType": "55", "readOnly": true, "portals": [ - "55" + "56" ], "secretRef": { - "name": "56" + "name": "57" }, - "initiatorName": "57" + "initiatorName": "58" }, "glusterfs": { - "endpoints": "58", - "path": "59" + "endpoints": "59", + "path": "60" }, "persistentVolumeClaim": { - "claimName": "60" + "claimName": "61" }, "rbd": { "monitors": [ - "61" + "62" ], - "image": "62", - "fsType": "63", - "pool": "64", - "user": "65", - "keyring": "66", + "image": "63", + "fsType": "64", + "pool": "65", + "user": "66", + "keyring": "67", "secretRef": { - "name": "67" + "name": "68" }, "readOnly": true }, "flexVolume": { - "driver": "68", - "fsType": "69", + "driver": "69", + "fsType": "70", "secretRef": { - "name": "70" + "name": "71" }, "options": { - "71": "72" + "72": "73" } }, "cinder": { - "volumeID": "73", - "fsType": "74", + "volumeID": "74", + "fsType": "75", "secretRef": { - "name": "75" + "name": "76" } }, "cephfs": { "monitors": [ - "76" + "77" ], - "path": "77", - "user": "78", - "secretFile": "79", + "path": "78", + "user": "79", + "secretFile": "80", "secretRef": { - "name": "80" + "name": "81" }, "readOnly": true }, "flocker": { - "datasetName": "81", - "datasetUUID": "82" + "datasetName": "82", + "datasetUUID": "83" }, "downwardAPI": { "items": [ { - "path": "83", + "path": "84", "fieldRef": { - "apiVersion": "84", - "fieldPath": "85" + "apiVersion": "85", + "fieldPath": "86" }, "resourceFieldRef": { - "containerName": "86", - "resource": "87", + "containerName": "87", + "resource": "88", "divisor": "965" }, "mode": 345648859 @@ -227,25 +228,25 @@ }, "fc": { "targetWWNs": [ - "88" + "89" ], "lun": -460478410, - "fsType": "89", + "fsType": "90", "wwids": [ - "90" + "91" ] }, "azureFile": { - "secretName": "91", - "shareName": "92", + "secretName": "92", + "shareName": "93", "readOnly": true }, "configMap": { - "name": "93", + "name": "94", "items": [ { - "key": "94", - "path": "95", + "key": "95", + "path": "96", "mode": -513127725 } ], @@ -253,39 +254,39 @@ "optional": true }, "vsphereVolume": { - "volumePath": "96", - "fsType": "97", - "storagePolicyName": "98", - "storagePolicyID": "99" + "volumePath": "97", + "fsType": "98", + "storagePolicyName": "99", + "storagePolicyID": "100" }, "quobyte": { - "registry": "100", - "volume": "101", - "user": "102", - "group": "103", - "tenant": "104" + "registry": "101", + "volume": "102", + "user": "103", + "group": "104", + "tenant": "105" }, "azureDisk": { - "diskName": "105", - "diskURI": "106", + "diskName": "106", + "diskURI": "107", "cachingMode": "穠C]躢|)黰eȪ嵛4$%Qɰ", - "fsType": "107", + "fsType": "108", "readOnly": false, "kind": "Ï抴ŨfZhUʎ浵ɲõTo\u0026蕭k" }, "photonPersistentDisk": { - "pdID": "108", - "fsType": "109" + "pdID": "109", + "fsType": "110" }, "projected": { "sources": [ { "secret": { - "name": "110", + "name": "111", "items": [ { - "key": "111", - "path": "112", + "key": "112", + "path": "113", "mode": -163325250 } ], @@ -294,14 +295,14 @@ "downwardAPI": { "items": [ { - "path": "113", + "path": "114", "fieldRef": { - "apiVersion": "114", - "fieldPath": "115" + "apiVersion": "115", + "fieldPath": "116" }, "resourceFieldRef": { - "containerName": "116", - "resource": "117", + "containerName": "117", + "resource": "118", "divisor": "85" }, "mode": -1996616480 @@ -309,72 +310,72 @@ ] }, "configMap": { - "name": "118", + "name": "119", "items": [ { - "key": "119", - "path": "120", + "key": "120", + "path": "121", "mode": -1120128337 } ], "optional": false }, "serviceAccountToken": { - "audience": "121", + "audience": "122", "expirationSeconds": -1239370187818888272, - "path": "122" + "path": "123" } } ], "defaultMode": 1366821517 }, "portworxVolume": { - "volumeID": "123", - "fsType": "124", + "volumeID": "124", + "fsType": "125", "readOnly": true }, "scaleIO": { - "gateway": "125", - "system": "126", + "gateway": "126", + "system": "127", "secretRef": { - "name": "127" + "name": "128" }, "sslEnabled": true, - "protectionDomain": "128", - "storagePool": "129", - "storageMode": "130", - "volumeName": "131", - "fsType": "132" + "protectionDomain": "129", + "storagePool": "130", + "storageMode": "131", + "volumeName": "132", + "fsType": "133" }, "storageos": { - "volumeName": "133", - "volumeNamespace": "134", - "fsType": "135", + "volumeName": "134", + "volumeNamespace": "135", + "fsType": "136", "secretRef": { - "name": "136" + "name": "137" } }, "csi": { - "driver": "137", + "driver": "138", "readOnly": true, - "fsType": "138", + "fsType": "139", "volumeAttributes": { - "139": "140" + "140": "141" }, "nodePublishSecretRef": { - "name": "141" + "name": "142" } } } ], "volumeMounts": [ { - "name": "142", + "name": "143", "readOnly": true, - "mountPath": "143", - "subPath": "144", + "mountPath": "144", + "subPath": "145", "mountPropagation": "腿ħ缶.蒅!a", - "subPathExpr": "145" + "subPathExpr": "146" } ] } diff --git a/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.pb b/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.pb index 3865408bbff..c9826c2a2ee 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.pb and b/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.yaml b/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.yaml index 5189f0f903f..e92273748b7 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/settings.k8s.io.v1alpha1.PodPreset.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -30,31 +31,31 @@ metadata: uid: "7" spec: env: - - name: "24" - value: "25" + - name: "25" + value: "26" valueFrom: configMapKeyRef: - key: "31" - name: "30" + key: "32" + name: "31" optional: false fieldRef: - apiVersion: "26" - fieldPath: "27" + apiVersion: "27" + fieldPath: "28" resourceFieldRef: - containerName: "28" + containerName: "29" divisor: "91" - resource: "29" + resource: "30" secretKeyRef: - key: "33" - name: "32" + key: "34" + name: "33" optional: true envFrom: - configMapRef: - name: "35" - optional: true - prefix: "34" - secretRef: name: "36" + optional: true + prefix: "35" + secretRef: + name: "37" optional: false selector: matchExpressions: @@ -65,207 +66,207 @@ spec: matchLabels: 8---jop9641lg.p-g8c2-k-912e5-c-e63-n-3n/E9.8ThjT9s-j41-0-6p-JFHn7y-74.-0MUORQQ.N2.3: 68._bQw.-dG6c-.6--_x.--0wmZk1_8._3s_-_Bq.m_4 volumeMounts: - - mountPath: "143" + - mountPath: "144" mountPropagation: 腿ħ缶.蒅!a - name: "142" + name: "143" readOnly: true - subPath: "144" - subPathExpr: "145" + subPath: "145" + subPathExpr: "146" volumes: - awsElasticBlockStore: - fsType: "42" + fsType: "43" partition: 1686297225 readOnly: true - volumeID: "41" + volumeID: "42" azureDisk: cachingMode: 穠C]躢|)黰eȪ嵛4$%Qɰ - diskName: "105" - diskURI: "106" - fsType: "107" + diskName: "106" + diskURI: "107" + fsType: "108" kind: Ï抴ŨfZhUʎ浵ɲõTo&蕭k readOnly: false azureFile: readOnly: true - secretName: "91" - shareName: "92" + secretName: "92" + shareName: "93" cephfs: monitors: - - "76" - path: "77" + - "77" + path: "78" readOnly: true - secretFile: "79" + secretFile: "80" secretRef: - name: "80" - user: "78" + name: "81" + user: "79" cinder: - fsType: "74" + fsType: "75" secretRef: - name: "75" - volumeID: "73" + name: "76" + volumeID: "74" configMap: defaultMode: -958191807 items: - - key: "94" + - key: "95" mode: -513127725 - path: "95" - name: "93" + path: "96" + name: "94" optional: true csi: - driver: "137" - fsType: "138" + driver: "138" + fsType: "139" nodePublishSecretRef: - name: "141" + name: "142" readOnly: true volumeAttributes: - "139": "140" + "140": "141" downwardAPI: defaultMode: 1169718433 items: - fieldRef: - apiVersion: "84" - fieldPath: "85" + apiVersion: "85" + fieldPath: "86" mode: 345648859 - path: "83" + path: "84" resourceFieldRef: - containerName: "86" + containerName: "87" divisor: "965" - resource: "87" + resource: "88" emptyDir: sizeLimit: "700" fc: - fsType: "89" + fsType: "90" lun: -460478410 targetWWNs: - - "88" + - "89" wwids: - - "90" + - "91" flexVolume: - driver: "68" - fsType: "69" + driver: "69" + fsType: "70" options: - "71": "72" + "72": "73" secretRef: - name: "70" + name: "71" flocker: - datasetName: "81" - datasetUUID: "82" + datasetName: "82" + datasetUUID: "83" gcePersistentDisk: - fsType: "40" + fsType: "41" partition: -1215463021 - pdName: "39" + pdName: "40" readOnly: true gitRepo: - directory: "45" - repository: "43" - revision: "44" + directory: "46" + repository: "44" + revision: "45" glusterfs: - endpoints: "58" - path: "59" + endpoints: "59" + path: "60" hostPath: - path: "38" + path: "39" type: 3fƻfʣ繡楙¯ĦE iscsi: - fsType: "54" - initiatorName: "57" - iqn: "52" - iscsiInterface: "53" + fsType: "55" + initiatorName: "58" + iqn: "53" + iscsiInterface: "54" lun: -388204860 portals: - - "55" + - "56" readOnly: true secretRef: - name: "56" - targetPortal: "51" - name: "37" + name: "57" + targetPortal: "52" + name: "38" nfs: - path: "50" + path: "51" readOnly: true - server: "49" + server: "50" persistentVolumeClaim: - claimName: "60" + claimName: "61" photonPersistentDisk: - fsType: "109" - pdID: "108" + fsType: "110" + pdID: "109" portworxVolume: - fsType: "124" + fsType: "125" readOnly: true - volumeID: "123" + volumeID: "124" projected: defaultMode: 1366821517 sources: - configMap: items: - - key: "119" + - key: "120" mode: -1120128337 - path: "120" - name: "118" + path: "121" + name: "119" optional: false downwardAPI: items: - fieldRef: - apiVersion: "114" - fieldPath: "115" + apiVersion: "115" + fieldPath: "116" mode: -1996616480 - path: "113" + path: "114" resourceFieldRef: - containerName: "116" + containerName: "117" divisor: "85" - resource: "117" + resource: "118" secret: items: - - key: "111" + - key: "112" mode: -163325250 - path: "112" - name: "110" + path: "113" + name: "111" optional: false serviceAccountToken: - audience: "121" + audience: "122" expirationSeconds: -1239370187818888272 - path: "122" + path: "123" quobyte: - group: "103" - registry: "100" - tenant: "104" - user: "102" - volume: "101" + group: "104" + registry: "101" + tenant: "105" + user: "103" + volume: "102" rbd: - fsType: "63" - image: "62" - keyring: "66" + fsType: "64" + image: "63" + keyring: "67" monitors: - - "61" - pool: "64" + - "62" + pool: "65" readOnly: true secretRef: - name: "67" - user: "65" + name: "68" + user: "66" scaleIO: - fsType: "132" - gateway: "125" - protectionDomain: "128" + fsType: "133" + gateway: "126" + protectionDomain: "129" secretRef: - name: "127" + name: "128" sslEnabled: true - storageMode: "130" - storagePool: "129" - system: "126" - volumeName: "131" + storageMode: "131" + storagePool: "130" + system: "127" + volumeName: "132" secret: defaultMode: -999327618 items: - - key: "47" + - key: "48" mode: -815194340 - path: "48" + path: "49" optional: false - secretName: "46" + secretName: "47" storageos: - fsType: "135" + fsType: "136" secretRef: - name: "136" - volumeName: "133" - volumeNamespace: "134" + name: "137" + volumeName: "134" + volumeNamespace: "135" vsphereVolume: - fsType: "97" - storagePolicyID: "99" - storagePolicyName: "98" - volumePath: "96" + fsType: "98" + storagePolicyID: "100" + storagePolicyName: "99" + volumePath: "97" diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.json b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.json index 69932a96092..891ace57d4f 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.json +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.json @@ -35,17 +35,18 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, - "provisioner": "18", + "provisioner": "19", "parameters": { - "19": "20" + "20": "21" }, "reclaimPolicy": "qJ枊a8衍`Ĩ", "mountOptions": [ - "21" + "22" ], "allowVolumeExpansion": true, "volumeBindingMode": "", @@ -53,9 +54,9 @@ { "matchLabelExpressions": [ { - "key": "22", + "key": "23", "values": [ - "23" + "24" ] } ] diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.pb b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.pb index 25e05aea56a..5ab7d7234aa 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.pb and b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.yaml b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.yaml index 06f00f4d585..40b3556b0bb 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.StorageClass.yaml @@ -1,9 +1,9 @@ allowVolumeExpansion: true allowedTopologies: - matchLabelExpressions: - - key: "22" + - key: "23" values: - - "23" + - "24" apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: @@ -20,6 +20,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -35,9 +36,9 @@ metadata: selfLink: "5" uid: "7" mountOptions: -- "21" +- "22" parameters: - "19": "20" -provisioner: "18" + "20": "21" +provisioner: "19" reclaimPolicy: qJ枊a8衍`Ĩ volumeBindingMode: "" diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.json b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.json index 4850882f9e8..694aa265bb7 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.json +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.json @@ -35,226 +35,227 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { - "attacher": "18", + "attacher": "19", "source": { - "persistentVolumeName": "19", + "persistentVolumeName": "20", "inlineVolumeSpec": { "capacity": { "qJ枊a8衍`Ĩ": "652" }, "gcePersistentDisk": { - "pdName": "20", - "fsType": "21", + "pdName": "21", + "fsType": "22", "partition": 1847377175 }, "awsElasticBlockStore": { - "volumeID": "22", - "fsType": "23", + "volumeID": "23", + "fsType": "24", "partition": -387137265 }, "hostPath": { - "path": "24", + "path": "25", "type": "夸eɑeʤ脽ěĂ凗蓏Ŋ蛊ĉy" }, "glusterfs": { - "endpoints": "25", - "path": "26", + "endpoints": "26", + "path": "27", "readOnly": true, - "endpointsNamespace": "27" + "endpointsNamespace": "28" }, "nfs": { - "server": "28", - "path": "29" + "server": "29", + "path": "30" }, "rbd": { "monitors": [ - "30" + "31" ], - "image": "31", - "fsType": "32", - "pool": "33", - "user": "34", - "keyring": "35", + "image": "32", + "fsType": "33", + "pool": "34", + "user": "35", + "keyring": "36", "secretRef": { - "name": "36", - "namespace": "37" + "name": "37", + "namespace": "38" } }, "iscsi": { - "targetPortal": "38", - "iqn": "39", + "targetPortal": "39", + "iqn": "40", "lun": 2048967527, - "iscsiInterface": "40", - "fsType": "41", + "iscsiInterface": "41", + "fsType": "42", "readOnly": true, "portals": [ - "42" + "43" ], "secretRef": { - "name": "43", - "namespace": "44" + "name": "44", + "namespace": "45" }, - "initiatorName": "45" + "initiatorName": "46" }, "cinder": { - "volumeID": "46", - "fsType": "47", + "volumeID": "47", + "fsType": "48", "readOnly": true, "secretRef": { - "name": "48", - "namespace": "49" + "name": "49", + "namespace": "50" } }, "cephfs": { "monitors": [ - "50" + "51" ], - "path": "51", - "user": "52", - "secretFile": "53", + "path": "52", + "user": "53", + "secretFile": "54", "secretRef": { - "name": "54", - "namespace": "55" + "name": "55", + "namespace": "56" }, "readOnly": true }, "fc": { "targetWWNs": [ - "56" + "57" ], "lun": -616291512, - "fsType": "57", + "fsType": "58", "wwids": [ - "58" + "59" ] }, "flocker": { - "datasetName": "59", - "datasetUUID": "60" + "datasetName": "60", + "datasetUUID": "61" }, "flexVolume": { - "driver": "61", - "fsType": "62", + "driver": "62", + "fsType": "63", "secretRef": { - "name": "63", - "namespace": "64" + "name": "64", + "namespace": "65" }, "options": { - "65": "66" + "66": "67" } }, "azureFile": { - "secretName": "67", - "shareName": "68", - "secretNamespace": "69" + "secretName": "68", + "shareName": "69", + "secretNamespace": "70" }, "vsphereVolume": { - "volumePath": "70", - "fsType": "71", - "storagePolicyName": "72", - "storagePolicyID": "73" + "volumePath": "71", + "fsType": "72", + "storagePolicyName": "73", + "storagePolicyID": "74" }, "quobyte": { - "registry": "74", - "volume": "75", + "registry": "75", + "volume": "76", "readOnly": true, - "user": "76", - "group": "77", - "tenant": "78" + "user": "77", + "group": "78", + "tenant": "79" }, "azureDisk": { - "diskName": "79", - "diskURI": "80", + "diskName": "80", + "diskURI": "81", "cachingMode": "x", - "fsType": "81", + "fsType": "82", "readOnly": false, "kind": "a鯿rŎǀ朲^苣" }, "photonPersistentDisk": { - "pdID": "82", - "fsType": "83" + "pdID": "83", + "fsType": "84" }, "portworxVolume": { - "volumeID": "84", - "fsType": "85", + "volumeID": "85", + "fsType": "86", "readOnly": true }, "scaleIO": { - "gateway": "86", - "system": "87", + "gateway": "87", + "system": "88", "secretRef": { - "name": "88", - "namespace": "89" + "name": "89", + "namespace": "90" }, - "protectionDomain": "90", - "storagePool": "91", - "storageMode": "92", - "volumeName": "93", - "fsType": "94" + "protectionDomain": "91", + "storagePool": "92", + "storageMode": "93", + "volumeName": "94", + "fsType": "95" }, "local": { - "path": "95", - "fsType": "96" + "path": "96", + "fsType": "97" }, "storageos": { - "volumeName": "97", - "volumeNamespace": "98", - "fsType": "99", + "volumeName": "98", + "volumeNamespace": "99", + "fsType": "100", "secretRef": { - "kind": "100", - "namespace": "101", - "name": "102", + "kind": "101", + "namespace": "102", + "name": "103", "uid": "ȮO励鹗塢ē ƕP", - "apiVersion": "103", - "resourceVersion": "104", - "fieldPath": "105" + "apiVersion": "104", + "resourceVersion": "105", + "fieldPath": "106" } }, "csi": { - "driver": "106", - "volumeHandle": "107", + "driver": "107", + "volumeHandle": "108", "readOnly": true, - "fsType": "108", + "fsType": "109", "volumeAttributes": { - "109": "110" + "110": "111" }, "controllerPublishSecretRef": { - "name": "111", - "namespace": "112" + "name": "112", + "namespace": "113" }, "nodeStageSecretRef": { - "name": "113", - "namespace": "114" + "name": "114", + "namespace": "115" }, "nodePublishSecretRef": { - "name": "115", - "namespace": "116" + "name": "116", + "namespace": "117" }, "controllerExpandSecretRef": { - "name": "117", - "namespace": "118" + "name": "118", + "namespace": "119" } }, "accessModes": [ "d賑'üA謥ǣ偐圠=" ], "claimRef": { - "kind": "119", - "namespace": "120", - "name": "121", - "apiVersion": "122", - "resourceVersion": "123", - "fieldPath": "124" + "kind": "120", + "namespace": "121", + "name": "122", + "apiVersion": "123", + "resourceVersion": "124", + "fieldPath": "125" }, "persistentVolumeReclaimPolicy": "錕?øēƺ魋Ď儇击3ƆìQ喞艋", - "storageClassName": "125", + "storageClassName": "126", "mountOptions": [ - "126" + "127" ], "volumeMode": "½", "nodeAffinity": { @@ -263,19 +264,19 @@ { "matchExpressions": [ { - "key": "127", + "key": "128", "operator": "檮Ǣ冖ž琔n宂¬轚9Ȏ瀮昃2", "values": [ - "128" + "129" ] } ], "matchFields": [ { - "key": "129", + "key": "130", "operator": "-议}ȧ外ĺ稥氹Ç|¶", "values": [ - "130" + "131" ] } ] @@ -285,20 +286,20 @@ } } }, - "nodeName": "131" + "nodeName": "132" }, "status": { "attached": true, "attachmentMetadata": { - "132": "133" + "133": "134" }, "attachError": { "time": "2327-07-20T07:31:37Z", - "message": "134" + "message": "135" }, "detachError": { "time": "2046-08-01T16:33:49Z", - "message": "135" + "message": "136" } } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.pb b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.pb index 7de821c73dd..85aa93ba166 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.pb and b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.yaml b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.yaml index a67569f3477..05e35837d1c 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1.VolumeAttachment.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,200 +30,200 @@ metadata: selfLink: "5" uid: "7" spec: - attacher: "18" - nodeName: "131" + attacher: "19" + nodeName: "132" source: inlineVolumeSpec: accessModes: - d賑'üA謥ǣ偐圠= awsElasticBlockStore: - fsType: "23" + fsType: "24" partition: -387137265 - volumeID: "22" + volumeID: "23" azureDisk: cachingMode: x - diskName: "79" - diskURI: "80" - fsType: "81" + diskName: "80" + diskURI: "81" + fsType: "82" kind: a鯿rŎǀ朲^苣 readOnly: false azureFile: - secretName: "67" - secretNamespace: "69" - shareName: "68" + secretName: "68" + secretNamespace: "70" + shareName: "69" capacity: qJ枊a8衍`Ĩ: "652" cephfs: monitors: - - "50" - path: "51" + - "51" + path: "52" readOnly: true - secretFile: "53" + secretFile: "54" secretRef: - name: "54" - namespace: "55" - user: "52" + name: "55" + namespace: "56" + user: "53" cinder: - fsType: "47" + fsType: "48" readOnly: true secretRef: - name: "48" - namespace: "49" - volumeID: "46" + name: "49" + namespace: "50" + volumeID: "47" claimRef: - apiVersion: "122" - fieldPath: "124" - kind: "119" - name: "121" - namespace: "120" - resourceVersion: "123" + apiVersion: "123" + fieldPath: "125" + kind: "120" + name: "122" + namespace: "121" + resourceVersion: "124" csi: controllerExpandSecretRef: - name: "117" - namespace: "118" + name: "118" + namespace: "119" controllerPublishSecretRef: - name: "111" - namespace: "112" - driver: "106" - fsType: "108" + name: "112" + namespace: "113" + driver: "107" + fsType: "109" nodePublishSecretRef: - name: "115" - namespace: "116" + name: "116" + namespace: "117" nodeStageSecretRef: - name: "113" - namespace: "114" + name: "114" + namespace: "115" readOnly: true volumeAttributes: - "109": "110" - volumeHandle: "107" + "110": "111" + volumeHandle: "108" fc: - fsType: "57" + fsType: "58" lun: -616291512 targetWWNs: - - "56" + - "57" wwids: - - "58" + - "59" flexVolume: - driver: "61" - fsType: "62" + driver: "62" + fsType: "63" options: - "65": "66" + "66": "67" secretRef: - name: "63" - namespace: "64" + name: "64" + namespace: "65" flocker: - datasetName: "59" - datasetUUID: "60" + datasetName: "60" + datasetUUID: "61" gcePersistentDisk: - fsType: "21" + fsType: "22" partition: 1847377175 - pdName: "20" + pdName: "21" glusterfs: - endpoints: "25" - endpointsNamespace: "27" - path: "26" + endpoints: "26" + endpointsNamespace: "28" + path: "27" readOnly: true hostPath: - path: "24" + path: "25" type: 夸eɑeʤ脽ěĂ凗蓏Ŋ蛊ĉy iscsi: - fsType: "41" - initiatorName: "45" - iqn: "39" - iscsiInterface: "40" + fsType: "42" + initiatorName: "46" + iqn: "40" + iscsiInterface: "41" lun: 2048967527 portals: - - "42" + - "43" readOnly: true secretRef: - name: "43" - namespace: "44" - targetPortal: "38" + name: "44" + namespace: "45" + targetPortal: "39" local: - fsType: "96" - path: "95" + fsType: "97" + path: "96" mountOptions: - - "126" + - "127" nfs: - path: "29" - server: "28" + path: "30" + server: "29" nodeAffinity: required: nodeSelectorTerms: - matchExpressions: - - key: "127" + - key: "128" operator: 檮Ǣ冖ž琔n宂¬轚9Ȏ瀮昃2 values: - - "128" + - "129" matchFields: - - key: "129" + - key: "130" operator: -议}ȧ外ĺ稥氹Ç|¶ values: - - "130" + - "131" persistentVolumeReclaimPolicy: 錕?øēƺ魋Ď儇击3ƆìQ喞艋 photonPersistentDisk: - fsType: "83" - pdID: "82" + fsType: "84" + pdID: "83" portworxVolume: - fsType: "85" + fsType: "86" readOnly: true - volumeID: "84" + volumeID: "85" quobyte: - group: "77" + group: "78" readOnly: true - registry: "74" - tenant: "78" - user: "76" - volume: "75" + registry: "75" + tenant: "79" + user: "77" + volume: "76" rbd: - fsType: "32" - image: "31" - keyring: "35" + fsType: "33" + image: "32" + keyring: "36" monitors: - - "30" - pool: "33" + - "31" + pool: "34" secretRef: - name: "36" - namespace: "37" - user: "34" + name: "37" + namespace: "38" + user: "35" scaleIO: - fsType: "94" - gateway: "86" - protectionDomain: "90" + fsType: "95" + gateway: "87" + protectionDomain: "91" secretRef: - name: "88" - namespace: "89" - storageMode: "92" - storagePool: "91" - system: "87" - volumeName: "93" - storageClassName: "125" + name: "89" + namespace: "90" + storageMode: "93" + storagePool: "92" + system: "88" + volumeName: "94" + storageClassName: "126" storageos: - fsType: "99" + fsType: "100" secretRef: - apiVersion: "103" - fieldPath: "105" - kind: "100" - name: "102" - namespace: "101" - resourceVersion: "104" + apiVersion: "104" + fieldPath: "106" + kind: "101" + name: "103" + namespace: "102" + resourceVersion: "105" uid: ȮO励鹗塢ē ƕP - volumeName: "97" - volumeNamespace: "98" + volumeName: "98" + volumeNamespace: "99" volumeMode: ½ vsphereVolume: - fsType: "71" - storagePolicyID: "73" - storagePolicyName: "72" - volumePath: "70" - persistentVolumeName: "19" + fsType: "72" + storagePolicyID: "74" + storagePolicyName: "73" + volumePath: "71" + persistentVolumeName: "20" status: attachError: - message: "134" + message: "135" time: "2327-07-20T07:31:37Z" attached: true attachmentMetadata: - "132": "133" + "133": "134" detachError: - message: "135" + message: "136" time: "2046-08-01T16:33:49Z" diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.json b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.json index d428922065b..7fdc8f43405 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.json +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.json @@ -35,226 +35,227 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { - "attacher": "18", + "attacher": "19", "source": { - "persistentVolumeName": "19", + "persistentVolumeName": "20", "inlineVolumeSpec": { "capacity": { "qJ枊a8衍`Ĩ": "652" }, "gcePersistentDisk": { - "pdName": "20", - "fsType": "21", + "pdName": "21", + "fsType": "22", "partition": 1847377175 }, "awsElasticBlockStore": { - "volumeID": "22", - "fsType": "23", + "volumeID": "23", + "fsType": "24", "partition": -387137265 }, "hostPath": { - "path": "24", + "path": "25", "type": "夸eɑeʤ脽ěĂ凗蓏Ŋ蛊ĉy" }, "glusterfs": { - "endpoints": "25", - "path": "26", + "endpoints": "26", + "path": "27", "readOnly": true, - "endpointsNamespace": "27" + "endpointsNamespace": "28" }, "nfs": { - "server": "28", - "path": "29" + "server": "29", + "path": "30" }, "rbd": { "monitors": [ - "30" + "31" ], - "image": "31", - "fsType": "32", - "pool": "33", - "user": "34", - "keyring": "35", + "image": "32", + "fsType": "33", + "pool": "34", + "user": "35", + "keyring": "36", "secretRef": { - "name": "36", - "namespace": "37" + "name": "37", + "namespace": "38" } }, "iscsi": { - "targetPortal": "38", - "iqn": "39", + "targetPortal": "39", + "iqn": "40", "lun": 2048967527, - "iscsiInterface": "40", - "fsType": "41", + "iscsiInterface": "41", + "fsType": "42", "readOnly": true, "portals": [ - "42" + "43" ], "secretRef": { - "name": "43", - "namespace": "44" + "name": "44", + "namespace": "45" }, - "initiatorName": "45" + "initiatorName": "46" }, "cinder": { - "volumeID": "46", - "fsType": "47", + "volumeID": "47", + "fsType": "48", "readOnly": true, "secretRef": { - "name": "48", - "namespace": "49" + "name": "49", + "namespace": "50" } }, "cephfs": { "monitors": [ - "50" + "51" ], - "path": "51", - "user": "52", - "secretFile": "53", + "path": "52", + "user": "53", + "secretFile": "54", "secretRef": { - "name": "54", - "namespace": "55" + "name": "55", + "namespace": "56" }, "readOnly": true }, "fc": { "targetWWNs": [ - "56" + "57" ], "lun": -616291512, - "fsType": "57", + "fsType": "58", "wwids": [ - "58" + "59" ] }, "flocker": { - "datasetName": "59", - "datasetUUID": "60" + "datasetName": "60", + "datasetUUID": "61" }, "flexVolume": { - "driver": "61", - "fsType": "62", + "driver": "62", + "fsType": "63", "secretRef": { - "name": "63", - "namespace": "64" + "name": "64", + "namespace": "65" }, "options": { - "65": "66" + "66": "67" } }, "azureFile": { - "secretName": "67", - "shareName": "68", - "secretNamespace": "69" + "secretName": "68", + "shareName": "69", + "secretNamespace": "70" }, "vsphereVolume": { - "volumePath": "70", - "fsType": "71", - "storagePolicyName": "72", - "storagePolicyID": "73" + "volumePath": "71", + "fsType": "72", + "storagePolicyName": "73", + "storagePolicyID": "74" }, "quobyte": { - "registry": "74", - "volume": "75", + "registry": "75", + "volume": "76", "readOnly": true, - "user": "76", - "group": "77", - "tenant": "78" + "user": "77", + "group": "78", + "tenant": "79" }, "azureDisk": { - "diskName": "79", - "diskURI": "80", + "diskName": "80", + "diskURI": "81", "cachingMode": "x", - "fsType": "81", + "fsType": "82", "readOnly": false, "kind": "a鯿rŎǀ朲^苣" }, "photonPersistentDisk": { - "pdID": "82", - "fsType": "83" + "pdID": "83", + "fsType": "84" }, "portworxVolume": { - "volumeID": "84", - "fsType": "85", + "volumeID": "85", + "fsType": "86", "readOnly": true }, "scaleIO": { - "gateway": "86", - "system": "87", + "gateway": "87", + "system": "88", "secretRef": { - "name": "88", - "namespace": "89" + "name": "89", + "namespace": "90" }, - "protectionDomain": "90", - "storagePool": "91", - "storageMode": "92", - "volumeName": "93", - "fsType": "94" + "protectionDomain": "91", + "storagePool": "92", + "storageMode": "93", + "volumeName": "94", + "fsType": "95" }, "local": { - "path": "95", - "fsType": "96" + "path": "96", + "fsType": "97" }, "storageos": { - "volumeName": "97", - "volumeNamespace": "98", - "fsType": "99", + "volumeName": "98", + "volumeNamespace": "99", + "fsType": "100", "secretRef": { - "kind": "100", - "namespace": "101", - "name": "102", + "kind": "101", + "namespace": "102", + "name": "103", "uid": "ȮO励鹗塢ē ƕP", - "apiVersion": "103", - "resourceVersion": "104", - "fieldPath": "105" + "apiVersion": "104", + "resourceVersion": "105", + "fieldPath": "106" } }, "csi": { - "driver": "106", - "volumeHandle": "107", + "driver": "107", + "volumeHandle": "108", "readOnly": true, - "fsType": "108", + "fsType": "109", "volumeAttributes": { - "109": "110" + "110": "111" }, "controllerPublishSecretRef": { - "name": "111", - "namespace": "112" + "name": "112", + "namespace": "113" }, "nodeStageSecretRef": { - "name": "113", - "namespace": "114" + "name": "114", + "namespace": "115" }, "nodePublishSecretRef": { - "name": "115", - "namespace": "116" + "name": "116", + "namespace": "117" }, "controllerExpandSecretRef": { - "name": "117", - "namespace": "118" + "name": "118", + "namespace": "119" } }, "accessModes": [ "d賑'üA謥ǣ偐圠=" ], "claimRef": { - "kind": "119", - "namespace": "120", - "name": "121", - "apiVersion": "122", - "resourceVersion": "123", - "fieldPath": "124" + "kind": "120", + "namespace": "121", + "name": "122", + "apiVersion": "123", + "resourceVersion": "124", + "fieldPath": "125" }, "persistentVolumeReclaimPolicy": "錕?øēƺ魋Ď儇击3ƆìQ喞艋", - "storageClassName": "125", + "storageClassName": "126", "mountOptions": [ - "126" + "127" ], "volumeMode": "½", "nodeAffinity": { @@ -263,19 +264,19 @@ { "matchExpressions": [ { - "key": "127", + "key": "128", "operator": "檮Ǣ冖ž琔n宂¬轚9Ȏ瀮昃2", "values": [ - "128" + "129" ] } ], "matchFields": [ { - "key": "129", + "key": "130", "operator": "-议}ȧ外ĺ稥氹Ç|¶", "values": [ - "130" + "131" ] } ] @@ -285,20 +286,20 @@ } } }, - "nodeName": "131" + "nodeName": "132" }, "status": { "attached": true, "attachmentMetadata": { - "132": "133" + "133": "134" }, "attachError": { "time": "2327-07-20T07:31:37Z", - "message": "134" + "message": "135" }, "detachError": { "time": "2046-08-01T16:33:49Z", - "message": "135" + "message": "136" } } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.pb b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.pb index a07f01d6eb6..0caf9b8d2be 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.pb and b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.yaml b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.yaml index 9036a113710..526e4459b18 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1alpha1.VolumeAttachment.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,200 +30,200 @@ metadata: selfLink: "5" uid: "7" spec: - attacher: "18" - nodeName: "131" + attacher: "19" + nodeName: "132" source: inlineVolumeSpec: accessModes: - d賑'üA謥ǣ偐圠= awsElasticBlockStore: - fsType: "23" + fsType: "24" partition: -387137265 - volumeID: "22" + volumeID: "23" azureDisk: cachingMode: x - diskName: "79" - diskURI: "80" - fsType: "81" + diskName: "80" + diskURI: "81" + fsType: "82" kind: a鯿rŎǀ朲^苣 readOnly: false azureFile: - secretName: "67" - secretNamespace: "69" - shareName: "68" + secretName: "68" + secretNamespace: "70" + shareName: "69" capacity: qJ枊a8衍`Ĩ: "652" cephfs: monitors: - - "50" - path: "51" + - "51" + path: "52" readOnly: true - secretFile: "53" + secretFile: "54" secretRef: - name: "54" - namespace: "55" - user: "52" + name: "55" + namespace: "56" + user: "53" cinder: - fsType: "47" + fsType: "48" readOnly: true secretRef: - name: "48" - namespace: "49" - volumeID: "46" + name: "49" + namespace: "50" + volumeID: "47" claimRef: - apiVersion: "122" - fieldPath: "124" - kind: "119" - name: "121" - namespace: "120" - resourceVersion: "123" + apiVersion: "123" + fieldPath: "125" + kind: "120" + name: "122" + namespace: "121" + resourceVersion: "124" csi: controllerExpandSecretRef: - name: "117" - namespace: "118" + name: "118" + namespace: "119" controllerPublishSecretRef: - name: "111" - namespace: "112" - driver: "106" - fsType: "108" + name: "112" + namespace: "113" + driver: "107" + fsType: "109" nodePublishSecretRef: - name: "115" - namespace: "116" + name: "116" + namespace: "117" nodeStageSecretRef: - name: "113" - namespace: "114" + name: "114" + namespace: "115" readOnly: true volumeAttributes: - "109": "110" - volumeHandle: "107" + "110": "111" + volumeHandle: "108" fc: - fsType: "57" + fsType: "58" lun: -616291512 targetWWNs: - - "56" + - "57" wwids: - - "58" + - "59" flexVolume: - driver: "61" - fsType: "62" + driver: "62" + fsType: "63" options: - "65": "66" + "66": "67" secretRef: - name: "63" - namespace: "64" + name: "64" + namespace: "65" flocker: - datasetName: "59" - datasetUUID: "60" + datasetName: "60" + datasetUUID: "61" gcePersistentDisk: - fsType: "21" + fsType: "22" partition: 1847377175 - pdName: "20" + pdName: "21" glusterfs: - endpoints: "25" - endpointsNamespace: "27" - path: "26" + endpoints: "26" + endpointsNamespace: "28" + path: "27" readOnly: true hostPath: - path: "24" + path: "25" type: 夸eɑeʤ脽ěĂ凗蓏Ŋ蛊ĉy iscsi: - fsType: "41" - initiatorName: "45" - iqn: "39" - iscsiInterface: "40" + fsType: "42" + initiatorName: "46" + iqn: "40" + iscsiInterface: "41" lun: 2048967527 portals: - - "42" + - "43" readOnly: true secretRef: - name: "43" - namespace: "44" - targetPortal: "38" + name: "44" + namespace: "45" + targetPortal: "39" local: - fsType: "96" - path: "95" + fsType: "97" + path: "96" mountOptions: - - "126" + - "127" nfs: - path: "29" - server: "28" + path: "30" + server: "29" nodeAffinity: required: nodeSelectorTerms: - matchExpressions: - - key: "127" + - key: "128" operator: 檮Ǣ冖ž琔n宂¬轚9Ȏ瀮昃2 values: - - "128" + - "129" matchFields: - - key: "129" + - key: "130" operator: -议}ȧ外ĺ稥氹Ç|¶ values: - - "130" + - "131" persistentVolumeReclaimPolicy: 錕?øēƺ魋Ď儇击3ƆìQ喞艋 photonPersistentDisk: - fsType: "83" - pdID: "82" + fsType: "84" + pdID: "83" portworxVolume: - fsType: "85" + fsType: "86" readOnly: true - volumeID: "84" + volumeID: "85" quobyte: - group: "77" + group: "78" readOnly: true - registry: "74" - tenant: "78" - user: "76" - volume: "75" + registry: "75" + tenant: "79" + user: "77" + volume: "76" rbd: - fsType: "32" - image: "31" - keyring: "35" + fsType: "33" + image: "32" + keyring: "36" monitors: - - "30" - pool: "33" + - "31" + pool: "34" secretRef: - name: "36" - namespace: "37" - user: "34" + name: "37" + namespace: "38" + user: "35" scaleIO: - fsType: "94" - gateway: "86" - protectionDomain: "90" + fsType: "95" + gateway: "87" + protectionDomain: "91" secretRef: - name: "88" - namespace: "89" - storageMode: "92" - storagePool: "91" - system: "87" - volumeName: "93" - storageClassName: "125" + name: "89" + namespace: "90" + storageMode: "93" + storagePool: "92" + system: "88" + volumeName: "94" + storageClassName: "126" storageos: - fsType: "99" + fsType: "100" secretRef: - apiVersion: "103" - fieldPath: "105" - kind: "100" - name: "102" - namespace: "101" - resourceVersion: "104" + apiVersion: "104" + fieldPath: "106" + kind: "101" + name: "103" + namespace: "102" + resourceVersion: "105" uid: ȮO励鹗塢ē ƕP - volumeName: "97" - volumeNamespace: "98" + volumeName: "98" + volumeNamespace: "99" volumeMode: ½ vsphereVolume: - fsType: "71" - storagePolicyID: "73" - storagePolicyName: "72" - volumePath: "70" - persistentVolumeName: "19" + fsType: "72" + storagePolicyID: "74" + storagePolicyName: "73" + volumePath: "71" + persistentVolumeName: "20" status: attachError: - message: "134" + message: "135" time: "2327-07-20T07:31:37Z" attached: true attachmentMetadata: - "132": "133" + "133": "134" detachError: - message: "135" + message: "136" time: "2046-08-01T16:33:49Z" diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.json b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.json index 8a0b0595ea0..0e9e30b0829 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.json +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.json @@ -35,7 +35,8 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.pb b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.pb index ebf9afd3677..bce3620d37e 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.pb and b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.yaml b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.yaml index 3ab93186ba5..bbb086e8692 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSIDriver.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.json b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.json index b4228322e1b..35cc4d9f5b6 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.json +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.json @@ -35,17 +35,18 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { "drivers": [ { - "name": "18", - "nodeID": "19", + "name": "19", + "nodeID": "20", "topologyKeys": [ - "20" + "21" ], "allocatable": { "count": 1305381319 diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.pb b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.pb index 84191ac7498..c94e89f4a28 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.pb and b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.yaml b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.yaml index 4e9e6b4f854..ebd3d929d4d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.CSINode.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -32,7 +33,7 @@ spec: drivers: - allocatable: count: 1305381319 - name: "18" - nodeID: "19" + name: "19" + nodeID: "20" topologyKeys: - - "20" + - "21" diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.json b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.json index 59e3a873293..115d300a157 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.json +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.json @@ -35,17 +35,18 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, - "provisioner": "18", + "provisioner": "19", "parameters": { - "19": "20" + "20": "21" }, "reclaimPolicy": "qJ枊a8衍`Ĩ", "mountOptions": [ - "21" + "22" ], "allowVolumeExpansion": true, "volumeBindingMode": "", @@ -53,9 +54,9 @@ { "matchLabelExpressions": [ { - "key": "22", + "key": "23", "values": [ - "23" + "24" ] } ] diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.pb b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.pb index 6bc0f51433c..2cb75f39797 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.pb and b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.yaml b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.yaml index 81ad16baa80..2b85e8e6943 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.StorageClass.yaml @@ -1,9 +1,9 @@ allowVolumeExpansion: true allowedTopologies: - matchLabelExpressions: - - key: "22" + - key: "23" values: - - "23" + - "24" apiVersion: storage.k8s.io/v1beta1 kind: StorageClass metadata: @@ -20,6 +20,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -35,9 +36,9 @@ metadata: selfLink: "5" uid: "7" mountOptions: -- "21" +- "22" parameters: - "19": "20" -provisioner: "18" + "20": "21" +provisioner: "19" reclaimPolicy: qJ枊a8衍`Ĩ volumeBindingMode: "" diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.json b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.json index 91ab580f6db..5284de5914d 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.json +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.json @@ -35,226 +35,227 @@ { "manager": "16", "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17" + "apiVersion": "17", + "fieldsType": "18" } ] }, "spec": { - "attacher": "18", + "attacher": "19", "source": { - "persistentVolumeName": "19", + "persistentVolumeName": "20", "inlineVolumeSpec": { "capacity": { "qJ枊a8衍`Ĩ": "652" }, "gcePersistentDisk": { - "pdName": "20", - "fsType": "21", + "pdName": "21", + "fsType": "22", "partition": 1847377175 }, "awsElasticBlockStore": { - "volumeID": "22", - "fsType": "23", + "volumeID": "23", + "fsType": "24", "partition": -387137265 }, "hostPath": { - "path": "24", + "path": "25", "type": "夸eɑeʤ脽ěĂ凗蓏Ŋ蛊ĉy" }, "glusterfs": { - "endpoints": "25", - "path": "26", + "endpoints": "26", + "path": "27", "readOnly": true, - "endpointsNamespace": "27" + "endpointsNamespace": "28" }, "nfs": { - "server": "28", - "path": "29" + "server": "29", + "path": "30" }, "rbd": { "monitors": [ - "30" + "31" ], - "image": "31", - "fsType": "32", - "pool": "33", - "user": "34", - "keyring": "35", + "image": "32", + "fsType": "33", + "pool": "34", + "user": "35", + "keyring": "36", "secretRef": { - "name": "36", - "namespace": "37" + "name": "37", + "namespace": "38" } }, "iscsi": { - "targetPortal": "38", - "iqn": "39", + "targetPortal": "39", + "iqn": "40", "lun": 2048967527, - "iscsiInterface": "40", - "fsType": "41", + "iscsiInterface": "41", + "fsType": "42", "readOnly": true, "portals": [ - "42" + "43" ], "secretRef": { - "name": "43", - "namespace": "44" + "name": "44", + "namespace": "45" }, - "initiatorName": "45" + "initiatorName": "46" }, "cinder": { - "volumeID": "46", - "fsType": "47", + "volumeID": "47", + "fsType": "48", "readOnly": true, "secretRef": { - "name": "48", - "namespace": "49" + "name": "49", + "namespace": "50" } }, "cephfs": { "monitors": [ - "50" + "51" ], - "path": "51", - "user": "52", - "secretFile": "53", + "path": "52", + "user": "53", + "secretFile": "54", "secretRef": { - "name": "54", - "namespace": "55" + "name": "55", + "namespace": "56" }, "readOnly": true }, "fc": { "targetWWNs": [ - "56" + "57" ], "lun": -616291512, - "fsType": "57", + "fsType": "58", "wwids": [ - "58" + "59" ] }, "flocker": { - "datasetName": "59", - "datasetUUID": "60" + "datasetName": "60", + "datasetUUID": "61" }, "flexVolume": { - "driver": "61", - "fsType": "62", + "driver": "62", + "fsType": "63", "secretRef": { - "name": "63", - "namespace": "64" + "name": "64", + "namespace": "65" }, "options": { - "65": "66" + "66": "67" } }, "azureFile": { - "secretName": "67", - "shareName": "68", - "secretNamespace": "69" + "secretName": "68", + "shareName": "69", + "secretNamespace": "70" }, "vsphereVolume": { - "volumePath": "70", - "fsType": "71", - "storagePolicyName": "72", - "storagePolicyID": "73" + "volumePath": "71", + "fsType": "72", + "storagePolicyName": "73", + "storagePolicyID": "74" }, "quobyte": { - "registry": "74", - "volume": "75", + "registry": "75", + "volume": "76", "readOnly": true, - "user": "76", - "group": "77", - "tenant": "78" + "user": "77", + "group": "78", + "tenant": "79" }, "azureDisk": { - "diskName": "79", - "diskURI": "80", + "diskName": "80", + "diskURI": "81", "cachingMode": "x", - "fsType": "81", + "fsType": "82", "readOnly": false, "kind": "a鯿rŎǀ朲^苣" }, "photonPersistentDisk": { - "pdID": "82", - "fsType": "83" + "pdID": "83", + "fsType": "84" }, "portworxVolume": { - "volumeID": "84", - "fsType": "85", + "volumeID": "85", + "fsType": "86", "readOnly": true }, "scaleIO": { - "gateway": "86", - "system": "87", + "gateway": "87", + "system": "88", "secretRef": { - "name": "88", - "namespace": "89" + "name": "89", + "namespace": "90" }, - "protectionDomain": "90", - "storagePool": "91", - "storageMode": "92", - "volumeName": "93", - "fsType": "94" + "protectionDomain": "91", + "storagePool": "92", + "storageMode": "93", + "volumeName": "94", + "fsType": "95" }, "local": { - "path": "95", - "fsType": "96" + "path": "96", + "fsType": "97" }, "storageos": { - "volumeName": "97", - "volumeNamespace": "98", - "fsType": "99", + "volumeName": "98", + "volumeNamespace": "99", + "fsType": "100", "secretRef": { - "kind": "100", - "namespace": "101", - "name": "102", + "kind": "101", + "namespace": "102", + "name": "103", "uid": "ȮO励鹗塢ē ƕP", - "apiVersion": "103", - "resourceVersion": "104", - "fieldPath": "105" + "apiVersion": "104", + "resourceVersion": "105", + "fieldPath": "106" } }, "csi": { - "driver": "106", - "volumeHandle": "107", + "driver": "107", + "volumeHandle": "108", "readOnly": true, - "fsType": "108", + "fsType": "109", "volumeAttributes": { - "109": "110" + "110": "111" }, "controllerPublishSecretRef": { - "name": "111", - "namespace": "112" + "name": "112", + "namespace": "113" }, "nodeStageSecretRef": { - "name": "113", - "namespace": "114" + "name": "114", + "namespace": "115" }, "nodePublishSecretRef": { - "name": "115", - "namespace": "116" + "name": "116", + "namespace": "117" }, "controllerExpandSecretRef": { - "name": "117", - "namespace": "118" + "name": "118", + "namespace": "119" } }, "accessModes": [ "d賑'üA謥ǣ偐圠=" ], "claimRef": { - "kind": "119", - "namespace": "120", - "name": "121", - "apiVersion": "122", - "resourceVersion": "123", - "fieldPath": "124" + "kind": "120", + "namespace": "121", + "name": "122", + "apiVersion": "123", + "resourceVersion": "124", + "fieldPath": "125" }, "persistentVolumeReclaimPolicy": "錕?øēƺ魋Ď儇击3ƆìQ喞艋", - "storageClassName": "125", + "storageClassName": "126", "mountOptions": [ - "126" + "127" ], "volumeMode": "½", "nodeAffinity": { @@ -263,19 +264,19 @@ { "matchExpressions": [ { - "key": "127", + "key": "128", "operator": "檮Ǣ冖ž琔n宂¬轚9Ȏ瀮昃2", "values": [ - "128" + "129" ] } ], "matchFields": [ { - "key": "129", + "key": "130", "operator": "-议}ȧ外ĺ稥氹Ç|¶", "values": [ - "130" + "131" ] } ] @@ -285,20 +286,20 @@ } } }, - "nodeName": "131" + "nodeName": "132" }, "status": { "attached": true, "attachmentMetadata": { - "132": "133" + "133": "134" }, "attachError": { "time": "2327-07-20T07:31:37Z", - "message": "134" + "message": "135" }, "detachError": { "time": "2046-08-01T16:33:49Z", - "message": "135" + "message": "136" } } } \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.pb b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.pb index 56c11d85e10..155fabc1e68 100644 Binary files a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.pb and b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.pb differ diff --git a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.yaml b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.yaml index 5312162392e..dd9833ab198 100644 --- a/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.yaml +++ b/staging/src/k8s.io/api/testdata/HEAD/storage.k8s.io.v1beta1.VolumeAttachment.yaml @@ -14,6 +14,7 @@ metadata: "7": "8" managedFields: - apiVersion: "17" + fieldsType: "18" manager: "16" operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] name: "2" @@ -29,200 +30,200 @@ metadata: selfLink: "5" uid: "7" spec: - attacher: "18" - nodeName: "131" + attacher: "19" + nodeName: "132" source: inlineVolumeSpec: accessModes: - d賑'üA謥ǣ偐圠= awsElasticBlockStore: - fsType: "23" + fsType: "24" partition: -387137265 - volumeID: "22" + volumeID: "23" azureDisk: cachingMode: x - diskName: "79" - diskURI: "80" - fsType: "81" + diskName: "80" + diskURI: "81" + fsType: "82" kind: a鯿rŎǀ朲^苣 readOnly: false azureFile: - secretName: "67" - secretNamespace: "69" - shareName: "68" + secretName: "68" + secretNamespace: "70" + shareName: "69" capacity: qJ枊a8衍`Ĩ: "652" cephfs: monitors: - - "50" - path: "51" + - "51" + path: "52" readOnly: true - secretFile: "53" + secretFile: "54" secretRef: - name: "54" - namespace: "55" - user: "52" + name: "55" + namespace: "56" + user: "53" cinder: - fsType: "47" + fsType: "48" readOnly: true secretRef: - name: "48" - namespace: "49" - volumeID: "46" + name: "49" + namespace: "50" + volumeID: "47" claimRef: - apiVersion: "122" - fieldPath: "124" - kind: "119" - name: "121" - namespace: "120" - resourceVersion: "123" + apiVersion: "123" + fieldPath: "125" + kind: "120" + name: "122" + namespace: "121" + resourceVersion: "124" csi: controllerExpandSecretRef: - name: "117" - namespace: "118" + name: "118" + namespace: "119" controllerPublishSecretRef: - name: "111" - namespace: "112" - driver: "106" - fsType: "108" + name: "112" + namespace: "113" + driver: "107" + fsType: "109" nodePublishSecretRef: - name: "115" - namespace: "116" + name: "116" + namespace: "117" nodeStageSecretRef: - name: "113" - namespace: "114" + name: "114" + namespace: "115" readOnly: true volumeAttributes: - "109": "110" - volumeHandle: "107" + "110": "111" + volumeHandle: "108" fc: - fsType: "57" + fsType: "58" lun: -616291512 targetWWNs: - - "56" + - "57" wwids: - - "58" + - "59" flexVolume: - driver: "61" - fsType: "62" + driver: "62" + fsType: "63" options: - "65": "66" + "66": "67" secretRef: - name: "63" - namespace: "64" + name: "64" + namespace: "65" flocker: - datasetName: "59" - datasetUUID: "60" + datasetName: "60" + datasetUUID: "61" gcePersistentDisk: - fsType: "21" + fsType: "22" partition: 1847377175 - pdName: "20" + pdName: "21" glusterfs: - endpoints: "25" - endpointsNamespace: "27" - path: "26" + endpoints: "26" + endpointsNamespace: "28" + path: "27" readOnly: true hostPath: - path: "24" + path: "25" type: 夸eɑeʤ脽ěĂ凗蓏Ŋ蛊ĉy iscsi: - fsType: "41" - initiatorName: "45" - iqn: "39" - iscsiInterface: "40" + fsType: "42" + initiatorName: "46" + iqn: "40" + iscsiInterface: "41" lun: 2048967527 portals: - - "42" + - "43" readOnly: true secretRef: - name: "43" - namespace: "44" - targetPortal: "38" + name: "44" + namespace: "45" + targetPortal: "39" local: - fsType: "96" - path: "95" + fsType: "97" + path: "96" mountOptions: - - "126" + - "127" nfs: - path: "29" - server: "28" + path: "30" + server: "29" nodeAffinity: required: nodeSelectorTerms: - matchExpressions: - - key: "127" + - key: "128" operator: 檮Ǣ冖ž琔n宂¬轚9Ȏ瀮昃2 values: - - "128" + - "129" matchFields: - - key: "129" + - key: "130" operator: -议}ȧ外ĺ稥氹Ç|¶ values: - - "130" + - "131" persistentVolumeReclaimPolicy: 錕?øēƺ魋Ď儇击3ƆìQ喞艋 photonPersistentDisk: - fsType: "83" - pdID: "82" + fsType: "84" + pdID: "83" portworxVolume: - fsType: "85" + fsType: "86" readOnly: true - volumeID: "84" + volumeID: "85" quobyte: - group: "77" + group: "78" readOnly: true - registry: "74" - tenant: "78" - user: "76" - volume: "75" + registry: "75" + tenant: "79" + user: "77" + volume: "76" rbd: - fsType: "32" - image: "31" - keyring: "35" + fsType: "33" + image: "32" + keyring: "36" monitors: - - "30" - pool: "33" + - "31" + pool: "34" secretRef: - name: "36" - namespace: "37" - user: "34" + name: "37" + namespace: "38" + user: "35" scaleIO: - fsType: "94" - gateway: "86" - protectionDomain: "90" + fsType: "95" + gateway: "87" + protectionDomain: "91" secretRef: - name: "88" - namespace: "89" - storageMode: "92" - storagePool: "91" - system: "87" - volumeName: "93" - storageClassName: "125" + name: "89" + namespace: "90" + storageMode: "93" + storagePool: "92" + system: "88" + volumeName: "94" + storageClassName: "126" storageos: - fsType: "99" + fsType: "100" secretRef: - apiVersion: "103" - fieldPath: "105" - kind: "100" - name: "102" - namespace: "101" - resourceVersion: "104" + apiVersion: "104" + fieldPath: "106" + kind: "101" + name: "103" + namespace: "102" + resourceVersion: "105" uid: ȮO励鹗塢ē ƕP - volumeName: "97" - volumeNamespace: "98" + volumeName: "98" + volumeNamespace: "99" volumeMode: ½ vsphereVolume: - fsType: "71" - storagePolicyID: "73" - storagePolicyName: "72" - volumePath: "70" - persistentVolumeName: "19" + fsType: "72" + storagePolicyID: "74" + storagePolicyName: "73" + volumePath: "71" + persistentVolumeName: "20" status: attachError: - message: "134" + message: "135" time: "2327-07-20T07:31:37Z" attached: true attachmentMetadata: - "132": "133" + "133": "134" detachError: - message: "135" + message: "136" time: "2046-08-01T16:33:49Z" diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go index 21e33e701a2..2bfde47b46e 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go @@ -58,7 +58,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Fields": schema_pkg_apis_meta_v1_Fields(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), @@ -81,7 +81,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ProtoFields": schema_pkg_apis_meta_v1_ProtoFields(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), @@ -1381,11 +1380,11 @@ func schema_pkg_apis_meta_v1_ExportOptions(ref common.ReferenceCallback) common. } } -func schema_pkg_apis_meta_v1_Fields(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_meta_v1_FieldsV1(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - 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:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where 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", + 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:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where 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: []string{"object"}, }, }, @@ -1922,17 +1921,24 @@ func schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref common.ReferenceCallback) co Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), }, }, - "fields": { + "fieldsType": { SchemaProps: spec.SchemaProps{ - Description: "Fields identifies a set of fields.", - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Fields"), + Description: "FieldsType is the discriminator for the different fields format and version. There is currently only one possible value: \"FieldsV1\"", + Type: []string{"string"}, + Format: "", + }, + }, + "fieldsV1": { + SchemaProps: spec.SchemaProps{ + Description: "FieldsV1 holds the first JSON version format as described in the \"FieldsV1\" type.", + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Fields", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } @@ -2352,17 +2358,6 @@ func schema_pkg_apis_meta_v1_Preconditions(ref common.ReferenceCallback) common. } } -func schema_pkg_apis_meta_v1_ProtoFields(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "ProtoFields is a struct that is equivalent to Fields, but intended for protobuf marshalling/unmarshalling. It is generated into a serialization that matches Fields. Do not use in Go structs.", - Type: []string{"object"}, - }, - }, - } -} - func schema_pkg_apis_meta_v1_RootPaths(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/BUILD b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/BUILD index 92d0279e8e6..119e5d166ec 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/BUILD @@ -41,7 +41,6 @@ go_library( "deepcopy.go", "doc.go", "duration.go", - "fields_proto.go", "generated.pb.go", "group_version.go", "helpers.go", diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go index f03ded7a4e7..31b1d955ece 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go @@ -301,28 +301,33 @@ func (m *ExportOptions) XXX_DiscardUnknown() { var xxx_messageInfo_ExportOptions proto.InternalMessageInfo -func (m *Fields) Reset() { *m = Fields{} } -func (*Fields) ProtoMessage() {} -func (*Fields) Descriptor() ([]byte, []int) { +func (m *FieldsV1) Reset() { *m = FieldsV1{} } +func (*FieldsV1) ProtoMessage() {} +func (*FieldsV1) Descriptor() ([]byte, []int) { return fileDescriptor_cf52fa777ced5367, []int{9} } -func (m *Fields) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Fields.Unmarshal(m, b) +func (m *FieldsV1) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } -func (m *Fields) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Fields.Marshal(b, m, deterministic) +func (m *FieldsV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } -func (m *Fields) XXX_Merge(src proto.Message) { - xxx_messageInfo_Fields.Merge(m, src) +func (m *FieldsV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_FieldsV1.Merge(m, src) } -func (m *Fields) XXX_Size() int { - return xxx_messageInfo_Fields.Size(m) +func (m *FieldsV1) XXX_Size() int { + return m.Size() } -func (m *Fields) XXX_DiscardUnknown() { - xxx_messageInfo_Fields.DiscardUnknown(m) +func (m *FieldsV1) XXX_DiscardUnknown() { + xxx_messageInfo_FieldsV1.DiscardUnknown(m) } -var xxx_messageInfo_Fields proto.InternalMessageInfo +var xxx_messageInfo_FieldsV1 proto.InternalMessageInfo func (m *GetOptions) Reset() { *m = GetOptions{} } func (*GetOptions) ProtoMessage() {} @@ -907,38 +912,10 @@ func (m *Preconditions) XXX_DiscardUnknown() { var xxx_messageInfo_Preconditions proto.InternalMessageInfo -func (m *ProtoFields) Reset() { *m = ProtoFields{} } -func (*ProtoFields) ProtoMessage() {} -func (*ProtoFields) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{31} -} -func (m *ProtoFields) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ProtoFields) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil -} -func (m *ProtoFields) XXX_Merge(src proto.Message) { - xxx_messageInfo_ProtoFields.Merge(m, src) -} -func (m *ProtoFields) XXX_Size() int { - return m.Size() -} -func (m *ProtoFields) XXX_DiscardUnknown() { - xxx_messageInfo_ProtoFields.DiscardUnknown(m) -} - -var xxx_messageInfo_ProtoFields proto.InternalMessageInfo - func (m *RootPaths) Reset() { *m = RootPaths{} } func (*RootPaths) ProtoMessage() {} func (*RootPaths) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{32} + return fileDescriptor_cf52fa777ced5367, []int{31} } func (m *RootPaths) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -966,7 +943,7 @@ var xxx_messageInfo_RootPaths proto.InternalMessageInfo func (m *ServerAddressByClientCIDR) Reset() { *m = ServerAddressByClientCIDR{} } func (*ServerAddressByClientCIDR) ProtoMessage() {} func (*ServerAddressByClientCIDR) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{33} + return fileDescriptor_cf52fa777ced5367, []int{32} } func (m *ServerAddressByClientCIDR) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -994,7 +971,7 @@ var xxx_messageInfo_ServerAddressByClientCIDR proto.InternalMessageInfo func (m *Status) Reset() { *m = Status{} } func (*Status) ProtoMessage() {} func (*Status) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{34} + return fileDescriptor_cf52fa777ced5367, []int{33} } func (m *Status) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1022,7 +999,7 @@ var xxx_messageInfo_Status proto.InternalMessageInfo func (m *StatusCause) Reset() { *m = StatusCause{} } func (*StatusCause) ProtoMessage() {} func (*StatusCause) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{35} + return fileDescriptor_cf52fa777ced5367, []int{34} } func (m *StatusCause) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1050,7 +1027,7 @@ var xxx_messageInfo_StatusCause proto.InternalMessageInfo func (m *StatusDetails) Reset() { *m = StatusDetails{} } func (*StatusDetails) ProtoMessage() {} func (*StatusDetails) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{36} + return fileDescriptor_cf52fa777ced5367, []int{35} } func (m *StatusDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1078,7 +1055,7 @@ var xxx_messageInfo_StatusDetails proto.InternalMessageInfo func (m *TableOptions) Reset() { *m = TableOptions{} } func (*TableOptions) ProtoMessage() {} func (*TableOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{37} + return fileDescriptor_cf52fa777ced5367, []int{36} } func (m *TableOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1106,7 +1083,7 @@ var xxx_messageInfo_TableOptions proto.InternalMessageInfo func (m *Time) Reset() { *m = Time{} } func (*Time) ProtoMessage() {} func (*Time) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{38} + return fileDescriptor_cf52fa777ced5367, []int{37} } func (m *Time) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Time.Unmarshal(m, b) @@ -1129,7 +1106,7 @@ var xxx_messageInfo_Time proto.InternalMessageInfo func (m *Timestamp) Reset() { *m = Timestamp{} } func (*Timestamp) ProtoMessage() {} func (*Timestamp) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{39} + return fileDescriptor_cf52fa777ced5367, []int{38} } func (m *Timestamp) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1157,7 +1134,7 @@ var xxx_messageInfo_Timestamp proto.InternalMessageInfo func (m *TypeMeta) Reset() { *m = TypeMeta{} } func (*TypeMeta) ProtoMessage() {} func (*TypeMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{40} + return fileDescriptor_cf52fa777ced5367, []int{39} } func (m *TypeMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1185,7 +1162,7 @@ var xxx_messageInfo_TypeMeta proto.InternalMessageInfo func (m *UpdateOptions) Reset() { *m = UpdateOptions{} } func (*UpdateOptions) ProtoMessage() {} func (*UpdateOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{41} + return fileDescriptor_cf52fa777ced5367, []int{40} } func (m *UpdateOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1213,7 +1190,7 @@ var xxx_messageInfo_UpdateOptions proto.InternalMessageInfo func (m *Verbs) Reset() { *m = Verbs{} } func (*Verbs) ProtoMessage() {} func (*Verbs) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{42} + return fileDescriptor_cf52fa777ced5367, []int{41} } func (m *Verbs) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1241,7 +1218,7 @@ var xxx_messageInfo_Verbs proto.InternalMessageInfo func (m *WatchEvent) Reset() { *m = WatchEvent{} } func (*WatchEvent) ProtoMessage() {} func (*WatchEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_cf52fa777ced5367, []int{43} + return fileDescriptor_cf52fa777ced5367, []int{42} } func (m *WatchEvent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1276,8 +1253,7 @@ func init() { proto.RegisterType((*DeleteOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.DeleteOptions") proto.RegisterType((*Duration)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Duration") proto.RegisterType((*ExportOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ExportOptions") - proto.RegisterType((*Fields)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Fields") - proto.RegisterMapType((map[string]Fields)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Fields.MapEntry") + proto.RegisterType((*FieldsV1)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.FieldsV1") proto.RegisterType((*GetOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GetOptions") proto.RegisterType((*GroupKind)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupKind") proto.RegisterType((*GroupResource)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupResource") @@ -1302,8 +1278,6 @@ func init() { proto.RegisterType((*Patch)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Patch") proto.RegisterType((*PatchOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.PatchOptions") proto.RegisterType((*Preconditions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Preconditions") - proto.RegisterType((*ProtoFields)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ProtoFields") - proto.RegisterMapType((map[string]Fields)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ProtoFields.MapEntry") proto.RegisterType((*RootPaths)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.RootPaths") proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ServerAddressByClientCIDR") proto.RegisterType((*Status)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Status") @@ -1323,181 +1297,177 @@ func init() { } var fileDescriptor_cf52fa777ced5367 = []byte{ - // 2779 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x1a, 0xcf, 0x6f, 0x1c, 0x57, - 0xd9, 0xb3, 0xeb, 0x5d, 0xef, 0x7e, 0xeb, 0x4d, 0xec, 0x97, 0x04, 0x36, 0x46, 0x78, 0xdd, 0x29, - 0xaa, 0x52, 0x48, 0xd7, 0x4d, 0xa0, 0x55, 0x48, 0x69, 0xc1, 0x6b, 0x3b, 0xa9, 0x69, 0x5c, 0x5b, - 0xcf, 0x49, 0x50, 0x43, 0x85, 0xfa, 0x3c, 0xf3, 0xbc, 0x1e, 0x3c, 0x3b, 0x33, 0x7d, 0x33, 0x6b, - 0x67, 0xe1, 0x40, 0x0f, 0x20, 0x40, 0x82, 0xaa, 0x47, 0x4e, 0xa8, 0x15, 0xfc, 0x05, 0x9c, 0xf8, - 0x03, 0x90, 0xe8, 0x05, 0xa9, 0x12, 0x97, 0x4a, 0xa0, 0x55, 0x6b, 0x0e, 0xc0, 0x09, 0x71, 0xe0, - 0xe2, 0x13, 0x7a, 0xbf, 0xe6, 0xc7, 0xae, 0x37, 0x9e, 0x25, 0xa5, 0xea, 0x6d, 0xe6, 0xfb, 0xf9, - 0xde, 0xfb, 0xbe, 0xf7, 0xfd, 0x9a, 0x81, 0xcd, 0x83, 0x1b, 0x61, 0xcb, 0xf1, 0x97, 0x0f, 0x7a, - 0xbb, 0x94, 0x79, 0x34, 0xa2, 0xe1, 0xf2, 0x21, 0xf5, 0x6c, 0x9f, 0x2d, 0x2b, 0x04, 0x09, 0x9c, - 0x2e, 0xb1, 0xf6, 0x1d, 0x8f, 0xb2, 0xfe, 0x72, 0x70, 0xd0, 0xe1, 0x80, 0x70, 0xb9, 0x4b, 0x23, - 0xb2, 0x7c, 0x78, 0x6d, 0xb9, 0x43, 0x3d, 0xca, 0x48, 0x44, 0xed, 0x56, 0xc0, 0xfc, 0xc8, 0x47, - 0x5f, 0x92, 0x5c, 0xad, 0x34, 0x57, 0x2b, 0x38, 0xe8, 0x70, 0x40, 0xd8, 0xe2, 0x5c, 0xad, 0xc3, - 0x6b, 0x0b, 0xcf, 0x74, 0x9c, 0x68, 0xbf, 0xb7, 0xdb, 0xb2, 0xfc, 0xee, 0x72, 0xc7, 0xef, 0xf8, - 0xcb, 0x82, 0x79, 0xb7, 0xb7, 0x27, 0xde, 0xc4, 0x8b, 0x78, 0x92, 0x42, 0x17, 0xc6, 0x2e, 0x85, - 0xf5, 0xbc, 0xc8, 0xe9, 0xd2, 0xe1, 0x55, 0x2c, 0x3c, 0x7f, 0x16, 0x43, 0x68, 0xed, 0xd3, 0x2e, - 0x19, 0xe6, 0x33, 0xff, 0x58, 0x84, 0xca, 0xca, 0xf6, 0xc6, 0x6d, 0xe6, 0xf7, 0x02, 0xb4, 0x04, - 0xd3, 0x1e, 0xe9, 0xd2, 0x86, 0xb1, 0x64, 0x5c, 0xa9, 0xb6, 0x67, 0xdf, 0x1f, 0x34, 0xa7, 0x8e, - 0x07, 0xcd, 0xe9, 0x57, 0x49, 0x97, 0x62, 0x81, 0x41, 0x2e, 0x54, 0x0e, 0x29, 0x0b, 0x1d, 0xdf, - 0x0b, 0x1b, 0x85, 0xa5, 0xe2, 0x95, 0xda, 0xf5, 0x97, 0x5a, 0x79, 0xf6, 0xdf, 0x12, 0x0a, 0xee, - 0x4b, 0xd6, 0x5b, 0x3e, 0x5b, 0x73, 0x42, 0xcb, 0x3f, 0xa4, 0xac, 0xdf, 0x9e, 0x53, 0x5a, 0x2a, - 0x0a, 0x19, 0xe2, 0x58, 0x03, 0xfa, 0xb1, 0x01, 0x73, 0x01, 0xa3, 0x7b, 0x94, 0x31, 0x6a, 0x2b, - 0x7c, 0xa3, 0xb8, 0x64, 0x7c, 0x02, 0x6a, 0x1b, 0x4a, 0xed, 0xdc, 0xf6, 0x90, 0x7c, 0x3c, 0xa2, - 0x11, 0xfd, 0xc6, 0x80, 0x85, 0x90, 0xb2, 0x43, 0xca, 0x56, 0x6c, 0x9b, 0xd1, 0x30, 0x6c, 0xf7, - 0x57, 0x5d, 0x87, 0x7a, 0xd1, 0xea, 0xc6, 0x1a, 0x0e, 0x1b, 0xd3, 0xe2, 0x1c, 0xbe, 0x99, 0x6f, - 0x41, 0x3b, 0xe3, 0xe4, 0xb4, 0x4d, 0xb5, 0xa2, 0x85, 0xb1, 0x24, 0x21, 0x7e, 0xc4, 0x32, 0xcc, - 0x3d, 0x98, 0xd5, 0x86, 0xbc, 0xe3, 0x84, 0x11, 0xba, 0x0f, 0xe5, 0x0e, 0x7f, 0x09, 0x1b, 0x86, - 0x58, 0x60, 0x2b, 0xdf, 0x02, 0xb5, 0x8c, 0xf6, 0x39, 0xb5, 0x9e, 0xb2, 0x78, 0x0d, 0xb1, 0x92, - 0x66, 0xfe, 0x7c, 0x1a, 0x6a, 0x2b, 0xdb, 0x1b, 0x98, 0x86, 0x7e, 0x8f, 0x59, 0x34, 0x87, 0xd3, - 0xdc, 0x80, 0xd9, 0xd0, 0xf1, 0x3a, 0x3d, 0x97, 0x30, 0x0e, 0x6d, 0x94, 0x05, 0xe5, 0x45, 0x45, - 0x39, 0xbb, 0x93, 0xc2, 0xe1, 0x0c, 0x25, 0xba, 0x0e, 0xc0, 0x25, 0x84, 0x01, 0xb1, 0xa8, 0xdd, - 0x28, 0x2c, 0x19, 0x57, 0x2a, 0x6d, 0xa4, 0xf8, 0xe0, 0xd5, 0x18, 0x83, 0x53, 0x54, 0xe8, 0x49, - 0x28, 0x89, 0x95, 0x36, 0x2a, 0x42, 0x4d, 0x5d, 0x91, 0x97, 0xc4, 0x36, 0xb0, 0xc4, 0xa1, 0xa7, - 0x61, 0x46, 0x79, 0x59, 0xa3, 0x2a, 0xc8, 0xce, 0x2b, 0xb2, 0x19, 0xed, 0x06, 0x1a, 0xcf, 0xf7, - 0x77, 0xe0, 0x78, 0xb6, 0xf0, 0xbb, 0xd4, 0xfe, 0x5e, 0x71, 0x3c, 0x1b, 0x0b, 0x0c, 0xba, 0x03, - 0xa5, 0x43, 0xca, 0x76, 0xb9, 0x27, 0x70, 0xd7, 0xfc, 0x4a, 0xbe, 0x83, 0xbe, 0xcf, 0x59, 0xda, - 0x55, 0xbe, 0x34, 0xf1, 0x88, 0xa5, 0x10, 0xd4, 0x02, 0x08, 0xf7, 0x7d, 0x16, 0x89, 0xed, 0x35, - 0x4a, 0x4b, 0xc5, 0x2b, 0xd5, 0xf6, 0x39, 0xbe, 0xdf, 0x9d, 0x18, 0x8a, 0x53, 0x14, 0x9c, 0xde, - 0x22, 0x11, 0xed, 0xf8, 0xcc, 0xa1, 0x61, 0x63, 0x26, 0xa1, 0x5f, 0x8d, 0xa1, 0x38, 0x45, 0x81, - 0xbe, 0x0d, 0x28, 0x8c, 0x7c, 0x46, 0x3a, 0x54, 0x6d, 0xf5, 0x65, 0x12, 0xee, 0x37, 0x40, 0xec, - 0x6e, 0x41, 0xed, 0x0e, 0xed, 0x8c, 0x50, 0xe0, 0x53, 0xb8, 0xcc, 0xdf, 0x19, 0x70, 0x3e, 0xe5, - 0x0b, 0xc2, 0xef, 0x6e, 0xc0, 0x6c, 0x27, 0x75, 0xeb, 0x94, 0x5f, 0xc4, 0xd6, 0x4e, 0xdf, 0x48, - 0x9c, 0xa1, 0x44, 0x14, 0xaa, 0x4c, 0x49, 0xd2, 0xd1, 0xe5, 0x5a, 0x6e, 0xa7, 0xd5, 0x6b, 0x48, - 0x34, 0xa5, 0x80, 0x21, 0x4e, 0x24, 0x9b, 0x7f, 0x37, 0x84, 0x03, 0xeb, 0x78, 0x83, 0xae, 0xa4, - 0x62, 0x9a, 0x21, 0x8e, 0x6f, 0x76, 0x4c, 0x3c, 0x3a, 0x23, 0x10, 0x14, 0x3e, 0x13, 0x81, 0xe0, - 0x66, 0xe5, 0x57, 0xef, 0x36, 0xa7, 0xde, 0xfa, 0xeb, 0xd2, 0x94, 0xd9, 0x85, 0xfa, 0x2a, 0xa3, - 0x24, 0xa2, 0x5b, 0x41, 0x24, 0x36, 0x60, 0x42, 0xd9, 0x66, 0x7d, 0xdc, 0xf3, 0xd4, 0x46, 0x81, - 0xdf, 0xef, 0x35, 0x01, 0xc1, 0x0a, 0xc3, 0xed, 0xb7, 0xe7, 0x50, 0xd7, 0xde, 0x24, 0x1e, 0xe9, - 0x50, 0xa6, 0xfc, 0x3e, 0x3e, 0xd5, 0x5b, 0x29, 0x1c, 0xce, 0x50, 0x9a, 0x3f, 0x2d, 0x42, 0x7d, - 0x8d, 0xba, 0x34, 0xd1, 0x77, 0x0b, 0x50, 0x87, 0x11, 0x8b, 0x6e, 0x53, 0xe6, 0xf8, 0xf6, 0x0e, - 0xb5, 0x7c, 0xcf, 0x0e, 0x85, 0x47, 0x14, 0xdb, 0x9f, 0xe3, 0x7e, 0x76, 0x7b, 0x04, 0x8b, 0x4f, - 0xe1, 0x40, 0x2e, 0xd4, 0x03, 0x26, 0x9e, 0x9d, 0x48, 0xe5, 0x1e, 0x7e, 0xd3, 0xbe, 0x9a, 0xef, - 0xa8, 0xb7, 0xd3, 0xac, 0xed, 0xf9, 0xe3, 0x41, 0xb3, 0x9e, 0x01, 0xe1, 0xac, 0x70, 0xf4, 0x2d, - 0x98, 0xf3, 0x59, 0xb0, 0x4f, 0xbc, 0x35, 0x1a, 0x50, 0xcf, 0xa6, 0x5e, 0x14, 0x8a, 0x53, 0xa8, - 0xb4, 0x2f, 0xf2, 0x8c, 0xb1, 0x35, 0x84, 0xc3, 0x23, 0xd4, 0xe8, 0x01, 0xcc, 0x07, 0xcc, 0x0f, - 0x48, 0x87, 0x70, 0x89, 0xdb, 0xbe, 0xeb, 0x58, 0x7d, 0x11, 0x1d, 0xaa, 0xed, 0xab, 0xc7, 0x83, - 0xe6, 0xfc, 0xf6, 0x30, 0xf2, 0x64, 0xd0, 0xbc, 0x20, 0x8e, 0x8e, 0x43, 0x12, 0x24, 0x1e, 0x15, - 0x93, 0xb2, 0x61, 0x69, 0x9c, 0x0d, 0xcd, 0x0d, 0xa8, 0xac, 0xf5, 0x98, 0xe0, 0x42, 0x2f, 0x42, - 0xc5, 0x56, 0xcf, 0xea, 0xe4, 0x9f, 0xd0, 0x29, 0x57, 0xd3, 0x9c, 0x0c, 0x9a, 0x75, 0x5e, 0x24, - 0xb4, 0x34, 0x00, 0xc7, 0x2c, 0xe6, 0xeb, 0x50, 0x5f, 0x7f, 0x18, 0xf8, 0x2c, 0xd2, 0x36, 0x7d, - 0x0a, 0xca, 0x54, 0x00, 0x84, 0xb4, 0x4a, 0x92, 0x27, 0x24, 0x19, 0x56, 0x58, 0x1e, 0x87, 0xe9, - 0x43, 0x62, 0x45, 0x2a, 0x6c, 0xc7, 0x71, 0x78, 0x9d, 0x03, 0xb1, 0xc4, 0x99, 0xff, 0x31, 0xa0, - 0x2c, 0x3c, 0x2a, 0x44, 0x77, 0xa1, 0xd8, 0x25, 0x81, 0x4a, 0x56, 0xcf, 0xe5, 0xb3, 0xac, 0x64, - 0x6d, 0x6d, 0x92, 0x60, 0xdd, 0x8b, 0x58, 0xbf, 0x5d, 0x53, 0x4a, 0x8a, 0x9b, 0x24, 0xc0, 0x5c, - 0x1c, 0xba, 0x0c, 0x45, 0x46, 0x8e, 0xc4, 0x1a, 0x66, 0xdb, 0x33, 0x1c, 0x85, 0xc9, 0x11, 0xe6, - 0xb0, 0x05, 0x1b, 0x2a, 0x9a, 0x11, 0xcd, 0x41, 0xf1, 0x80, 0xf6, 0x65, 0xac, 0xc2, 0xfc, 0x11, - 0xb5, 0xa1, 0x74, 0x48, 0xdc, 0x1e, 0x55, 0xae, 0x76, 0x75, 0x92, 0x05, 0x61, 0xc9, 0x7a, 0xb3, - 0x70, 0xc3, 0xb8, 0x79, 0x91, 0xdf, 0xc6, 0x9f, 0xbd, 0xd7, 0x9c, 0x7a, 0xe7, 0xbd, 0xe6, 0xd4, - 0xbb, 0xef, 0xa9, 0x9b, 0xb9, 0x05, 0x70, 0x9b, 0xc6, 0x47, 0xba, 0x02, 0xe7, 0x75, 0x78, 0xca, - 0x46, 0xcd, 0xcf, 0xab, 0xfd, 0x9c, 0xc7, 0x59, 0x34, 0x1e, 0xa6, 0x37, 0x5f, 0x87, 0xaa, 0x88, - 0xac, 0x3c, 0x2d, 0x25, 0x29, 0xd0, 0x78, 0x44, 0x0a, 0xd4, 0x79, 0xad, 0x30, 0x2e, 0xaf, 0xa5, - 0x02, 0x89, 0x0b, 0x75, 0xc9, 0xab, 0x93, 0x7e, 0x2e, 0x0d, 0x57, 0xa1, 0xa2, 0x97, 0xa9, 0xb4, - 0xc4, 0xc5, 0x9e, 0x16, 0x84, 0x63, 0x8a, 0x94, 0xb6, 0x7d, 0xc8, 0x64, 0x89, 0x7c, 0xca, 0x52, - 0x19, 0xbd, 0xf0, 0xe8, 0x8c, 0x9e, 0xd2, 0xf4, 0x23, 0x68, 0x8c, 0xab, 0x10, 0x1f, 0x23, 0x8f, - 0xe5, 0x5f, 0x8a, 0xf9, 0xb6, 0x01, 0x73, 0x69, 0x49, 0xf9, 0xcd, 0x97, 0x5f, 0xc9, 0xd9, 0x15, - 0x4c, 0xea, 0x44, 0x7e, 0x6d, 0xc0, 0xc5, 0xcc, 0xd6, 0x26, 0xb2, 0xf8, 0x04, 0x8b, 0x4a, 0x3b, - 0x47, 0x71, 0x02, 0xe7, 0xf8, 0x73, 0x01, 0xea, 0x77, 0xc8, 0x2e, 0x75, 0x77, 0xa8, 0x4b, 0xad, - 0xc8, 0x67, 0xe8, 0x87, 0x50, 0xeb, 0x92, 0xc8, 0xda, 0x17, 0x50, 0x5d, 0xed, 0xae, 0xe5, 0xbb, - 0xaf, 0x19, 0x49, 0xad, 0xcd, 0x44, 0x8c, 0x8c, 0x27, 0x17, 0xd4, 0x92, 0x6a, 0x29, 0x0c, 0x4e, - 0x6b, 0x13, 0x2d, 0x8a, 0x78, 0x5f, 0x7f, 0x18, 0xf0, 0x54, 0x3c, 0x79, 0x67, 0x94, 0x59, 0x02, - 0xa6, 0x6f, 0xf6, 0x1c, 0x46, 0xbb, 0xd4, 0x8b, 0x92, 0x16, 0x65, 0x73, 0x48, 0x3e, 0x1e, 0xd1, - 0xb8, 0xf0, 0x12, 0xcc, 0x0d, 0x2f, 0xfe, 0x94, 0x98, 0x76, 0x31, 0x1d, 0xd3, 0xaa, 0xa9, 0x28, - 0x65, 0xfe, 0xd6, 0x80, 0xc6, 0xb8, 0x85, 0xa0, 0x2f, 0xa6, 0x04, 0x25, 0x21, 0xf6, 0x15, 0xda, - 0x97, 0x52, 0xd7, 0xa1, 0xe2, 0x07, 0xbc, 0xa9, 0xf4, 0x99, 0xb2, 0xfa, 0xd3, 0xda, 0x92, 0x5b, - 0x0a, 0x7e, 0x32, 0x68, 0x5e, 0xca, 0x88, 0xd7, 0x08, 0x1c, 0xb3, 0xf2, 0xbc, 0x26, 0xd6, 0xc3, - 0x73, 0x6d, 0x9c, 0xd7, 0xee, 0x0b, 0x08, 0x56, 0x18, 0xf3, 0xf7, 0x06, 0x4c, 0x8b, 0x22, 0xf3, - 0x75, 0xa8, 0xf0, 0xf3, 0xb3, 0x49, 0x44, 0xc4, 0xba, 0x72, 0xb7, 0x37, 0x9c, 0x7b, 0x93, 0x46, - 0x24, 0xf1, 0x36, 0x0d, 0xc1, 0xb1, 0x44, 0x84, 0xa1, 0xe4, 0x44, 0xb4, 0xab, 0x0d, 0xf9, 0xcc, - 0x58, 0xd1, 0xaa, 0xb9, 0x6e, 0x61, 0x72, 0xb4, 0xfe, 0x30, 0xa2, 0x1e, 0x37, 0x46, 0x72, 0x35, - 0x36, 0xb8, 0x0c, 0x2c, 0x45, 0x99, 0xff, 0x36, 0x20, 0x56, 0xc5, 0x9d, 0x3f, 0xa4, 0xee, 0xde, - 0x1d, 0xc7, 0x3b, 0x50, 0xc7, 0x1a, 0x2f, 0x67, 0x47, 0xc1, 0x71, 0x4c, 0x71, 0x5a, 0x7a, 0x28, - 0x4c, 0x96, 0x1e, 0xb8, 0x42, 0xcb, 0xf7, 0x22, 0xc7, 0xeb, 0x8d, 0xdc, 0xb6, 0x55, 0x05, 0xc7, - 0x31, 0x05, 0x2f, 0xdb, 0x18, 0xed, 0x12, 0xc7, 0x73, 0xbc, 0x0e, 0xdf, 0xc4, 0xaa, 0xdf, 0xf3, - 0x22, 0x51, 0xbf, 0xa8, 0xb2, 0x0d, 0x8f, 0x60, 0xf1, 0x29, 0x1c, 0xe6, 0x9f, 0x8a, 0x50, 0xe3, - 0x7b, 0xd6, 0x79, 0xee, 0x05, 0xa8, 0xbb, 0x69, 0x2f, 0x50, 0x7b, 0xbf, 0xa4, 0x96, 0x92, 0xbd, - 0xd7, 0x38, 0x4b, 0xcb, 0x99, 0x45, 0xb5, 0x19, 0x33, 0x17, 0xb2, 0xcc, 0xb7, 0xd2, 0x48, 0x9c, - 0xa5, 0xe5, 0xd1, 0xeb, 0x88, 0xdf, 0x0f, 0x55, 0xc7, 0xc5, 0x26, 0xfa, 0x0e, 0x07, 0x62, 0x89, - 0x43, 0x9b, 0x70, 0x81, 0xb8, 0xae, 0x7f, 0x24, 0x80, 0x6d, 0xdf, 0x3f, 0xe8, 0x12, 0x76, 0x10, - 0x8a, 0x06, 0xb1, 0xd2, 0xfe, 0x82, 0x62, 0xb9, 0xb0, 0x32, 0x4a, 0x82, 0x4f, 0xe3, 0x3b, 0xcd, - 0x6c, 0xd3, 0x13, 0x9a, 0xed, 0x26, 0x9c, 0xe3, 0xfe, 0xe5, 0xf7, 0x22, 0x5d, 0x3b, 0x97, 0x84, - 0x11, 0xd0, 0xf1, 0xa0, 0x79, 0xee, 0x6e, 0x06, 0x83, 0x87, 0x28, 0xf9, 0x96, 0x5d, 0xa7, 0xeb, - 0x44, 0x8d, 0x19, 0xc1, 0x12, 0x6f, 0xf9, 0x0e, 0x07, 0x62, 0x89, 0xcb, 0xf8, 0x45, 0xe5, 0x2c, - 0xbf, 0x30, 0xff, 0x51, 0x00, 0x24, 0x8b, 0x7d, 0x5b, 0x16, 0x3a, 0x32, 0xd0, 0x3c, 0x0d, 0x33, - 0x5d, 0xd5, 0x2c, 0x18, 0xd9, 0xa8, 0xaf, 0xfb, 0x04, 0x8d, 0x47, 0x9b, 0x50, 0x95, 0x17, 0x3e, - 0x71, 0xe2, 0x65, 0x45, 0x5c, 0xdd, 0xd2, 0x88, 0x93, 0x41, 0x73, 0x21, 0xa3, 0x26, 0xc6, 0xdc, - 0xed, 0x07, 0x14, 0x27, 0x12, 0xd0, 0x75, 0x00, 0x12, 0x38, 0xe9, 0xc9, 0x50, 0x35, 0x99, 0x0f, - 0x24, 0x3d, 0x1e, 0x4e, 0x51, 0xa1, 0x97, 0x61, 0x9a, 0x9f, 0x94, 0x6a, 0xd6, 0xbf, 0x9c, 0x2f, - 0x6c, 0xf0, 0xb3, 0x6e, 0x57, 0x78, 0xd6, 0xe4, 0x4f, 0x58, 0x48, 0x40, 0x0f, 0xa0, 0x2c, 0xbc, - 0x4c, 0x5a, 0x65, 0xc2, 0x1a, 0x51, 0xf4, 0x12, 0xaa, 0xf6, 0x3d, 0x89, 0x9f, 0xb0, 0x92, 0x68, - 0xbe, 0x09, 0xd5, 0x4d, 0xc7, 0x62, 0x3e, 0x57, 0xc7, 0x0f, 0x38, 0xcc, 0xf4, 0x4e, 0xf1, 0x01, - 0x6b, 0xe3, 0x6b, 0x3c, 0xb7, 0xba, 0x47, 0x3c, 0x5f, 0x76, 0x48, 0xa5, 0xc4, 0xea, 0xaf, 0x72, - 0x20, 0x96, 0xb8, 0x31, 0x35, 0xe9, 0x09, 0x00, 0x6c, 0xed, 0x7e, 0x9f, 0x5a, 0x32, 0x46, 0xe5, - 0x9a, 0xeb, 0xe8, 0x71, 0xa2, 0x98, 0xeb, 0x14, 0x86, 0x2a, 0xa4, 0x14, 0x0e, 0x67, 0x28, 0xd1, - 0x32, 0x54, 0xe3, 0x89, 0x8d, 0x32, 0xdb, 0xbc, 0x76, 0x83, 0x78, 0xac, 0x83, 0x13, 0x9a, 0x4c, - 0xc0, 0x9c, 0x3e, 0x33, 0x60, 0xb6, 0xa1, 0xd8, 0x73, 0x6c, 0x61, 0x95, 0x6a, 0xfb, 0x59, 0x9d, - 0xb0, 0xee, 0x6d, 0xac, 0x9d, 0x0c, 0x9a, 0x4f, 0x8c, 0x1b, 0x94, 0x46, 0xfd, 0x80, 0x86, 0xad, - 0x7b, 0x1b, 0x6b, 0x98, 0x33, 0x9f, 0x76, 0x7b, 0xcb, 0x13, 0xde, 0xde, 0xeb, 0x00, 0x6a, 0xd7, - 0x9c, 0x5b, 0x5e, 0xc3, 0xd8, 0x3b, 0x6f, 0xc7, 0x18, 0x9c, 0xa2, 0x42, 0x21, 0xcc, 0x5b, 0xbc, - 0x65, 0xe7, 0xce, 0xee, 0x74, 0x69, 0x18, 0x91, 0xae, 0x9c, 0x64, 0x4d, 0xe6, 0xaa, 0x97, 0x95, - 0x9a, 0xf9, 0xd5, 0x61, 0x61, 0x78, 0x54, 0x3e, 0xf2, 0x61, 0xde, 0x56, 0xcd, 0x67, 0xa2, 0xb4, - 0x3a, 0xb1, 0xd2, 0x4b, 0x5c, 0xe1, 0xda, 0xb0, 0x20, 0x3c, 0x2a, 0x1b, 0x7d, 0x0f, 0x16, 0x34, - 0x70, 0x74, 0x02, 0x20, 0x66, 0x51, 0xc5, 0xf6, 0xe2, 0xf1, 0xa0, 0xb9, 0xb0, 0x36, 0x96, 0x0a, - 0x3f, 0x42, 0x02, 0xb2, 0xa1, 0xec, 0xca, 0x6a, 0xb0, 0x26, 0x32, 0xf8, 0x37, 0xf2, 0xed, 0x22, - 0xf1, 0xfe, 0x56, 0xba, 0x0a, 0x8c, 0x3b, 0x5c, 0x55, 0x00, 0x2a, 0xd9, 0xe8, 0x21, 0xd4, 0x88, - 0xe7, 0xf9, 0x11, 0x91, 0x33, 0x89, 0x59, 0xa1, 0x6a, 0x65, 0x62, 0x55, 0x2b, 0x89, 0x8c, 0xa1, - 0xaa, 0x33, 0x85, 0xc1, 0x69, 0x55, 0xe8, 0x08, 0xce, 0xfb, 0x47, 0x1e, 0x65, 0x98, 0xee, 0x51, - 0x46, 0x3d, 0x8b, 0x86, 0x8d, 0xba, 0xd0, 0xfe, 0xb5, 0x9c, 0xda, 0x33, 0xcc, 0x89, 0x4b, 0x67, - 0xe1, 0x21, 0x1e, 0xd6, 0x82, 0x5a, 0x00, 0x7b, 0x8e, 0x47, 0x5c, 0xe7, 0x07, 0x94, 0x85, 0x8d, - 0x73, 0xc9, 0xb0, 0xf1, 0x56, 0x0c, 0xc5, 0x29, 0x0a, 0xf4, 0x1c, 0xd4, 0x2c, 0xb7, 0x17, 0x46, - 0x54, 0x4e, 0x7e, 0xcf, 0x8b, 0x1b, 0x14, 0xef, 0x6f, 0x35, 0x41, 0xe1, 0x34, 0x1d, 0xea, 0x41, - 0xbd, 0x9b, 0x4e, 0x00, 0x8d, 0x79, 0xb1, 0xbb, 0x1b, 0xf9, 0x76, 0x37, 0x9a, 0xa2, 0x92, 0x2a, - 0x21, 0x83, 0xc3, 0x59, 0x2d, 0x0b, 0x5f, 0x87, 0xda, 0xff, 0x58, 0x40, 0xf3, 0x02, 0x7c, 0xd8, - 0x8e, 0x13, 0x15, 0xe0, 0x7f, 0x28, 0xc0, 0xb9, 0xec, 0xe9, 0x0f, 0x25, 0xb7, 0x52, 0xae, 0xe4, - 0xa6, 0x5b, 0x3d, 0x63, 0xec, 0xb0, 0x5a, 0x87, 0xf5, 0xe2, 0xd8, 0xb0, 0xae, 0xa2, 0xe7, 0xf4, - 0xe3, 0x44, 0xcf, 0x16, 0x00, 0xaf, 0x1a, 0x98, 0xef, 0xba, 0x94, 0x89, 0xc0, 0x59, 0x51, 0x43, - 0xe9, 0x18, 0x8a, 0x53, 0x14, 0xbc, 0xe2, 0xdc, 0x75, 0x7d, 0xeb, 0x40, 0x1c, 0x81, 0xbe, 0xf4, - 0x22, 0x64, 0x56, 0x64, 0xc5, 0xd9, 0x1e, 0xc1, 0xe2, 0x53, 0x38, 0xcc, 0x3e, 0x5c, 0xda, 0x26, - 0x2c, 0x72, 0x88, 0x9b, 0x5c, 0x30, 0x51, 0xd2, 0xbf, 0x31, 0xd2, 0x30, 0x3c, 0x3b, 0xe9, 0x45, - 0x4d, 0x0e, 0x3f, 0x81, 0x25, 0x4d, 0x83, 0xf9, 0x17, 0x03, 0x2e, 0x9f, 0xaa, 0xfb, 0x53, 0x68, - 0x58, 0xde, 0xc8, 0x36, 0x2c, 0x2f, 0xe4, 0x9c, 0x8b, 0x9e, 0xb6, 0xda, 0x31, 0xed, 0xcb, 0x0c, - 0x94, 0xb6, 0x79, 0x79, 0x6b, 0xfe, 0xd2, 0x80, 0x59, 0xf1, 0x34, 0xc9, 0x4c, 0xb9, 0x09, 0xa5, - 0x3d, 0x5f, 0x8f, 0x81, 0x2a, 0xf2, 0xa3, 0xc7, 0x2d, 0x0e, 0xc0, 0x12, 0xfe, 0x18, 0x43, 0xe7, - 0xb7, 0x0d, 0xc8, 0x4e, 0x73, 0xd1, 0x4b, 0xd2, 0x7f, 0x8d, 0x78, 0xdc, 0x3a, 0xa1, 0xef, 0xbe, - 0x38, 0xae, 0xdd, 0xba, 0x90, 0x6b, 0x12, 0xf7, 0x4f, 0x03, 0x6a, 0xdb, 0xcc, 0x8f, 0x7c, 0x35, - 0xd7, 0x7c, 0x2d, 0x3d, 0xd7, 0xbc, 0x99, 0x77, 0x62, 0x1d, 0xf3, 0x7f, 0x96, 0x87, 0x9b, 0xe6, - 0x55, 0xa8, 0x62, 0xdf, 0x8f, 0xb6, 0x49, 0xb4, 0x1f, 0x72, 0x23, 0x07, 0xfc, 0x41, 0xf9, 0x81, - 0x30, 0xb2, 0xc0, 0x60, 0x09, 0x37, 0x7f, 0x61, 0xc0, 0xe5, 0xb1, 0xdf, 0x34, 0x78, 0xb8, 0xb3, - 0xe2, 0x37, 0x65, 0xbd, 0xf8, 0xc6, 0x25, 0x74, 0x38, 0x45, 0xc5, 0x7b, 0xc2, 0xcc, 0x87, 0x90, - 0xe1, 0x9e, 0x30, 0xa3, 0x0d, 0x67, 0x69, 0xcd, 0x7f, 0x15, 0xa0, 0xbc, 0x13, 0x91, 0xa8, 0x17, - 0xfe, 0x9f, 0x6f, 0xe7, 0x53, 0x50, 0x0e, 0x85, 0x1e, 0xb5, 0xbc, 0xb8, 0x9e, 0x90, 0xda, 0xb1, - 0xc2, 0x8a, 0x3e, 0x8a, 0x86, 0x21, 0xe9, 0xe8, 0xe8, 0x9c, 0xf4, 0x51, 0x12, 0x8c, 0x35, 0x1e, - 0x3d, 0x0f, 0x65, 0x46, 0x49, 0x18, 0xb7, 0x94, 0x8b, 0x5a, 0x24, 0x16, 0xd0, 0x93, 0x41, 0x73, - 0x56, 0x09, 0x17, 0xef, 0x58, 0x51, 0xa3, 0x07, 0x30, 0x63, 0xd3, 0x88, 0x38, 0xae, 0xee, 0x59, - 0x72, 0x7e, 0x42, 0x91, 0xc2, 0xd6, 0x24, 0x6b, 0xbb, 0xc6, 0xd7, 0xa4, 0x5e, 0xb0, 0x16, 0xc8, - 0x33, 0x8b, 0xe5, 0xdb, 0xf2, 0xf3, 0x6e, 0x29, 0xc9, 0x2c, 0xab, 0xbe, 0x4d, 0xb1, 0xc0, 0x98, - 0xef, 0x18, 0x50, 0x93, 0x92, 0x56, 0x49, 0x2f, 0xa4, 0xe8, 0x5a, 0xbc, 0x0b, 0x69, 0x6e, 0x5d, - 0xb5, 0x4e, 0xf3, 0x3e, 0xef, 0x64, 0xd0, 0xac, 0x0a, 0x32, 0xd1, 0xf4, 0xe9, 0x0d, 0xa4, 0xce, - 0xa8, 0x70, 0xc6, 0x19, 0x3d, 0x09, 0x25, 0x11, 0x29, 0xd4, 0x61, 0xc6, 0x71, 0x4d, 0xb8, 0x31, - 0x96, 0x38, 0xf3, 0xa3, 0x02, 0xd4, 0x33, 0x9b, 0xcb, 0xd1, 0xf7, 0xc4, 0xa3, 0xd0, 0x42, 0x8e, - 0xf1, 0xfa, 0xf8, 0xcf, 0xc6, 0x2a, 0xcf, 0x96, 0x1f, 0x27, 0xcf, 0xbe, 0x06, 0x65, 0x8b, 0x9f, - 0x91, 0xfe, 0x0b, 0xe1, 0xda, 0x24, 0xe6, 0x14, 0xa7, 0x9b, 0x78, 0xa3, 0x78, 0x0d, 0xb1, 0x12, - 0x88, 0x6e, 0xc3, 0x3c, 0xa3, 0x11, 0xeb, 0xaf, 0xec, 0x45, 0x94, 0xa5, 0xc7, 0x0f, 0xa5, 0xa4, - 0xbb, 0xc0, 0xc3, 0x04, 0x78, 0x94, 0xc7, 0xdc, 0x85, 0xd9, 0xbb, 0x64, 0xd7, 0x8d, 0x3f, 0x0a, - 0x62, 0xa8, 0x3b, 0x9e, 0xe5, 0xf6, 0x6c, 0x2a, 0x33, 0x8f, 0x8e, 0xd4, 0xfa, 0xd2, 0x6e, 0xa4, - 0x91, 0x27, 0x83, 0xe6, 0x85, 0x0c, 0x40, 0x7e, 0x05, 0xc3, 0x59, 0x11, 0xa6, 0x0b, 0xd3, 0x9f, - 0x62, 0xa7, 0xfc, 0x5d, 0xa8, 0x26, 0xbd, 0xcc, 0x27, 0xac, 0xd2, 0x7c, 0x03, 0x2a, 0xdc, 0xe3, - 0x75, 0x0f, 0x7e, 0x46, 0x39, 0x97, 0x2d, 0x12, 0x0b, 0x79, 0x8a, 0x44, 0xb3, 0x0b, 0xf5, 0x7b, - 0x81, 0xfd, 0x98, 0x9f, 0x85, 0x0b, 0xb9, 0x33, 0xf4, 0x75, 0x90, 0x3f, 0x38, 0xf0, 0x04, 0x21, - 0xab, 0x94, 0x54, 0x82, 0x48, 0x17, 0x19, 0xa9, 0x29, 0xff, 0x4f, 0x0c, 0x00, 0x31, 0x4e, 0x5b, - 0x3f, 0xa4, 0x5e, 0xc4, 0xcf, 0x81, 0x3b, 0xfe, 0xf0, 0x39, 0x88, 0xc8, 0x20, 0x30, 0xe8, 0x1e, - 0x94, 0x7d, 0xe9, 0x4d, 0x32, 0xa5, 0x4d, 0x38, 0xb3, 0x8d, 0x2f, 0x81, 0xf4, 0x27, 0xac, 0x84, - 0xb5, 0xaf, 0xbc, 0xff, 0xf1, 0xe2, 0xd4, 0x07, 0x1f, 0x2f, 0x4e, 0x7d, 0xf8, 0xf1, 0xe2, 0xd4, - 0x5b, 0xc7, 0x8b, 0xc6, 0xfb, 0xc7, 0x8b, 0xc6, 0x07, 0xc7, 0x8b, 0xc6, 0x87, 0xc7, 0x8b, 0xc6, - 0x47, 0xc7, 0x8b, 0xc6, 0x3b, 0x7f, 0x5b, 0x9c, 0x7a, 0x50, 0x38, 0xbc, 0xf6, 0xdf, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xe2, 0xeb, 0x45, 0x81, 0x56, 0x26, 0x00, 0x00, + // 2713 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x19, 0xcd, 0x6f, 0x1b, 0x59, + 0x3d, 0x63, 0xc7, 0x8e, 0xfd, 0x73, 0x9c, 0x8f, 0x97, 0x16, 0xdc, 0x00, 0x71, 0x76, 0x16, 0xad, + 0x52, 0xe8, 0x3a, 0x9b, 0x02, 0xab, 0xd2, 0x65, 0x0b, 0x71, 0x9c, 0x74, 0xc3, 0x36, 0x4d, 0xf4, + 0xd2, 0x16, 0x28, 0x15, 0xea, 0x64, 0xe6, 0xc5, 0x19, 0x32, 0x9e, 0xf1, 0xbe, 0x19, 0x27, 0x35, + 0x1c, 0xd8, 0x03, 0x08, 0x90, 0x60, 0xd5, 0x23, 0xe2, 0x80, 0xb6, 0x82, 0xbf, 0x80, 0x13, 0x7f, + 0x00, 0x12, 0xbd, 0x20, 0xad, 0xc4, 0x65, 0x25, 0x90, 0xb5, 0x0d, 0x07, 0x8e, 0x88, 0x6b, 0x4e, + 0xe8, 0x7d, 0xcd, 0x87, 0x1d, 0x37, 0x63, 0xba, 0xac, 0xf6, 0xe6, 0xf9, 0x7d, 0xff, 0xde, 0xfb, + 0xbd, 0xdf, 0x97, 0x61, 0xeb, 0xf0, 0x9a, 0x5f, 0xb3, 0xbd, 0xe5, 0xc3, 0xce, 0x1e, 0xa1, 0x2e, + 0x09, 0x88, 0xbf, 0x7c, 0x44, 0x5c, 0xcb, 0xa3, 0xcb, 0x12, 0x61, 0xb4, 0xed, 0x96, 0x61, 0x1e, + 0xd8, 0x2e, 0xa1, 0xdd, 0xe5, 0xf6, 0x61, 0x93, 0x01, 0xfc, 0xe5, 0x16, 0x09, 0x8c, 0xe5, 0xa3, + 0x95, 0xe5, 0x26, 0x71, 0x09, 0x35, 0x02, 0x62, 0xd5, 0xda, 0xd4, 0x0b, 0x3c, 0xf4, 0x45, 0xc1, + 0x55, 0x8b, 0x73, 0xd5, 0xda, 0x87, 0x4d, 0x06, 0xf0, 0x6b, 0x8c, 0xab, 0x76, 0xb4, 0x32, 0xff, + 0x6a, 0xd3, 0x0e, 0x0e, 0x3a, 0x7b, 0x35, 0xd3, 0x6b, 0x2d, 0x37, 0xbd, 0xa6, 0xb7, 0xcc, 0x99, + 0xf7, 0x3a, 0xfb, 0xfc, 0x8b, 0x7f, 0xf0, 0x5f, 0x42, 0xe8, 0xfc, 0x50, 0x53, 0x68, 0xc7, 0x0d, + 0xec, 0x16, 0xe9, 0xb7, 0x62, 0xfe, 0xf5, 0xf3, 0x18, 0x7c, 0xf3, 0x80, 0xb4, 0x8c, 0x7e, 0x3e, + 0xfd, 0x2f, 0x59, 0x28, 0xac, 0xee, 0x6c, 0xde, 0xa4, 0x5e, 0xa7, 0x8d, 0x16, 0x61, 0xdc, 0x35, + 0x5a, 0xa4, 0xa2, 0x2d, 0x6a, 0x4b, 0xc5, 0xfa, 0xe4, 0xd3, 0x5e, 0x75, 0xec, 0xa4, 0x57, 0x1d, + 0xbf, 0x6d, 0xb4, 0x08, 0xe6, 0x18, 0xe4, 0x40, 0xe1, 0x88, 0x50, 0xdf, 0xf6, 0x5c, 0xbf, 0x92, + 0x59, 0xcc, 0x2e, 0x95, 0xae, 0xde, 0xa8, 0xa5, 0xf1, 0xbf, 0xc6, 0x15, 0xdc, 0x13, 0xac, 0x1b, + 0x1e, 0x6d, 0xd8, 0xbe, 0xe9, 0x1d, 0x11, 0xda, 0xad, 0xcf, 0x48, 0x2d, 0x05, 0x89, 0xf4, 0x71, + 0xa8, 0x01, 0xfd, 0x54, 0x83, 0x99, 0x36, 0x25, 0xfb, 0x84, 0x52, 0x62, 0x49, 0x7c, 0x25, 0xbb, + 0xa8, 0x7d, 0x0c, 0x6a, 0x2b, 0x52, 0xed, 0xcc, 0x4e, 0x9f, 0x7c, 0x3c, 0xa0, 0x11, 0xfd, 0x5e, + 0x83, 0x79, 0x9f, 0xd0, 0x23, 0x42, 0x57, 0x2d, 0x8b, 0x12, 0xdf, 0xaf, 0x77, 0xd7, 0x1c, 0x9b, + 0xb8, 0xc1, 0xda, 0x66, 0x03, 0xfb, 0x95, 0x71, 0x7e, 0x0e, 0xdf, 0x4c, 0x67, 0xd0, 0xee, 0x30, + 0x39, 0x75, 0x5d, 0x5a, 0x34, 0x3f, 0x94, 0xc4, 0xc7, 0xcf, 0x31, 0x43, 0xdf, 0x87, 0x49, 0x75, + 0x91, 0xb7, 0x6c, 0x3f, 0x40, 0xf7, 0x20, 0xdf, 0x64, 0x1f, 0x7e, 0x45, 0xe3, 0x06, 0xd6, 0xd2, + 0x19, 0xa8, 0x64, 0xd4, 0xa7, 0xa4, 0x3d, 0x79, 0xfe, 0xe9, 0x63, 0x29, 0x4d, 0xff, 0xe5, 0x38, + 0x94, 0x56, 0x77, 0x36, 0x31, 0xf1, 0xbd, 0x0e, 0x35, 0x49, 0x8a, 0xa0, 0xb9, 0x06, 0x93, 0xbe, + 0xed, 0x36, 0x3b, 0x8e, 0x41, 0x19, 0xb4, 0x92, 0xe7, 0x94, 0x17, 0x24, 0xe5, 0xe4, 0x6e, 0x0c, + 0x87, 0x13, 0x94, 0xe8, 0x2a, 0x00, 0x93, 0xe0, 0xb7, 0x0d, 0x93, 0x58, 0x95, 0xcc, 0xa2, 0xb6, + 0x54, 0xa8, 0x23, 0xc9, 0x07, 0xb7, 0x43, 0x0c, 0x8e, 0x51, 0xa1, 0x97, 0x21, 0xc7, 0x2d, 0xad, + 0x14, 0xb8, 0x9a, 0xb2, 0x24, 0xcf, 0x71, 0x37, 0xb0, 0xc0, 0xa1, 0xcb, 0x30, 0x21, 0xa3, 0xac, + 0x52, 0xe4, 0x64, 0xd3, 0x92, 0x6c, 0x42, 0x85, 0x81, 0xc2, 0x33, 0xff, 0x0e, 0x6d, 0xd7, 0xe2, + 0x71, 0x17, 0xf3, 0xef, 0x6d, 0xdb, 0xb5, 0x30, 0xc7, 0xa0, 0x5b, 0x90, 0x3b, 0x22, 0x74, 0x8f, + 0x45, 0x02, 0x0b, 0xcd, 0x2f, 0xa7, 0x3b, 0xe8, 0x7b, 0x8c, 0xa5, 0x5e, 0x64, 0xa6, 0xf1, 0x9f, + 0x58, 0x08, 0x41, 0x35, 0x00, 0xff, 0xc0, 0xa3, 0x01, 0x77, 0xaf, 0x92, 0x5b, 0xcc, 0x2e, 0x15, + 0xeb, 0x53, 0xcc, 0xdf, 0xdd, 0x10, 0x8a, 0x63, 0x14, 0x8c, 0xde, 0x34, 0x02, 0xd2, 0xf4, 0xa8, + 0x4d, 0xfc, 0xca, 0x44, 0x44, 0xbf, 0x16, 0x42, 0x71, 0x8c, 0x02, 0x7d, 0x1b, 0x90, 0x1f, 0x78, + 0xd4, 0x68, 0x12, 0xe9, 0xea, 0x5b, 0x86, 0x7f, 0x50, 0x01, 0xee, 0xdd, 0xbc, 0xf4, 0x0e, 0xed, + 0x0e, 0x50, 0xe0, 0x33, 0xb8, 0xf4, 0x3f, 0x6a, 0x30, 0x1d, 0x8b, 0x05, 0x1e, 0x77, 0xd7, 0x60, + 0xb2, 0x19, 0x7b, 0x75, 0x32, 0x2e, 0xc2, 0xdb, 0x8e, 0xbf, 0x48, 0x9c, 0xa0, 0x44, 0x04, 0x8a, + 0x54, 0x4a, 0x52, 0xd9, 0x65, 0x25, 0x75, 0xd0, 0x2a, 0x1b, 0x22, 0x4d, 0x31, 0xa0, 0x8f, 0x23, + 0xc9, 0xfa, 0xbf, 0x34, 0x1e, 0xc0, 0x2a, 0xdf, 0xa0, 0xa5, 0x58, 0x4e, 0xd3, 0xf8, 0xf1, 0x4d, + 0x0e, 0xc9, 0x47, 0xe7, 0x24, 0x82, 0xcc, 0xa7, 0x22, 0x11, 0x5c, 0x2f, 0xfc, 0xe6, 0xfd, 0xea, + 0xd8, 0xbb, 0xff, 0x58, 0x1c, 0xd3, 0x5b, 0x50, 0x5e, 0xa3, 0xc4, 0x08, 0xc8, 0x76, 0x3b, 0xe0, + 0x0e, 0xe8, 0x90, 0xb7, 0x68, 0x17, 0x77, 0x5c, 0xe9, 0x28, 0xb0, 0xf7, 0xdd, 0xe0, 0x10, 0x2c, + 0x31, 0xec, 0xfe, 0xf6, 0x6d, 0xe2, 0x58, 0x5b, 0x86, 0x6b, 0x34, 0x09, 0x95, 0x71, 0x1f, 0x9e, + 0xea, 0x46, 0x0c, 0x87, 0x13, 0x94, 0xfa, 0xcf, 0xb3, 0x50, 0x6e, 0x10, 0x87, 0x44, 0xfa, 0x36, + 0x00, 0x35, 0xa9, 0x61, 0x92, 0x1d, 0x42, 0x6d, 0xcf, 0xda, 0x25, 0xa6, 0xe7, 0x5a, 0x3e, 0x8f, + 0x88, 0x6c, 0xfd, 0x33, 0x2c, 0xce, 0x6e, 0x0e, 0x60, 0xf1, 0x19, 0x1c, 0xc8, 0x81, 0x72, 0x9b, + 0xf2, 0xdf, 0x76, 0x20, 0x6b, 0x0f, 0x7b, 0x69, 0x5f, 0x49, 0x77, 0xd4, 0x3b, 0x71, 0xd6, 0xfa, + 0xec, 0x49, 0xaf, 0x5a, 0x4e, 0x80, 0x70, 0x52, 0x38, 0xfa, 0x16, 0xcc, 0x78, 0xb4, 0x7d, 0x60, + 0xb8, 0x0d, 0xd2, 0x26, 0xae, 0x45, 0xdc, 0xc0, 0xe7, 0xa7, 0x50, 0xa8, 0x5f, 0x60, 0x15, 0x63, + 0xbb, 0x0f, 0x87, 0x07, 0xa8, 0xd1, 0x7d, 0x98, 0x6d, 0x53, 0xaf, 0x6d, 0x34, 0x0d, 0x26, 0x71, + 0xc7, 0x73, 0x6c, 0xb3, 0xcb, 0xb3, 0x43, 0xb1, 0x7e, 0xe5, 0xa4, 0x57, 0x9d, 0xdd, 0xe9, 0x47, + 0x9e, 0xf6, 0xaa, 0x73, 0xfc, 0xe8, 0x18, 0x24, 0x42, 0xe2, 0x41, 0x31, 0xb1, 0x3b, 0xcc, 0x0d, + 0xbb, 0x43, 0x7d, 0x13, 0x0a, 0x8d, 0x0e, 0xe5, 0x5c, 0xe8, 0x4d, 0x28, 0x58, 0xf2, 0xb7, 0x3c, + 0xf9, 0x97, 0x54, 0xc9, 0x55, 0x34, 0xa7, 0xbd, 0x6a, 0x99, 0x35, 0x09, 0x35, 0x05, 0xc0, 0x21, + 0x8b, 0xfe, 0x00, 0xca, 0xeb, 0x8f, 0xda, 0x1e, 0x0d, 0xd4, 0x9d, 0xbe, 0x02, 0x79, 0xc2, 0x01, + 0x5c, 0x5a, 0x21, 0xaa, 0x13, 0x82, 0x0c, 0x4b, 0x2c, 0xcb, 0xc3, 0xe4, 0x91, 0x61, 0x06, 0x32, + 0x6d, 0x87, 0x79, 0x78, 0x9d, 0x01, 0xb1, 0xc0, 0xe9, 0x9f, 0x87, 0x02, 0x0f, 0x28, 0xff, 0xde, + 0x0a, 0x9a, 0x81, 0x2c, 0x36, 0x8e, 0xb9, 0xd4, 0x49, 0x9c, 0xa5, 0xc6, 0xb1, 0xbe, 0x0d, 0x70, + 0x93, 0x84, 0x8a, 0x57, 0x61, 0x5a, 0x3d, 0xe2, 0x64, 0x6e, 0xf9, 0xac, 0x14, 0x3d, 0x8d, 0x93, + 0x68, 0xdc, 0x4f, 0xaf, 0x3f, 0x80, 0x22, 0xcf, 0x3f, 0x2c, 0x79, 0x47, 0x85, 0x42, 0x7b, 0x4e, + 0xa1, 0x50, 0xd9, 0x3f, 0x33, 0x2c, 0xfb, 0xc7, 0x9e, 0x9b, 0x03, 0x65, 0xc1, 0xab, 0x4a, 0x63, + 0x2a, 0x0d, 0x57, 0xa0, 0xa0, 0xcc, 0x94, 0x5a, 0xc2, 0x96, 0x48, 0x09, 0xc2, 0x21, 0x45, 0x4c, + 0xdb, 0x01, 0x24, 0x72, 0x69, 0x3a, 0x65, 0xb1, 0xba, 0x97, 0x79, 0x7e, 0xdd, 0x8b, 0x69, 0xfa, + 0x09, 0x54, 0x86, 0xf5, 0x51, 0x2f, 0x90, 0xed, 0xd3, 0x9b, 0xa2, 0xbf, 0xa7, 0xc1, 0x4c, 0x5c, + 0x52, 0xfa, 0xeb, 0x4b, 0xaf, 0xe4, 0xfc, 0x3a, 0x1f, 0x3b, 0x91, 0xdf, 0x69, 0x70, 0x21, 0xe1, + 0xda, 0x48, 0x37, 0x3e, 0x82, 0x51, 0xf1, 0xe0, 0xc8, 0x8e, 0x10, 0x1c, 0x7f, 0xcb, 0x40, 0xf9, + 0x96, 0xb1, 0x47, 0x9c, 0x5d, 0xe2, 0x10, 0x33, 0xf0, 0x28, 0xfa, 0x31, 0x94, 0x5a, 0x46, 0x60, + 0x1e, 0x70, 0xa8, 0xea, 0x09, 0x1b, 0xe9, 0x12, 0x68, 0x42, 0x52, 0x6d, 0x2b, 0x12, 0xb3, 0xee, + 0x06, 0xb4, 0x5b, 0x9f, 0x93, 0x26, 0x95, 0x62, 0x18, 0x1c, 0xd7, 0xc6, 0x1b, 0x79, 0xfe, 0xbd, + 0xfe, 0xa8, 0xcd, 0x0a, 0xd6, 0xe8, 0xf3, 0x43, 0xc2, 0x04, 0x4c, 0xde, 0xe9, 0xd8, 0x94, 0xb4, + 0x88, 0x1b, 0x44, 0x8d, 0xfc, 0x56, 0x9f, 0x7c, 0x3c, 0xa0, 0x71, 0xfe, 0x06, 0xcc, 0xf4, 0x1b, + 0xcf, 0xb2, 0xce, 0x21, 0xe9, 0x8a, 0xfb, 0xc2, 0xec, 0x27, 0xba, 0x00, 0xb9, 0x23, 0xc3, 0xe9, + 0xc8, 0xd7, 0x88, 0xc5, 0xc7, 0xf5, 0xcc, 0x35, 0x4d, 0xff, 0x83, 0x06, 0x95, 0x61, 0x86, 0xa0, + 0x2f, 0xc4, 0x04, 0xd5, 0x4b, 0xd2, 0xaa, 0xec, 0xdb, 0xa4, 0x2b, 0xa4, 0xae, 0x43, 0xc1, 0x6b, + 0xb3, 0xd1, 0xcb, 0xa3, 0xf2, 0xd6, 0x2f, 0xab, 0x9b, 0xdc, 0x96, 0xf0, 0xd3, 0x5e, 0xf5, 0x62, + 0x42, 0xbc, 0x42, 0xe0, 0x90, 0x95, 0x65, 0x7f, 0x6e, 0x0f, 0xab, 0x48, 0x61, 0xf6, 0xbf, 0xc7, + 0x21, 0x58, 0x62, 0xf4, 0x3f, 0x69, 0x30, 0xce, 0x5b, 0xb1, 0x07, 0x50, 0x60, 0xe7, 0x67, 0x19, + 0x81, 0xc1, 0xed, 0x4a, 0x3d, 0x04, 0x30, 0xee, 0x2d, 0x12, 0x18, 0x51, 0xb4, 0x29, 0x08, 0x0e, + 0x25, 0x22, 0x0c, 0x39, 0x3b, 0x20, 0x2d, 0x75, 0x91, 0xaf, 0x0e, 0x15, 0x2d, 0x47, 0xd0, 0x1a, + 0x36, 0x8e, 0xd7, 0x1f, 0x05, 0xc4, 0x65, 0x97, 0x11, 0x3d, 0x8d, 0x4d, 0x26, 0x03, 0x0b, 0x51, + 0xfa, 0x7f, 0x34, 0x08, 0x55, 0xb1, 0xe0, 0xf7, 0x89, 0xb3, 0x7f, 0xcb, 0x76, 0x0f, 0xe5, 0xb1, + 0x86, 0xe6, 0xec, 0x4a, 0x38, 0x0e, 0x29, 0xce, 0x2a, 0x0f, 0x99, 0xd1, 0xca, 0x03, 0x53, 0x68, + 0x7a, 0x6e, 0x60, 0xbb, 0x9d, 0x81, 0xd7, 0xb6, 0x26, 0xe1, 0x38, 0xa4, 0x60, 0xcd, 0x0d, 0x25, + 0x2d, 0xc3, 0x76, 0x6d, 0xb7, 0xc9, 0x9c, 0x58, 0xf3, 0x3a, 0x6e, 0xc0, 0xab, 0xbc, 0x6c, 0x6e, + 0xf0, 0x00, 0x16, 0x9f, 0xc1, 0xa1, 0xff, 0x35, 0x0b, 0x25, 0xe6, 0xb3, 0xaa, 0x73, 0x6f, 0x40, + 0xd9, 0x89, 0x47, 0x81, 0xf4, 0xfd, 0xa2, 0x34, 0x25, 0xf9, 0xae, 0x71, 0x92, 0x96, 0x31, 0xf3, + 0x9e, 0x2c, 0x64, 0xce, 0x24, 0x99, 0x37, 0xe2, 0x48, 0x9c, 0xa4, 0x65, 0xd9, 0xeb, 0x98, 0xbd, + 0x0f, 0xd9, 0xed, 0x84, 0x57, 0xf4, 0x1d, 0x06, 0xc4, 0x02, 0x87, 0xb6, 0x60, 0xce, 0x70, 0x1c, + 0xef, 0x98, 0x03, 0xeb, 0x9e, 0x77, 0xd8, 0x32, 0xe8, 0xa1, 0xcf, 0xc7, 0xa8, 0x42, 0xfd, 0x73, + 0x92, 0x65, 0x6e, 0x75, 0x90, 0x04, 0x9f, 0xc5, 0x77, 0xd6, 0xb5, 0x8d, 0x8f, 0x78, 0x6d, 0xd7, + 0x61, 0x8a, 0xc5, 0x97, 0xd7, 0x09, 0x54, 0x87, 0x99, 0xe3, 0x97, 0x80, 0x4e, 0x7a, 0xd5, 0xa9, + 0x3b, 0x09, 0x0c, 0xee, 0xa3, 0x64, 0x2e, 0x3b, 0x76, 0xcb, 0x0e, 0x2a, 0x13, 0x9c, 0x25, 0x74, + 0xf9, 0x16, 0x03, 0x62, 0x81, 0x4b, 0xc4, 0x45, 0xe1, 0xbc, 0xb8, 0xd0, 0x7f, 0x9b, 0x05, 0x24, + 0x5a, 0x62, 0x4b, 0xf4, 0x36, 0x22, 0xd1, 0x5c, 0x86, 0x89, 0x96, 0x6c, 0xa9, 0xb5, 0x64, 0xd6, + 0x57, 0xdd, 0xb4, 0xc2, 0xa3, 0x2d, 0x28, 0x8a, 0x07, 0x1f, 0x05, 0xf1, 0xb2, 0x24, 0x2e, 0x6e, + 0x2b, 0xc4, 0x69, 0xaf, 0x3a, 0x9f, 0x50, 0x13, 0x62, 0xee, 0x74, 0xdb, 0x04, 0x47, 0x12, 0xd8, + 0x14, 0x6d, 0xb4, 0xed, 0xf8, 0xfe, 0xa4, 0x18, 0x4d, 0xd1, 0xd1, 0x24, 0x84, 0x63, 0x54, 0xe8, + 0x2d, 0x18, 0x67, 0x27, 0x25, 0x47, 0xda, 0x2f, 0xa5, 0x4b, 0x1b, 0xec, 0xac, 0xeb, 0x05, 0x56, + 0x35, 0xd9, 0x2f, 0xcc, 0x25, 0x30, 0xed, 0x3c, 0xca, 0x7c, 0x66, 0x96, 0x9c, 0xfd, 0x43, 0xed, + 0x1b, 0x21, 0x06, 0xc7, 0xa8, 0xd0, 0x77, 0xa1, 0xb0, 0x2f, 0xdb, 0x42, 0x7e, 0x31, 0xa9, 0x13, + 0x97, 0x6a, 0x26, 0xc5, 0x08, 0xa7, 0xbe, 0x70, 0x28, 0x4d, 0x7f, 0x07, 0x8a, 0x5b, 0xb6, 0x49, + 0x3d, 0x66, 0x20, 0xbb, 0x12, 0x3f, 0x31, 0x93, 0x84, 0x57, 0xa2, 0xc2, 0x45, 0xe1, 0x59, 0x9c, + 0xb8, 0x86, 0xeb, 0x89, 0xc9, 0x23, 0x17, 0xc5, 0xc9, 0x6d, 0x06, 0xc4, 0x02, 0x77, 0xfd, 0x02, + 0xab, 0xbf, 0xbf, 0x78, 0x52, 0x1d, 0x7b, 0xfc, 0xa4, 0x3a, 0xf6, 0xfe, 0x13, 0x59, 0x8b, 0x4f, + 0x01, 0x60, 0x7b, 0xef, 0x87, 0xc4, 0x14, 0x59, 0x2d, 0xd5, 0xbe, 0x44, 0xad, 0xe9, 0xf8, 0xbe, + 0x24, 0xd3, 0xd7, 0x53, 0xc5, 0x70, 0x38, 0x41, 0x89, 0x96, 0xa1, 0x18, 0x6e, 0x42, 0xe4, 0x45, + 0xcf, 0xaa, 0xc0, 0x09, 0xd7, 0x25, 0x38, 0xa2, 0x49, 0xa4, 0xd8, 0xf1, 0x73, 0x53, 0x6c, 0x1d, + 0xb2, 0x1d, 0xdb, 0xe2, 0xaf, 0xab, 0x58, 0x7f, 0x4d, 0x95, 0xb8, 0xbb, 0x9b, 0x8d, 0xd3, 0x5e, + 0xf5, 0xa5, 0x61, 0x0b, 0xc8, 0xa0, 0xdb, 0x26, 0x7e, 0xed, 0xee, 0x66, 0x03, 0x33, 0xe6, 0xb3, + 0xde, 0x7b, 0x7e, 0xc4, 0xf7, 0x7e, 0x15, 0x40, 0x7a, 0xcd, 0xb8, 0xc5, 0xc3, 0x0d, 0x23, 0xea, + 0x66, 0x88, 0xc1, 0x31, 0x2a, 0xe4, 0xc3, 0xac, 0xc9, 0x46, 0x61, 0xf6, 0x3c, 0xec, 0x16, 0xf1, + 0x03, 0xa3, 0x25, 0x36, 0x44, 0xa3, 0x05, 0xf7, 0x25, 0xa9, 0x66, 0x76, 0xad, 0x5f, 0x18, 0x1e, + 0x94, 0x8f, 0x3c, 0x98, 0xb5, 0xe4, 0x50, 0x17, 0x29, 0x2d, 0x8e, 0xac, 0xf4, 0x22, 0x53, 0xd8, + 0xe8, 0x17, 0x84, 0x07, 0x65, 0xa3, 0x1f, 0xc0, 0xbc, 0x02, 0x0e, 0x4e, 0xd6, 0x7c, 0xc7, 0x93, + 0xad, 0x2f, 0x9c, 0xf4, 0xaa, 0xf3, 0x8d, 0xa1, 0x54, 0xf8, 0x39, 0x12, 0x90, 0x05, 0x79, 0x47, + 0xf4, 0x8f, 0x25, 0x5e, 0xf3, 0xbf, 0x91, 0xce, 0x8b, 0x28, 0xfa, 0x6b, 0xf1, 0xbe, 0x31, 0x9c, + 0x1c, 0x65, 0xcb, 0x28, 0x65, 0xa3, 0x47, 0x50, 0x32, 0x5c, 0xd7, 0x0b, 0x0c, 0x31, 0xeb, 0x4f, + 0x72, 0x55, 0xab, 0x23, 0xab, 0x5a, 0x8d, 0x64, 0xf4, 0xf5, 0xa9, 0x31, 0x0c, 0x8e, 0xab, 0x42, + 0xc7, 0x30, 0xed, 0x1d, 0xbb, 0x84, 0x62, 0xb2, 0x4f, 0x28, 0x71, 0x4d, 0xe2, 0x57, 0xca, 0x5c, + 0xfb, 0x57, 0x53, 0x6a, 0x4f, 0x30, 0x47, 0x21, 0x9d, 0x84, 0xfb, 0xb8, 0x5f, 0x0b, 0xaa, 0xb1, + 0x24, 0xe9, 0x1a, 0x8e, 0xfd, 0x23, 0x42, 0xfd, 0xca, 0x54, 0xb4, 0xc4, 0xdb, 0x08, 0xa1, 0x38, + 0x46, 0x81, 0xbe, 0x06, 0x25, 0xd3, 0xe9, 0xf8, 0x01, 0x11, 0x1b, 0xd5, 0x69, 0xfe, 0x82, 0x42, + 0xff, 0xd6, 0x22, 0x14, 0x8e, 0xd3, 0xa1, 0x0e, 0x94, 0x5b, 0xf1, 0x92, 0x51, 0x99, 0xe5, 0xde, + 0x5d, 0x4b, 0xe7, 0xdd, 0x60, 0x51, 0x8b, 0xfa, 0x8a, 0x04, 0x0e, 0x27, 0xb5, 0xcc, 0x7f, 0x1d, + 0x4a, 0xff, 0x63, 0xcb, 0xcd, 0x5a, 0xf6, 0xfe, 0x7b, 0x1c, 0xa9, 0x65, 0xff, 0x73, 0x06, 0xa6, + 0x92, 0xa7, 0xdf, 0x57, 0x0e, 0x73, 0xa9, 0xca, 0xa1, 0x1a, 0x0e, 0xb5, 0xa1, 0x4b, 0x60, 0x95, + 0xd6, 0xb3, 0x43, 0xd3, 0xba, 0xcc, 0x9e, 0xe3, 0x2f, 0x92, 0x3d, 0x6b, 0x00, 0xac, 0xcf, 0xa0, + 0x9e, 0xe3, 0x10, 0xca, 0x13, 0x67, 0x41, 0x2e, 0x7b, 0x43, 0x28, 0x8e, 0x51, 0xb0, 0x1e, 0x75, + 0xcf, 0xf1, 0xcc, 0x43, 0x7e, 0x04, 0xea, 0xd1, 0xf3, 0x94, 0x59, 0x10, 0x3d, 0x6a, 0x7d, 0x00, + 0x8b, 0xcf, 0xe0, 0xd0, 0xbb, 0x70, 0x71, 0xc7, 0xa0, 0x81, 0x6d, 0x38, 0xd1, 0x03, 0xe3, 0x43, + 0xc0, 0xc3, 0x81, 0x11, 0xe3, 0xb5, 0x51, 0x1f, 0x6a, 0x74, 0xf8, 0x11, 0x2c, 0x1a, 0x33, 0xf4, + 0xbf, 0x6b, 0x70, 0xe9, 0x4c, 0xdd, 0x9f, 0xc0, 0x88, 0xf3, 0x30, 0x39, 0xe2, 0xbc, 0x91, 0x72, + 0xdf, 0x78, 0x96, 0xb5, 0x43, 0x06, 0x9e, 0x09, 0xc8, 0xed, 0xb0, 0x86, 0x58, 0xff, 0xb5, 0x06, + 0x93, 0xfc, 0xd7, 0x28, 0xbb, 0xda, 0x2a, 0xe4, 0xf6, 0x3d, 0xb5, 0x38, 0x2a, 0x88, 0x3f, 0x13, + 0x36, 0x18, 0x00, 0x0b, 0xf8, 0x0b, 0x2c, 0x73, 0xdf, 0xd3, 0x20, 0xb9, 0x25, 0x45, 0x37, 0x44, + 0xfc, 0x6a, 0xe1, 0x1a, 0x73, 0xc4, 0xd8, 0x7d, 0x73, 0xd8, 0x80, 0x36, 0x97, 0x6a, 0x77, 0x77, + 0x05, 0x8a, 0xd8, 0xf3, 0x82, 0x1d, 0x23, 0x38, 0xf0, 0x99, 0xe3, 0x6d, 0xf6, 0x43, 0x9e, 0x0d, + 0x77, 0x9c, 0x63, 0xb0, 0x80, 0xeb, 0xbf, 0xd2, 0xe0, 0xd2, 0xd0, 0xfd, 0x39, 0x4b, 0x01, 0x66, + 0xf8, 0x25, 0x3d, 0x0a, 0xa3, 0x30, 0xa2, 0xc3, 0x31, 0x2a, 0x36, 0x59, 0x25, 0x96, 0xee, 0xfd, + 0x93, 0x55, 0x42, 0x1b, 0x4e, 0xd2, 0xea, 0xff, 0xce, 0x40, 0x7e, 0x37, 0x30, 0x82, 0x8e, 0xff, + 0x7f, 0x8e, 0xd8, 0x57, 0x20, 0xef, 0x73, 0x3d, 0xd2, 0xbc, 0xb0, 0xc6, 0x0a, 0xed, 0x58, 0x62, + 0xf9, 0x34, 0x42, 0x7c, 0xdf, 0x68, 0xaa, 0x8c, 0x15, 0x4d, 0x23, 0x02, 0x8c, 0x15, 0x1e, 0xbd, + 0x0e, 0x79, 0x4a, 0x0c, 0x3f, 0x1c, 0xcc, 0x16, 0x94, 0x48, 0xcc, 0xa1, 0xa7, 0xbd, 0xea, 0xa4, + 0x14, 0xce, 0xbf, 0xb1, 0xa4, 0x46, 0xf7, 0x61, 0xc2, 0x22, 0x81, 0x61, 0x3b, 0x62, 0x1e, 0x4b, + 0xbd, 0xae, 0x17, 0xc2, 0x1a, 0x82, 0xb5, 0x5e, 0x62, 0x36, 0xc9, 0x0f, 0xac, 0x04, 0xb2, 0x6c, + 0x6b, 0x7a, 0x96, 0x18, 0x27, 0x72, 0x51, 0xb6, 0x5d, 0xf3, 0x2c, 0x82, 0x39, 0x46, 0x7f, 0xac, + 0x41, 0x49, 0x48, 0x5a, 0x33, 0x3a, 0x3e, 0x41, 0x2b, 0xa1, 0x17, 0xe2, 0xba, 0x55, 0x27, 0x37, + 0xce, 0x06, 0x8e, 0xd3, 0x5e, 0xb5, 0xc8, 0xc9, 0xf8, 0x24, 0xa2, 0x1c, 0x88, 0x9d, 0x51, 0xe6, + 0x9c, 0x33, 0x7a, 0x19, 0x72, 0xfc, 0xf5, 0xc8, 0xc3, 0x0c, 0xdf, 0x3a, 0x7f, 0x60, 0x58, 0xe0, + 0xf4, 0x8f, 0x32, 0x50, 0x4e, 0x38, 0x97, 0x62, 0x16, 0x08, 0x17, 0x8a, 0x99, 0x14, 0x4b, 0xea, + 0xe1, 0x7f, 0x51, 0xca, 0xda, 0x93, 0x7f, 0x91, 0xda, 0xf3, 0x3d, 0xc8, 0x9b, 0xec, 0x8c, 0xd4, + 0x3f, 0xde, 0x2b, 0xa3, 0x5c, 0x27, 0x3f, 0xdd, 0x28, 0x1a, 0xf9, 0xa7, 0x8f, 0xa5, 0x40, 0x74, + 0x13, 0x66, 0x29, 0x09, 0x68, 0x77, 0x75, 0x3f, 0x20, 0x34, 0x3e, 0xc4, 0xe7, 0xa2, 0x8e, 0x1b, + 0xf7, 0x13, 0xe0, 0x41, 0x1e, 0x7d, 0x0f, 0x26, 0xef, 0x18, 0x7b, 0x4e, 0xf8, 0x07, 0x14, 0x86, + 0xb2, 0xed, 0x9a, 0x4e, 0xc7, 0x22, 0x22, 0x1b, 0xab, 0xec, 0xa5, 0x1e, 0xed, 0x66, 0x1c, 0x79, + 0xda, 0xab, 0xce, 0x25, 0x00, 0xe2, 0x1f, 0x17, 0x9c, 0x14, 0xa1, 0x3b, 0x30, 0xfe, 0x09, 0x4e, + 0x8f, 0xdf, 0x87, 0x62, 0xd4, 0xdf, 0x7f, 0xcc, 0x2a, 0xf5, 0x87, 0x50, 0x60, 0x11, 0xaf, 0xe6, + 0xd2, 0x73, 0x5a, 0x9c, 0x64, 0xe3, 0x94, 0x49, 0xd3, 0x38, 0xe9, 0x2d, 0x28, 0xdf, 0x6d, 0x5b, + 0x2f, 0xf8, 0x17, 0x64, 0x26, 0x75, 0xd5, 0xba, 0x0a, 0xe2, 0xcf, 0x74, 0x56, 0x20, 0x44, 0xe5, + 0x8e, 0x15, 0x88, 0x78, 0xe1, 0x8d, 0xed, 0xca, 0x7f, 0xa6, 0x01, 0xf0, 0xa5, 0xd4, 0xfa, 0x11, + 0x71, 0x03, 0x76, 0x0e, 0x2c, 0xf0, 0xfb, 0xcf, 0x81, 0x67, 0x06, 0x8e, 0x41, 0x77, 0x21, 0xef, + 0x89, 0x68, 0x12, 0x7f, 0x43, 0x8e, 0xb8, 0xf9, 0x0c, 0x1f, 0x81, 0x88, 0x27, 0x2c, 0x85, 0xd5, + 0x97, 0x9e, 0x3e, 0x5b, 0x18, 0xfb, 0xe0, 0xd9, 0xc2, 0xd8, 0x87, 0xcf, 0x16, 0xc6, 0xde, 0x3d, + 0x59, 0xd0, 0x9e, 0x9e, 0x2c, 0x68, 0x1f, 0x9c, 0x2c, 0x68, 0x1f, 0x9e, 0x2c, 0x68, 0x1f, 0x9d, + 0x2c, 0x68, 0x8f, 0xff, 0xb9, 0x30, 0x76, 0x3f, 0x73, 0xb4, 0xf2, 0xdf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x61, 0xb7, 0xc5, 0x7c, 0xc2, 0x24, 0x00, 0x00, } func (m *APIGroup) Marshal() (dAtA []byte, err error) { @@ -1950,6 +1920,36 @@ func (m *ExportOptions) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *FieldsV1) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *FieldsV1) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FieldsV1) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Raw != nil { + i -= len(m.Raw) + copy(dAtA[i:], m.Raw) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Raw))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *GetOptions) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2466,9 +2466,9 @@ func (m *ManagedFieldsEntry) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Fields != nil { + if m.FieldsV1 != nil { { - size, err := m.Fields.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.FieldsV1.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2476,8 +2476,13 @@ func (m *ManagedFieldsEntry) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenerated(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x3a } + i -= len(m.FieldsType) + copy(dAtA[i:], m.FieldsType) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.FieldsType))) + i-- + dAtA[i] = 0x32 if m.Time != nil { { size, err := m.Time.MarshalToSizedBuffer(dAtA[:i]) @@ -2933,65 +2938,6 @@ func (m *Preconditions) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ProtoFields) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ProtoFields) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ProtoFields) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Raw != nil { - i -= len(m.Raw) - copy(dAtA[i:], m.Raw) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.Raw))) - i-- - dAtA[i] = 0x12 - } - if len(m.Map) > 0 { - keysForMap := make([]string, 0, len(m.Map)) - for k := range m.Map { - keysForMap = append(keysForMap, string(k)) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMap) - for iNdEx := len(keysForMap) - 1; iNdEx >= 0; iNdEx-- { - v := m.Map[string(keysForMap[iNdEx])] - baseI := i - { - size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - i -= len(keysForMap[iNdEx]) - copy(dAtA[i:], keysForMap[iNdEx]) - i = encodeVarintGenerated(dAtA, i, uint64(len(keysForMap[iNdEx]))) - i-- - dAtA[i] = 0xa - i = encodeVarintGenerated(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - func (m *RootPaths) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3609,6 +3555,19 @@ func (m *ExportOptions) Size() (n int) { return n } +func (m *FieldsV1) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Raw != nil { + l = len(m.Raw) + n += 1 + l + sovGenerated(uint64(l)) + } + return n +} + func (m *GetOptions) Size() (n int) { if m == nil { return 0 @@ -3818,8 +3777,10 @@ func (m *ManagedFieldsEntry) Size() (n int) { l = m.Time.Size() n += 1 + l + sovGenerated(uint64(l)) } - if m.Fields != nil { - l = m.Fields.Size() + l = len(m.FieldsType) + n += 1 + l + sovGenerated(uint64(l)) + if m.FieldsV1 != nil { + l = m.FieldsV1.Size() n += 1 + l + sovGenerated(uint64(l)) } return n @@ -3989,28 +3950,6 @@ func (m *Preconditions) Size() (n int) { return n } -func (m *ProtoFields) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Map) > 0 { - for k, v := range m.Map { - _ = k - _ = v - l = v.Size() - mapEntrySize := 1 + len(k) + sovGenerated(uint64(len(k))) + 1 + l + sovGenerated(uint64(l)) - n += mapEntrySize + 1 + sovGenerated(uint64(mapEntrySize)) - } - } - if m.Raw != nil { - l = len(m.Raw) - n += 1 + l + sovGenerated(uint64(l)) - } - return n -} - func (m *RootPaths) Size() (n int) { if m == nil { return 0 @@ -4305,6 +4244,16 @@ func (this *ExportOptions) String() string { }, "") return s } +func (this *FieldsV1) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&FieldsV1{`, + `Raw:` + valueToStringGenerated(this.Raw) + `,`, + `}`, + }, "") + return s +} func (this *GetOptions) String() string { if this == nil { return "nil" @@ -4419,7 +4368,8 @@ func (this *ManagedFieldsEntry) String() string { `Operation:` + fmt.Sprintf("%v", this.Operation) + `,`, `APIVersion:` + fmt.Sprintf("%v", this.APIVersion) + `,`, `Time:` + strings.Replace(fmt.Sprintf("%v", this.Time), "Time", "Time", 1) + `,`, - `Fields:` + strings.Replace(fmt.Sprintf("%v", this.Fields), "Fields", "Fields", 1) + `,`, + `FieldsType:` + fmt.Sprintf("%v", this.FieldsType) + `,`, + `FieldsV1:` + strings.Replace(this.FieldsV1.String(), "FieldsV1", "FieldsV1", 1) + `,`, `}`, }, "") return s @@ -4552,27 +4502,6 @@ func (this *Preconditions) String() string { }, "") return s } -func (this *ProtoFields) String() string { - if this == nil { - return "nil" - } - keysForMap := make([]string, 0, len(this.Map)) - for k := range this.Map { - keysForMap = append(keysForMap, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForMap) - mapStringForMap := "map[string]Fields{" - for _, k := range keysForMap { - mapStringForMap += fmt.Sprintf("%v: %v,", k, this.Map[k]) - } - mapStringForMap += "}" - s := strings.Join([]string{`&ProtoFields{`, - `Map:` + mapStringForMap + `,`, - `Raw:` + valueToStringGenerated(this.Raw) + `,`, - `}`, - }, "") - return s -} func (this *RootPaths) String() string { if this == nil { return "nil" @@ -6056,6 +5985,93 @@ func (m *ExportOptions) Unmarshal(dAtA []byte) error { } return nil } +func (m *FieldsV1) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: FieldsV1: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: FieldsV1: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Raw", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Raw = append(m.Raw[:0], dAtA[iNdEx:postIndex]...) + if m.Raw == nil { + m.Raw = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *GetOptions) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -7980,9 +7996,41 @@ func (m *ManagedFieldsEntry) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fields", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FieldsType", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.FieldsType = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FieldsV1", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8009,10 +8057,10 @@ func (m *ManagedFieldsEntry) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Fields == nil { - m.Fields = &Fields{} + if m.FieldsV1 == nil { + m.FieldsV1 = &FieldsV1{} } - if err := m.Fields.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.FieldsV1.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -9518,222 +9566,6 @@ func (m *Preconditions) Unmarshal(dAtA []byte) error { } return nil } -func (m *ProtoFields) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ProtoFields: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ProtoFields: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Map", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenerated - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Map == nil { - m.Map = make(map[string]Fields) - } - var mapkey string - mapvalue := &Fields{} - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthGenerated - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthGenerated - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapmsglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapmsglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if mapmsglen < 0 { - return ErrInvalidLengthGenerated - } - postmsgIndex := iNdEx + mapmsglen - if postmsgIndex < 0 { - return ErrInvalidLengthGenerated - } - if postmsgIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = &Fields{} - if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { - return err - } - iNdEx = postmsgIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.Map[mapkey] = *mapvalue - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Raw", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthGenerated - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthGenerated - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Raw = append(m.Raw[:0], dAtA[iNdEx:postIndex]...) - if m.Raw == nil { - m.Raw = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *RootPaths) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto index ba36c3cd25e..c84f3d89887 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto @@ -212,7 +212,7 @@ message ExportOptions { optional bool exact = 2; } -// Fields stores a set of fields in a data structure like a Trie. +// FieldsV1 stores a set of fields in a data structure like a Trie, in JSON format. // // Each 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: @@ -223,15 +223,9 @@ message ExportOptions { // If a key maps to an empty Fields value, the field that key represents is part of the set. // // The exact format is defined in sigs.k8s.io/structured-merge-diff -// +protobuf.options.marshal=false -// +protobuf.as=ProtoFields -// +protobuf.options.(gogoproto.goproto_stringer)=false -message Fields { - // Map is the representation used in the alpha version of this API - map map = 1; - +message FieldsV1 { // Raw is the underlying serialization of this object. - optional bytes raw = 2; + optional bytes Raw = 1; } // GetOptions is the standard query options to the standard REST get call. @@ -500,9 +494,13 @@ message ManagedFieldsEntry { // +optional optional Time time = 4; - // Fields identifies a set of fields. + // FieldsType is the discriminator for the different fields format and version. + // There is currently only one possible value: "FieldsV1" + optional string fieldsType = 6; + + // FieldsV1 holds the first JSON version format as described in the "FieldsV1" type. // +optional - optional Fields fields = 5; + optional FieldsV1 fieldsV1 = 7; } // MicroTime is version of Time with microsecond level precision. @@ -790,17 +788,6 @@ message Preconditions { optional string resourceVersion = 2; } -// ProtoFields is a struct that is equivalent to Fields, but intended for -// protobuf marshalling/unmarshalling. It is generated into a serialization -// that matches Fields. Do not use in Go structs. -message ProtoFields { - // Map is the representation used in the alpha version of this API - map map = 1; - - // Raw is the underlying serialization of this object. - optional bytes raw = 2; -} - // RootPaths lists the paths available at root. // For example: "/healthz", "/apis". message RootPaths { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go index 5bbc110f979..f1ef7e6ea21 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go @@ -119,12 +119,12 @@ func (ExportOptions) SwaggerDoc() map[string]string { return map_ExportOptions } -var map_Fields = map[string]string{ - "": "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:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where 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", +var map_FieldsV1 = map[string]string{ + "": "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:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where 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", } -func (Fields) SwaggerDoc() map[string]string { - return map_Fields +func (FieldsV1) SwaggerDoc() map[string]string { + return map_FieldsV1 } var map_GetOptions = map[string]string{ @@ -211,7 +211,8 @@ var map_ManagedFieldsEntry = map[string]string{ "operation": "Operation is the type of operation which lead to this ManagedFieldsEntry being created. The only valid values for this field are 'Apply' and 'Update'.", "apiVersion": "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.", "time": "Time is timestamp of when these fields were set. It should always be empty if Operation is 'Apply'", - "fields": "Fields identifies a set of fields.", + "fieldsType": "FieldsType is the discriminator for the different fields format and version. There is currently only one possible value: \"FieldsV1\"", + "fieldsV1": "FieldsV1 holds the first JSON version format as described in the \"FieldsV1\" type.", } func (ManagedFieldsEntry) SwaggerDoc() map[string]string { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go index eddbbe33894..b82fdf202f2 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go @@ -313,7 +313,7 @@ func (in *ExportOptions) DeepCopyObject() runtime.Object { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Fields) DeepCopyInto(out *Fields) { +func (in *FieldsV1) DeepCopyInto(out *FieldsV1) { *out = *in if in.Raw != nil { in, out := &in.Raw, &out.Raw @@ -323,12 +323,12 @@ func (in *Fields) DeepCopyInto(out *Fields) { return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Fields. -func (in *Fields) DeepCopy() *Fields { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FieldsV1. +func (in *FieldsV1) DeepCopy() *FieldsV1 { if in == nil { return nil } - out := new(Fields) + out := new(FieldsV1) in.DeepCopyInto(out) return out } @@ -615,9 +615,9 @@ func (in *ManagedFieldsEntry) DeepCopyInto(out *ManagedFieldsEntry) { in, out := &in.Time, &out.Time *out = (*in).DeepCopy() } - if in.Fields != nil { - in, out := &in.Fields, &out.Fields - *out = new(Fields) + if in.FieldsV1 != nil { + in, out := &in.FieldsV1, &out.FieldsV1 + *out = new(FieldsV1) (*in).DeepCopyInto(*out) } return @@ -864,34 +864,6 @@ func (in *Preconditions) DeepCopy() *Preconditions { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ProtoFields) DeepCopyInto(out *ProtoFields) { - *out = *in - if in.Map != nil { - in, out := &in.Map, &out.Map - *out = make(map[string]Fields, len(*in)) - for key, val := range *in { - (*out)[key] = *val.DeepCopy() - } - } - if in.Raw != nil { - in, out := &in.Raw, &out.Raw - *out = make([]byte, len(*in)) - copy(*out, *in) - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProtoFields. -func (in *ProtoFields) DeepCopy() *ProtoFields { - if in == nil { - return nil - } - out := new(ProtoFields) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RootPaths) DeepCopyInto(out *RootPaths) { *out = *in diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/openapi/zz_generated.openapi.go b/staging/src/k8s.io/code-generator/_examples/apiserver/openapi/zz_generated.openapi.go index 627c283e9e9..36f94763bc6 100644 --- a/staging/src/k8s.io/code-generator/_examples/apiserver/openapi/zz_generated.openapi.go +++ b/staging/src/k8s.io/code-generator/_examples/apiserver/openapi/zz_generated.openapi.go @@ -39,7 +39,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Fields": schema_pkg_apis_meta_v1_Fields(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), @@ -62,7 +62,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ProtoFields": schema_pkg_apis_meta_v1_ProtoFields(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), @@ -587,11 +586,11 @@ func schema_pkg_apis_meta_v1_ExportOptions(ref common.ReferenceCallback) common. } } -func schema_pkg_apis_meta_v1_Fields(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_meta_v1_FieldsV1(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - 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:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where 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", + 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:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where 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: []string{"object"}, }, }, @@ -1128,17 +1127,24 @@ func schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref common.ReferenceCallback) co Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), }, }, - "fields": { + "fieldsType": { SchemaProps: spec.SchemaProps{ - Description: "Fields identifies a set of fields.", - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Fields"), + Description: "FieldsType is the discriminator for the different fields format and version. There is currently only one possible value: \"FieldsV1\"", + Type: []string{"string"}, + Format: "", + }, + }, + "fieldsV1": { + SchemaProps: spec.SchemaProps{ + Description: "FieldsV1 holds the first JSON version format as described in the \"FieldsV1\" type.", + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Fields", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } @@ -1558,17 +1564,6 @@ func schema_pkg_apis_meta_v1_Preconditions(ref common.ReferenceCallback) common. } } -func schema_pkg_apis_meta_v1_ProtoFields(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "ProtoFields is a struct that is equivalent to Fields, but intended for protobuf marshalling/unmarshalling. It is generated into a serialization that matches Fields. Do not use in Go structs.", - Type: []string{"object"}, - }, - }, - } -} - func schema_pkg_apis_meta_v1_RootPaths(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go b/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go index 0e5e31ed32a..6c7748bf9c3 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/zz_generated.openapi.go @@ -39,7 +39,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Fields": schema_pkg_apis_meta_v1_Fields(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), @@ -62,7 +62,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ProtoFields": schema_pkg_apis_meta_v1_ProtoFields(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), @@ -591,11 +590,11 @@ func schema_pkg_apis_meta_v1_ExportOptions(ref common.ReferenceCallback) common. } } -func schema_pkg_apis_meta_v1_Fields(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_pkg_apis_meta_v1_FieldsV1(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - 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:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where 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", + 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:', where is the name of a field in a struct, or key in a map 'v:', where is the exact json formatted value of a list item 'i:', where is position of a item in a list 'k:', where 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: []string{"object"}, }, }, @@ -1132,17 +1131,24 @@ func schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref common.ReferenceCallback) co Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), }, }, - "fields": { + "fieldsType": { SchemaProps: spec.SchemaProps{ - Description: "Fields identifies a set of fields.", - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Fields"), + Description: "FieldsType is the discriminator for the different fields format and version. There is currently only one possible value: \"FieldsV1\"", + Type: []string{"string"}, + Format: "", + }, + }, + "fieldsV1": { + SchemaProps: spec.SchemaProps{ + Description: "FieldsV1 holds the first JSON version format as described in the \"FieldsV1\" type.", + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1"), }, }, }, }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.Fields", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } @@ -1562,17 +1568,6 @@ func schema_pkg_apis_meta_v1_Preconditions(ref common.ReferenceCallback) common. } } -func schema_pkg_apis_meta_v1_ProtoFields(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "ProtoFields is a struct that is equivalent to Fields, but intended for protobuf marshalling/unmarshalling. It is generated into a serialization that matches Fields. Do not use in Go structs.", - Type: []string{"object"}, - }, - }, - } -} - func schema_pkg_apis_meta_v1_RootPaths(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{