Skip to content

crd additional printer columns #799

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
merged 1 commit into from
Apr 2, 2025
Merged

crd additional printer columns #799

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
7 changes: 7 additions & 0 deletions cyclops-ctrl/api/v1alpha1/module_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ type HistoryEntry struct {

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
//+kubebuilder:printcolumn:name="Target Namespace",type=string,JSONPath=`.spec.targetNamespace`,priority=1
//+kubebuilder:printcolumn:name="Template",type=string,JSONPath=`.spec.template.repo`
//+kubebuilder:printcolumn:name="Template path",type=string,JSONPath=`.spec.template.path`,priority=1
//+kubebuilder:printcolumn:name="Template version",type=string,JSONPath=`.spec.template.version`,priority=1
//+kubebuilder:printcolumn:name="Template resolved version",type=string,JSONPath=`.status.templateResolvedVersion`,priority=1
//+kubebuilder:printcolumn:name="Reconciliation Status",type=string,JSONPath=`.status.reconciliationStatus.status`

// Module is the Schema for the modules API
type Module struct {
Expand Down
2 changes: 2 additions & 0 deletions cyclops-ctrl/api/v1alpha1/template_auth_rule_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ type TemplateAuthRuleSpec struct {

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
//+kubebuilder:printcolumn:name="Repository",type=string,JSONPath=`.spec.repo`

// TemplateAuthRule is the Schema for the modules API
type TemplateAuthRule struct {
Expand Down
5 changes: 5 additions & 0 deletions cyclops-ctrl/api/v1alpha1/template_store_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ import (
const IconURLAnnotation = "cyclops-ui.com/icon"

//+kubebuilder:object:root=true
//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
//+kubebuilder:printcolumn:name="Type",type=string,JSONPath=`.spec.sourceType`
//+kubebuilder:printcolumn:name="Repository",type=string,JSONPath=`.spec.repo`
//+kubebuilder:printcolumn:name="Path",type=string,JSONPath=`.spec.path`
//+kubebuilder:printcolumn:name="Version",type=string,JSONPath=`.spec.version`

// TemplateStore holds reference to a template that can be offered as a starting point
type TemplateStore struct {
Expand Down
28 changes: 27 additions & 1 deletion cyclops-ctrl/config/crd/bases/cyclops-ui.com_modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,33 @@ spec:
singular: module
scope: Namespaced
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
- jsonPath: .spec.targetNamespace
name: Target Namespace
priority: 1
type: string
- jsonPath: .spec.template.repo
name: Template
type: string
- jsonPath: .spec.template.path
name: Template path
priority: 1
type: string
- jsonPath: .spec.template.version
name: Template version
priority: 1
type: string
- jsonPath: .status.templateResolvedVersion
name: Template resolved version
priority: 1
type: string
- jsonPath: .status.reconciliationStatus.status
name: Reconciliation Status
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: Module is the Schema for the modules API
Expand Down
9 changes: 8 additions & 1 deletion cyclops-ctrl/config/crd/bases/cyclops-ui.com_templateauthrules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@ spec:
singular: templateauthrule
scope: Namespaced
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
- jsonPath: .spec.repo
name: Repository
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: TemplateAuthRule is the Schema for the modules API
Expand Down
19 changes: 18 additions & 1 deletion cyclops-ctrl/config/crd/bases/cyclops-ui.com_templatestores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,23 @@ spec:
singular: templatestore
scope: Namespaced
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
- jsonPath: .spec.sourceType
name: Type
type: string
- jsonPath: .spec.repo
name: Repository
type: string
- jsonPath: .spec.path
name: Path
type: string
- jsonPath: .spec.version
name: Version
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: TemplateStore holds reference to a template that can be offered
Expand Down Expand Up @@ -59,3 +75,4 @@ spec:
type: object
served: true
storage: true
subresources: {}
56 changes: 53 additions & 3 deletions install/cyclops-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,33 @@ spec:
singular: module
scope: Namespaced
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
- jsonPath: .spec.targetNamespace
name: Target Namespace
priority: 1
type: string
- jsonPath: .spec.template.repo
name: Template
type: string
- jsonPath: .spec.template.path
name: Template path
priority: 1
type: string
- jsonPath: .spec.template.version
name: Template version
priority: 1
type: string
- jsonPath: .status.templateResolvedVersion
name: Template resolved version
priority: 1
type: string
- jsonPath: .status.reconciliationStatus.status
name: Reconciliation Status
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: Module is the Schema for the modules API
Expand Down Expand Up @@ -160,7 +186,14 @@ spec:
singular: templateauthrule
scope: Namespaced
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
- jsonPath: .spec.repo
name: Repository
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: TemplateAuthRule is the Schema for the modules API
Expand Down Expand Up @@ -263,7 +296,23 @@ spec:
singular: templatestore
scope: Namespaced
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
- jsonPath: .spec.sourceType
name: Type
type: string
- jsonPath: .spec.repo
name: Repository
type: string
- jsonPath: .spec.path
name: Path
type: string
- jsonPath: .spec.version
name: Version
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: TemplateStore holds reference to a template that can be offered
Expand Down Expand Up @@ -308,6 +357,7 @@ spec:
type: object
served: true
storage: true
subresources: {}
---
apiVersion: v1
kind: Namespace
Expand Down