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 bcd0f9bdf36..05d15ed3fc3 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 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 896f5886b1a..2627f2db332 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 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 5a870634b93..3dee5d5d502 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 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 f512b3d723d..5d4c34ed646 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 a863b758eb9..3a321df4453 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 @@ -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.v1beta2.Deployment.json b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.json index 44a446238f0..17d1bcb3eb0 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 @@ -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.v1beta2.Deployment.pb b/staging/src/k8s.io/api/testdata/HEAD/apps.v1beta2.Deployment.pb index d9ea50c5224..e76c5cf8275 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 7b6eddb956e..db0d512585c 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 @@ -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/coordination.k8s.io.v1.Lease.json b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.json index 062943538d6..fa968b8b50e 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 @@ -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.v1.Lease.pb b/staging/src/k8s.io/api/testdata/HEAD/coordination.k8s.io.v1.Lease.pb index a97de023e68..7e266bc664a 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 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 f33af86899f..cd503af4a13 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 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 2edc219ab3e..15c82db86a6 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 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 530dea71de1..6fe6963b633 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 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 15d0fe73f6b..19ded16fe8a 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 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 6392ec06017..549337621b3 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 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 480c815dda2..1e8d8c74283 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 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)) } }