Skip to content

Commit 87f8ba5

Browse files
author
jennybuckley
committed
Update compatibility fixture data:
This is necessary becase we intentionally treat proto and json of old versions of serialized metav1.Fields differnetly. Specifically, the json/yaml representation is unchanged, but the proto message uses a new field number, and round tripping through the old proto format is expected to change the value in this field. This is okay because the field is part of an alpha feature and is annotated with the note: 'This field is alpha and can be changed or removed without notice.'
1 parent 1475b59 commit 87f8ba5

File tree

499 files changed

+27093
-27718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

499 files changed

+27093
-27718
lines changed

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

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"generateName": "3",
77
"namespace": "4",
88
"selfLink": "5",
9-
"uid": "ą飋īqJ枊a8衍`Ĩɘ.蘯6ċV夸e",
10-
"resourceVersion": "16964250748386560239",
9+
"uid": "7",
10+
"resourceVersion": "11042405498087606203",
1111
"generation": 8071137005907523419,
1212
"creationTimestamp": null,
1313
"deletionGracePeriodSeconds": -4955867275792137171,
@@ -35,74 +35,73 @@
3535
{
3636
"manager": "16",
3737
"operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
38-
"apiVersion": "17",
39-
"fields": {"18":{"19":null}}
38+
"apiVersion": "17"
4039
}
4140
]
4241
},
4342
"webhooks": [
4443
{
45-
"name": "24",
44+
"name": "18",
4645
"clientConfig": {
47-
"url": "25",
46+
"url": "19",
4847
"service": {
49-
"namespace": "26",
50-
"name": "27",
51-
"path": "28",
52-
"port": 2114329341
48+
"namespace": "20",
49+
"name": "21",
50+
"path": "22",
51+
"port": -1971381490
5352
},
54-
"caBundle": "RA=="
53+
"caBundle": "IQ=="
5554
},
5655
"rules": [
5756
{
5857
"operations": [
59-
"ʕVŚ(ĿȊ甞谐颋DžSǡƏS$+½H牗"
58+
"8衍`Ĩɘ.蘯"
6059
],
6160
"apiGroups": [
62-
"29"
61+
"23"
6362
],
6463
"apiVersions": [
65-
"30"
64+
"24"
6665
],
6766
"resources": [
68-
"31"
67+
"25"
6968
],
70-
"scope": "ȎțêɘIJ斬³;Ơ歿"
69+
"scope": "昍řČ扷5ƗǸƢ6/"
7170
}
7271
],
73-
"failurePolicy": "狞夌碕ʂɭ",
74-
"matchPolicy": "cP$Iņɖ橙9",
72+
"failurePolicy": "VŚ(ĿȊ甞谐颋",
73+
"matchPolicy": "SǡƏ",
7574
"namespaceSelector": {
7675
"matchLabels": {
77-
"MHLU..8._bQw.-dG6c-.6--_x.--0wmZk1_8.3": "U-_Bq.m_4"
76+
"2.1.L.l-Y._.-44..d.__Gg8-2_kS91.e5K-_e63_-_3-n-_-__3u-.J": "G_.7U-Uo_4_-D7r__.am64"
7877
},
7978
"matchExpressions": [
8079
{
81-
"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",
80+
"key": "2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--n1-5",
8281
"operator": "In",
8382
"values": [
84-
"D07.a_.y_y_o0_5qN2_---_M.N_._a6.9bHjdH.-.5_.I8__n"
83+
"Ou1.m_.5AW-_S-.3g.7_2fNc5-_.-RX8"
8584
]
8685
}
8786
]
8887
},
8988
"objectSelector": {
9089
"matchLabels": {
91-
"81po6c-m6173y.390q-6-i2d020hj--a-8g--z-nt-b-6-17-58-n---5df19/H.__.h-J-M.9_T.q-o7.y-SQ.9A-F-.4--_vLW.jj-.5B.._.5_3-_4.3i": "i.Fg.Cs_.8-EA"
90+
"7p_w.e6._.pj5t_k-_v.-6b6.N_-u.---.8-L": "k-U.v.4"
9291
},
9392
"matchExpressions": [
9493
{
95-
"key": "4m-s0833--52-9guv59s-3------6tv27r-m8w-6d/5w9-Wm_AO-l8VKLyHA_.-F_E2_QOuQ_8.-1_57__JR.N-1zL-4--6o-B",
96-
"operator": "DoesNotExist"
94+
"key": "35--5ht-a-29--0qso79yg--79-e-a74bc-v--0jjy45-17-05-3z-4838/3-H2._67yg-Ln-__.-__2--z.t2w",
95+
"operator": "Exists"
9796
}
9897
]
9998
},
100-
"sideEffects": "ŴĿ",
101-
"timeoutSeconds": 1525829664,
99+
"sideEffects": "Ɵ)Ù",
100+
"timeoutSeconds": 1132918207,
102101
"admissionReviewVersions": [
103-
"44"
102+
"38"
104103
],
105-
"reinvocationPolicy": "ȉ彂"
104+
"reinvocationPolicy": "錯ƶ"
106105
}
107106
]
108107
}

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

