Skip to content

Commit f230e6c

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #33007 from smarterclayton/fix_versioned_event
Automatic merge from submit-queue Correct versioned.Event output in Swagger Fixes #24240 ```release-note The value of the `versioned.Event` object (returned by watch APIs) in the Swagger 1.2 schemas has been updated from `*versioned.Event` which was not expected by many client tools. The new value is consistent with other structs returned by the API. ```
2 parents b60df6c + 8fd096e commit f230e6c

31 files changed

+813
-399
lines changed

‎api/swagger-spec/apps_v1alpha1.json

+20-9
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
"description": "API at /apis/apps/v1alpha1",
225225
"operations": [
226226
{
227-
"type": "*versioned.Event",
227+
"type": "versioned.Event",
228228
"method": "GET",
229229
"summary": "watch individual changes to a list of PetSet",
230230
"nickname": "watchNamespacedPetSetList",
@@ -290,7 +290,7 @@
290290
{
291291
"code": 200,
292292
"message": "OK",
293-
"responseModel": "*versioned.Event"
293+
"responseModel": "versioned.Event"
294294
}
295295
],
296296
"produces": [
@@ -546,7 +546,7 @@
546546
"description": "API at /apis/apps/v1alpha1",
547547
"operations": [
548548
{
549-
"type": "*versioned.Event",
549+
"type": "versioned.Event",
550550
"method": "GET",
551551
"summary": "watch changes to an object of kind PetSet",
552552
"nickname": "watchNamespacedPetSet",
@@ -620,7 +620,7 @@
620620
{
621621
"code": 200,
622622
"message": "OK",
623-
"responseModel": "*versioned.Event"
623+
"responseModel": "versioned.Event"
624624
}
625625
],
626626
"produces": [
@@ -717,7 +717,7 @@
717717
"description": "API at /apis/apps/v1alpha1",
718718
"operations": [
719719
{
720-
"type": "*versioned.Event",
720+
"type": "versioned.Event",
721721
"method": "GET",
722722
"summary": "watch individual changes to a list of PetSet",
723723
"nickname": "watchNamespacedPetSetList",
@@ -775,7 +775,7 @@
775775
{
776776
"code": 200,
777777
"message": "OK",
778-
"responseModel": "*versioned.Event"
778+
"responseModel": "versioned.Event"
779779
}
780780
],
781781
"produces": [
@@ -2746,9 +2746,20 @@
27462746
}
27472747
}
27482748
},
2749-
"*versioned.Event": {
2750-
"id": "*versioned.Event",
2751-
"properties": {}
2749+
"versioned.Event": {
2750+
"id": "versioned.Event",
2751+
"required": [
2752+
"type",
2753+
"object"
2754+
],
2755+
"properties": {
2756+
"type": {
2757+
"type": "string"
2758+
},
2759+
"object": {
2760+
"type": "string"
2761+
}
2762+
}
27522763
},
27532764
"unversioned.Patch": {
27542765
"id": "unversioned.Patch",

‎api/swagger-spec/autoscaling_v1.json

+20-9
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
"description": "API at /apis/autoscaling/v1",
225225
"operations": [
226226
{
227-
"type": "*versioned.Event",
227+
"type": "versioned.Event",
228228
"method": "GET",
229229
"summary": "watch individual changes to a list of HorizontalPodAutoscaler",
230230
"nickname": "watchNamespacedHorizontalPodAutoscalerList",
@@ -290,7 +290,7 @@
290290
{
291291
"code": 200,
292292
"message": "OK",
293-
"responseModel": "*versioned.Event"
293+
"responseModel": "versioned.Event"
294294
}
295295
],
296296
"produces": [
@@ -546,7 +546,7 @@
546546
"description": "API at /apis/autoscaling/v1",
547547
"operations": [
548548
{
549-
"type": "*versioned.Event",
549+
"type": "versioned.Event",
550550
"method": "GET",
551551
"summary": "watch changes to an object of kind HorizontalPodAutoscaler",
552552
"nickname": "watchNamespacedHorizontalPodAutoscaler",
@@ -620,7 +620,7 @@
620620
{
621621
"code": 200,
622622
"message": "OK",
623-
"responseModel": "*versioned.Event"
623+
"responseModel": "versioned.Event"
624624
}
625625
],
626626
"produces": [
@@ -717,7 +717,7 @@
717717
"description": "API at /apis/autoscaling/v1",
718718
"operations": [
719719
{
720-
"type": "*versioned.Event",
720+
"type": "versioned.Event",
721721
"method": "GET",
722722
"summary": "watch individual changes to a list of HorizontalPodAutoscaler",
723723
"nickname": "watchNamespacedHorizontalPodAutoscalerList",
@@ -775,7 +775,7 @@
775775
{
776776
"code": 200,
777777
"message": "OK",
778-
"responseModel": "*versioned.Event"
778+
"responseModel": "versioned.Event"
779779
}
780780
],
781781
"produces": [
@@ -1329,9 +1329,20 @@
13291329
}
13301330
}
13311331
},
1332-
"*versioned.Event": {
1333-
"id": "*versioned.Event",
1334-
"properties": {}
1332+
"versioned.Event": {
1333+
"id": "versioned.Event",
1334+
"required": [
1335+
"type",
1336+
"object"
1337+
],
1338+
"properties": {
1339+
"type": {
1340+
"type": "string"
1341+
},
1342+
"object": {
1343+
"type": "string"
1344+
}
1345+
}
13351346
},
13361347
"unversioned.Patch": {
13371348
"id": "unversioned.Patch",

‎api/swagger-spec/batch_v1.json

+20-9
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
"description": "API at /apis/batch/v1",
225225
"operations": [
226226
{
227-
"type": "*versioned.Event",
227+
"type": "versioned.Event",
228228
"method": "GET",
229229
"summary": "watch individual changes to a list of Job",
230230
"nickname": "watchNamespacedJobList",
@@ -290,7 +290,7 @@
290290
{
291291
"code": 200,
292292
"message": "OK",
293-
"responseModel": "*versioned.Event"
293+
"responseModel": "versioned.Event"
294294
}
295295
],
296296
"produces": [
@@ -546,7 +546,7 @@
546546
"description": "API at /apis/batch/v1",
547547
"operations": [
548548
{
549-
"type": "*versioned.Event",
549+
"type": "versioned.Event",
550550
"method": "GET",
551551
"summary": "watch changes to an object of kind Job",
552552
"nickname": "watchNamespacedJob",
@@ -620,7 +620,7 @@
620620
{
621621
"code": 200,
622622
"message": "OK",
623-
"responseModel": "*versioned.Event"
623+
"responseModel": "versioned.Event"
624624
}
625625
],
626626
"produces": [
@@ -717,7 +717,7 @@
717717
"description": "API at /apis/batch/v1",
718718
"operations": [
719719
{
720-
"type": "*versioned.Event",
720+
"type": "versioned.Event",
721721
"method": "GET",
722722
"summary": "watch individual changes to a list of Job",
723723
"nickname": "watchNamespacedJobList",
@@ -775,7 +775,7 @@
775775
{
776776
"code": 200,
777777
"message": "OK",
778-
"responseModel": "*versioned.Event"
778+
"responseModel": "versioned.Event"
779779
}
780780
],
781781
"produces": [
@@ -2730,9 +2730,20 @@
27302730
}
27312731
}
27322732
},
2733-
"*versioned.Event": {
2734-
"id": "*versioned.Event",
2735-
"properties": {}
2733+
"versioned.Event": {
2734+
"id": "versioned.Event",
2735+
"required": [
2736+
"type",
2737+
"object"
2738+
],
2739+
"properties": {
2740+
"type": {
2741+
"type": "string"
2742+
},
2743+
"object": {
2744+
"type": "string"
2745+
}
2746+
}
27362747
},
27372748
"unversioned.Patch": {
27382749
"id": "unversioned.Patch",

‎api/swagger-spec/certificates.k8s.io_v1alpha1.json

+18-7
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
"description": "API at /apis/certificates.k8s.io/v1alpha1",
201201
"operations": [
202202
{
203-
"type": "*versioned.Event",
203+
"type": "versioned.Event",
204204
"method": "GET",
205205
"summary": "watch individual changes to a list of CertificateSigningRequest",
206206
"nickname": "watchCertificateSigningRequestList",
@@ -258,7 +258,7 @@
258258
{
259259
"code": 200,
260260
"message": "OK",
261-
"responseModel": "*versioned.Event"
261+
"responseModel": "versioned.Event"
262262
}
263263
],
264264
"produces": [
@@ -482,7 +482,7 @@
482482
"description": "API at /apis/certificates.k8s.io/v1alpha1",
483483
"operations": [
484484
{
485-
"type": "*versioned.Event",
485+
"type": "versioned.Event",
486486
"method": "GET",
487487
"summary": "watch changes to an object of kind CertificateSigningRequest",
488488
"nickname": "watchCertificateSigningRequest",
@@ -548,7 +548,7 @@
548548
{
549549
"code": 200,
550550
"message": "OK",
551-
"responseModel": "*versioned.Event"
551+
"responseModel": "versioned.Event"
552552
}
553553
],
554554
"produces": [
@@ -1020,9 +1020,20 @@
10201020
}
10211021
}
10221022
},
1023-
"*versioned.Event": {
1024-
"id": "*versioned.Event",
1025-
"properties": {}
1023+
"versioned.Event": {
1024+
"id": "versioned.Event",
1025+
"required": [
1026+
"type",
1027+
"object"
1028+
],
1029+
"properties": {
1030+
"type": {
1031+
"type": "string"
1032+
},
1033+
"object": {
1034+
"type": "string"
1035+
}
1036+
}
10261037
},
10271038
"unversioned.Patch": {
10281039
"id": "unversioned.Patch",

0 commit comments

Comments
 (0)