Skip to content

Skip setting ListKind #339

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

Merged
tamalsaha merged 1 commit into from
Apr 1, 2018
Merged

Skip setting ListKind #339

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions apis/monitoring/v1alpha1/crd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@ func (a ClusterAlert) CustomResourceDefinition() *apiextensions.CustomResourceDe
Plural: ResourcePluralClusterAlert,
Singular: ResourceSingularClusterAlert,
Kind: ResourceKindClusterAlert,
ListKind: ResourceKindClusterAlert + "List",
ShortNames: []string{"ca"},
ResourceScope: string(apiextensions.NamespaceScoped),
Labels: crdutils.Labels{
LabelsMap: map[string]string{
"app": "searchlight",
},
LabelsMap: map[string]string{"app": "searchlight"},
},
SpecDefinitionName: "github.com/appscode/searchlight/apis/monitoring/v1alpha1.ClusterAlert",
EnableValidation: true,
Expand All @@ -33,13 +30,10 @@ func (a NodeAlert) CustomResourceDefinition() *apiextensions.CustomResourceDefin
Plural: ResourcePluralNodeAlert,
Singular: ResourceSingularNodeAlert,
Kind: ResourceKindNodeAlert,
ListKind: ResourceKindNodeAlert + "List",
ShortNames: []string{"noa"},
ResourceScope: string(apiextensions.NamespaceScoped),
Labels: crdutils.Labels{
LabelsMap: map[string]string{
"app": "searchlight",
},
LabelsMap: map[string]string{"app": "searchlight"},
},
SpecDefinitionName: "github.com/appscode/searchlight/apis/monitoring/v1alpha1.NodeAlert",
EnableValidation: true,
Expand All @@ -54,13 +48,10 @@ func (a PodAlert) CustomResourceDefinition() *apiextensions.CustomResourceDefini
Plural: ResourcePluralPodAlert,
Singular: ResourceSingularPodAlert,
Kind: ResourceKindPodAlert,
ListKind: ResourceKindPodAlert + "List",
ShortNames: []string{"poa"},
ResourceScope: string(apiextensions.NamespaceScoped),
Labels: crdutils.Labels{
LabelsMap: map[string]string{
"app": "searchlight",
},
LabelsMap: map[string]string{"app": "searchlight"},
},
SpecDefinitionName: "github.com/appscode/searchlight/apis/monitoring/v1alpha1.PodAlert",
EnableValidation: true,
Expand All @@ -75,12 +66,9 @@ func (a Incident) CustomResourceDefinition() *apiextensions.CustomResourceDefini
Plural: ResourcePluralIncident,
Singular: ResourceSingularIncident,
Kind: ResourceKindIncident,
ListKind: ResourceKindIncident + "List",
ResourceScope: string(apiextensions.NamespaceScoped),
Labels: crdutils.Labels{
LabelsMap: map[string]string{
"app": "searchlight",
},
LabelsMap: map[string]string{"app": "searchlight"},
},
SpecDefinitionName: "github.com/appscode/searchlight/apis/monitoring/v1alpha1.Incident",
EnableValidation: true,
Expand Down
4 changes: 0 additions & 4 deletions apis/monitoring/v1alpha1/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ spec:
group: monitoring.appscode.com
names:
kind: ClusterAlert
listKind: ClusterAlertList
plural: clusteralerts
shortNames:
- ca
Expand Down Expand Up @@ -371,7 +370,6 @@ spec:
group: monitoring.appscode.com
names:
kind: NodeAlert
listKind: NodeAlertList
plural: nodealerts
shortNames:
- noa
Expand Down Expand Up @@ -735,7 +733,6 @@ spec:
group: monitoring.appscode.com
names:
kind: PodAlert
listKind: PodAlertList
plural: podalerts
shortNames:
- poa
Expand Down Expand Up @@ -1139,7 +1136,6 @@ spec:
group: monitoring.appscode.com
names:
kind: Incident
listKind: IncidentList
plural: incidents
singular: incident
scope: Namespaced
Expand Down
4 changes: 2 additions & 2 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions vendor/github.com/appscode/kutil/apiextensions/v1beta1/cli-utils.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/appscode/kutil/apiextensions/v1beta1/convert_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.