-208 Bytes
Binary file not shown.

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

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ metadata:
1414
"7": "8"
1515
managedFields:
1616
- apiVersion: "17"
17-
fields:
18-
"18":
19-
"19": null
2017
manager: "16"
2118
operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
2219
name: "2"
@@ -28,47 +25,47 @@ metadata:
2825
kind: "12"
2926
name: "13"
3027
uid: Dz廔ȇ{sŊƏp
31-
resourceVersion: "16964250748386560239"
28+
resourceVersion: "11042405498087606203"
3229
selfLink: "5"
33-
uid: ą飋īqJ枊a8衍`Ĩɘ.蘯6ċV夸e
30+
uid: "7"
3431
webhooks:
3532
- admissionReviewVersions:
36-
- "44"
33+
- "38"
3734
clientConfig:
38-
caBundle: RA==
35+
caBundle: IQ==
3936
service:
40-
name: "27"
41-
namespace: "26"
42-
path: "28"
43-
port: 2114329341
44-
url: "25"
45-
failurePolicy: 狞夌碕ʂɭ
46-
matchPolicy: cP$Iņɖ橙9
47-
name: "24"
37+
name: "21"
38+
namespace: "20"
39+
path: "22"
40+
port: -1971381490
41+
url: "19"
42+
failurePolicy: VŚ(ĿȊ甞谐颋
43+
matchPolicy: SǡƏ
44+
name: "18"
4845
namespaceSelector:
4946
matchExpressions:
50-
- 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
47+
- key: 2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--n1-5
5148
operator: In
5249
values:
53-
- D07.a_.y_y_o0_5qN2_---_M.N_._a6.9bHjdH.-.5_.I8__n
50+
- Ou1.m_.5AW-_S-.3g.7_2fNc5-_.-RX8
5451
matchLabels:
55-
MHLU..8._bQw.-dG6c-.6--_x.--0wmZk1_8.3: U-_Bq.m_4
52+
2.1.L.l-Y._.-44..d.__Gg8-2_kS91.e5K-_e63_-_3-n-_-__3u-.J: G_.7U-Uo_4_-D7r__.am64
5653
objectSelector:
5754
matchExpressions:
58-
- key: 4m-s0833--52-9guv59s-3------6tv27r-m8w-6d/5w9-Wm_AO-l8VKLyHA_.-F_E2_QOuQ_8.-1_57__JR.N-1zL-4--6o-B
59-
operator: DoesNotExist
55+
- key: 35--5ht-a-29--0qso79yg--79-e-a74bc-v--0jjy45-17-05-3z-4838/3-H2._67yg-Ln-__.-__2--z.t2w
56+
operator: Exists
6057
matchLabels:
61-
81po6c-m6173y.390q-6-i2d020hj--a-8g--z-nt-b-6-17-58-n---5df19/H.__.h-J-M.9_T.q-o7.y-SQ.9A-F-.4--_vLW.jj-.5B.._.5_3-_4.3i: i.Fg.Cs_.8-EA
62-
reinvocationPolicy: ȉ彂
58+
7p_w.e6._.pj5t_k-_v.-6b6.N_-u.---.8-L: k-U.v.4
59+
reinvocationPolicy: 錯ƶ
6360
rules:
6461
- apiGroups:
65-
- "29"
62+
- "23"
6663
apiVersions:
67-
- "30"
64+
- "24"
6865
operations:
69-
- ʕVŚ(ĿȊ甞谐颋DžSǡƏS$+½H牗
66+
- 8衍`Ĩɘ.蘯
7067
resources:
71-
- "31"
72-
scope: ȎțêɘIJ斬³;Ơ歿
73-
sideEffects: ŴĿ
74-
timeoutSeconds: 1525829664
68+
- "25"
69+
scope: 昍řČ扷5ƗǸƢ6/
70+
sideEffects: Ɵ)Ù
71+
timeoutSeconds: 1132918207

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

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"generateName": "3",
77
"namespace": "4",
88
"selfLink": "5",
9-
"uid": "ą飋īqJ枊a8衍`Ĩɘ.蘯6ċV夸e",
10-
"resourceVersion": "16964250748386560239",
9+
"uid": "7",
10+
"resourceVersion": "11042405498087606203",
1111
"generation": 8071137005907523419,
1212
"creationTimestamp": null,
1313
"deletionGracePeriodSeconds": -4955867275792137171,
@@ -35,72 +35,71 @@
3535
{
3636
"manager": "16",
3737
"operation": "鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]",
38-
"apiVersion": "17",
39-
"fields": {"18":{"19":null}}
38+
"apiVersion": "17"
4039
}
4140
]
4241
},
4342
"webhooks": [
4443
{
45-
"name": "24",
44+
"name": "18",
4645
"clientConfig": {
47-
"url": "25",
46+
"url": "19",
4847
"service": {
49-
"namespace": "26",
50-
"name": "27",
51-
"path": "28",
52-
"port": 2114329341
48+
"namespace": "20",
49+
"name": "21",
50+
"path": "22",
51+
"port": -1971381490
5352
},
54-
"caBundle": "RA=="
53+
"caBundle": "IQ=="
5554
},
5655
"rules": [
5756
{
5857
"operations": [
59-
"ʕVŚ(ĿȊ甞谐颋DžSǡƏS$+½H牗"
58+
"8衍`Ĩɘ.蘯"
6059
],
6160
"apiGroups": [
62-
"29"
61+
"23"
6362
],
6463
"apiVersions": [
65-
"30"
64+
"24"
6665
],
6766
"resources": [
68-
"31"
67+
"25"
6968
],
70-
"scope": "ȎțêɘIJ斬³;Ơ歿"
69+
"scope": "昍řČ扷5ƗǸƢ6/"
7170
}
7271
],
73-
"failurePolicy": "狞夌碕ʂɭ",
74-
"matchPolicy": "cP$Iņɖ橙9",
72+
"failurePolicy": "VŚ(ĿȊ甞谐颋",
73+
"matchPolicy": "SǡƏ",
7574
"namespaceSelector": {
7675
"matchLabels": {
77-
"MHLU..8._bQw.-dG6c-.6--_x.--0wmZk1_8.3": "U-_Bq.m_4"
76+
"2.1.L.l-Y._.-44..d.__Gg8-2_kS91.e5K-_e63_-_3-n-_-__3u-.J": "G_.7U-Uo_4_-D7r__.am64"
7877
},
7978
"matchExpressions": [
8079
{
81-
"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",
80+
"key": "2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--n1-5",
8281
"operator": "In",
8382
"values": [
84-
"D07.a_.y_y_o0_5qN2_---_M.N_._a6.9bHjdH.-.5_.I8__n"
83+
"Ou1.m_.5AW-_S-.3g.7_2fNc5-_.-RX8"
8584
]
8685
}
8786
]
8887
},
8988
"objectSelector": {
9089
"matchLabels": {
91-
"81po6c-m6173y.390q-6-i2d020hj--a-8g--z-nt-b-6-17-58-n---5df19/H.__.h-J-M.9_T.q-o7.y-SQ.9A-F-.4--_vLW.jj-.5B.._.5_3-_4.3i": "i.Fg.Cs_.8-EA"
90+
"7p_w.e6._.pj5t_k-_v.-6b6.N_-u.---.8-L": "k-U.v.4"
9291
},
9392
"matchExpressions": [
9493
{
95-
"key": "4m-s0833--52-9guv59s-3------6tv27r-m8w-6d/5w9-Wm_AO-l8VKLyHA_.-F_E2_QOuQ_8.-1_57__JR.N-1zL-4--6o-B",
96-
"operator": "DoesNotExist"
94+
"key": "35--5ht-a-29--0qso79yg--79-e-a74bc-v--0jjy45-17-05-3z-4838/3-H2._67yg-Ln-__.-__2--z.t2w",
95+
"operator": "Exists"
9796
}
9897
]
9998
},
100-
"sideEffects": "ŴĿ",
101-
"timeoutSeconds": 1525829664,
99+
"sideEffects": "Ɵ)Ù",
100+
"timeoutSeconds": 1132918207,
102101
"admissionReviewVersions": [
103-
"44"
102+
"38"
104103
]
105104
}
106105
]

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

