Add Conditions printcolumns to all resources

Fixes Azure#1665
matthchr · Aug 10, 2021 · aa25c92 · aa25c92
1 parent 62d6c85
commit aa25c92
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/hack/generator/pkg/codegen/pipeline/add_status_conditions.go b/hack/generator/pkg/codegen/pipeline/add_status_conditions.go
@@ -48,6 +48,12 @@ func AddStatusConditions(idFactory astmodel.IdentifierFactory) Stage {
 				}
 				resourceType = resourceType.WithInterface(conditionerImpl)
 
+				// Resources with the genruntime.Conditioner interface should also have kubebuilder:printcolumn set
+				// so that the conditions are displayed
+				resourceType = resourceType.WithAnnotation("// +kubebuilder:printcolumn:name=\"Ready\",type=\"string\",JSONPath=\".status.conditions[?(@.type=='Ready')].status\"")
+				resourceType = resourceType.WithAnnotation("// +kubebuilder:printcolumn:name=\"Reason\",type=\"string\",JSONPath=\".status.conditions[?(@.type=='Ready')].reason\"")
+				resourceType = resourceType.WithAnnotation("// +kubebuilder:printcolumn:name=\"Message\",type=\"string\",JSONPath=\".status.conditions[?(@.type=='Ready')].message\"")
+
 				result.Add(def.WithType(resourceType))
 			}
 			result = defs.OverlayWith(result)

diff --git a/...r/pkg/codegen/pipeline/testdata/TestAddStatusConditions/microsoft.person-v20200101.golden b/...r/pkg/codegen/pipeline/testdata/TestAddStatusConditions/microsoft.person-v20200101.golden
@@ -10,6 +10,9 @@ import (
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
+// +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].reason"
+// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].message"
 type Person struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`