Skip to content

Commit e5bc152

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#49592 from mbohlool/automated-cherry-pick-of-#49357-upstream-release-1.7
Automatic merge from submit-queue Automated cherry pick of kubernetes#49357 upstream release 1.7 Cherry pick of kubernetes#49357 on release-1.7. kubernetes#49357: Fix Operation names for subresources
2 parents 8f84d56 + 7370f4c commit e5bc152

File tree

12 files changed

+138
-134
lines changed

12 files changed

+138
-134
lines changed

‎api/openapi-spec/swagger.json

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3813,7 +3813,7 @@
38133813
},
38143814
"/api/v1/namespaces/{namespace}/pods/{name}/binding": {
38153815
"post": {
3816-
"description": "create binding of a Binding",
3816+
"description": "create binding of a Pod",
38173817
"consumes": [
38183818
"*/*"
38193819
],
@@ -3828,7 +3828,7 @@
38283828
"tags": [
38293829
"core_v1"
38303830
],
3831-
"operationId": "createCoreV1NamespacedBindingBinding",
3831+
"operationId": "createCoreV1NamespacedPodBinding",
38323832
"parameters": [
38333833
{
38343834
"name": "body",
@@ -3885,7 +3885,7 @@
38853885
},
38863886
"/api/v1/namespaces/{namespace}/pods/{name}/eviction": {
38873887
"post": {
3888-
"description": "create eviction of an Eviction",
3888+
"description": "create eviction of a Pod",
38893889
"consumes": [
38903890
"*/*"
38913891
],
@@ -3900,7 +3900,7 @@
39003900
"tags": [
39013901
"core_v1"
39023902
],
3903-
"operationId": "createCoreV1NamespacedEvictionEviction",
3903+
"operationId": "createCoreV1NamespacedPodEviction",
39043904
"parameters": [
39053905
{
39063906
"name": "body",
@@ -5888,7 +5888,7 @@
58885888
},
58895889
"/api/v1/namespaces/{namespace}/replicationcontrollers/{name}/scale": {
58905890
"get": {
5891-
"description": "read scale of the specified Scale",
5891+
"description": "read scale of the specified ReplicationController",
58925892
"consumes": [
58935893
"*/*"
58945894
],
@@ -5903,7 +5903,7 @@
59035903
"tags": [
59045904
"core_v1"
59055905
],
5906-
"operationId": "readCoreV1NamespacedScaleScale",
5906+
"operationId": "readCoreV1NamespacedReplicationControllerScale",
59075907
"responses": {
59085908
"200": {
59095909
"description": "OK",
@@ -5923,7 +5923,7 @@
59235923
}
59245924
},
59255925
"put": {
5926-
"description": "replace scale of the specified Scale",
5926+
"description": "replace scale of the specified ReplicationController",
59275927
"consumes": [
59285928
"*/*"
59295929
],
@@ -5938,7 +5938,7 @@
59385938
"tags": [
59395939
"core_v1"
59405940
],
5941-
"operationId": "replaceCoreV1NamespacedScaleScale",
5941+
"operationId": "replaceCoreV1NamespacedReplicationControllerScale",
59425942
"parameters": [
59435943
{
59445944
"name": "body",
@@ -5968,7 +5968,7 @@
59685968
}
59695969
},
59705970
"patch": {
5971-
"description": "partially update scale of the specified Scale",
5971+
"description": "partially update scale of the specified ReplicationController",
59725972
"consumes": [
59735973
"application/json-patch+json",
59745974
"application/merge-patch+json",
@@ -5985,7 +5985,7 @@
59855985
"tags": [
59865986
"core_v1"
59875987
],
5988-
"operationId": "patchCoreV1NamespacedScaleScale",
5988+
"operationId": "patchCoreV1NamespacedReplicationControllerScale",
59895989
"parameters": [
59905990
{
59915991
"name": "body",
@@ -20501,7 +20501,7 @@
2050120501
},
2050220502
"/apis/apps/v1beta1/namespaces/{namespace}/deployments/{name}/rollback": {
2050320503
"post": {
20504-
"description": "create rollback of a DeploymentRollback",
20504+
"description": "create rollback of a Deployment",
2050520505
"consumes": [
2050620506
"*/*"
2050720507
],
@@ -20516,7 +20516,7 @@
2051620516
"tags": [
2051720517
"apps_v1beta1"
2051820518
],
20519-
"operationId": "createAppsV1beta1NamespacedDeploymentRollbackRollback",
20519+
"operationId": "createAppsV1beta1NamespacedDeploymentRollback",
2052020520
"parameters": [
2052120521
{
2052220522
"name": "body",
@@ -20573,7 +20573,7 @@
2057320573
},
2057420574
"/apis/apps/v1beta1/namespaces/{namespace}/deployments/{name}/scale": {
2057520575
"get": {
20576-
"description": "read scale of the specified Scale",
20576+
"description": "read scale of the specified Deployment",
2057720577
"consumes": [
2057820578
"*/*"
2057920579
],
@@ -20588,7 +20588,7 @@
2058820588
"tags": [
2058920589
"apps_v1beta1"
2059020590
],
20591-
"operationId": "readAppsV1beta1NamespacedScaleScale",
20591+
"operationId": "readAppsV1beta1NamespacedDeploymentScale",
2059220592
"responses": {
2059320593
"200": {
2059420594
"description": "OK",
@@ -20608,7 +20608,7 @@
2060820608
}
2060920609
},
2061020610
"put": {
20611-
"description": "replace scale of the specified Scale",
20611+
"description": "replace scale of the specified Deployment",
2061220612
"consumes": [
2061320613
"*/*"
2061420614
],
@@ -20623,7 +20623,7 @@
2062320623
"tags": [
2062420624
"apps_v1beta1"
2062520625
],
20626-
"operationId": "replaceAppsV1beta1NamespacedScaleScale",
20626+
"operationId": "replaceAppsV1beta1NamespacedDeploymentScale",
2062720627
"parameters": [
2062820628
{
2062920629
"name": "body",
@@ -20653,7 +20653,7 @@
2065320653
}
2065420654
},
2065520655
"patch": {
20656-
"description": "partially update scale of the specified Scale",
20656+
"description": "partially update scale of the specified Deployment",
2065720657
"consumes": [
2065820658
"application/json-patch+json",
2065920659
"application/merge-patch+json",
@@ -20670,7 +20670,7 @@
2067020670
"tags": [
2067120671
"apps_v1beta1"
2067220672
],
20673-
"operationId": "patchAppsV1beta1NamespacedScaleScale",
20673+
"operationId": "patchAppsV1beta1NamespacedDeploymentScale",
2067420674
"parameters": [
2067520675
{
2067620676
"name": "body",
@@ -30553,7 +30553,7 @@
3055330553
},
3055430554
"/apis/extensions/v1beta1/namespaces/{namespace}/deployments/{name}/rollback": {
3055530555
"post": {
30556-
"description": "create rollback of a DeploymentRollback",
30556+
"description": "create rollback of a Deployment",
3055730557
"consumes": [
3055830558
"*/*"
3055930559
],
@@ -30568,7 +30568,7 @@
3056830568
"tags": [
3056930569
"extensions_v1beta1"
3057030570
],
30571-
"operationId": "createExtensionsV1beta1NamespacedDeploymentRollbackRollback",
30571+
"operationId": "createExtensionsV1beta1NamespacedDeploymentRollback",
3057230572
"parameters": [
3057330573
{
3057430574
"name": "body",
@@ -30625,7 +30625,7 @@
3062530625
},
3062630626
"/apis/extensions/v1beta1/namespaces/{namespace}/deployments/{name}/scale": {
3062730627
"get": {
30628-
"description": "read scale of the specified Scale",
30628+
"description": "read scale of the specified Deployment",
3062930629
"consumes": [
3063030630
"*/*"
3063130631
],
@@ -30640,7 +30640,7 @@
3064030640
"tags": [
3064130641
"extensions_v1beta1"
3064230642
],
30643-
"operationId": "readExtensionsV1beta1NamespacedDeploymentsScale",
30643+
"operationId": "readExtensionsV1beta1NamespacedDeploymentScale",
3064430644
"responses": {
3064530645
"200": {
3064630646
"description": "OK",
@@ -30660,7 +30660,7 @@
3066030660
}
3066130661
},
3066230662
"put": {
30663-
"description": "replace scale of the specified Scale",
30663+
"description": "replace scale of the specified Deployment",
3066430664
"consumes": [
3066530665
"*/*"
3066630666
],
@@ -30675,7 +30675,7 @@
3067530675
"tags": [
3067630676
"extensions_v1beta1"
3067730677
],
30678-
"operationId": "replaceExtensionsV1beta1NamespacedDeploymentsScale",
30678+
"operationId": "replaceExtensionsV1beta1NamespacedDeploymentScale",
3067930679
"parameters": [
3068030680
{
3068130681
"name": "body",
@@ -30705,7 +30705,7 @@
3070530705
}
3070630706
},
3070730707
"patch": {
30708-
"description": "partially update scale of the specified Scale",
30708+
"description": "partially update scale of the specified Deployment",
3070930709
"consumes": [
3071030710
"application/json-patch+json",
3071130711
"application/merge-patch+json",
@@ -30722,7 +30722,7 @@
3072230722
"tags": [
3072330723
"extensions_v1beta1"
3072430724
],
30725-
"operationId": "patchExtensionsV1beta1NamespacedDeploymentsScale",
30725+
"operationId": "patchExtensionsV1beta1NamespacedDeploymentScale",
3072630726
"parameters": [
3072730727
{
3072830728
"name": "body",
@@ -32467,7 +32467,7 @@
3246732467
},
3246832468
"/apis/extensions/v1beta1/namespaces/{namespace}/replicasets/{name}/scale": {
3246932469
"get": {
32470-
"description": "read scale of the specified Scale",
32470+
"description": "read scale of the specified ReplicaSet",
3247132471
"consumes": [
3247232472
"*/*"
3247332473
],
@@ -32482,7 +32482,7 @@
3248232482
"tags": [
3248332483
"extensions_v1beta1"
3248432484
],
32485-
"operationId": "readExtensionsV1beta1NamespacedReplicasetsScale",
32485+
"operationId": "readExtensionsV1beta1NamespacedReplicaSetScale",
3248632486
"responses": {
3248732487
"200": {
3248832488
"description": "OK",
@@ -32502,7 +32502,7 @@
3250232502
}
3250332503
},
3250432504
"put": {
32505-
"description": "replace scale of the specified Scale",
32505+
"description": "replace scale of the specified ReplicaSet",
3250632506
"consumes": [
3250732507
"*/*"
3250832508
],
@@ -32517,7 +32517,7 @@
3251732517
"tags": [
3251832518
"extensions_v1beta1"
3251932519
],
32520-
"operationId": "replaceExtensionsV1beta1NamespacedReplicasetsScale",
32520+
"operationId": "replaceExtensionsV1beta1NamespacedReplicaSetScale",
3252132521
"parameters": [
3252232522
{
3252332523
"name": "body",
@@ -32547,7 +32547,7 @@
3254732547
}
3254832548
},
3254932549
"patch": {
32550-
"description": "partially update scale of the specified Scale",
32550+
"description": "partially update scale of the specified ReplicaSet",
3255132551
"consumes": [
3255232552
"application/json-patch+json",
3255332553
"application/merge-patch+json",
@@ -32564,7 +32564,7 @@
3256432564
"tags": [
3256532565
"extensions_v1beta1"
3256632566
],
32567-
"operationId": "patchExtensionsV1beta1NamespacedReplicasetsScale",
32567+
"operationId": "patchExtensionsV1beta1NamespacedReplicaSetScale",
3256832568
"parameters": [
3256932569
{
3257032570
"name": "body",
@@ -32775,7 +32775,7 @@
3277532775
},
3277632776
"/apis/extensions/v1beta1/namespaces/{namespace}/replicationcontrollers/{name}/scale": {
3277732777
"get": {
32778-
"description": "read scale of the specified Scale",
32778+
"description": "read scale of the specified ReplicationControllerDummy",
3277932779
"consumes": [
3278032780
"*/*"
3278132781
],
@@ -32790,7 +32790,7 @@
3279032790
"tags": [
3279132791
"extensions_v1beta1"
3279232792
],
32793-
"operationId": "readExtensionsV1beta1NamespacedReplicationcontrollersScale",
32793+
"operationId": "readExtensionsV1beta1NamespacedReplicationControllerDummyScale",
3279432794
"responses": {
3279532795
"200": {
3279632796
"description": "OK",
@@ -32810,7 +32810,7 @@
3281032810
}
3281132811
},
3281232812
"put": {
32813-
"description": "replace scale of the specified Scale",
32813+
"description": "replace scale of the specified ReplicationControllerDummy",
3281432814
"consumes": [
3281532815
"*/*"
3281632816
],
@@ -32825,7 +32825,7 @@
3282532825
"tags": [
3282632826
"extensions_v1beta1"
3282732827
],
32828-
"operationId": "replaceExtensionsV1beta1NamespacedReplicationcontrollersScale",
32828+
"operationId": "replaceExtensionsV1beta1NamespacedReplicationControllerDummyScale",
3282932829
"parameters": [
3283032830
{
3283132831
"name": "body",
@@ -32855,7 +32855,7 @@
3285532855
}
3285632856
},
3285732857
"patch": {
32858-
"description": "partially update scale of the specified Scale",
32858+
"description": "partially update scale of the specified ReplicationControllerDummy",
3285932859
"consumes": [
3286032860
"application/json-patch+json",
3286132861
"application/merge-patch+json",
@@ -32872,7 +32872,7 @@
3287232872
"tags": [
3287332873
"extensions_v1beta1"
3287432874
],
32875-
"operationId": "patchExtensionsV1beta1NamespacedReplicationcontrollersScale",
32875+
"operationId": "patchExtensionsV1beta1NamespacedReplicationControllerDummyScale",
3287632876
"parameters": [
3287732877
{
3287832878
"name": "body",

‎api/swagger-spec/apps_v1beta1.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,8 +1737,8 @@
17371737
{
17381738
"type": "v1beta1.DeploymentRollback",
17391739
"method": "POST",
1740-
"summary": "create rollback of a DeploymentRollback",
1741-
"nickname": "createNamespacedDeploymentRollbackRollback",
1740+
"summary": "create rollback of a Deployment",
1741+
"nickname": "createNamespacedDeploymentRollback",
17421742
"parameters": [
17431743
{
17441744
"type": "string",
@@ -1798,8 +1798,8 @@
17981798
{
17991799
"type": "v1beta1.Scale",
18001800
"method": "GET",
1801-
"summary": "read scale of the specified Scale",
1802-
"nickname": "readNamespacedScaleScale",
1801+
"summary": "read scale of the specified Deployment",
1802+
"nickname": "readNamespacedDeploymentScale",
18031803
"parameters": [
18041804
{
18051805
"type": "string",
@@ -1845,8 +1845,8 @@
18451845
{
18461846
"type": "v1beta1.Scale",
18471847
"method": "PUT",
1848-
"summary": "replace scale of the specified Scale",
1849-
"nickname": "replaceNamespacedScaleScale",
1848+
"summary": "replace scale of the specified Deployment",
1849+
"nickname": "replaceNamespacedDeploymentScale",
18501850
"parameters": [
18511851
{
18521852
"type": "string",
@@ -1900,8 +1900,8 @@
19001900
{
19011901
"type": "v1beta1.Scale",
19021902
"method": "PATCH",
1903-
"summary": "partially update scale of the specified Scale",
1904-
"nickname": "patchNamespacedScaleScale",
1903+
"summary": "partially update scale of the specified Deployment",
1904+
"nickname": "patchNamespacedDeploymentScale",
19051905
"parameters": [
19061906
{
19071907
"type": "string",

0 commit comments

Comments
 (0)