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.

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

[CN-1004] Print HazelcastReference column in the wide output of CRDs referencing to Hazelcast CR #899

Merged
merged 1 commit into from Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions api/v1alpha1/cache_types.go
Expand Up @@ -44,6 +44,7 @@ type CacheStatus struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="Current state of the Cache Config"
// +kubebuilder:printcolumn:name="Hazelcast-Resource",type="string",priority=1,JSONPath=".spec.hazelcastResourceName",description="Name of the Hazelcast resource that this resource is created for"
// +kubebuilder:printcolumn:name="Message",type="string",priority=1,JSONPath=".status.message",description="Message for the current Cache Config"
// +kubebuilder:resource:shortName=ch

Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/cronhotbackup_types.go
Expand Up @@ -63,6 +63,7 @@ type CronHotBackupStatus struct{}
// +kubebuilder:resource:shortName=chb
// CronHotBackup is the Schema for the cronhotbackups API
// +kubebuilder:printcolumn:name="SUSPENDED",type="boolean",JSONPath=".spec.suspend",description="Suspention status of the CronHotBackup"
// +kubebuilder:printcolumn:name="Hazelcast-Resource",type="string",priority=1,JSONPath=".spec.hotBackupTemplate.spec.hazelcastResourceName",description="Name of the Hazelcast resource that this resource is created for"
type CronHotBackup struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/hazelcastendpoint_types.go
Expand Up @@ -45,6 +45,7 @@ type HazelcastEndpointStatus struct {
// HazelcastEndpoint is the Schema for the hazelcastendpoints API
// +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type",description="Type of the HazelcastEndpoint"
// +kubebuilder:printcolumn:name="Address",type="string",JSONPath=".status.address",description="Address of the HazelcastEndpoint"
// +kubebuilder:printcolumn:name="Hazelcast-Resource",type="string",priority=1,JSONPath=".spec.hazelcastResourceName",description="Name of the Hazelcast resource that this resource is created for"
// +kubebuilder:printcolumn:name="Message",type="string",priority=1,JSONPath=".status.message",description="Message for the current HazelcastEndpoint"
// +kubebuilder:resource:shortName=hzep
type HazelcastEndpoint struct {
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/hotbackup_types.go
Expand Up @@ -113,6 +113,7 @@ func (hbs *HotBackupSpec) IsExternal() bool {

// HotBackup is the Schema for the hot backup API
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="Current state of the HotBackup process"
// +kubebuilder:printcolumn:name="Hazelcast-Resource",type="string",priority=1,JSONPath=".spec.hazelcastResourceName",description="Name of the Hazelcast resource that this resource is created for"
// +kubebuilder:printcolumn:name="Message",type="string",priority=1,JSONPath=".status.message",description="Message for the current HotBackup Config"
// +kubebuilder:resource:shortName=hb
type HotBackup struct {
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/jetjob_types.go
Expand Up @@ -120,6 +120,7 @@ func (jjs JetJobStatusPhase) IsSuspended() bool {
//+kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase",description="Current state of the JetJob"
// +kubebuilder:printcolumn:name="Id",type="string",JSONPath=".status.id",description="ID of the JetJob"
// +kubebuilder:printcolumn:name="Hazelcast-Resource",type="string",priority=1,JSONPath=".spec.hazelcastResourceName",description="Name of the Hazelcast resource that this resource is created for"
// +kubebuilder:printcolumn:name="SubmissionTime",type="string",JSONPath=".status.submissionTime",description="Time when the JetJob was submitted"
// +kubebuilder:printcolumn:name="CompletionTime",type="string",JSONPath=".status.completionTime",description="Time when the JetJob was completed"
// +kubebuilder:resource:shortName=jj
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/map_types.go
Expand Up @@ -366,6 +366,7 @@ type EventJournal struct {

// Map is the Schema for the maps API
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="Current state of the Map Config"
// +kubebuilder:printcolumn:name="Hazelcast-Resource",type="string",priority=1,JSONPath=".spec.hazelcastResourceName",description="Name of the Hazelcast resource that this resource is created for"
// +kubebuilder:printcolumn:name="Message",type="string",priority=1,JSONPath=".status.message",description="Message for the current Map Config"
type Map struct {
metav1.TypeMeta `json:",inline"`
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/multimap_types.go
Expand Up @@ -44,6 +44,7 @@ type MultiMapStatus struct {

// MultiMap is the Schema for the multimaps API
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="Current state of the MultiMap Config"
// +kubebuilder:printcolumn:name="Hazelcast-Resource",type="string",priority=1,JSONPath=".spec.hazelcastResourceName",description="Name of the Hazelcast resource that this resource is created for"
// +kubebuilder:printcolumn:name="Message",type="string",priority=1,JSONPath=".status.message",description="Message for the current MultiMap Config"
// +kubebuilder:resource:shortName=mmap
type MultiMap struct {
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/queue_types.go
Expand Up @@ -40,6 +40,7 @@ type QueueStatus struct {
//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="Current state of the Queue Config"
// +kubebuilder:printcolumn:name="Hazelcast-Resource",type="string",priority=1,JSONPath=".spec.hazelcastResourceName",description="Name of the Hazelcast resource that this resource is created for"
// +kubebuilder:printcolumn:name="Message",type="string",priority=1,JSONPath=".status.message",description="Message for the current Queue Config"
// +kubebuilder:resource:shortName=q

Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/replicatedmap_types.go
Expand Up @@ -52,6 +52,7 @@ const (

// ReplicatedMap is the Schema for the replicatedmaps API
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="Current state of the ReplicatedMap Config"
// +kubebuilder:printcolumn:name="Hazelcast-Resource",type="string",priority=1,JSONPath=".spec.hazelcastResourceName",description="Name of the Hazelcast resource that this resource is created for"
// +kubebuilder:printcolumn:name="Message",type="string",priority=1,JSONPath=".status.message",description="Message for the current ReplicatedMap Config"
// +kubebuilder:resource:shortName=rmap
type ReplicatedMap struct {
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/topic_types.go
Expand Up @@ -41,6 +41,7 @@ type TopicStatus struct {
//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="Current state of the Topic Config"
// +kubebuilder:printcolumn:name="Hazelcast-Resource",type="string",priority=1,JSONPath=".spec.hazelcastResourceName",description="Name of the Hazelcast resource that this resource is created for"
// +kubebuilder:printcolumn:name="Message",type="string",priority=1,JSONPath=".status.message",description="Message for the current Topic Config"

// Topic is the Schema for the topics API
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/hazelcast.com_caches.yaml
Expand Up @@ -22,6 +22,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current Cache Config
jsonPath: .status.message
name: Message
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/hazelcast.com_cronhotbackups.yaml
Expand Up @@ -22,6 +22,11 @@ spec:
jsonPath: .spec.suspend
name: SUSPENDED
type: boolean
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hotBackupTemplate.spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
name: v1alpha1
schema:
openAPIV3Schema:
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/hazelcast.com_hazelcastendpoints.yaml
Expand Up @@ -26,6 +26,11 @@ spec:
jsonPath: .status.address
name: Address
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current HazelcastEndpoint
jsonPath: .status.message
name: Message
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/hazelcast.com_hotbackups.yaml
Expand Up @@ -22,6 +22,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current HotBackup Config
jsonPath: .status.message
name: Message
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/hazelcast.com_jetjobs.yaml
Expand Up @@ -26,6 +26,11 @@ spec:
jsonPath: .status.id
name: Id
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Time when the JetJob was submitted
jsonPath: .status.submissionTime
name: SubmissionTime
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/hazelcast.com_maps.yaml
Expand Up @@ -20,6 +20,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current Map Config
jsonPath: .status.message
name: Message
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/hazelcast.com_multimaps.yaml
Expand Up @@ -22,6 +22,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current MultiMap Config
jsonPath: .status.message
name: Message
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/hazelcast.com_queues.yaml
Expand Up @@ -22,6 +22,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current Queue Config
jsonPath: .status.message
name: Message
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/hazelcast.com_replicatedmaps.yaml
Expand Up @@ -22,6 +22,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current ReplicatedMap Config
jsonPath: .status.message
name: Message
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/hazelcast.com_topics.yaml
Expand Up @@ -20,6 +20,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current Topic Config
jsonPath: .status.message
name: Message
Expand Down
Expand Up @@ -22,6 +22,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current Cache Config
jsonPath: .status.message
name: Message
Expand Down Expand Up @@ -169,6 +174,11 @@ spec:
jsonPath: .spec.suspend
name: SUSPENDED
type: boolean
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hotBackupTemplate.spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
name: v1alpha1
schema:
openAPIV3Schema:
Expand Down Expand Up @@ -301,6 +311,11 @@ spec:
jsonPath: .status.address
name: Address
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current HazelcastEndpoint
jsonPath: .status.message
name: Message
Expand Down Expand Up @@ -2406,6 +2421,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current HotBackup Config
jsonPath: .status.message
name: Message
Expand Down Expand Up @@ -2504,6 +2524,11 @@ spec:
jsonPath: .status.id
name: Id
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Time when the JetJob was submitted
jsonPath: .status.submissionTime
name: SubmissionTime
Expand Down Expand Up @@ -4095,6 +4120,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current Map Config
jsonPath: .status.message
name: Message
Expand Down Expand Up @@ -4475,6 +4505,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current MultiMap Config
jsonPath: .status.message
name: Message
Expand Down Expand Up @@ -4597,6 +4632,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current Queue Config
jsonPath: .status.message
name: Message
Expand Down Expand Up @@ -4726,6 +4766,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current ReplicatedMap Config
jsonPath: .status.message
name: Message
Expand Down Expand Up @@ -4832,6 +4877,11 @@ spec:
jsonPath: .status.state
name: Status
type: string
- description: Name of the Hazelcast resource that this resource is created for
jsonPath: .spec.hazelcastResourceName
name: Hazelcast-Resource
priority: 1
type: string
- description: Message for the current Topic Config
jsonPath: .status.message
name: Message
Expand Down