Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: scaffolded by default the subresource status #1484

Merged
merged 1 commit into from
May 12, 2020
Merged

feat: scaffolded by default the subresource status #1484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/book/src/cronjob-tutorial/testdata/emptyapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/migration/guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {...}

Expand Down
1 change: 1 addition & 0 deletions pkg/scaffold/internal/templates/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions plugins/addon/type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2-addon/api/v1/admiral_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2-addon/api/v1/captain_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2-addon/api/v1/firstmate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2-addon/config/crd/bases/crew.testproject.org_admirals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: admirals
singular: admiral
scope: Cluster
subresources:
status: {}
validation:
openAPIV3Schema:
description: Admiral is the Schema for the admirals API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2-addon/config/crd/bases/crew.testproject.org_captains.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: captains
singular: captain
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Captain is the Schema for the captains API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2-addon/config/crd/bases/crew.testproject.org_firstmates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: firstmates
singular: firstmate
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: FirstMate is the Schema for the firstmates API
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2-multigroup/apis/crew/v1/captain_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/kraken_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2-multigroup/apis/ship/v1/destroyer_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2-multigroup/config/crd/bases/crew.testproject.org_captains.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: captains
singular: captain
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Captain is the Schema for the captains API
Expand Down
2 changes: 2 additions & 0 deletions ...roject-v2-multigroup/config/crd/bases/foo.policy.testproject.org_healthcheckpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: healthcheckpolicies
singular: healthcheckpolicy
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: HealthCheckPolicy is the Schema for the healthcheckpolicies API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2-multigroup/config/crd/bases/sea-creatures.testproject.org_krakens.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: krakens
singular: kraken
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Kraken is the Schema for the krakens API
Expand Down
2 changes: 2 additions & 0 deletions ...data/project-v2-multigroup/config/crd/bases/sea-creatures.testproject.org_leviathans.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: leviathans
singular: leviathan
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Leviathan is the Schema for the leviathans API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2-multigroup/config/crd/bases/ship.testproject.org_cruisers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: cruisers
singular: cruiser
scope: Cluster
subresources:
status: {}
validation:
openAPIV3Schema:
description: Cruiser is the Schema for the cruisers API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2-multigroup/config/crd/bases/ship.testproject.org_destroyers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: destroyers
singular: destroyer
scope: Cluster
subresources:
status: {}
validation:
openAPIV3Schema:
description: Destroyer is the Schema for the destroyers API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2-multigroup/config/crd/bases/ship.testproject.org_frigates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: frigates
singular: frigate
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Frigate is the Schema for the frigates API
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2/api/v1/admiral_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2/api/v1/captain_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v2/api/v1/firstmate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2/config/crd/bases/crew.testproject.org_admirals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: admirals
singular: admiral
scope: Cluster
subresources:
status: {}
validation:
openAPIV3Schema:
description: Admiral is the Schema for the admirals API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2/config/crd/bases/crew.testproject.org_captains.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: captains
singular: captain
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Captain is the Schema for the captains API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v2/config/crd/bases/crew.testproject.org_firstmates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: firstmates
singular: firstmate
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: FirstMate is the Schema for the firstmates API
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v3-addon/api/v1/admiral_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v3-addon/api/v1/captain_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v3-addon/api/v1/firstmate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v3-addon/config/crd/bases/crew.testproject.org_admirals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: admirals
singular: admiral
scope: Cluster
subresources:
status: {}
validation:
openAPIV3Schema:
description: Admiral is the Schema for the admirals API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v3-addon/config/crd/bases/crew.testproject.org_captains.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: captains
singular: captain
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Captain is the Schema for the captains API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v3-addon/config/crd/bases/crew.testproject.org_firstmates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: firstmates
singular: firstmate
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: FirstMate is the Schema for the firstmates API
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v3-multigroup/apis/crew/v1/captain_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v3-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/kraken_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v3-multigroup/apis/ship/v1/destroyer_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v3-multigroup/apis/ship/v1beta1/frigate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions testdata/project-v3-multigroup/apis/ship/v2alpha1/cruiser_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v3-multigroup/config/crd/bases/crew.testproject.org_captains.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: captains
singular: captain
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Captain is the Schema for the captains API
Expand Down
2 changes: 2 additions & 0 deletions ...roject-v3-multigroup/config/crd/bases/foo.policy.testproject.org_healthcheckpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: healthcheckpolicies
singular: healthcheckpolicy
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: HealthCheckPolicy is the Schema for the healthcheckpolicies API
Expand Down
2 changes: 2 additions & 0 deletions testdata/project-v3-multigroup/config/crd/bases/sea-creatures.testproject.org_krakens.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: krakens
singular: kraken
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Kraken is the Schema for the krakens API
Expand Down
2 changes: 2 additions & 0 deletions ...data/project-v3-multigroup/config/crd/bases/sea-creatures.testproject.org_leviathans.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: leviathans
singular: leviathan
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Leviathan is the Schema for the leviathans API
Expand Down