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:
diff --git a/docs/api-reference/certificates/v1alpha1/operations.html b/docs/api-reference/certificates.k8s.io/v1alpha1/operations.html similarity index 98% rename from docs/api-reference/certificates/v1alpha1/operations.html rename to docs/api-reference/certificates.k8s.io/v1alpha1/operations.html index 99dc6f14380..8a6ea1a943b 100755 --- a/docs/api-reference/certificates/v1alpha1/operations.html +++ b/docs/api-reference/certificates.k8s.io/v1alpha1/operations.html @@ -371,7 +371,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

get available resources

-
GET /apis/certificates/v1alpha1
+
GET /apis/certificates.k8s.io/v1alpha1
@@ -436,7 +436,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
@@ -446,7 +446,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

list or watch objects of kind CertificateSigningRequest

-
GET /apis/certificates/v1alpha1/certificatesigningrequests
+
GET /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests
@@ -579,7 +579,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -589,7 +589,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

delete collection of CertificateSigningRequest

-
DELETE /apis/certificates/v1alpha1/certificatesigningrequests
+
DELETE /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests
@@ -722,7 +722,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -732,7 +732,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

create a CertificateSigningRequest

-
POST /apis/certificates/v1alpha1/certificatesigningrequests
+
POST /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests
@@ -833,7 +833,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -843,7 +843,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

read the specified CertificateSigningRequest

-
GET /apis/certificates/v1alpha1/certificatesigningrequests/{name}
+
GET /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}
@@ -960,7 +960,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -970,7 +970,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

replace the specified CertificateSigningRequest

-
PUT /apis/certificates/v1alpha1/certificatesigningrequests/{name}
+
PUT /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}
@@ -1079,7 +1079,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -1089,7 +1089,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

delete a CertificateSigningRequest

-
DELETE /apis/certificates/v1alpha1/certificatesigningrequests/{name}
+
DELETE /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}
@@ -1198,7 +1198,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -1208,7 +1208,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

partially update the specified CertificateSigningRequest

-
PATCH /apis/certificates/v1alpha1/certificatesigningrequests/{name}
+
PATCH /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}
@@ -1323,7 +1323,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -1333,7 +1333,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

replace approval of the specified CertificateSigningRequest

-
PUT /apis/certificates/v1alpha1/certificatesigningrequests/{name}/approval
+
PUT /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/approval
@@ -1442,7 +1442,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -1452,7 +1452,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

replace status of the specified CertificateSigningRequest

-
PUT /apis/certificates/v1alpha1/certificatesigningrequests/{name}/status
+
PUT /apis/certificates.k8s.io/v1alpha1/certificatesigningrequests/{name}/status
@@ -1561,7 +1561,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -1571,7 +1571,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

watch individual changes to a list of CertificateSigningRequest

-
GET /apis/certificates/v1alpha1/watch/certificatesigningrequests
+
GET /apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests
@@ -1707,7 +1707,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -1717,7 +1717,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

watch changes to an object of kind CertificateSigningRequest

-
GET /apis/certificates/v1alpha1/watch/certificatesigningrequests/{name}
+
GET /apis/certificates.k8s.io/v1alpha1/watch/certificatesigningrequests/{name}
@@ -1861,7 +1861,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
  • -

    apiscertificatesv1alpha1

    +

    apiscertificates.k8s.iov1alpha1

