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

Show stack processing state in printer columns #747

Merged
merged 2 commits into from
Nov 11, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CHANGELOG
- Improved support for using custom program sources. [#741](https://github.com/pulumi/pulumi-kubernetes-operator/pull/741)
- Improved Status logging. [#742](https://github.com/pulumi/pulumi-kubernetes-operator/pull/742)
- Support for ReconcileRequest annotation. [#745](https://github.com/pulumi/pulumi-kubernetes-operator/pull/745)
- Show stack processing state in printer columns. [#747](https://github.com/pulumi/pulumi-kubernetes-operator/pull/747)

## 2.0.0-beta.1 (2024-10-18)

Expand Down
26 changes: 23 additions & 3 deletions deploy/crds/pulumi.com_stacks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,31 @@ spec:
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
- jsonPath: .spec.stack
name: Stack
priority: 10
type: string
- jsonPath: .status.lastUpdate.state
name: Last Update
type: string
- jsonPath: .status.lastUpdate.lastResyncTime
name: Age
type: date
- jsonPath: .status.lastUpdate.state
name: State
- jsonPath: .status.lastUpdate.lastAttemptedCommit
name: Last Commit
priority: 10
type: string
- jsonPath: .status.conditions[?(@.type=="Ready")].status
name: Ready
type: string
- jsonPath: .status.conditions[?(@.type=="Reconciling")].reason
name: Reconciling
type: string
- jsonPath: .status.conditions[?(@.type=="Stalled")].status
name: Stalled
type: string
- jsonPath: .status.lastUpdate.permalink
name: Permalink
type: string
name: v1
schema:
Expand Down
26 changes: 23 additions & 3 deletions deploy/helm/pulumi-operator/crds/pulumi.com_stacks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,31 @@ spec:
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
- jsonPath: .spec.stack
name: Stack
priority: 10
type: string
- jsonPath: .status.lastUpdate.state
name: Last Update
type: string
- jsonPath: .status.lastUpdate.lastResyncTime
name: Age
type: date
- jsonPath: .status.lastUpdate.state
name: State
- jsonPath: .status.lastUpdate.lastAttemptedCommit
name: Last Commit
priority: 10
type: string
- jsonPath: .status.conditions[?(@.type=="Ready")].status
name: Ready
type: string
- jsonPath: .status.conditions[?(@.type=="Reconciling")].reason
name: Reconciling
type: string
- jsonPath: .status.conditions[?(@.type=="Stalled")].status
name: Stalled
type: string
- jsonPath: .status.lastUpdate.permalink
name: Permalink
type: string
name: v1
schema:
Expand Down
26 changes: 23 additions & 3 deletions deploy/yaml/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,31 @@ spec:
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
- jsonPath: .spec.stack
name: Stack
priority: 10
type: string
- jsonPath: .status.lastUpdate.state
name: Last Update
type: string
- jsonPath: .status.lastUpdate.lastResyncTime
name: Age
type: date
- jsonPath: .status.lastUpdate.state
name: State
- jsonPath: .status.lastUpdate.lastAttemptedCommit
name: Last Commit
priority: 10
type: string
- jsonPath: .status.conditions[?(@.type=="Ready")].status
name: Ready
type: string
- jsonPath: .status.conditions[?(@.type=="Reconciling")].reason
name: Reconciling
type: string
- jsonPath: .status.conditions[?(@.type=="Stalled")].status
name: Stalled
type: string
- jsonPath: .status.lastUpdate.permalink
name: Permalink
type: string
name: v1
schema:
Expand Down
15 changes: 10 additions & 5 deletions operator/api/pulumi/v1/stack_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,17 @@ func (s *StackStatus) MarkReadyCondition() {
})
}

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:storageversion
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
// +kubebuilder:printcolumn:name="State",type="string",JSONPath=".status.lastUpdate.state"

// +kubebuilder:printcolumn:name="Stack",priority=10,type="string",JSONPath=".spec.stack"
// +kubebuilder:printcolumn:name="Last Update",type="string",JSONPath=".status.lastUpdate.state"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".status.lastUpdate.lastResyncTime"
// +kubebuilder:printcolumn:name="Last Commit",priority=10,type="string",JSONPath=".status.lastUpdate.lastAttemptedCommit"
// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].status`
// +kubebuilder:printcolumn:name="Reconciling",type=string,JSONPath=`.status.conditions[?(@.type=="Reconciling")].reason`
// +kubebuilder:printcolumn:name="Stalled",type=string,JSONPath=`.status.conditions[?(@.type=="Stalled")].status`
// +kubebuilder:printcolumn:name="Permalink",type="string",JSONPath=".status.lastUpdate.permalink"
// Stack is the Schema for the stacks API
type Stack struct {
metav1.TypeMeta `json:",inline"`
Expand Down
26 changes: 23 additions & 3 deletions operator/config/crd/bases/pulumi.com_stacks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,31 @@ spec:
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
- jsonPath: .spec.stack
name: Stack
priority: 10
type: string
- jsonPath: .status.lastUpdate.state
name: Last Update
type: string
- jsonPath: .status.lastUpdate.lastResyncTime
name: Age
type: date
- jsonPath: .status.lastUpdate.state
name: State
- jsonPath: .status.lastUpdate.lastAttemptedCommit
name: Last Commit
priority: 10
type: string
- jsonPath: .status.conditions[?(@.type=="Ready")].status
name: Ready
type: string
- jsonPath: .status.conditions[?(@.type=="Reconciling")].reason
name: Reconciling
type: string
- jsonPath: .status.conditions[?(@.type=="Stalled")].status
name: Stalled
type: string
- jsonPath: .status.lastUpdate.permalink
name: Permalink
type: string
name: v1
schema:
Expand Down