diff --git a/api/v1beta1/kustomization_types.go b/api/v1beta1/kustomization_types.go index 18850a100..8322cf266 100644 --- a/api/v1beta1/kustomization_types.go +++ b/api/v1beta1/kustomization_types.go @@ -332,8 +332,9 @@ const ( // +kubebuilder:resource:shortName=ks // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description="" -// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description="" +// +kubebuilder:printcolumn:name="Suspended",type="string",JSONPath=".spec.suspended" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="" +// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description="" // Kustomization is the Schema for the kustomizations API. type Kustomization struct { diff --git a/api/v1beta2/kustomization_types.go b/api/v1beta2/kustomization_types.go index 9a2d94753..c238b9728 100644 --- a/api/v1beta2/kustomization_types.go +++ b/api/v1beta2/kustomization_types.go @@ -17,10 +17,10 @@ limitations under the License. package v1beta2 import ( - apimeta "k8s.io/apimachinery/pkg/api/meta" "time" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apimeta "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -327,8 +327,9 @@ func (in *Kustomization) GetStatusConditions() *[]metav1.Condition { // +kubebuilder:resource:shortName=ks // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description="" -// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description="" +// +kubebuilder:printcolumn:name="Suspended",type="string",JSONPath=".spec.suspended" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="" +// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description="" // Kustomization is the Schema for the kustomizations API. type Kustomization struct { diff --git a/config/crd/bases/kustomize.toolkit.fluxcd.io_kustomizations.yaml b/config/crd/bases/kustomize.toolkit.fluxcd.io_kustomizations.yaml index 87eefc253..e08bf46cf 100644 --- a/config/crd/bases/kustomize.toolkit.fluxcd.io_kustomizations.yaml +++ b/config/crd/bases/kustomize.toolkit.fluxcd.io_kustomizations.yaml @@ -22,12 +22,15 @@ spec: - jsonPath: .status.conditions[?(@.type=="Ready")].status name: Ready type: string - - jsonPath: .status.conditions[?(@.type=="Ready")].message - name: Status + - jsonPath: .spec.suspended + name: Suspended type: string - jsonPath: .metadata.creationTimestamp name: Age type: date + - jsonPath: .status.conditions[?(@.type=="Ready")].message + name: Status + type: string name: v1beta1 schema: openAPIV3Schema: @@ -557,12 +560,15 @@ spec: - jsonPath: .status.conditions[?(@.type=="Ready")].status name: Ready type: string - - jsonPath: .status.conditions[?(@.type=="Ready")].message - name: Status + - jsonPath: .spec.suspended + name: Suspended type: string - jsonPath: .metadata.creationTimestamp name: Age type: date + - jsonPath: .status.conditions[?(@.type=="Ready")].message + name: Status + type: string name: v1beta2 schema: openAPIV3Schema: