From 9cfbf062256cd840a97306551f2273e98fc30641 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Wed, 26 May 2021 19:57:29 +0800 Subject: [PATCH] cleanup PodPreset testdata --- pkg/apis/core/validation/validation.go | 4 +- .../settings.k8s.io.v1alpha1.PodPreset.json | 461 ------------------ .../settings.k8s.io.v1alpha1.PodPreset.pb | Bin 2207 -> 0 bytes .../settings.k8s.io.v1alpha1.PodPreset.yaml | 327 ------------- test/integration/apiserver/print_test.go | 1 - 5 files changed, 2 insertions(+), 791 deletions(-) delete mode 100644 staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.json delete mode 100644 staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.pb delete mode 100644 staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.yaml diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index 0848bed6576..d783d7b37e1 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -1216,8 +1216,8 @@ func validateMountPropagation(mountPropagation *core.MountPropagationMode, conta } if container == nil { - // The container is not available yet, e.g. during validation of - // PodPreset. Stop validation now, Pod validation will refuse final + // The container is not available yet. + // Stop validation now, Pod validation will refuse final // Pods with Bidirectional propagation in non-privileged containers. return allErrs } diff --git a/staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.json b/staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.json deleted file mode 100644 index d1e81963df0..00000000000 --- a/staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.json +++ /dev/null @@ -1,461 +0,0 @@ -{ - "kind": "PodPreset", - "apiVersion": "settings.k8s.io/v1alpha1", - "metadata": { - "name": "2", - "generateName": "3", - "namespace": "4", - "selfLink": "5", - "uid": "7", - "resourceVersion": "11042405498087606203", - "generation": 8071137005907523419, - "creationTimestamp": null, - "deletionGracePeriodSeconds": -4955867275792137171, - "labels": { - "7": "8" - }, - "annotations": { - "9": "10" - }, - "ownerReferences": [ - { - "apiVersion": "11", - "kind": "12", - "name": "13", - "uid": "Dz廔ȇ{sŊƏp", - "controller": false, - "blockOwnerDeletion": true - } - ], - "finalizers": [ - "14" - ], - "clusterName": "15", - "managedFields": [ - { - "manager": "16", - "operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]", - "apiVersion": "17", - "fieldsType": "18" - } - ] - }, - "spec": { - "selector": { - "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" - }, - "matchExpressions": [ - { - "key": "p503---477-49p---o61---4fy--9---7--9-9s-0-u5lj2--10pq-0-7-9-2-0/fP81.-.9Vdx.TB_M-H_5_.t..bG0", - "operator": "In", - "values": [ - "D07.a_.y_y_o0_5qN2_---_M.N_._a6.9bHjdH.-.5_.I8__n" - ] - } - ] - }, - "env": [ - { - "name": "25", - "value": "26", - "valueFrom": { - "fieldRef": { - "apiVersion": "27", - "fieldPath": "28" - }, - "resourceFieldRef": { - "containerName": "29", - "resource": "30", - "divisor": "91" - }, - "configMapKeyRef": { - "name": "31", - "key": "32", - "optional": false - }, - "secretKeyRef": { - "name": "33", - "key": "34", - "optional": true - } - } - } - ], - "envFrom": [ - { - "prefix": "35", - "configMapRef": { - "name": "36", - "optional": true - }, - "secretRef": { - "name": "37", - "optional": false - } - } - ], - "volumes": [ - { - "name": "38", - "hostPath": { - "path": "39", - "type": "3fƻfʣ繡楙¯ĦE" - }, - "emptyDir": { - "sizeLimit": "700" - }, - "gcePersistentDisk": { - "pdName": "40", - "fsType": "41", - "partition": -1215463021, - "readOnly": true - }, - "awsElasticBlockStore": { - "volumeID": "42", - "fsType": "43", - "partition": 1686297225, - "readOnly": true - }, - "gitRepo": { - "repository": "44", - "revision": "45", - "directory": "46" - }, - "secret": { - "secretName": "47", - "items": [ - { - "key": "48", - "path": "49", - "mode": -815194340 - } - ], - "defaultMode": -999327618, - "optional": false - }, - "nfs": { - "server": "50", - "path": "51", - "readOnly": true - }, - "iscsi": { - "targetPortal": "52", - "iqn": "53", - "lun": -388204860, - "iscsiInterface": "54", - "fsType": "55", - "readOnly": true, - "portals": [ - "56" - ], - "secretRef": { - "name": "57" - }, - "initiatorName": "58" - }, - "glusterfs": { - "endpoints": "59", - "path": "60" - }, - "persistentVolumeClaim": { - "claimName": "61" - }, - "rbd": { - "monitors": [ - "62" - ], - "image": "63", - "fsType": "64", - "pool": "65", - "user": "66", - "keyring": "67", - "secretRef": { - "name": "68" - }, - "readOnly": true - }, - "flexVolume": { - "driver": "69", - "fsType": "70", - "secretRef": { - "name": "71" - }, - "options": { - "72": "73" - } - }, - "cinder": { - "volumeID": "74", - "fsType": "75", - "secretRef": { - "name": "76" - } - }, - "cephfs": { - "monitors": [ - "77" - ], - "path": "78", - "user": "79", - "secretFile": "80", - "secretRef": { - "name": "81" - }, - "readOnly": true - }, - "flocker": { - "datasetName": "82", - "datasetUUID": "83" - }, - "downwardAPI": { - "items": [ - { - "path": "84", - "fieldRef": { - "apiVersion": "85", - "fieldPath": "86" - }, - "resourceFieldRef": { - "containerName": "87", - "resource": "88", - "divisor": "965" - }, - "mode": 345648859 - } - ], - "defaultMode": 1169718433 - }, - "fc": { - "targetWWNs": [ - "89" - ], - "lun": -460478410, - "fsType": "90", - "wwids": [ - "91" - ] - }, - "azureFile": { - "secretName": "92", - "shareName": "93", - "readOnly": true - }, - "configMap": { - "name": "94", - "items": [ - { - "key": "95", - "path": "96", - "mode": -513127725 - } - ], - "defaultMode": -958191807, - "optional": true - }, - "vsphereVolume": { - "volumePath": "97", - "fsType": "98", - "storagePolicyName": "99", - "storagePolicyID": "100" - }, - "quobyte": { - "registry": "101", - "volume": "102", - "user": "103", - "group": "104", - "tenant": "105" - }, - "azureDisk": { - "diskName": "106", - "diskURI": "107", - "cachingMode": "穠C]躢|)黰eȪ嵛4$%Qɰ", - "fsType": "108", - "readOnly": false, - "kind": "Ï抴ŨfZhUʎ浵ɲõTo\u0026蕭k" - }, - "photonPersistentDisk": { - "pdID": "109", - "fsType": "110" - }, - "projected": { - "sources": [ - { - "secret": { - "name": "111", - "items": [ - { - "key": "112", - "path": "113", - "mode": -163325250 - } - ], - "optional": false - }, - "downwardAPI": { - "items": [ - { - "path": "114", - "fieldRef": { - "apiVersion": "115", - "fieldPath": "116" - }, - "resourceFieldRef": { - "containerName": "117", - "resource": "118", - "divisor": "85" - }, - "mode": -1996616480 - } - ] - }, - "configMap": { - "name": "119", - "items": [ - { - "key": "120", - "path": "121", - "mode": -1120128337 - } - ], - "optional": false - }, - "serviceAccountToken": { - "audience": "122", - "expirationSeconds": -1239370187818888272, - "path": "123" - } - } - ], - "defaultMode": 1366821517 - }, - "portworxVolume": { - "volumeID": "124", - "fsType": "125", - "readOnly": true - }, - "scaleIO": { - "gateway": "126", - "system": "127", - "secretRef": { - "name": "128" - }, - "sslEnabled": true, - "protectionDomain": "129", - "storagePool": "130", - "storageMode": "131", - "volumeName": "132", - "fsType": "133" - }, - "storageos": { - "volumeName": "134", - "volumeNamespace": "135", - "fsType": "136", - "secretRef": { - "name": "137" - } - }, - "csi": { - "driver": "138", - "readOnly": true, - "fsType": "139", - "volumeAttributes": { - "140": "141" - }, - "nodePublishSecretRef": { - "name": "142" - } - }, - "ephemeral": { - "volumeClaimTemplate": { - "metadata": { - "name": "143", - "generateName": "144", - "namespace": "145", - "selfLink": "146", - "uid": "y綸_Ú8參遼ū", - "resourceVersion": "16267283576845911679", - "generation": 2131277878630553496, - "creationTimestamp": null, - "deletionGracePeriodSeconds": -2351574817327272831, - "labels": { - "148": "149" - }, - "annotations": { - "150": "151" - }, - "ownerReferences": [ - { - "apiVersion": "152", - "kind": "153", - "name": "154", - "uid": "臷Ľð»ųKĵ\u00264ʑ%:;栍dʪ", - "controller": false, - "blockOwnerDeletion": false - } - ], - "finalizers": [ - "155" - ], - "clusterName": "156", - "managedFields": [ - { - "manager": "157", - "operation": "ɍi縱ù墴1Rƥ贫", - "apiVersion": "158", - "fieldsType": "159" - } - ] - }, - "spec": { - "accessModes": [ - "掊°nʮ閼咎櫸eʔŊƞ究:hoĂɋ瀐" - ], - "selector": { - "matchLabels": { - "d.iUaC_wYSJfB._.zS-._..3le-Q4-R-083.SD..P.---5.-Z3P__D__6t-2.-m": "wE._._3.-.83_iQ" - }, - "matchExpressions": [ - { - "key": "x--r7v66bm71u-n4f9wk-3--652x01--p--n4-4-t--2/C.A-j..9dfn3Y8d_0_.---M_4FpF_W-1._-vL_i.-_-a--G-I.-_Y33--.8U.6", - "operator": "In", - "values": [ - "A.0.__cd..lv-_aLQbI2_-.XFw.8._..._Wxpe..J7r6" - ] - } - ] - }, - "resources": { - "limits": { - "\u003c鴒翁杙Ŧ癃8鸖ɱJȉ罴": "587" - }, - "requests": { - "Ó6dz娝嘚庎D}埽uʎȺ眖R#yV": "156" - } - }, - "volumeName": "166", - "storageClassName": "167", - "volumeMode": "瘦ɖ緕ȚÍ勅跦Opwǩ曬逴", - "dataSource": { - "apiGroup": "168", - "kind": "169", - "name": "170" - } - } - }, - "readOnly": true - } - } - ], - "volumeMounts": [ - { - "name": "171", - "readOnly": true, - "mountPath": "172", - "subPath": "173", - "mountPropagation": "œȠƬQg鄠[颐o啛更偢ɇ卷荙JLĹ]", - "subPathExpr": "174" - } - ] - } -} \ No newline at end of file diff --git a/staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.pb b/staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.pb deleted file mode 100644 index 07ef4ca7da240b4cf0d22c667f6374d8a1ebbb04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2207 zcmXX{du$ZP8NXQ`Nj4~4wvBXI6ve#+L{6FU&g|~YtXs9jn1@{;w!ukoi&i$a!4J-d zZSbRw6k}2vyEX){gN*~k5EAnU4)FspP!&J09VLod^^Z2Hnnb!gU)4mZTD7TCk$!V# z|M=eDZ)U#vX1{7#AJA9oq5ATMhRW!!dQvUxNo8&3ep*r!+g(D9hw^L7^6SdMZ+scl z2a%4Lfou~wVdO@TVBe?Ia+qVejwdZCxW$=e%TK>L@Wi{kym6JsTrv&UafyxzJxas7?SU+n-i!89t3+spM+n%;)= ztrBBgRU7lTLu+=C7~Um!GF**4%F1256PI%vN3k8vT;~zFZFki+uO3%96kC|baNhcj zQPGTrL$I~E==s8e0+jy2s;+GaQ5?r={@5F>->^BjNt;RjY)zk;4UGHN*doS7J zJ4QFse;#u!8#dwyfgLXfQZ1)SuV}{D13@STOIvuKTT{g_rdDh(XadX(TbUL4k`he3 z7s{H*wrqbh-srnNX&|I@gJo#BQIqCaf|U5A*>Co1E#KX{h53N%ZzfxO;+JsZm2Rvm z+Xxttmn(fgYOK*U<{BE~Cf6SXS%55!M?ix6u`P44u6fj4rUSPrSXd|!UeIjNoDecY z;Bk!y(-Ay~%mqmV1L1oQgG(C!d01C5o?+M()8iF$XOq|8O1#~B=gQ>yb;d(_z*wR$ z5|(8?rfUwI!=a&LZKF58{SH2qfx)|n(IU~*R@cV z=JGXxLO8N3UJ8_IuFO-(P!Mi~0)^|33XUb<5Wy-7I~I~czx((%WA_V*2GFAr0xNp3QO^r6 zqLy_5typQRnF_{HXjE1hnzfRq6 z>_Av8##nIZoiDoH`1@GmD`bLh2Rpkz>saz<6aufUPG-Acw>eyz+N3SMKu;qDIGph0i7P`N9=!dp*(cx^-ukCc{@EA*{Jp=T;`Dk_fqJD%hDQa2R#{56 zVI9{Aub4kHHhF7e=+5}m2S1%0S>?>VzB22Fi8GyLa~C2I!Qjsxr~|=m0m9qSQz}^) z#%yP0^4j|o*W&}jv~c?E`QeKSP%U5jpVn9WC^dXE`PMHM#`4B> z5bxXY8vp%-oe-TsSDBfdpwamaelTZIo3VXH_;jI zcy)g4{PVHKyMu|7mr}0`XDx?9an%>xgK7yYh$24*lc4EF6%3kB*pXFJ$7aqnd*LT2$3&#wE1OEreNQT@1 diff --git a/staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.yaml b/staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.yaml deleted file mode 100644 index 2dd00087635..00000000000 --- a/staging/src/k8s.io/api/testdata/v1.21.0/settings.k8s.io.v1alpha1.PodPreset.yaml +++ /dev/null @@ -1,327 +0,0 @@ -apiVersion: settings.k8s.io/v1alpha1 -kind: PodPreset -metadata: - annotations: - "9": "10" - clusterName: "15" - creationTimestamp: null - deletionGracePeriodSeconds: -4955867275792137171 - finalizers: - - "14" - generateName: "3" - generation: 8071137005907523419 - labels: - "7": "8" - managedFields: - - apiVersion: "17" - fieldsType: "18" - manager: "16" - operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć] - name: "2" - namespace: "4" - ownerReferences: - - apiVersion: "11" - blockOwnerDeletion: true - controller: false - kind: "12" - name: "13" - uid: Dz廔ȇ{sŊƏp - resourceVersion: "11042405498087606203" - selfLink: "5" - uid: "7" -spec: - env: - - name: "25" - value: "26" - valueFrom: - configMapKeyRef: - key: "32" - name: "31" - optional: false - fieldRef: - apiVersion: "27" - fieldPath: "28" - resourceFieldRef: - containerName: "29" - divisor: "91" - resource: "30" - secretKeyRef: - key: "34" - name: "33" - optional: true - envFrom: - - configMapRef: - name: "36" - optional: true - prefix: "35" - secretRef: - name: "37" - optional: false - selector: - matchExpressions: - - key: p503---477-49p---o61---4fy--9---7--9-9s-0-u5lj2--10pq-0-7-9-2-0/fP81.-.9Vdx.TB_M-H_5_.t..bG0 - operator: In - values: - - D07.a_.y_y_o0_5qN2_---_M.N_._a6.9bHjdH.-.5_.I8__n - 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: "172" - mountPropagation: œȠƬQg鄠[颐o啛更偢ɇ卷荙JLĹ] - name: "171" - readOnly: true - subPath: "173" - subPathExpr: "174" - volumes: - - awsElasticBlockStore: - fsType: "43" - partition: 1686297225 - readOnly: true - volumeID: "42" - azureDisk: - cachingMode: 穠C]躢|)黰eȪ嵛4$%Qɰ - diskName: "106" - diskURI: "107" - fsType: "108" - kind: Ï抴ŨfZhUʎ浵ɲõTo&蕭k - readOnly: false - azureFile: - readOnly: true - secretName: "92" - shareName: "93" - cephfs: - monitors: - - "77" - path: "78" - readOnly: true - secretFile: "80" - secretRef: - name: "81" - user: "79" - cinder: - fsType: "75" - secretRef: - name: "76" - volumeID: "74" - configMap: - defaultMode: -958191807 - items: - - key: "95" - mode: -513127725 - path: "96" - name: "94" - optional: true - csi: - driver: "138" - fsType: "139" - nodePublishSecretRef: - name: "142" - readOnly: true - volumeAttributes: - "140": "141" - downwardAPI: - defaultMode: 1169718433 - items: - - fieldRef: - apiVersion: "85" - fieldPath: "86" - mode: 345648859 - path: "84" - resourceFieldRef: - containerName: "87" - divisor: "965" - resource: "88" - emptyDir: - sizeLimit: "700" - ephemeral: - readOnly: true - volumeClaimTemplate: - metadata: - annotations: - "150": "151" - clusterName: "156" - creationTimestamp: null - deletionGracePeriodSeconds: -2351574817327272831 - finalizers: - - "155" - generateName: "144" - generation: 2131277878630553496 - labels: - "148": "149" - managedFields: - - apiVersion: "158" - fieldsType: "159" - manager: "157" - operation: ɍi縱ù墴1Rƥ贫 - name: "143" - namespace: "145" - ownerReferences: - - apiVersion: "152" - blockOwnerDeletion: false - controller: false - kind: "153" - name: "154" - uid: 臷Ľð»ųKĵ&4ʑ%:;栍dʪ - resourceVersion: "16267283576845911679" - selfLink: "146" - uid: y綸_Ú8參遼ū - spec: - accessModes: - - 掊°nʮ閼咎櫸eʔŊƞ究:hoĂɋ瀐 - dataSource: - apiGroup: "168" - kind: "169" - name: "170" - resources: - limits: - <鴒翁杙Ŧ癃8鸖ɱJȉ罴: "587" - requests: - Ó6dz娝嘚庎D}埽uʎȺ眖R#yV: "156" - selector: - matchExpressions: - - key: x--r7v66bm71u-n4f9wk-3--652x01--p--n4-4-t--2/C.A-j..9dfn3Y8d_0_.---M_4FpF_W-1._-vL_i.-_-a--G-I.-_Y33--.8U.6 - operator: In - values: - - A.0.__cd..lv-_aLQbI2_-.XFw.8._..._Wxpe..J7r6 - matchLabels: - d.iUaC_wYSJfB._.zS-._..3le-Q4-R-083.SD..P.---5.-Z3P__D__6t-2.-m: wE._._3.-.83_iQ - storageClassName: "167" - volumeMode: 瘦ɖ緕ȚÍ勅跦Opwǩ曬逴 - volumeName: "166" - fc: - fsType: "90" - lun: -460478410 - targetWWNs: - - "89" - wwids: - - "91" - flexVolume: - driver: "69" - fsType: "70" - options: - "72": "73" - secretRef: - name: "71" - flocker: - datasetName: "82" - datasetUUID: "83" - gcePersistentDisk: - fsType: "41" - partition: -1215463021 - pdName: "40" - readOnly: true - gitRepo: - directory: "46" - repository: "44" - revision: "45" - glusterfs: - endpoints: "59" - path: "60" - hostPath: - path: "39" - type: 3fƻfʣ繡楙¯ĦE - iscsi: - fsType: "55" - initiatorName: "58" - iqn: "53" - iscsiInterface: "54" - lun: -388204860 - portals: - - "56" - readOnly: true - secretRef: - name: "57" - targetPortal: "52" - name: "38" - nfs: - path: "51" - readOnly: true - server: "50" - persistentVolumeClaim: - claimName: "61" - photonPersistentDisk: - fsType: "110" - pdID: "109" - portworxVolume: - fsType: "125" - readOnly: true - volumeID: "124" - projected: - defaultMode: 1366821517 - sources: - - configMap: - items: - - key: "120" - mode: -1120128337 - path: "121" - name: "119" - optional: false - downwardAPI: - items: - - fieldRef: - apiVersion: "115" - fieldPath: "116" - mode: -1996616480 - path: "114" - resourceFieldRef: - containerName: "117" - divisor: "85" - resource: "118" - secret: - items: - - key: "112" - mode: -163325250 - path: "113" - name: "111" - optional: false - serviceAccountToken: - audience: "122" - expirationSeconds: -1239370187818888272 - path: "123" - quobyte: - group: "104" - registry: "101" - tenant: "105" - user: "103" - volume: "102" - rbd: - fsType: "64" - image: "63" - keyring: "67" - monitors: - - "62" - pool: "65" - readOnly: true - secretRef: - name: "68" - user: "66" - scaleIO: - fsType: "133" - gateway: "126" - protectionDomain: "129" - secretRef: - name: "128" - sslEnabled: true - storageMode: "131" - storagePool: "130" - system: "127" - volumeName: "132" - secret: - defaultMode: -999327618 - items: - - key: "48" - mode: -815194340 - path: "49" - optional: false - secretName: "47" - storageos: - fsType: "136" - secretRef: - name: "137" - volumeName: "134" - volumeNamespace: "135" - vsphereVolume: - fsType: "98" - storagePolicyID: "100" - storagePolicyName: "99" - volumePath: "97" diff --git a/test/integration/apiserver/print_test.go b/test/integration/apiserver/print_test.go index 2f5fe4286f7..b56290826d7 100644 --- a/test/integration/apiserver/print_test.go +++ b/test/integration/apiserver/print_test.go @@ -120,7 +120,6 @@ var missingHanlders = sets.NewString( "ResourceQuota", "Role", "PriorityClass", - "PodPreset", "AuditSink", )