fix: use conditions to show policy ready status (#6071)

* fix: use conditions to show policy ready status Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> * fix Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com> Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
2024-12-14 11:57:48 +00:00 · 2023-01-30 11:16:49 +01:00 · 2023-01-30 11:16:49 +01:00 · 8250dc6ca3
commit 8250dc6ca3
parent a8f5a4798e
8 changed files with 28 additions and 28 deletions
--- a/api/kyverno/v1/clusterpolicy_types.go
+++ b/api/kyverno/v1/clusterpolicy_types.go
@ -17,7 +17,7 @@ import (
 // +kubebuilder:printcolumn:name="Background",type=boolean,JSONPath=".spec.background"
 // +kubebuilder:printcolumn:name="Validate Action",type=string,JSONPath=".spec.validationFailureAction"
 // +kubebuilder:printcolumn:name="Failure Policy",type=string,JSONPath=".spec.failurePolicy",priority=1
-// +kubebuilder:printcolumn:name="Ready",type=boolean,JSONPath=`.status.ready`
+// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type == "Ready")].status`
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Validate",type=integer,JSONPath=`.status.rulecount.validate`,priority=1
 // +kubebuilder:printcolumn:name="Mutate",type=integer,JSONPath=`.status.rulecount.mutate`,priority=1
--- a/api/kyverno/v1/policy_types.go
+++ b/api/kyverno/v1/policy_types.go
@ -15,7 +15,7 @@ import (
 // +kubebuilder:printcolumn:name="Background",type=boolean,JSONPath=".spec.background"
 // +kubebuilder:printcolumn:name="Validate Action",type=string,JSONPath=".spec.validationFailureAction"
 // +kubebuilder:printcolumn:name="Failure Policy",type=string,JSONPath=".spec.failurePolicy",priority=1
-// +kubebuilder:printcolumn:name="Ready",type=boolean,JSONPath=`.status.ready`
+// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type == "Ready")].status`
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Validate",type=integer,JSONPath=`.status.rulecount.validate`,priority=1
 // +kubebuilder:printcolumn:name="Mutate",type=integer,JSONPath=`.status.rulecount.mutate`,priority=1
--- a/api/kyverno/v2beta1/clusterpolicy_types.go
+++ b/api/kyverno/v2beta1/clusterpolicy_types.go
@ -18,7 +18,7 @@ import (
 // +kubebuilder:printcolumn:name="Background",type=boolean,JSONPath=".spec.background"
 // +kubebuilder:printcolumn:name="Validate Action",type=string,JSONPath=".spec.validationFailureAction"
 // +kubebuilder:printcolumn:name="Failure Policy",type=string,JSONPath=".spec.failurePolicy",priority=1
-// +kubebuilder:printcolumn:name="Ready",type=boolean,JSONPath=`.status.ready`
+// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type == "Ready")].status`
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Validate",type=integer,JSONPath=`.status.rulecount.validate`,priority=1
 // +kubebuilder:printcolumn:name="Mutate",type=integer,JSONPath=`.status.rulecount.mutate`,priority=1
--- a/api/kyverno/v2beta1/policy_types.go
+++ b/api/kyverno/v2beta1/policy_types.go
@ -16,7 +16,7 @@ import (
 // +kubebuilder:printcolumn:name="Background",type=boolean,JSONPath=".spec.background"
 // +kubebuilder:printcolumn:name="Validate Action",type=string,JSONPath=".spec.validationFailureAction"
 // +kubebuilder:printcolumn:name="Failure Policy",type=string,JSONPath=".spec.failurePolicy",priority=1
-// +kubebuilder:printcolumn:name="Ready",type=boolean,JSONPath=`.status.ready`
+// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type == "Ready")].status`
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Validate",type=integer,JSONPath=`.status.rulecount.validate`,priority=1
 // +kubebuilder:printcolumn:name="Mutate",type=integer,JSONPath=`.status.rulecount.mutate`,priority=1
--- a/charts/kyverno/templates/crds/crds.yaml
+++ b/charts/kyverno/templates/crds/crds.yaml
@ -3432,9 +3432,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
@ -10109,9 +10109,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
@ -16542,9 +16542,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
@ -23221,9 +23221,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
--- a/config/crds/kyverno.io_clusterpolicies.yaml
+++ b/config/crds/kyverno.io_clusterpolicies.yaml
@ -30,9 +30,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
@ -6707,9 +6707,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
--- a/config/crds/kyverno.io_policies.yaml
+++ b/config/crds/kyverno.io_policies.yaml
@ -30,9 +30,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
@ -6709,9 +6709,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
--- a/config/install.yaml
+++ b/config/install.yaml
@ -3503,9 +3503,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
@ -10180,9 +10180,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
@ -16613,9 +16613,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date
@ -23292,9 +23292,9 @@ spec:
      name: Failure Policy
      priority: 1
      type: string
-    - jsonPath: .status.ready
+    - jsonPath: .status.conditions[?(@.type == "Ready")].status
      name: Ready
-      type: boolean
+      type: string
    - jsonPath: .metadata.creationTimestamp
      name: Age
      type: date