Skip to content

Commit a869de6

Browse files
liggittliggitt
committed
Namespace certificates API group
1 parent a910a59 commit a869de6

File tree

21 files changed

+69
-58
lines changed

21 files changed

+69
-58
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"swaggerVersion": "1.2",
33
"apiVersion": "",
44
"basePath": "https://10.10.10.10:6443",
5-
"resourcePath": "/apis/certificates",
5+
"resourcePath": "/apis/certificates.k8s.io",
66
"info": {
77
"title": "",
88
"description": ""
99
},
1010
"apis": [
1111
{
12-
"path": "/apis/certificates",
12+
"path": "/apis/certificates.k8s.io",
1313
"description": "get information of a group",
1414
"operations": [
1515
{

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"swaggerVersion": "1.2",
3-
"apiVersion": "certificates/v1alpha1",
3+
"apiVersion": "certificates.k8s.io/v1alpha1",
44
"basePath": "https://10.10.10.10:6443",
5-
"resourcePath": "/apis/certificates/v1alpha1",
5+
"resourcePath": "/apis/certificates.k8s.io/v1alpha1",
66
"info": {
77
"title": "",
88
"description": ""
99
},
1010
"apis": [
1111
{
12-
"path": "/apis/certificates/v1alpha1/certificatesigningrequests",
13-
"description": "API at /apis/certificates/v1alpha1",
12+
"path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests",
13+
"description": "API at /apis/certificates.k8s.io/v1alpha1",
1414
"operations": [
1515
{
1616
"type": "v1alpha1.CertificateSigningRequestList",
@@ -196,8 +196,8 @@
196196
]
197197
},
198198
{
199-
"path": "/apis/certificates/v1alpha1/watch/certificatesigningrequests",
200-
"description": "API at /apis/certificates/v1alpha1",
199+
"path": "/apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests",
200+
"description": "API at /apis/certificates.k8s.io/v1alpha1",
201201
"operations": [
202202
{
203203
"type": "*versioned.Event",
@@ -274,8 +274,8 @@
274274
]
275275
},
276276
{
277-
"path": "/apis/certificates/v1alpha1/certificatesigningrequests/{name}",
278-
"description": "API at /apis/certificates/v1alpha1",
277+
"path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}",
278+
"description": "API at /apis/certificates.k8s.io/v1alpha1",
279279
"operations": [
280280
{
281281
"type": "v1alpha1.CertificateSigningRequest",
@@ -478,8 +478,8 @@
478478
]
479479
},
480480
{
481-
"path": "/apis/certificates/v1alpha1/watch/certificatesigningrequests/{name}",
482-
"description": "API at /apis/certificates/v1alpha1",
481+
"path": "/apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests/{name}",
482+
"description": "API at /apis/certificates.k8s.io/v1alpha1",
483483
"operations": [
484484
{
485485
"type": "*versioned.Event",
@@ -564,8 +564,8 @@
564564
]
565565
},
566566
{
567-
"path": "/apis/certificates/v1alpha1/certificatesigningrequests/{name}/approval",
568-
"description": "API at /apis/certificates/v1alpha1",
567+
"path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/approval",
568+
"description": "API at /apis/certificates.k8s.io/v1alpha1",
569569
"operations": [
570570
{
571571
"type": "v1alpha1.CertificateSigningRequest",
@@ -617,8 +617,8 @@
617617
]
618618
},
619619
{
620-
"path": "/apis/certificates/v1alpha1/certificatesigningrequests/{name}/status",
621-
"description": "API at /apis/certificates/v1alpha1",
620+
"path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/status",
621+
"description": "API at /apis/certificates.k8s.io/v1alpha1",
622622
"operations": [
623623
{
624624
"type": "v1alpha1.CertificateSigningRequest",
@@ -670,8 +670,8 @@
670670
]
671671
},
672672
{
673-
"path": "/apis/certificates/v1alpha1",
674-
"description": "API at /apis/certificates/v1alpha1",
673+
"path": "/apis/certificates.k8s.io/v1alpha1",
674+
"description": "API at /apis/certificates.k8s.io/v1alpha1",
675675
"operations": [
676676
{
677677
"type": "unversioned.APIResourceList",

‎api/swagger-spec/resourceListing.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
"description": "get information of a group"
6767
},
6868
{
69-
"path": "/apis/certificates/v1alpha1",
70-
"description": "API at /apis/certificates/v1alpha1"
69+
"path": "/apis/certificates.k8s.io/v1alpha1",
70+
"description": "API at /apis/certificates.k8s.io/v1alpha1"
7171
},
7272
{
73-
"path": "/apis/certificates",
73+
"path": "/apis/certificates.k8s.io",
7474
"description": "get information of a group"
7575
},
7676
{

‎cmd/kube-controller-manager/app/controllermanager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
455455
go attachDetachController.Run(wait.NeverStop)
456456
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
457457

458-
groupVersion = "certificates/v1alpha1"
458+
groupVersion = "certificates.k8s.io/v1alpha1"
459459
resources, found = resourceMap[groupVersion]
460460
glog.Infof("Attempting to start certificates, full resource map %+v", resourceMap)
461461
if containsVersion(versions, groupVersion) && found {

‎docs/api-reference/certificates/v1alpha1/definitions.html ‎docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,7 @@ <h3 id="_any">any</h3>
13111311
</div>
13121312
<div id="footer">
13131313
<div id="footer-text">
1314-
Last updated 2016-08-23 17:35:27 UTC
1314+
Last updated 2016-09-01 18:34:11 UTC
13151315
</div>
13161316
</div>
13171317
</body>

‎docs/api-reference/certificates/v1alpha1/operations.html ‎docs/api-reference/certificates.k8s.io/v1alpha1/operations.html

+25-25
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ <h2 id="_operations">Operations</h2>
371371
<h3 id="_get_available_resources">get available resources</h3>
372372
<div class="listingblock">
373373
<div class="content">
374-
<pre>GET /apis/certificates/v1alpha1</pre>
374+
<pre>GET /apis/certificates.k8s.io/v1alpha1</pre>
375375
</div>
376376
</div>
377377
<div class="sect3">
@@ -436,7 +436,7 @@ <h4 id="_tags">Tags</h4>
436436
<div class="ulist">
437437
<ul>
438438
<li>
439-
<p>apiscertificatesv1alpha1</p>
439+
<p>apiscertificates.k8s.iov1alpha1</p>
440440
</li>
441441
</ul>
442442
</div>
@@ -446,7 +446,7 @@ <h4 id="_tags">Tags</h4>
446446
<h3 id="_list_or_watch_objects_of_kind_certificatesigningrequest">list or watch objects of kind CertificateSigningRequest</h3>
447447
<div class="listingblock">
448448
<div class="content">
449-
<pre>GET /apis/certificates/v1alpha1/certificatesigningrequests</pre>
449+
<pre>GET /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests</pre>
450450
</div>
451451
</div>
452452
<div class="sect3">
@@ -579,7 +579,7 @@ <h4 id="_tags_2">Tags</h4>
579579
<div class="ulist">
580580
<ul>
581581
<li>
582-
<p>apiscertificatesv1alpha1</p>
582+
<p>apiscertificates.k8s.iov1alpha1</p>
583583
</li>
584584
</ul>
585585
</div>
@@ -589,7 +589,7 @@ <h4 id="_tags_2">Tags</h4>
589589
<h3 id="_delete_collection_of_certificatesigningrequest">delete collection of CertificateSigningRequest</h3>
590590
<div class="listingblock">
591591
<div class="content">
592-
<pre>DELETE /apis/certificates/v1alpha1/certificatesigningrequests</pre>
592+
<pre>DELETE /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests</pre>
593593
</div>
594594
</div>
595595
<div class="sect3">
@@ -722,7 +722,7 @@ <h4 id="_tags_3">Tags</h4>
722722
<div class="ulist">
723723
<ul>
724724
<li>
725-
<p>apiscertificatesv1alpha1</p>
725+
<p>apiscertificates.k8s.iov1alpha1</p>
726726
</li>
727727
</ul>
728728
</div>
@@ -732,7 +732,7 @@ <h4 id="_tags_3">Tags</h4>
732732
<h3 id="_create_a_certificatesigningrequest">create a CertificateSigningRequest</h3>
733733
<div class="listingblock">
734734
<div class="content">
735-
<pre>POST /apis/certificates/v1alpha1/certificatesigningrequests</pre>
735+
<pre>POST /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests</pre>
736736
</div>
737737
</div>
738738
<div class="sect3">
@@ -833,7 +833,7 @@ <h4 id="_tags_4">Tags</h4>
833833
<div class="ulist">
834834
<ul>
835835
<li>
836-
<p>apiscertificatesv1alpha1</p>
836+
<p>apiscertificates.k8s.iov1alpha1</p>
837837
</li>
838838
</ul>
839839
</div>
@@ -843,7 +843,7 @@ <h4 id="_tags_4">Tags</h4>
843843
<h3 id="_read_the_specified_certificatesigningrequest">read the specified CertificateSigningRequest</h3>
844844
<div class="listingblock">
845845
<div class="content">
846-
<pre>GET /apis/certificates/v1alpha1/certificatesigningrequests/{name}</pre>
846+
<pre>GET /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}</pre>
847847
</div>
848848
</div>
849849
<div class="sect3">
@@ -960,7 +960,7 @@ <h4 id="_tags_5">Tags</h4>
960960
<div class="ulist">
961961
<ul>
962962
<li>
963-
<p>apiscertificatesv1alpha1</p>
963+
<p>apiscertificates.k8s.iov1alpha1</p>
964964
</li>
965965
</ul>
966966
</div>
@@ -970,7 +970,7 @@ <h4 id="_tags_5">Tags</h4>
970970
<h3 id="_replace_the_specified_certificatesigningrequest">replace the specified CertificateSigningRequest</h3>
971971
<div class="listingblock">
972972
<div class="content">
973-
<pre>PUT /apis/certificates/v1alpha1/certificatesigningrequests/{name}</pre>
973+
<pre>PUT /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}</pre>
974974
</div>
975975
</div>
976976
<div class="sect3">
@@ -1079,7 +1079,7 @@ <h4 id="_tags_6">Tags</h4>
10791079
<div class="ulist">
10801080
<ul>
10811081
<li>
1082-
<p>apiscertificatesv1alpha1</p>
1082+
<p>apiscertificates.k8s.iov1alpha1</p>
10831083
</li>
10841084
</ul>
10851085
</div>
@@ -1089,7 +1089,7 @@ <h4 id="_tags_6">Tags</h4>
10891089
<h3 id="_delete_a_certificatesigningrequest">delete a CertificateSigningRequest</h3>
10901090
<div class="listingblock">
10911091
<div class="content">
1092-
<pre>DELETE /apis/certificates/v1alpha1/certificatesigningrequests/{name}</pre>
1092+
<pre>DELETE /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}</pre>
10931093
</div>
10941094
</div>
10951095
<div class="sect3">
@@ -1198,7 +1198,7 @@ <h4 id="_tags_7">Tags</h4>
11981198
<div class="ulist">
11991199
<ul>
12001200
<li>
1201-
<p>apiscertificatesv1alpha1</p>
1201+
<p>apiscertificates.k8s.iov1alpha1</p>
12021202
</li>
12031203
</ul>
12041204
</div>
@@ -1208,7 +1208,7 @@ <h4 id="_tags_7">Tags</h4>
12081208
<h3 id="_partially_update_the_specified_certificatesigningrequest">partially update the specified CertificateSigningRequest</h3>
12091209
<div class="listingblock">
12101210
<div class="content">
1211-
<pre>PATCH /apis/certificates/v1alpha1/certificatesigningrequests/{name}</pre>
1211+
<pre>PATCH /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}</pre>
12121212
</div>
12131213
</div>
12141214
<div class="sect3">
@@ -1323,7 +1323,7 @@ <h4 id="_tags_8">Tags</h4>
13231323
<div class="ulist">
13241324
<ul>
13251325
<li>
1326-
<p>apiscertificatesv1alpha1</p>
1326+
<p>apiscertificates.k8s.iov1alpha1</p>
13271327
</li>
13281328
</ul>
13291329
</div>
@@ -1333,7 +1333,7 @@ <h4 id="_tags_8">Tags</h4>
13331333
<h3 id="_replace_approval_of_the_specified_certificatesigningrequest">replace approval of the specified CertificateSigningRequest</h3>
13341334
<div class="listingblock">
13351335
<div class="content">
1336-
<pre>PUT /apis/certificates/v1alpha1/certificatesigningrequests/{name}/approval</pre>
1336+
<pre>PUT /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/approval</pre>
13371337
</div>
13381338
</div>
13391339
<div class="sect3">
@@ -1442,7 +1442,7 @@ <h4 id="_tags_9">Tags</h4>
14421442
<div class="ulist">
14431443
<ul>
14441444
<li>
1445-
<p>apiscertificatesv1alpha1</p>
1445+
<p>apiscertificates.k8s.iov1alpha1</p>
14461446
</li>
14471447
</ul>
14481448
</div>
@@ -1452,7 +1452,7 @@ <h4 id="_tags_9">Tags</h4>
14521452
<h3 id="_replace_status_of_the_specified_certificatesigningrequest">replace status of the specified CertificateSigningRequest</h3>
14531453
<div class="listingblock">
14541454
<div class="content">
1455-
<pre>PUT /apis/certificates/v1alpha1/certificatesigningrequests/{name}/status</pre>
1455+
<pre>PUT /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/status</pre>
14561456
</div>
14571457
</div>
14581458
<div class="sect3">
@@ -1561,7 +1561,7 @@ <h4 id="_tags_10">Tags</h4>
15611561
<div class="ulist">
15621562
<ul>
15631563
<li>
1564-
<p>apiscertificatesv1alpha1</p>
1564+
<p>apiscertificates.k8s.iov1alpha1</p>
15651565
</li>
15661566
</ul>
15671567
</div>
@@ -1571,7 +1571,7 @@ <h4 id="_tags_10">Tags</h4>
15711571
<h3 id="_watch_individual_changes_to_a_list_of_certificatesigningrequest">watch individual changes to a list of CertificateSigningRequest</h3>
15721572
<div class="listingblock">
15731573
<div class="content">
1574-
<pre>GET /apis/certificates/v1alpha1/watch/certificatesigningrequests</pre>
1574+
<pre>GET /apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests</pre>
15751575
</div>
15761576
</div>
15771577
<div class="sect3">
@@ -1707,7 +1707,7 @@ <h4 id="_tags_11">Tags</h4>
17071707
<div class="ulist">
17081708
<ul>
17091709
<li>
1710-
<p>apiscertificatesv1alpha1</p>
1710+
<p>apiscertificates.k8s.iov1alpha1</p>
17111711
</li>
17121712
</ul>
17131713
</div>
@@ -1717,7 +1717,7 @@ <h4 id="_tags_11">Tags</h4>
17171717
<h3 id="_watch_changes_to_an_object_of_kind_certificatesigningrequest">watch changes to an object of kind CertificateSigningRequest</h3>
17181718
<div class="listingblock">
17191719
<div class="content">
1720-
<pre>GET /apis/certificates/v1alpha1/watch/certificatesigningrequests/{name}</pre>
1720+
<pre>GET /apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests/{name}</pre>
17211721
</div>
17221722
</div>
17231723
<div class="sect3">
@@ -1861,7 +1861,7 @@ <h4 id="_tags_12">Tags</h4>
18611861
<div class="ulist">
18621862
<ul>
18631863
<li>
1864-
<p>apiscertificatesv1alpha1</p>
1864+
<p>apiscertificates.k8s.iov1alpha1</p>
18651865
</li>
18661866
</ul>
18671867
</div>
@@ -1872,7 +1872,7 @@ <h4 id="_tags_12">Tags</h4>
18721872
</div>
18731873
<div id="footer">
18741874
<div id="footer-text">
1875-
Last updated 2016-07-29 20:29:11 UTC
1875+
Last updated 2016-09-01 18:34:11 UTC
18761876
</div>
18771877
</div>
18781878
</body>

‎hack/lib/util.sh

+7
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ kube::util::analytics-link() {
293293
# * default behavior: extensions/v1beta1 -> apis/extensions/v1beta1
294294
# * default behavior for only a group: experimental -> apis/experimental
295295
# * Special handling for empty group: v1 -> api/v1, unversioned -> api/unversioned
296+
# * Special handling for groups suffixed with ".k8s.io": foo.k8s.io/v1 -> apis/foo/v1
296297
# * Very special handling for when both group and version are "": / -> api
297298
kube::util::group-version-to-pkg-path() {
298299
local group_version="$1"
@@ -310,6 +311,12 @@ kube::util::group-version-to-pkg-path() {
310311
unversioned)
311312
echo "api/unversioned"
312313
;;
314+
*.k8s.io)
315+
echo "apis/${group_version%.k8s.io}"
316+
;;
317+
*.k8s.io/*)
318+
echo "apis/${group_version/.k8s.io/}"
319+
;;
313320
*)
314321
echo "apis/${group_version%__internal}"
315322
;;

‎hack/make-rules/test-integration.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
2727
# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"}
2828
# FIXME: due to current implementation of a test client (see: pkg/api/testapi/testapi.go)
2929
# ONLY the last version is tested in each group.
30-
KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,authorization.k8s.io/v1beta1,autoscaling/v1,batch/v1,apps/v1alpha1,policy/v1alpha1,extensions/v1beta1,rbac.authorization.k8s.io/v1alpha1,certificates/v1alpha1"}
30+
KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,authorization.k8s.io/v1beta1,autoscaling/v1,batch/v1,apps/v1alpha1,policy/v1alpha1,extensions/v1beta1,rbac.authorization.k8s.io/v1alpha1,certificates.k8s.io/v1alpha1"}
3131

3232
# Give integration tests longer to run
3333
# TODO: allow a larger value to be passed in

0 commit comments

Comments
 (0)