-208 Bytes
Binary file not shown.

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

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ metadata:
1414
"7": "8"
1515
managedFields:
1616
- apiVersion: "17"
17-
fields:
18-
"18":
19-
"19": null
2017
manager: "16"
2118
operation: 鐊唊飙Ş-U圴÷a/ɔ}摁(湗Ć]
2219
name: "2"
@@ -28,46 +25,46 @@ metadata:
2825
kind: "12"
2926
name: "13"
3027
uid: Dz廔ȇ{sŊƏp
31-
resourceVersion: "16964250748386560239"
28+
resourceVersion: "11042405498087606203"
3229
selfLink: "5"
33-
uid: ą飋īqJ枊a8衍`Ĩɘ.蘯6ċV夸e
30+
uid: "7"
3431
webhooks:
3532
- admissionReviewVersions:
36-
- "44"
33+
- "38"
3734
clientConfig:
38-
caBundle: RA==
35+
caBundle: IQ==
3936
service:
40-
name: "27"
41-
namespace: "26"
42-
path: "28"
43-
port: 2114329341
44-
url: "25"
45-
failurePolicy: 狞夌碕ʂɭ
46-
matchPolicy: cP$Iņɖ橙9
47-
name: "24"
37+
name: "21"
38+
namespace: "20"
39+
path: "22"
40+
port: -1971381490
41+
url: "19"
42+
failurePolicy: VŚ(ĿȊ甞谐颋
43+
matchPolicy: SǡƏ
44+
name: "18"
4845
namespaceSelector:
4946
matchExpressions:
50-
- 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
47+
- key: 2.-__E_Sv__26KX_R_.-.Nth._--S_4DA_-5_-4lQ42M--n1-5
5148
operator: In
5249
values:
53-
- D07.a_.y_y_o0_5qN2_---_M.N_._a6.9bHjdH.-.5_.I8__n
50+
- Ou1.m_.5AW-_S-.3g.7_2fNc5-_.-RX8
5451
matchLabels:
55-
MHLU..8._bQw.-dG6c-.6--_x.--0wmZk1_8.3: U-_Bq.m_4
52+
2.1.L.l-Y._.-44..d.__Gg8-2_kS91.e5K-_e63_-_3-n-_-__3u-.J: G_.7U-Uo_4_-D7r__.am64
5653
objectSelector:
5754
matchExpressions:
58-
- key: 4m-s0833--52-9guv59s-3------6tv27r-m8w-6d/5w9-Wm_AO-l8VKLyHA_.-F_E2_QOuQ_8.-1_57__JR.N-1zL-4--6o-B
59-
operator: DoesNotExist
55+
- key: 35--5ht-a-29--0qso79yg--79-e-a74bc-v--0jjy45-17-05-3z-4838/3-H2._67yg-Ln-__.-__2--z.t2w
56+
operator: Exists
6057
matchLabels:
61-
81po6c-m6173y.390q-6-i2d020hj--a-8g--z-nt-b-6-17-58-n---5df19/H.__.h-J-M.9_T.q-o7.y-SQ.9A-F-.4--_vLW.jj-.5B.._.5_3-_4.3i: i.Fg.Cs_.8-EA
58+
7p_w.e6._.pj5t_k-_v.-6b6.N_-u.---.8-L: k-U.v.4
6259
rules:
6360
- apiGroups:
64-
- "29"
61+
- "23"
6562
apiVersions:
66-
- "30"
63+
- "24"
6764
operations:
68-
- ʕVŚ(ĿȊ甞谐颋DžSǡƏS$+½H牗
65+
- 8衍`Ĩɘ.蘯
6966
resources:
70-
- "31"
71-
scope: ȎțêɘIJ斬³;Ơ歿
72-
sideEffects: ŴĿ
73-
timeoutSeconds: 1525829664
67+
- "25"
68+
scope: 昍řČ扷5ƗǸƢ6/
69+
sideEffects: Ɵ)Ù
70+
timeoutSeconds: 1132918207

0 commit comments

Comments
 (0)