From 1dec736aff255d30e6addced7326c18610bcfedf Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 14 Nov 2019 00:02:37 -0500 Subject: [PATCH] Include *intstr.IntOrString in API compatibility tests --- .../api/testdata/HEAD/apps.v1.DaemonSet.json | 2 +- .../api/testdata/HEAD/apps.v1.DaemonSet.pb | Bin 6305 -> 6313 bytes .../api/testdata/HEAD/apps.v1.DaemonSet.yaml | 3 +- .../api/testdata/HEAD/apps.v1.Deployment.json | 3 +- .../api/testdata/HEAD/apps.v1.Deployment.pb | Bin 6321 -> 6337 bytes .../api/testdata/HEAD/apps.v1.Deployment.yaml | 4 ++- .../HEAD/apps.v1beta1.Deployment.json | 3 +- .../testdata/HEAD/apps.v1beta1.Deployment.pb | Bin 6337 -> 6353 bytes .../HEAD/apps.v1beta1.Deployment.yaml | 4 ++- .../testdata/HEAD/apps.v1beta2.DaemonSet.json | 2 +- .../testdata/HEAD/apps.v1beta2.DaemonSet.pb | Bin 6310 -> 6318 bytes .../testdata/HEAD/apps.v1beta2.DaemonSet.yaml | 3 +- .../HEAD/apps.v1beta2.Deployment.json | 3 +- .../testdata/HEAD/apps.v1beta2.Deployment.pb | Bin 6326 -> 6342 bytes .../HEAD/apps.v1beta2.Deployment.yaml | 4 ++- .../HEAD/coordination.k8s.io.v1.Lease.json | 2 ++ .../HEAD/coordination.k8s.io.v1.Lease.pb | Bin 234 -> 246 bytes .../HEAD/coordination.k8s.io.v1.Lease.yaml | 2 ++ .../coordination.k8s.io.v1beta1.Lease.json | 2 ++ .../HEAD/coordination.k8s.io.v1beta1.Lease.pb | Bin 239 -> 251 bytes .../coordination.k8s.io.v1beta1.Lease.yaml | 2 ++ .../HEAD/extensions.v1beta1.DaemonSet.json | 2 +- .../HEAD/extensions.v1beta1.DaemonSet.pb | Bin 6361 -> 6369 bytes .../HEAD/extensions.v1beta1.DaemonSet.yaml | 3 +- .../HEAD/extensions.v1beta1.Deployment.json | 3 +- .../HEAD/extensions.v1beta1.Deployment.pb | Bin 6343 -> 6359 bytes .../HEAD/extensions.v1beta1.Deployment.yaml | 4 ++- .../extensions.v1beta1.NetworkPolicy.json | 6 ++-- .../HEAD/extensions.v1beta1.NetworkPolicy.pb | Bin 1381 -> 1397 bytes .../extensions.v1beta1.NetworkPolicy.yaml | 6 ++-- .../networking.k8s.io.v1.NetworkPolicy.json | 6 ++-- .../networking.k8s.io.v1.NetworkPolicy.pb | Bin 1383 -> 1399 bytes .../networking.k8s.io.v1.NetworkPolicy.yaml | 6 ++-- .../policy.v1beta1.PodDisruptionBudget.json | 4 ++- .../policy.v1beta1.PodDisruptionBudget.pb | Bin 587 -> 603 bytes .../policy.v1beta1.PodDisruptionBudget.yaml | 2 ++ .../pkg/api/apitesting/roundtrip/BUILD | 1 + .../api/apitesting/roundtrip/compatibility.go | 26 ++++++++++++++++-- 38 files changed, 82 insertions(+), 26 deletions(-) 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 0d428f3227f..e2fc2b969e8 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 @@ -1380,7 +1380,7 @@ "updateStrategy": { "type": "荥ơ'禧ǵŊ)TiD¢ƿ媴h5", "rollingUpdate": { - + "maxUnavailable": 2 } }, "minReadySeconds": 212061711, 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 bcd0f9bdf36bbccecdf8758fd0c0811739ac364f..05d15ed3fc30e65cd9e093ff90c7c864dd12dcac 100644 GIT binary patch delta 60 zcmV-C0K@;GF{v?-8v%%s9IgT2vCAqKCMF6R=#8bup(p32r^mI$iYZiSM8cxRzvZg5 SXf+ZD3I+%O5CR&L6Bv#m`xuS@ delta 52 zcmV-40L%ZWF`+S#8v%fk9IgS_vCAqK9v%uB=#8bup(p32r^mI$iYZiSM8cxRzvZg5 KXf+a(8yJpbL>MXn 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 f5679c0f1d0..34905291491 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 @@ -941,7 +941,8 @@ spec: storagePolicyName: "103" volumePath: "101" updateStrategy: - rollingUpdate: {} + rollingUpdate: + maxUnavailable: 2 type: 荥ơ'禧ǵŊ)TiD¢ƿ媴h5 status: collisionCount: -449319810 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 215c0ce1559..746f8d78b85 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 @@ -1376,7 +1376,8 @@ "strategy": { "type": "荥ơ'禧ǵŊ)TiD¢ƿ媴h5", "rollingUpdate": { - + "maxUnavailable": 2, + "maxSurge": 3 } }, "minReadySeconds": 212061711, 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 896f5886b1acf7bb8c809d60c3eedcc9298434ab..2627f2db3329bddcf6479dbc1bbc57ab573f78ef 100644 GIT binary patch delta 44 ycmdmJc+hZy4CDNXvg;WCZaiZo&Zsx}zqqV`02dnvg8-8hgAj;jmYOUhF%#L>H=Z#PXOx@#UtD&wj>J>|nD7d6 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 dad648a7e34..e7727b5af41 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 @@ -41,7 +41,9 @@ spec: 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 strategy: - rollingUpdate: {} + rollingUpdate: + maxSurge: 3 + maxUnavailable: 2 type: 荥ơ'禧ǵŊ)TiD¢ƿ媴h5 template: metadata: 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 26d07131042..ca918b84c20 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 @@ -1376,7 +1376,8 @@ "strategy": { "type": "荥ơ'禧ǵŊ)TiD¢ƿ媴h5", "rollingUpdate": { - + "maxUnavailable": 2, + "maxSurge": 3 } }, "minReadySeconds": 212061711, 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 5a870634b93272550704c3ccc08ee09972f6fa34..3dee5d5d502ef17d63126219d0c68bfc5f7afae6 100644 GIT binary patch delta 69 zcmX?Tc+qfzBIBxwO6!i6=gXEK-+Hu5GbGdH(4u4epRU@H ZVJalR#m2!Pz$C>W1frRxCM!xT0092t8EgOm delta 53 zcmV-50LuT-F~KpAApx3^BCZ1UF0s-v7akr88t9Fs#-S(Yrl-fX#fm9ZX+*-J#=qsN Lv}iRFlQ9^ej4c@& 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 ca6a34b7bb8..bdd3a1bad69 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 @@ -43,7 +43,9 @@ spec: 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 strategy: - rollingUpdate: {} + rollingUpdate: + maxSurge: 3 + maxUnavailable: 2 type: 荥ơ'禧ǵŊ)TiD¢ƿ媴h5 template: metadata: 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 d198478fb8c..bf8f65c69ff 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 @@ -1380,7 +1380,7 @@ "updateStrategy": { "type": "荥ơ'禧ǵŊ)TiD¢ƿ媴h5", "rollingUpdate": { - + "maxUnavailable": 2 } }, "minReadySeconds": 212061711, 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 f512b3d723d261fdb9498caf8c0c9a66afbb1f04..5d4c34ed6463dca5806d86d7ba5cfde7bf72c582 100644 GIT binary patch delta 36 scmZ2xxXy5b0%ONS#dVAiHeS#YXH=W~TU?fdgNu!WL4ZkWvV=q*0Ow8$fdBvi delta 27 jcmZ2yxXf^Z0%OBO#dVA~HeS#YXOx@#TU>UsfFOb8sn*n>gyC`xR?wr1$N9jyqZ~xg@Z|eL5YQfS%5*~_~c#hSfm(~7yv%; B3^M=# delta 33 pcmeyy_=<6Y8sol+>gz-WxR?wr1$N9jyqa0#_~c#hSfm(~7y!@J3zh%? 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 5af1769990b..ca23767e83c 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 @@ -30,6 +30,8 @@ metadata: selfLink: "5" uid: "7" spec: + acquireTime: "1970-01-01T00:00:02.000000Z" holderIdentity: "19" leaseDurationSeconds: 896585016 leaseTransitions: 1305381319 + renewTime: "1970-01-01T00:00:03.000000Z" 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 2361dd18c1d..0ebf3881f60 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 @@ -43,6 +43,8 @@ "spec": { "holderIdentity": "19", "leaseDurationSeconds": 896585016, + "acquireTime": "1970-01-01T00:00:02.000000Z", + "renewTime": "1970-01-01T00:00:03.000000Z", "leaseTransitions": 1305381319 } } \ No newline at end of file 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 f33af86899f5973365f7320054f1c1c1ddf2feda..cd503af4a13437d3b6cc1586ce4994205593a075 100644 GIT binary patch delta 45 zcmaFQ_?vNpHsh&@I_nf=xR?wr1$N9jyqZ~xg@Z|eL5YQfS%5*~_~c#hSfm(~7yv>g B3`YO} delta 33 pcmey(_?~fsHsijDI_pFQxR?wr1$N9jyqa0#_~c#hSfm(~7y!~43#tGB 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 a529937f768..ebf97588a64 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 @@ -30,6 +30,8 @@ metadata: selfLink: "5" uid: "7" spec: + acquireTime: "1970-01-01T00:00:02.000000Z" holderIdentity: "19" leaseDurationSeconds: 896585016 leaseTransitions: 1305381319 + renewTime: "1970-01-01T00:00:03.000000Z" 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 502da5dfa2f..a5d8c2195d0 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 @@ -1380,7 +1380,7 @@ "updateStrategy": { "type": "荥ơ'禧ǵŊ)TiD¢ƿ媴h5", "rollingUpdate": { - + "maxUnavailable": 2 } }, "minReadySeconds": 212061711, 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 2edc219ab3ec8c6eefec937481010b1a230a1338..15c82db86a6dee45932e167990f90f38d2d86e4b 100644 GIT binary patch delta 36 scmca<_|R~I8spZ9>gyO^ZM>!>&Zst-Q9_o3gNu!WL4ZkWvYfgyOEZM>!>&L}sTQ9^dIn#67ZoW%+T 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 0b30647cb35..588deb11d3c 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 @@ -942,7 +942,8 @@ spec: volumePath: "101" templateGeneration: 8027668557984017414 updateStrategy: - rollingUpdate: {} + rollingUpdate: + maxUnavailable: 2 type: 荥ơ'禧ǵŊ)TiD¢ƿ媴h5 status: collisionCount: 2063260600 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 abede0dcd95..d17a53a2721 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 @@ -1376,7 +1376,8 @@ "strategy": { "type": "荥ơ'禧ǵŊ)TiD¢ƿ媴h5", "rollingUpdate": { - + "maxUnavailable": 2, + "maxSurge": 3 } }, "minReadySeconds": 212061711, 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 530dea71de1b9abd899fcce7207638a414bad7c1..6fe6963b63316f0ae4815879a0f33431070f46a5 100644 GIT binary patch delta 45 zcmX?Zc-?STSGXD9$K1nM*=;vbn?p0HXE^BLDyZ 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 544403c3fd9..b84ee756f85 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 @@ -43,7 +43,9 @@ spec: 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 strategy: - rollingUpdate: {} + rollingUpdate: + maxSurge: 3 + maxUnavailable: 2 type: 荥ơ'禧ǵŊ)TiD¢ƿ媴h5 template: metadata: 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 b00c838511d..9b115670ffe 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 @@ -59,7 +59,8 @@ { "ports": [ { - "protocol": "Ǐ2啗塧ȱ蓿彭聡A3fƻfʣ" + "protocol": "Ǐ2啗塧ȱ蓿彭聡A3fƻfʣ", + "port": 2 } ], "from": [ @@ -100,7 +101,8 @@ { "ports": [ { - "protocol": "ɗ" + "protocol": "ɗ", + "port": 3 } ], "to": [ 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 15d0fe73f6b5bc53e3fdd154b850e140ddb57584..19ded16fe8ab398741a9a556ea782599ad880994 100644 GIT binary patch delta 61 zcmaFL^_6Ra7UR*0+UppnZM>z-$g-B1OKmbElRP^c2ZI2U6vJkDrZz@_oy=T3TudjY P3xPzLfud`fcQ66~8j24K delta 45 zcmV+|0Mh^U3grrrDgm{TE3N^CvDza61f>HC9+LqAAG0U|g#ie$0}2ER0?C)Ny#u%b DV5SaD 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 cb934819ba3..185702d11c6 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 @@ -32,7 +32,8 @@ metadata: spec: egress: - ports: - - protocol: ɗ + - port: 3 + protocol: ɗ to: - ipBlock: cidr: "51" @@ -74,7 +75,8 @@ spec: matchLabels: yg--79-e-a74bc-v--0jjy45-17-053.zyyms7-tk1po6c-m61733-x-2v4r--5-xgc3-yz-7-x--c0-w5-6r/78A6.6O: 17_.8CnT ports: - - protocol: Ǐ2啗塧ȱ蓿彭聡A3fƻfʣ + - port: 2 + protocol: Ǐ2啗塧ȱ蓿彭聡A3fƻfʣ podSelector: 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 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 5ffff9c455f..360e125b65f 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 @@ -59,7 +59,8 @@ { "ports": [ { - "protocol": "Ǐ2啗塧ȱ蓿彭聡A3fƻfʣ" + "protocol": "Ǐ2啗塧ȱ蓿彭聡A3fƻfʣ", + "port": 2 } ], "from": [ @@ -100,7 +101,8 @@ { "ports": [ { - "protocol": "ɗ" + "protocol": "ɗ", + "port": 3 } ], "to": [ 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 6392ec06017871325f893d7660017060faef2a5f..549337621b3e375de85326b82cd61317b32d6388 100644 GIT binary patch delta 87 zcmaFP^_^>i4&%{@y6YIHZM>t*sI``vON~qBc)!upsnee>Tz+EXi^=<+?p^z$aiODe q+OgefrxpvbaWDulNil3zWNKp+*vZVr!^L!RI#`q$D7v0`2O|J#cObg} delta 71 zcmV-N0J#763g-%tECIEVEv^BEvD_m8BBcWg9ts@Ck22+zm*t_S$g${?zvaEH=z*a@ dGiJuSX3C?pDFTK82(beS1PTJlm$SbExB-q)AL;-A 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 e8dffa53164..0c1b28c586c 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 @@ -32,7 +32,8 @@ metadata: spec: egress: - ports: - - protocol: ɗ + - port: 3 + protocol: ɗ to: - ipBlock: cidr: "51" @@ -74,7 +75,8 @@ spec: matchLabels: yg--79-e-a74bc-v--0jjy45-17-053.zyyms7-tk1po6c-m61733-x-2v4r--5-xgc3-yz-7-x--c0-w5-6r/78A6.6O: 17_.8CnT ports: - - protocol: Ǐ2啗塧ȱ蓿彭聡A3fƻfʣ + - port: 2 + protocol: Ǐ2啗塧ȱ蓿彭聡A3fƻfʣ podSelector: 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 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 bb7e8106b70..49d9219261f 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 @@ -41,6 +41,7 @@ ] }, "spec": { + "minAvailable": 2, "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" @@ -54,7 +55,8 @@ ] } ] - } + }, + "maxUnavailable": 3 }, "status": { "observedGeneration": -6582200896939805980, 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 480c815dda26f7a4f5bbfe7a3fac19f9a0374390..1e8d8c742831bf4acd26ed9afd33bf6c51079610 100644 GIT binary patch delta 38 scmX@ja+_s>4&%y+y6d<$GI6nSFbFV7F>Ji6#K;a}GfOc{{>SJG0M6_QQ~&?~ delta 22 ecmcc3a++m=4&%&;y6c!0GHraS#5kFs$p-*otp~pV 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 3643bb936bd..1f8d9147bac 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 @@ -30,6 +30,8 @@ metadata: selfLink: "5" uid: "7" spec: + maxUnavailable: 3 + minAvailable: 2 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 diff --git a/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/BUILD b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/BUILD index e2105c67794..4db9a04fe5e 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/BUILD +++ b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/BUILD @@ -26,6 +26,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/protobuf:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/github.com/davecgh/go-spew/spew:go_default_library", "//vendor/github.com/golang/protobuf/proto:go_default_library", diff --git a/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/compatibility.go b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/compatibility.go index 5b5cd3d8158..c65525330f9 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/compatibility.go +++ b/staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip/compatibility.go @@ -26,6 +26,7 @@ import ( "strconv" "strings" "testing" + "time" "github.com/google/go-cmp/cmp" fuzz "github.com/google/gofuzz" @@ -39,6 +40,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/apimachinery/pkg/runtime/serializer/protobuf" + "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" ) @@ -221,12 +223,30 @@ func CompatibilityTestFuzzer(scheme *runtime.Scheme, fuzzFuncs []interface{}) *f fuzzer := fuzz.NewWithSeed(0).NilChance(0).NumElements(1, 1).MaxDepth(20) fuzzer = fuzzer.Funcs(genericfuzzer.Funcs(serializer.NewCodecFactory(scheme))...) fuzzString := 1 + fuzzIntOrString := 1 + fuzzMicroTime := int64(1) fuzzer.Funcs( // avoid crazy strings func(s *string, c fuzz.Continue) { fuzzString++ *s = strconv.Itoa(fuzzString) }, + func(i **intstr.IntOrString, c fuzz.Continue) { + fuzzIntOrString++ + tmp := intstr.FromInt(fuzzIntOrString) + _ = tmp + *i = &tmp + }, + func(t **metav1.MicroTime, c fuzz.Continue) { + if t != nil && *t != nil { + // use type-defined fuzzing for non-nil objects + (*t).Fuzz(c) + return + } + fuzzMicroTime++ + tmp := metav1.NewMicroTime(time.Unix(fuzzMicroTime, 0)) + *t = &tmp + }, // limit managed fields to two levels func(f *[]metav1.ManagedFieldsEntry, c fuzz.Continue) { field := metav1.ManagedFieldsEntry{} @@ -280,20 +300,20 @@ func (c *CompatibilityTestOptions) runCurrentVersionTest(t *testing.T, gvk schem } else { if !bytes.Equal(expectedJSON, actualJSON) { t.Errorf("json differs") - t.Log(cmp.Diff(string(expectedJSON), string(actualJSON))) + t.Log(cmp.Diff(string(actualJSON), string(expectedJSON))) needsUpdate = true } if !bytes.Equal(expectedYAML, actualYAML) { t.Errorf("yaml differs") - t.Log(cmp.Diff(string(expectedYAML), string(actualYAML))) + t.Log(cmp.Diff(string(actualYAML), string(expectedYAML))) needsUpdate = true } if !bytes.Equal(expectedProto, actualProto) { t.Errorf("proto differs") needsUpdate = true - t.Log(cmp.Diff(dumpProto(t, expectedProto[4:]), dumpProto(t, actualProto[4:]))) + t.Log(cmp.Diff(dumpProto(t, actualProto[4:]), dumpProto(t, expectedProto[4:]))) // t.Logf("json (for locating the offending field based on surrounding data): %s", string(expectedJSON)) } }