diff --git a/api/swagger-spec/certificates.json b/api/swagger-spec/certificates.k8s.io.json
similarity index 98%
rename from api/swagger-spec/certificates.json
rename to api/swagger-spec/certificates.k8s.io.json
index d96703da227..42855f420e3 100644
--- a/api/swagger-spec/certificates.json
+++ b/api/swagger-spec/certificates.k8s.io.json
@@ -2,14 +2,14 @@
"swaggerVersion": "1.2",
"apiVersion": "",
"basePath": "https://10.10.10.10:6443",
- "resourcePath": "/apis/certificates",
+ "resourcePath": "/apis/certificates.k8s.io",
"info": {
"title": "",
"description": ""
},
"apis": [
{
- "path": "/apis/certificates",
+ "path": "/apis/certificates.k8s.io",
"description": "get information of a group",
"operations": [
{
diff --git a/api/swagger-spec/certificates_v1alpha1.json b/api/swagger-spec/certificates.k8s.io_v1alpha1.json
similarity index 97%
rename from api/swagger-spec/certificates_v1alpha1.json
rename to api/swagger-spec/certificates.k8s.io_v1alpha1.json
index 14c8e8ff73c..ad328c03ab0 100644
--- a/api/swagger-spec/certificates_v1alpha1.json
+++ b/api/swagger-spec/certificates.k8s.io_v1alpha1.json
@@ -1,16 +1,16 @@
{
"swaggerVersion": "1.2",
- "apiVersion": "certificates/v1alpha1",
+ "apiVersion": "certificates.k8s.io/v1alpha1",
"basePath": "https://10.10.10.10:6443",
- "resourcePath": "/apis/certificates/v1alpha1",
+ "resourcePath": "/apis/certificates.k8s.io/v1alpha1",
"info": {
"title": "",
"description": ""
},
"apis": [
{
- "path": "/apis/certificates/v1alpha1/certificatesigningrequests",
- "description": "API at /apis/certificates/v1alpha1",
+ "path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests",
+ "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [
{
"type": "v1alpha1.CertificateSigningRequestList",
@@ -196,8 +196,8 @@
]
},
{
- "path": "/apis/certificates/v1alpha1/watch/certificatesigningrequests",
- "description": "API at /apis/certificates/v1alpha1",
+ "path": "/apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests",
+ "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [
{
"type": "*versioned.Event",
@@ -274,8 +274,8 @@
]
},
{
- "path": "/apis/certificates/v1alpha1/certificatesigningrequests/{name}",
- "description": "API at /apis/certificates/v1alpha1",
+ "path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}",
+ "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [
{
"type": "v1alpha1.CertificateSigningRequest",
@@ -478,8 +478,8 @@
]
},
{
- "path": "/apis/certificates/v1alpha1/watch/certificatesigningrequests/{name}",
- "description": "API at /apis/certificates/v1alpha1",
+ "path": "/apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests/{name}",
+ "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [
{
"type": "*versioned.Event",
@@ -564,8 +564,8 @@
]
},
{
- "path": "/apis/certificates/v1alpha1/certificatesigningrequests/{name}/approval",
- "description": "API at /apis/certificates/v1alpha1",
+ "path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/approval",
+ "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [
{
"type": "v1alpha1.CertificateSigningRequest",
@@ -617,8 +617,8 @@
]
},
{
- "path": "/apis/certificates/v1alpha1/certificatesigningrequests/{name}/status",
- "description": "API at /apis/certificates/v1alpha1",
+ "path": "/apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/status",
+ "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [
{
"type": "v1alpha1.CertificateSigningRequest",
@@ -670,8 +670,8 @@
]
},
{
- "path": "/apis/certificates/v1alpha1",
- "description": "API at /apis/certificates/v1alpha1",
+ "path": "/apis/certificates.k8s.io/v1alpha1",
+ "description": "API at /apis/certificates.k8s.io/v1alpha1",
"operations": [
{
"type": "unversioned.APIResourceList",
diff --git a/api/swagger-spec/resourceListing.json b/api/swagger-spec/resourceListing.json
index d5997c803e1..6e2227bcad1 100644
--- a/api/swagger-spec/resourceListing.json
+++ b/api/swagger-spec/resourceListing.json
@@ -66,11 +66,11 @@
"description": "get information of a group"
},
{
- "path": "/apis/certificates/v1alpha1",
- "description": "API at /apis/certificates/v1alpha1"
+ "path": "/apis/certificates.k8s.io/v1alpha1",
+ "description": "API at /apis/certificates.k8s.io/v1alpha1"
},
{
- "path": "/apis/certificates",
+ "path": "/apis/certificates.k8s.io",
"description": "get information of a group"
},
{
diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go
index 84231748844..17491b6a52d 100644
--- a/cmd/kube-controller-manager/app/controllermanager.go
+++ b/cmd/kube-controller-manager/app/controllermanager.go
@@ -455,7 +455,7 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
go attachDetachController.Run(wait.NeverStop)
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
- groupVersion = "certificates/v1alpha1"
+ groupVersion = "certificates.k8s.io/v1alpha1"
resources, found = resourceMap[groupVersion]
glog.Infof("Attempting to start certificates, full resource map %+v", resourceMap)
if containsVersion(versions, groupVersion) && found {
diff --git a/docs/api-reference/certificates/v1alpha1/definitions.html b/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html
similarity index 99%
rename from docs/api-reference/certificates/v1alpha1/definitions.html
rename to docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html
index e28aedef38d..b650ae2d140 100755
--- a/docs/api-reference/certificates/v1alpha1/definitions.html
+++ b/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html
@@ -1311,7 +1311,7 @@ Examples: