Merge pull request #1484 from camilamacedo86/set-status-subresource

feat: scaffolded by default the subresource status
kubernetes-sigs · May 12, 2020 · 1eccd8f · 1eccd8f
2 parents 45ade82 + 10e28db
commit 1eccd8f
Show file tree

Hide file tree

Showing 56 changed files with 82 additions and 2 deletions.
diff --git a/docs/book/src/cronjob-tutorial/testdata/emptyapi.go b/docs/book/src/cronjob-tutorial/testdata/emptyapi.go
@@ -69,7 +69,7 @@ interface that all types representing Kinds must implement.
 */
 
 // +kubebuilder:object:root=true
-
+// +kubebuilder:subresource:status
 // CronJob is the Schema for the cronjobs API
 type CronJob struct {
 	metav1.TypeMeta   `json:",inline"`

diff --git a/docs/book/src/migration/guide.md b/docs/book/src/migration/guide.md
@@ -107,7 +107,7 @@ Our API types should look like the following:
 
 ```go
 // +kubebuilder:object:root=true
-
+// +kubebuilder:subresource:status
 // CronJob is the Schema for the cronjobs API
 type CronJob struct {...}
 

diff --git a/pkg/scaffold/internal/templates/types.go b/pkg/scaffold/internal/templates/types.go
@@ -79,6 +79,7 @@ type {{ .Resource.Kind }}Status struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 {{ if not .Resource.Namespaced }} // +kubebuilder:resource:scope=Cluster {{ end }}
 
 // {{ .Resource.Kind }} is the Schema for the {{ .Resource.Plural }} API

diff --git a/plugins/addon/type.go b/plugins/addon/type.go
@@ -75,6 +75,7 @@ type {{.Resource.Kind}}Status struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 {{ if not .Resource.Namespaced }} // +kubebuilder:resource:scope=Cluster {{ end }}
 
 // {{.Resource.Kind}} is the Schema for the {{ .Resource.Plural }} API

diff --git a/testdata/project-v2-addon/api/v1/admiral_types.go b/testdata/project-v2-addon/api/v1/admiral_types.go
@@ -42,6 +42,7 @@ type AdmiralStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 
 // Admiral is the Schema for the admirals API

diff --git a/testdata/project-v2-addon/api/v1/captain_types.go b/testdata/project-v2-addon/api/v1/captain_types.go
@@ -42,6 +42,7 @@ type CaptainStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Captain is the Schema for the captains API
 type Captain struct {

diff --git a/testdata/project-v2-addon/api/v1/firstmate_types.go b/testdata/project-v2-addon/api/v1/firstmate_types.go
@@ -42,6 +42,7 @@ type FirstMateStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // FirstMate is the Schema for the firstmates API
 type FirstMate struct {

diff --git a/testdata/project-v2-addon/config/crd/bases/crew.testproject.org_admirals.yaml b/testdata/project-v2-addon/config/crd/bases/crew.testproject.org_admirals.yaml
@@ -15,6 +15,8 @@ spec:
     plural: admirals
     singular: admiral
   scope: Cluster
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Admiral is the Schema for the admirals API

diff --git a/testdata/project-v2-addon/config/crd/bases/crew.testproject.org_captains.yaml b/testdata/project-v2-addon/config/crd/bases/crew.testproject.org_captains.yaml
@@ -15,6 +15,8 @@ spec:
     plural: captains
     singular: captain
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Captain is the Schema for the captains API

diff --git a/testdata/project-v2-addon/config/crd/bases/crew.testproject.org_firstmates.yaml b/testdata/project-v2-addon/config/crd/bases/crew.testproject.org_firstmates.yaml
@@ -15,6 +15,8 @@ spec:
     plural: firstmates
     singular: firstmate
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: FirstMate is the Schema for the firstmates API

diff --git a/testdata/project-v2-multigroup/apis/crew/v1/captain_types.go b/testdata/project-v2-multigroup/apis/crew/v1/captain_types.go
@@ -39,6 +39,7 @@ type CaptainStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Captain is the Schema for the captains API
 type Captain struct {

diff --git a/testdata/project-v2-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go b/testdata/project-v2-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go
@@ -39,6 +39,7 @@ type HealthCheckPolicyStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // HealthCheckPolicy is the Schema for the healthcheckpolicies API
 type HealthCheckPolicy struct {

diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/kraken_types.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/kraken_types.go
@@ -39,6 +39,7 @@ type KrakenStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Kraken is the Schema for the krakens API
 type Kraken struct {

diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go
@@ -39,6 +39,7 @@ type LeviathanStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Leviathan is the Schema for the leviathans API
 type Leviathan struct {

diff --git a/testdata/project-v2-multigroup/apis/ship/v1/destroyer_types.go b/testdata/project-v2-multigroup/apis/ship/v1/destroyer_types.go
@@ -39,6 +39,7 @@ type DestroyerStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 
 // Destroyer is the Schema for the destroyers API

diff --git a/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_types.go b/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_types.go
@@ -39,6 +39,7 @@ type FrigateStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Frigate is the Schema for the frigates API
 type Frigate struct {

diff --git a/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_types.go b/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_types.go
@@ -39,6 +39,7 @@ type CruiserStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 
 // Cruiser is the Schema for the cruisers API

diff --git a/testdata/project-v2-multigroup/config/crd/bases/crew.testproject.org_captains.yaml b/testdata/project-v2-multigroup/config/crd/bases/crew.testproject.org_captains.yaml
@@ -15,6 +15,8 @@ spec:
     plural: captains
     singular: captain
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Captain is the Schema for the captains API

diff --git a/...roject-v2-multigroup/config/crd/bases/foo.policy.testproject.org_healthcheckpolicies.yaml b/...roject-v2-multigroup/config/crd/bases/foo.policy.testproject.org_healthcheckpolicies.yaml
@@ -15,6 +15,8 @@ spec:
     plural: healthcheckpolicies
     singular: healthcheckpolicy
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: HealthCheckPolicy is the Schema for the healthcheckpolicies API

diff --git a/testdata/project-v2-multigroup/config/crd/bases/sea-creatures.testproject.org_krakens.yaml b/testdata/project-v2-multigroup/config/crd/bases/sea-creatures.testproject.org_krakens.yaml
@@ -15,6 +15,8 @@ spec:
     plural: krakens
     singular: kraken
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Kraken is the Schema for the krakens API

diff --git a/...data/project-v2-multigroup/config/crd/bases/sea-creatures.testproject.org_leviathans.yaml b/...data/project-v2-multigroup/config/crd/bases/sea-creatures.testproject.org_leviathans.yaml
@@ -15,6 +15,8 @@ spec:
     plural: leviathans
     singular: leviathan
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Leviathan is the Schema for the leviathans API

diff --git a/testdata/project-v2-multigroup/config/crd/bases/ship.testproject.org_cruisers.yaml b/testdata/project-v2-multigroup/config/crd/bases/ship.testproject.org_cruisers.yaml
@@ -15,6 +15,8 @@ spec:
     plural: cruisers
     singular: cruiser
   scope: Cluster
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Cruiser is the Schema for the cruisers API

diff --git a/testdata/project-v2-multigroup/config/crd/bases/ship.testproject.org_destroyers.yaml b/testdata/project-v2-multigroup/config/crd/bases/ship.testproject.org_destroyers.yaml
@@ -15,6 +15,8 @@ spec:
     plural: destroyers
     singular: destroyer
   scope: Cluster
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Destroyer is the Schema for the destroyers API

diff --git a/testdata/project-v2-multigroup/config/crd/bases/ship.testproject.org_frigates.yaml b/testdata/project-v2-multigroup/config/crd/bases/ship.testproject.org_frigates.yaml
@@ -15,6 +15,8 @@ spec:
     plural: frigates
     singular: frigate
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Frigate is the Schema for the frigates API

diff --git a/testdata/project-v2/api/v1/admiral_types.go b/testdata/project-v2/api/v1/admiral_types.go
@@ -39,6 +39,7 @@ type AdmiralStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 
 // Admiral is the Schema for the admirals API

diff --git a/testdata/project-v2/api/v1/captain_types.go b/testdata/project-v2/api/v1/captain_types.go
@@ -39,6 +39,7 @@ type CaptainStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Captain is the Schema for the captains API
 type Captain struct {

diff --git a/testdata/project-v2/api/v1/firstmate_types.go b/testdata/project-v2/api/v1/firstmate_types.go
@@ -39,6 +39,7 @@ type FirstMateStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // FirstMate is the Schema for the firstmates API
 type FirstMate struct {

diff --git a/testdata/project-v2/config/crd/bases/crew.testproject.org_admirals.yaml b/testdata/project-v2/config/crd/bases/crew.testproject.org_admirals.yaml
@@ -15,6 +15,8 @@ spec:
     plural: admirals
     singular: admiral
   scope: Cluster
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Admiral is the Schema for the admirals API

diff --git a/testdata/project-v2/config/crd/bases/crew.testproject.org_captains.yaml b/testdata/project-v2/config/crd/bases/crew.testproject.org_captains.yaml
@@ -15,6 +15,8 @@ spec:
     plural: captains
     singular: captain
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Captain is the Schema for the captains API

diff --git a/testdata/project-v2/config/crd/bases/crew.testproject.org_firstmates.yaml b/testdata/project-v2/config/crd/bases/crew.testproject.org_firstmates.yaml
@@ -15,6 +15,8 @@ spec:
     plural: firstmates
     singular: firstmate
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: FirstMate is the Schema for the firstmates API

diff --git a/testdata/project-v3-addon/api/v1/admiral_types.go b/testdata/project-v3-addon/api/v1/admiral_types.go
@@ -42,6 +42,7 @@ type AdmiralStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 
 // Admiral is the Schema for the admirals API

diff --git a/testdata/project-v3-addon/api/v1/captain_types.go b/testdata/project-v3-addon/api/v1/captain_types.go
@@ -42,6 +42,7 @@ type CaptainStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Captain is the Schema for the captains API
 type Captain struct {

diff --git a/testdata/project-v3-addon/api/v1/firstmate_types.go b/testdata/project-v3-addon/api/v1/firstmate_types.go
@@ -42,6 +42,7 @@ type FirstMateStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // FirstMate is the Schema for the firstmates API
 type FirstMate struct {

diff --git a/testdata/project-v3-addon/config/crd/bases/crew.testproject.org_admirals.yaml b/testdata/project-v3-addon/config/crd/bases/crew.testproject.org_admirals.yaml
@@ -15,6 +15,8 @@ spec:
     plural: admirals
     singular: admiral
   scope: Cluster
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Admiral is the Schema for the admirals API

diff --git a/testdata/project-v3-addon/config/crd/bases/crew.testproject.org_captains.yaml b/testdata/project-v3-addon/config/crd/bases/crew.testproject.org_captains.yaml
@@ -15,6 +15,8 @@ spec:
     plural: captains
     singular: captain
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Captain is the Schema for the captains API

diff --git a/testdata/project-v3-addon/config/crd/bases/crew.testproject.org_firstmates.yaml b/testdata/project-v3-addon/config/crd/bases/crew.testproject.org_firstmates.yaml
@@ -15,6 +15,8 @@ spec:
     plural: firstmates
     singular: firstmate
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: FirstMate is the Schema for the firstmates API

diff --git a/testdata/project-v3-multigroup/apis/crew/v1/captain_types.go b/testdata/project-v3-multigroup/apis/crew/v1/captain_types.go
@@ -39,6 +39,7 @@ type CaptainStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Captain is the Schema for the captains API
 type Captain struct {

diff --git a/testdata/project-v3-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go b/testdata/project-v3-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go
@@ -39,6 +39,7 @@ type HealthCheckPolicyStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // HealthCheckPolicy is the Schema for the healthcheckpolicies API
 type HealthCheckPolicy struct {

diff --git a/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/kraken_types.go b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/kraken_types.go
@@ -39,6 +39,7 @@ type KrakenStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Kraken is the Schema for the krakens API
 type Kraken struct {

diff --git a/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go
@@ -39,6 +39,7 @@ type LeviathanStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Leviathan is the Schema for the leviathans API
 type Leviathan struct {

diff --git a/testdata/project-v3-multigroup/apis/ship/v1/destroyer_types.go b/testdata/project-v3-multigroup/apis/ship/v1/destroyer_types.go
@@ -39,6 +39,7 @@ type DestroyerStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 
 // Destroyer is the Schema for the destroyers API

diff --git a/testdata/project-v3-multigroup/apis/ship/v1beta1/frigate_types.go b/testdata/project-v3-multigroup/apis/ship/v1beta1/frigate_types.go
@@ -39,6 +39,7 @@ type FrigateStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // Frigate is the Schema for the frigates API
 type Frigate struct {

diff --git a/testdata/project-v3-multigroup/apis/ship/v2alpha1/cruiser_types.go b/testdata/project-v3-multigroup/apis/ship/v2alpha1/cruiser_types.go
@@ -39,6 +39,7 @@ type CruiserStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 
 // Cruiser is the Schema for the cruisers API

diff --git a/testdata/project-v3-multigroup/config/crd/bases/crew.testproject.org_captains.yaml b/testdata/project-v3-multigroup/config/crd/bases/crew.testproject.org_captains.yaml
@@ -15,6 +15,8 @@ spec:
     plural: captains
     singular: captain
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Captain is the Schema for the captains API

diff --git a/...roject-v3-multigroup/config/crd/bases/foo.policy.testproject.org_healthcheckpolicies.yaml b/...roject-v3-multigroup/config/crd/bases/foo.policy.testproject.org_healthcheckpolicies.yaml
@@ -15,6 +15,8 @@ spec:
     plural: healthcheckpolicies
     singular: healthcheckpolicy
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: HealthCheckPolicy is the Schema for the healthcheckpolicies API

diff --git a/testdata/project-v3-multigroup/config/crd/bases/sea-creatures.testproject.org_krakens.yaml b/testdata/project-v3-multigroup/config/crd/bases/sea-creatures.testproject.org_krakens.yaml
@@ -15,6 +15,8 @@ spec:
     plural: krakens
     singular: kraken
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Kraken is the Schema for the krakens API

diff --git a/...data/project-v3-multigroup/config/crd/bases/sea-creatures.testproject.org_leviathans.yaml b/...data/project-v3-multigroup/config/crd/bases/sea-creatures.testproject.org_leviathans.yaml
@@ -15,6 +15,8 @@ spec:
     plural: leviathans
     singular: leviathan
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: Leviathan is the Schema for the leviathans API