scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31887 from liggitt/certificates-group

Browse Source 
Automatic merge from submit-queue

Namespace certificates API group

New API groups should follow best-practices for naming, including using DNS names within the k8s.io namespace

```release-note
The certificates API group has been renamed to certificates.k8s.io
```
This commit is contained in:
Kubernetes Submit Queue
2016-09-02 15:08:55 -07:00
committed by GitHub
parent be290b5904 a869de61bd
commit 11765ab92e
21 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/swagger-spec/certificates.json → api/swagger-spec/certificates.k8s.io.json
View File

@@ -2,14 +2,14 @@
"swaggerVersion": "1.2", "swaggerVersion": "1.2",
"apiVersion": "", "apiVersion": "",
"basePath": "https://10.10.10.10:6443", "basePath": "https://10.10.10.10:6443",
"resourcePath": "/apis/certificates", "resourcePath": "/apis/certificates.k8s.io",
"info": { "info": {
"title": "", "title": "",
"description": "" "description": ""
}, },
"apis": [ "apis": [
{ {
"path": "/apis/certificates", "path": "/apis/certificates.k8s.io",
"description": "get information of a group", "description": "get information of a group",
"operations": [ "operations": [
{ {

32
api/swagger-spec/certificates_v1alpha1.json → api/swagger-spec/certificates.k8s.io_v1alpha1.json
View File

@@ -1,16 +1,16 @@
{ {
"swaggerVersion": "1.2", "swaggerVersion": "1.2",
"apiVersion": "certificates/v1alpha1", "apiVersion": "certificates.k8s.io/v1alpha1",
"basePath": "https://10.10.10.10:6443", "basePath": "https://10.10.10.10:6443",
"resourcePath": "/apis/certificates/v1alpha1", "resourcePath": "/apis/certificates.k8s.io/v1alpha1",
"info": { "info": {
"title": "", "title": "",
"description": "" "description": ""
}, },
"apis": [ "apis": [
{ {
"path": "/apis/certificates/v1alpha1/certificatesigningrequests", "path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests",
"description": "API at /apis/certificates/v1alpha1", "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [ "operations": [
{ {
"type": "v1alpha1.CertificateSigningRequestList", "type": "v1alpha1.CertificateSigningRequestList",
@@ -196,8 +196,8 @@
] ]
}, },
{ {
"path": "/apis/certificates/v1alpha1/watch/certificatesigningrequests", "path": "/apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests",
"description": "API at /apis/certificates/v1alpha1", "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [ "operations": [
{ {
"type": "*versioned.Event", "type": "*versioned.Event",
@@ -274,8 +274,8 @@
] ]
}, },
{ {
"path": "/apis/certificates/v1alpha1/certificatesigningrequests/{name}", "path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}",
"description": "API at /apis/certificates/v1alpha1", "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [ "operations": [
{ {
"type": "v1alpha1.CertificateSigningRequest", "type": "v1alpha1.CertificateSigningRequest",
@@ -478,8 +478,8 @@
] ]
}, },
{ {
"path": "/apis/certificates/v1alpha1/watch/certificatesigningrequests/{name}", "path": "/apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests/{name}",
"description": "API at /apis/certificates/v1alpha1", "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [ "operations": [
{ {
"type": "*versioned.Event", "type": "*versioned.Event",
@@ -564,8 +564,8 @@
] ]
}, },
{ {
"path": "/apis/certificates/v1alpha1/certificatesigningrequests/{name}/approval", "path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/approval",
"description": "API at /apis/certificates/v1alpha1", "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [ "operations": [
{ {
"type": "v1alpha1.CertificateSigningRequest", "type": "v1alpha1.CertificateSigningRequest",
@@ -617,8 +617,8 @@
] ]
}, },
{ {
"path": "/apis/certificates/v1alpha1/certificatesigningrequests/{name}/status", "path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/status",
"description": "API at /apis/certificates/v1alpha1", "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [ "operations": [
{ {
"type": "v1alpha1.CertificateSigningRequest", "type": "v1alpha1.CertificateSigningRequest",
@@ -670,8 +670,8 @@
] ]
}, },
{ {
"path": "/apis/certificates/v1alpha1", "path": "/apis/certificates.k8s.io/v1alpha1",
"description": "API at /apis/certificates/v1alpha1", "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [ "operations": [
{ {
"type": "unversioned.APIResourceList", "type": "unversioned.APIResourceList",

6
api/swagger-spec/resourceListing.json
View File

@@ -66,11 +66,11 @@
"description": "get information of a group" "description": "get information of a group"
}, },
{ {
"path": "/apis/certificates/v1alpha1", "path": "/apis/certificates.k8s.io/v1alpha1",
"description": "API at /apis/certificates/v1alpha1" "description": "API at /apis/certificates.k8s.io/v1alpha1"
}, },
{ {
"path": "/apis/certificates", "path": "/apis/certificates.k8s.io",
"description": "get information of a group" "description": "get information of a group"
}, },
{ {

2
cmd/kube-controller-manager/app/controllermanager.go
View File

@@ -455,7 +455,7 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
go attachDetachController.Run(wait.NeverStop) go attachDetachController.Run(wait.NeverStop)
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter)) time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
groupVersion = "certificates/v1alpha1" groupVersion = "certificates.k8s.io/v1alpha1"
resources, found = resourceMap[groupVersion] resources, found = resourceMap[groupVersion]
glog.Infof("Attempting to start certificates, full resource map %+v", resourceMap) glog.Infof("Attempting to start certificates, full resource map %+v", resourceMap)
if containsVersion(versions, groupVersion) && found { if containsVersion(versions, groupVersion) && found {

2
docs/api-reference/certificates/v1alpha1/definitions.html → docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html
View File

@@ -1311,7 +1311,7 @@ Examples:<br>
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2016-08-23 17:35:27 UTC Last updated 2016-09-01 18:34:11 UTC
</div> </div>
</div> </div>
</body> </body>

50
docs/api-reference/certificates/v1alpha1/operations.html → docs/api-reference/certificates.k8s.io/v1alpha1/operations.html
View File

@@ -371,7 +371,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_get_available_resources">get available resources</h3> <h3 id="_get_available_resources">get available resources</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>GET /apis/certificates/v1alpha1</pre> <pre>GET /apis/certificates.k8s.io/v1alpha1</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -436,7 +436,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -446,7 +446,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_list_or_watch_objects_of_kind_certificatesigningrequest">list or watch objects of kind CertificateSigningRequest</h3> <h3 id="_list_or_watch_objects_of_kind_certificatesigningrequest">list or watch objects of kind CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>GET /apis/certificates/v1alpha1/certificatesigningrequests</pre> <pre>GET /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -579,7 +579,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -589,7 +589,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_delete_collection_of_certificatesigningrequest">delete collection of CertificateSigningRequest</h3> <h3 id="_delete_collection_of_certificatesigningrequest">delete collection of CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>DELETE /apis/certificates/v1alpha1/certificatesigningrequests</pre> <pre>DELETE /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -722,7 +722,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -732,7 +732,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_create_a_certificatesigningrequest">create a CertificateSigningRequest</h3> <h3 id="_create_a_certificatesigningrequest">create a CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>POST /apis/certificates/v1alpha1/certificatesigningrequests</pre> <pre>POST /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -833,7 +833,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -843,7 +843,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_read_the_specified_certificatesigningrequest">read the specified CertificateSigningRequest</h3> <h3 id="_read_the_specified_certificatesigningrequest">read the specified CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>GET /apis/certificates/v1alpha1/certificatesigningrequests/{name}</pre> <pre>GET /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -960,7 +960,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -970,7 +970,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_replace_the_specified_certificatesigningrequest">replace the specified CertificateSigningRequest</h3> <h3 id="_replace_the_specified_certificatesigningrequest">replace the specified CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>PUT /apis/certificates/v1alpha1/certificatesigningrequests/{name}</pre> <pre>PUT /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -1079,7 +1079,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -1089,7 +1089,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_delete_a_certificatesigningrequest">delete a CertificateSigningRequest</h3> <h3 id="_delete_a_certificatesigningrequest">delete a CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>DELETE /apis/certificates/v1alpha1/certificatesigningrequests/{name}</pre> <pre>DELETE /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -1198,7 +1198,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -1208,7 +1208,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_partially_update_the_specified_certificatesigningrequest">partially update the specified CertificateSigningRequest</h3> <h3 id="_partially_update_the_specified_certificatesigningrequest">partially update the specified CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>PATCH /apis/certificates/v1alpha1/certificatesigningrequests/{name}</pre> <pre>PATCH /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -1323,7 +1323,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -1333,7 +1333,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_replace_approval_of_the_specified_certificatesigningrequest">replace approval of the specified CertificateSigningRequest</h3> <h3 id="_replace_approval_of_the_specified_certificatesigningrequest">replace approval of the specified CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>PUT /apis/certificates/v1alpha1/certificatesigningrequests/{name}/approval</pre> <pre>PUT /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/approval</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -1442,7 +1442,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -1452,7 +1452,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_replace_status_of_the_specified_certificatesigningrequest">replace status of the specified CertificateSigningRequest</h3> <h3 id="_replace_status_of_the_specified_certificatesigningrequest">replace status of the specified CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>PUT /apis/certificates/v1alpha1/certificatesigningrequests/{name}/status</pre> <pre>PUT /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/status</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -1561,7 +1561,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -1571,7 +1571,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_watch_individual_changes_to_a_list_of_certificatesigningrequest">watch individual changes to a list of CertificateSigningRequest</h3> <h3 id="_watch_individual_changes_to_a_list_of_certificatesigningrequest">watch individual changes to a list of CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>GET /apis/certificates/v1alpha1/watch/certificatesigningrequests</pre> <pre>GET /apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -1707,7 +1707,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -1717,7 +1717,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_watch_changes_to_an_object_of_kind_certificatesigningrequest">watch changes to an object of kind CertificateSigningRequest</h3> <h3 id="_watch_changes_to_an_object_of_kind_certificatesigningrequest">watch changes to an object of kind CertificateSigningRequest</h3>
<div class="listingblock"> <div class="listingblock">
<div class="content"> <div class="content">
<pre>GET /apis/certificates/v1alpha1/watch/certificatesigningrequests/{name}</pre> <pre>GET /apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests/{name}</pre>
</div> </div>
</div> </div>
<div class="sect3"> <div class="sect3">
@@ -1861,7 +1861,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist"> <div class="ulist">
<ul> <ul>
<li> <li>
<p>apiscertificatesv1alpha1</p> <p>apiscertificates.k8s.iov1alpha1</p>
</li> </li>
</ul> </ul>
</div> </div>
@@ -1872,7 +1872,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2016-07-29 20:29:11 UTC Last updated 2016-09-01 18:34:11 UTC
</div> </div>
</div> </div>
</body> </body>

7
hack/lib/util.sh
View File

@@ -293,6 +293,7 @@ kube::util::analytics-link() {
# * default behavior: extensions/v1beta1 -> apis/extensions/v1beta1 # * default behavior: extensions/v1beta1 -> apis/extensions/v1beta1
# * default behavior for only a group: experimental -> apis/experimental # * default behavior for only a group: experimental -> apis/experimental
# * Special handling for empty group: v1 -> api/v1, unversioned -> api/unversioned # * Special handling for empty group: v1 -> api/v1, unversioned -> api/unversioned
# * Special handling for groups suffixed with ".k8s.io": foo.k8s.io/v1 -> apis/foo/v1
# * Very special handling for when both group and version are "": / -> api # * Very special handling for when both group and version are "": / -> api
kube::util::group-version-to-pkg-path() { kube::util::group-version-to-pkg-path() {
local group_version="$1" local group_version="$1"
@@ -310,6 +311,12 @@ kube::util::group-version-to-pkg-path() {
unversioned) unversioned)
echo "api/unversioned" echo "api/unversioned"
;; ;;
*.k8s.io)
echo "apis/${group_version%.k8s.io}"
;;
*.k8s.io/*)
echo "apis/${group_version/.k8s.io/}"
;;
*) *)
echo "apis/${group_version%__internal}" echo "apis/${group_version%__internal}"
;; ;;

2
hack/make-rules/test-integration.sh
View File

@@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"} # KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"}
# FIXME: due to current implementation of a test client (see: pkg/api/testapi/testapi.go) # FIXME: due to current implementation of a test client (see: pkg/api/testapi/testapi.go)
# ONLY the last version is tested in each group. # ONLY the last version is tested in each group.
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"} 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"}
# Give integration tests longer to run # Give integration tests longer to run
# TODO: allow a larger value to be passed in # TODO: allow a larger value to be passed in

2
hack/make-rules/test.sh
View File

@@ -66,7 +66,7 @@ KUBE_GOVERALLS_BIN=${KUBE_GOVERALLS_BIN:-}
# "v1,compute/v1alpha1,experimental/v1alpha2;v1,compute/v2,experimental/v1alpha3" # "v1,compute/v1alpha1,experimental/v1alpha2;v1,compute/v2,experimental/v1alpha3"
# FIXME: due to current implementation of a test client (see: pkg/api/testapi/testapi.go) # FIXME: due to current implementation of a test client (see: pkg/api/testapi/testapi.go)
# ONLY the last version is tested in each group. # ONLY the last version is tested in each group.
KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,apps/v1alpha1,authentication.k8s.io/v1beta1,authorization.k8s.io/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,federation/v1beta1,policy/v1alpha1,rbac.authorization.k8s.io/v1alpha1,imagepolicy.k8s.io/v1alpha1"} KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,apps/v1alpha1,authentication.k8s.io/v1beta1,authorization.k8s.io/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates.k8s.io/v1alpha1,extensions/v1beta1,federation/v1beta1,policy/v1alpha1,rbac.authorization.k8s.io/v1alpha1,imagepolicy.k8s.io/v1alpha1"}
# once we have multiple group supports # once we have multiple group supports
# Create a junit-style XML test report in this directory if set. # Create a junit-style XML test report in this directory if set.
KUBE_JUNIT_REPORT_DIR=${KUBE_JUNIT_REPORT_DIR:-} KUBE_JUNIT_REPORT_DIR=${KUBE_JUNIT_REPORT_DIR:-}

2
hack/update-api-reference-docs.sh
View File

@@ -34,7 +34,7 @@ OUTPUT=${1:-${DEFAULT_OUTPUT}}
SWAGGER_SPEC_PATH="${REPO_DIR}/api/swagger-spec" SWAGGER_SPEC_PATH="${REPO_DIR}/api/swagger-spec"
GROUP_VERSIONS=("v1" "extensions/v1beta1" "batch/v1" "autoscaling/v1" "certificates/v1alpha1") GROUP_VERSIONS=("v1" "extensions/v1beta1" "batch/v1" "autoscaling/v1" "certificates.k8s.io/v1alpha1")
GV_DIRS=() GV_DIRS=()
for gv in "${GROUP_VERSIONS[@]}"; do for gv in "${GROUP_VERSIONS[@]}"; do
GV_DIRS+=("${REPO_DIR}/pkg/$(kube::util::group-version-to-pkg-path "${gv}")") GV_DIRS+=("${REPO_DIR}/pkg/$(kube::util::group-version-to-pkg-path "${gv}")")

2
hack/update-swagger-spec.sh
View File

@@ -73,7 +73,7 @@ APISERVER_PID=$!
kube::util::wait_for_url "${API_HOST}:${API_PORT}/healthz" "apiserver: " kube::util::wait_for_url "${API_HOST}:${API_PORT}/healthz" "apiserver: "
SWAGGER_API_PATH="${API_HOST}:${API_PORT}/swaggerapi/" SWAGGER_API_PATH="${API_HOST}:${API_PORT}/swaggerapi/"
DEFAULT_GROUP_VERSIONS="v1 apps/v1alpha1 authentication.k8s.io/v1beta1 authorization.k8s.io/v1beta1 autoscaling/v1 batch/v1 batch/v2alpha1 extensions/v1beta1 certificates/v1alpha1 policy/v1alpha1 rbac.authorization.k8s.io/v1alpha1" DEFAULT_GROUP_VERSIONS="v1 apps/v1alpha1 authentication.k8s.io/v1beta1 authorization.k8s.io/v1beta1 autoscaling/v1 batch/v1 batch/v2alpha1 extensions/v1beta1 certificates.k8s.io/v1alpha1 policy/v1alpha1 rbac.authorization.k8s.io/v1alpha1"
VERSIONS=${VERSIONS:-$DEFAULT_GROUP_VERSIONS} VERSIONS=${VERSIONS:-$DEFAULT_GROUP_VERSIONS}
kube::log::status "Updating " ${SWAGGER_ROOT_DIR} kube::log::status "Updating " ${SWAGGER_ROOT_DIR}

1
pkg/apis/certificates/doc.go
View File

@@ -16,4 +16,5 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
// +groupName=certificates.k8s.io
package certificates // import "k8s.io/kubernetes/pkg/apis/certificates" package certificates // import "k8s.io/kubernetes/pkg/apis/certificates"

2
pkg/apis/certificates/register.go
View File

@@ -28,7 +28,7 @@ var (
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
const GroupName = "certificates" const GroupName = "certificates.k8s.io"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}

1
pkg/apis/certificates/v1alpha1/doc.go
View File

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +groupName=certificates.k8s.io
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/certificates // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/certificates

2
pkg/apis/certificates/v1alpha1/register.go
View File

@@ -24,7 +24,7 @@ import (
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
const GroupName = "certificates" const GroupName = "certificates.k8s.io"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"} var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"}

2
pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go
View File

@@ -66,7 +66,7 @@ func New(c *restclient.RESTClient) *CertificatesClient {
func setConfigDefaults(config *restclient.Config) error { func setConfigDefaults(config *restclient.Config) error {
// if certificates group is not registered, return an error // if certificates group is not registered, return an error
g, err := registered.Group("certificates") g, err := registered.Group("certificates.k8s.io")
if err != nil { if err != nil {
return err return err
} }

2
pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificatesigningrequest.go
View File

@@ -30,7 +30,7 @@ type FakeCertificateSigningRequests struct {
Fake *FakeCertificates Fake *FakeCertificates
} }
var certificatesigningrequestsResource = unversioned.GroupVersionResource{Group: "certificates", Version: "", Resource: "certificatesigningrequests"} var certificatesigningrequestsResource = unversioned.GroupVersionResource{Group: "certificates.k8s.io", Version: "", Resource: "certificatesigningrequests"}
func (c *FakeCertificateSigningRequests) Create(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error) { func (c *FakeCertificateSigningRequests) Create(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error) {
obj, err := c.Fake. obj, err := c.Fake.

1
staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/doc.go
View File

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +groupName=certificates.k8s.io
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
package certificates package certificates

2
staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/register.go
View File

@@ -28,7 +28,7 @@ var (
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
const GroupName = "certificates" const GroupName = "certificates.k8s.io"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}

1
staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/v1alpha1/doc.go
View File

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +groupName=certificates.k8s.io
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/certificates // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/certificates

2
staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/v1alpha1/register.go
View File

@@ -24,7 +24,7 @@ import (
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package
const GroupName = "certificates" const GroupName = "certificates.k8s.io"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"} var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"}