@@ -1872,7 +1872,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/hack/lib/util.sh b/hack/lib/util.sh index 067c3e1c59d..f6b6d162bd2 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -293,6 +293,7 @@ kube::util::analytics-link() { # * default behavior: extensions/v1beta1 -> apis/extensions/v1beta1 # * default behavior for only a group: experimental -> apis/experimental # * 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 kube::util::group-version-to-pkg-path() { local group_version="$1" @@ -310,6 +311,12 @@ kube::util::group-version-to-pkg-path() { 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}" ;; diff --git a/hack/make-rules/test-integration.sh b/hack/make-rules/test-integration.sh index 9737c642daf..ad7df722525 100755 --- a/hack/make-rules/test-integration.sh +++ b/hack/make-rules/test-integration.sh @@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" # 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) # 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 # TODO: allow a larger value to be passed in diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh index 2a58ac829e3..acfb324231f 100755 --- a/hack/make-rules/test.sh +++ b/hack/make-rules/test.sh @@ -66,7 +66,7 @@ KUBE_GOVERALLS_BIN=${KUBE_GOVERALLS_BIN:-} # "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) # 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 # Create a junit-style XML test report in this directory if set. KUBE_JUNIT_REPORT_DIR=${KUBE_JUNIT_REPORT_DIR:-} diff --git a/hack/update-api-reference-docs.sh b/hack/update-api-reference-docs.sh index 756164940b0..21e01bba8dd 100755 --- a/hack/update-api-reference-docs.sh +++ b/hack/update-api-reference-docs.sh @@ -34,7 +34,7 @@ OUTPUT=${1:-${DEFAULT_OUTPUT}} 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=() for gv in "${GROUP_VERSIONS[@]}"; do GV_DIRS+=("${REPO_DIR}/pkg/$(kube::util::group-version-to-pkg-path "${gv}")") diff --git a/hack/update-swagger-spec.sh b/hack/update-swagger-spec.sh index d173199bb42..46f690184e7 100755 --- a/hack/update-swagger-spec.sh +++ b/hack/update-swagger-spec.sh @@ -73,7 +73,7 @@ APISERVER_PID=$! kube::util::wait_for_url "${API_HOST}:${API_PORT}/healthz" "apiserver: " 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} kube::log::status "Updating " ${SWAGGER_ROOT_DIR} diff --git a/pkg/apis/certificates/doc.go b/pkg/apis/certificates/doc.go index 908fda8c0c6..801141b8245 100644 --- a/pkg/apis/certificates/doc.go +++ b/pkg/apis/certificates/doc.go @@ -16,4 +16,5 @@ limitations under the License. // +k8s:deepcopy-gen=package,register +// +groupName=certificates.k8s.io package certificates // import "k8s.io/kubernetes/pkg/apis/certificates" diff --git a/pkg/apis/certificates/register.go b/pkg/apis/certificates/register.go index 53b3ad13e59..884044114c4 100644 --- a/pkg/apis/certificates/register.go +++ b/pkg/apis/certificates/register.go @@ -28,7 +28,7 @@ var ( ) // 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 var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} diff --git a/pkg/apis/certificates/v1alpha1/doc.go b/pkg/apis/certificates/v1alpha1/doc.go index 3063ec00aa6..fc797123756 100644 --- a/pkg/apis/certificates/v1alpha1/doc.go +++ b/pkg/apis/certificates/v1alpha1/doc.go @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// +groupName=certificates.k8s.io // +k8s:deepcopy-gen=package,register // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/certificates diff --git a/pkg/apis/certificates/v1alpha1/register.go b/pkg/apis/certificates/v1alpha1/register.go index 508d6125c15..cc6cd3c2219 100644 --- a/pkg/apis/certificates/v1alpha1/register.go +++ b/pkg/apis/certificates/v1alpha1/register.go @@ -24,7 +24,7 @@ import ( ) // 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 var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go index f1fdb455907..c11bff9a9b9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go @@ -66,7 +66,7 @@ func New(c *restclient.RESTClient) *CertificatesClient { func setConfigDefaults(config *restclient.Config) 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 { return err } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificatesigningrequest.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificatesigningrequest.go index f89638d6db4..497f1c22445 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificatesigningrequest.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificatesigningrequest.go @@ -30,7 +30,7 @@ type FakeCertificateSigningRequests struct { 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) { obj, err := c.Fake. diff --git a/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/doc.go b/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/doc.go index d2897cb87d7..fd28fd007ad 100644 --- a/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/doc.go +++ b/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/doc.go @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// +groupName=certificates.k8s.io // +k8s:deepcopy-gen=package,register package certificates diff --git a/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/register.go b/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/register.go index 8e225c23635..39ef9fe3794 100644 --- a/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/register.go +++ b/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/register.go @@ -28,7 +28,7 @@ var ( ) // 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 var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal} diff --git a/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/v1alpha1/doc.go b/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/v1alpha1/doc.go index 3528c164f9a..13be49cbfcf 100644 --- a/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/v1alpha1/doc.go +++ b/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/v1alpha1/doc.go @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// +groupName=certificates.k8s.io // +k8s:deepcopy-gen=package,register // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/certificates diff --git a/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/v1alpha1/register.go b/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/v1alpha1/register.go index ced77f7b060..253d8d9d8be 100644 --- a/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/v1alpha1/register.go +++ b/staging/src/k8s.io/client-go/1.4/pkg/apis/certificates/v1alpha1/register.go @@ -24,7 +24,7 @@ import ( ) // 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 var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"}