Update resources for print column

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

api/v1/clusterextensionrevision_types.go

@@ -17,131 +17,131 @@ limitations under the License.
 package v1
 
 import (
-    metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-    "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-    "k8s.io/apimachinery/pkg/types"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/types"
 )
 
 const (
-    ClusterExtensionRevisionKind = "ClusterExtensionRevision"
-
-    // Condition Types
-    ClusterExtensionRevisionTypeAvailable = "Available"
-    ClusterExtensionRevisionTypeSucceeded = "Succeeded"
-
-    // Condition Reasons
-    ClusterExtensionRevisionReasonAvailable                 = "Available"
-    ClusterExtensionRevisionReasonReconcileFailure          = "ReconcileFailure"
-    ClusterExtensionRevisionReasonRevisionValidationFailure = "RevisionValidationFailure"
-    ClusterExtensionRevisionReasonPhaseValidationError      = "PhaseValidationError"
-    ClusterExtensionRevisionReasonObjectCollisions          = "ObjectCollisions"
-    ClusterExtensionRevisionReasonRolloutSuccess            = "RolloutSuccess"
-    ClusterExtensionRevisionReasonProbeFailure              = "ProbeFailure"
-    ClusterExtensionRevisionReasonIncomplete                = "Incomplete"
-    ClusterExtensionRevisionReasonProgressing               = "Progressing"
-    ClusterExtensionRevisionReasonArchived                  = "Archived"
+	ClusterExtensionRevisionKind = "ClusterExtensionRevision"
+
+	// Condition Types
+	ClusterExtensionRevisionTypeAvailable = "Available"
+	ClusterExtensionRevisionTypeSucceeded = "Succeeded"
+
+	// Condition Reasons
+	ClusterExtensionRevisionReasonAvailable                 = "Available"
+	ClusterExtensionRevisionReasonReconcileFailure          = "ReconcileFailure"
+	ClusterExtensionRevisionReasonRevisionValidationFailure = "RevisionValidationFailure"
+	ClusterExtensionRevisionReasonPhaseValidationError      = "PhaseValidationError"
+	ClusterExtensionRevisionReasonObjectCollisions          = "ObjectCollisions"
+	ClusterExtensionRevisionReasonRolloutSuccess            = "RolloutSuccess"
+	ClusterExtensionRevisionReasonProbeFailure              = "ProbeFailure"
+	ClusterExtensionRevisionReasonIncomplete                = "Incomplete"
+	ClusterExtensionRevisionReasonProgressing               = "Progressing"
+	ClusterExtensionRevisionReasonArchived                  = "Archived"
 )
 
 // ClusterExtensionRevisionSpec defines the desired state of ClusterExtensionRevision.
 type ClusterExtensionRevisionSpec struct {
-    // Specifies the lifecycle state of the ClusterExtensionRevision.
-    //
-    // +kubebuilder:default="Active"
-    // +kubebuilder:validation:Enum=Active;Paused;Archived
-    // +kubebuilder:validation:XValidation:rule="oldSelf == 'Active' || oldSelf == 'Paused' || oldSelf == 'Archived' && oldSelf == self", message="can not un-archive"
-    LifecycleState ClusterExtensionRevisionLifecycleState `json:"lifecycleState,omitempty"`
-    // Revision is a sequence number representing a specific revision of the ClusterExtension instance.
-    // Must be positive. Each ClusterExtensionRevision of the same parent ClusterExtension needs to have
-    // a unique value assigned. It is immutable after creation. The new revision number must always be previous revision +1.
-    //
-    // +kubebuilder:validation:Required
-    // +kubebuilder:validation:Minimum:=1
-    // +kubebuilder:validation:XValidation:rule="self == oldSelf", message="revision is immutable"
-    Revision int64 `json:"revision"`
-    // Phases are groups of objects that will be applied at the same time.
-    // All objects in the phase will have to pass their probes in order to progress to the next phase.
-    //
-    // +kubebuilder:validation:XValidation:rule="self == oldSelf || oldSelf.size() == 0", message="phases is immutable"
-    // +listType=map
-    // +listMapKey=name
-    // +optional
-    Phases []ClusterExtensionRevisionPhase `json:"phases,omitempty"`
-    // Previous references previous revisions that objects can be adopted from.
-    //
-    // +kubebuilder:validation:XValidation:rule="self == oldSelf", message="previous is immutable"
-    Previous []ClusterExtensionRevisionPrevious `json:"previous,omitempty"`
+	// Specifies the lifecycle state of the ClusterExtensionRevision.
+	//
+	// +kubebuilder:default="Active"
+	// +kubebuilder:validation:Enum=Active;Paused;Archived
+	// +kubebuilder:validation:XValidation:rule="oldSelf == 'Active' || oldSelf == 'Paused' || oldSelf == 'Archived' && oldSelf == self", message="can not un-archive"
+	LifecycleState ClusterExtensionRevisionLifecycleState `json:"lifecycleState,omitempty"`
+	// Revision is a sequence number representing a specific revision of the ClusterExtension instance.
+	// Must be positive. Each ClusterExtensionRevision of the same parent ClusterExtension needs to have
+	// a unique value assigned. It is immutable after creation. The new revision number must always be previous revision +1.
+	//
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:Minimum:=1
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="revision is immutable"
+	Revision int64 `json:"revision"`
+	// Phases are groups of objects that will be applied at the same time.
+	// All objects in the phase will have to pass their probes in order to progress to the next phase.
+	//
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf || oldSelf.size() == 0", message="phases is immutable"
+	// +listType=map
+	// +listMapKey=name
+	// +optional
+	Phases []ClusterExtensionRevisionPhase `json:"phases,omitempty"`
+	// Previous references previous revisions that objects can be adopted from.
+	//
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="previous is immutable"
+	Previous []ClusterExtensionRevisionPrevious `json:"previous,omitempty"`
 }
 
 // ClusterExtensionRevisionLifecycleState specifies the lifecycle state of the ClusterExtensionRevision.
 type ClusterExtensionRevisionLifecycleState string
 
 const (
-    // ClusterExtensionRevisionLifecycleStateActive / "Active" is the default lifecycle state.
-    ClusterExtensionRevisionLifecycleStateActive ClusterExtensionRevisionLifecycleState = "Active"
-    // ClusterExtensionRevisionLifecycleStatePaused / "Paused" disables reconciliation of the ClusterExtensionRevision.
-    // Only Status updates will still propagated, but object changes will not be reconciled.
-    ClusterExtensionRevisionLifecycleStatePaused ClusterExtensionRevisionLifecycleState = "Paused"
-    // ClusterExtensionRevisionLifecycleStateArchived / "Archived" disables reconciliation while also "scaling to zero",
-    // which deletes all objects that are not excluded via the pausedFor property and
-    // removes itself from the owner list of all other objects previously under management.
-    ClusterExtensionRevisionLifecycleStateArchived ClusterExtensionRevisionLifecycleState = "Archived"
+	// ClusterExtensionRevisionLifecycleStateActive / "Active" is the default lifecycle state.
+	ClusterExtensionRevisionLifecycleStateActive ClusterExtensionRevisionLifecycleState = "Active"
+	// ClusterExtensionRevisionLifecycleStatePaused / "Paused" disables reconciliation of the ClusterExtensionRevision.
+	// Only Status updates will still propagated, but object changes will not be reconciled.
+	ClusterExtensionRevisionLifecycleStatePaused ClusterExtensionRevisionLifecycleState = "Paused"
+	// ClusterExtensionRevisionLifecycleStateArchived / "Archived" disables reconciliation while also "scaling to zero",
+	// which deletes all objects that are not excluded via the pausedFor property and
+	// removes itself from the owner list of all other objects previously under management.
+	ClusterExtensionRevisionLifecycleStateArchived ClusterExtensionRevisionLifecycleState = "Archived"
 )
 
 // ClusterExtensionRevisionPhase are groups of objects that will be applied at the same time.
 // All objects in the a phase will have to pass their probes in order to progress to the next phase.
 type ClusterExtensionRevisionPhase struct {
-    // Name identifies this phase.
-    //
-    // +kubebuilder:validation:MaxLength=63
-    // +kubebuilder:validation:Pattern=`^[a-z]([-a-z0-9]*[a-z0-9])?$`
-    Name string `json:"name"`
-    // Objects are a list of all the objects within this phase.
-    Objects []ClusterExtensionRevisionObject `json:"objects"`
+	// Name identifies this phase.
+	//
+	// +kubebuilder:validation:MaxLength=63
+	// +kubebuilder:validation:Pattern=`^[a-z]([-a-z0-9]*[a-z0-9])?$`
+	Name string `json:"name"`
+	// Objects are a list of all the objects within this phase.
+	Objects []ClusterExtensionRevisionObject `json:"objects"`
 }
 
 // ClusterExtensionRevisionObject contains an object and settings for it.
 type ClusterExtensionRevisionObject struct {
-    // +kubebuilder:validation:EmbeddedResource
-    // +kubebuilder:pruning:PreserveUnknownFields
-    Object unstructured.Unstructured `json:"object"`
-    // CollisionProtection controls whether OLM can adopt and modify objects
-    // already existing on the cluster or even owned by another controller.
-    //
-    // +kubebuilder:default="Prevent"
-    // +optional
-    CollisionProtection CollisionProtection `json:"collisionProtection,omitempty"`
+	// +kubebuilder:validation:EmbeddedResource
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Object unstructured.Unstructured `json:"object"`
+	// CollisionProtection controls whether OLM can adopt and modify objects
+	// already existing on the cluster or even owned by another controller.
+	//
+	// +kubebuilder:default="Prevent"
+	// +optional
+	CollisionProtection CollisionProtection `json:"collisionProtection,omitempty"`
 }
 
 // CollisionProtection specifies if and how ownership collisions are prevented.
 type CollisionProtection string
 
 const (
-    // CollisionProtectionPrevent prevents owner collisions entirely
-    // by only allowing to work with objects itself has created.
-    CollisionProtectionPrevent CollisionProtection = "Prevent"
-    // CollisionProtectionIfNoController allows to patch and override
-    // objects already present if they are not owned by another controller.
-    CollisionProtectionIfNoController CollisionProtection = "IfNoController"
-    // CollisionProtectionNone allows to patch and override objects
-    // already present and owned by other controllers.
-    // Be careful! This setting may cause multiple controllers to fight over a resource,
-    // causing load on the API server and etcd.
-    CollisionProtectionNone CollisionProtection = "None"
+	// CollisionProtectionPrevent prevents owner collisions entirely
+	// by only allowing to work with objects itself has created.
+	CollisionProtectionPrevent CollisionProtection = "Prevent"
+	// CollisionProtectionIfNoController allows to patch and override
+	// objects already present if they are not owned by another controller.
+	CollisionProtectionIfNoController CollisionProtection = "IfNoController"
+	// CollisionProtectionNone allows to patch and override objects
+	// already present and owned by other controllers.
+	// Be careful! This setting may cause multiple controllers to fight over a resource,
+	// causing load on the API server and etcd.
+	CollisionProtectionNone CollisionProtection = "None"
 )
 
 type ClusterExtensionRevisionPrevious struct {
-    // +kubebuilder:validation:Required
-    Name string `json:"name"`
-    // +kubebuilder:validation:Required
-    UID types.UID `json:"uid"`
+	// +kubebuilder:validation:Required
+	Name string `json:"name"`
+	// +kubebuilder:validation:Required
+	UID types.UID `json:"uid"`
 }
 
 // ClusterExtensionRevisionStatus defines the observed state of a ClusterExtensionRevision.
 type ClusterExtensionRevisionStatus struct {
-    // +listType=map
-    // +listMapKey=type
-    // +optional
-    Conditions []metav1.Condition `json:"conditions,omitempty"`
+	// +listType=map
+	// +listMapKey=type
+	// +optional
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -152,33 +152,33 @@ type ClusterExtensionRevisionStatus struct {
 // +kubebuilder:printcolumn:name="Available",type=string,JSONPath=`.status.conditions[?(@.type=='Available')].status`
 // +kubebuilder:printcolumn:name=Age,type=date,JSONPath=`.metadata.creationTimestamp`
 type ClusterExtensionRevision struct {
-    metav1.TypeMeta   `json:",inline"`
-    metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-    // spec is an optional field that defines the desired state of the ClusterExtension.
-    // +optional
-    Spec ClusterExtensionRevisionSpec `json:"spec,omitempty"`
+	// spec is an optional field that defines the desired state of the ClusterExtension.
+	// +optional
+	Spec ClusterExtensionRevisionSpec `json:"spec,omitempty"`
 
-    // status is an optional field that defines the observed state of the ClusterExtension.
-    // +optional
-    Status ClusterExtensionRevisionStatus `json:"status,omitempty"`
+	// status is an optional field that defines the observed state of the ClusterExtension.
+	// +optional
+	Status ClusterExtensionRevisionStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
 // ClusterExtensionRevisionList contains a list of ClusterExtensionRevision
 type ClusterExtensionRevisionList struct {
-    metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta `json:",inline"`
 
-    // +optional
-    metav1.ListMeta `json:"metadata,omitempty"`
+	// +optional
+	metav1.ListMeta `json:"metadata,omitempty"`
 
-    // items is a required list of ClusterExtensionRevision objects.
-    //
-    // +kubebuilder:validation:Required
-    Items []ClusterExtensionRevision `json:"items"`
+	// items is a required list of ClusterExtensionRevision objects.
+	//
+	// +kubebuilder:validation:Required
+	Items []ClusterExtensionRevision `json:"items"`
 }
 
 func init() {
-    SchemeBuilder.Register(&ClusterExtensionRevision{}, &ClusterExtensionRevisionList{})
+	SchemeBuilder.Register(&ClusterExtensionRevision{}, &ClusterExtensionRevisionList{})
 }

helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensionrevisions.yaml

@@ -15,7 +15,14 @@ spec:
     singular: clusterextensionrevision
   scope: Cluster
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=='Available')].status
+      name: Available
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
     schema:
       openAPIV3Schema:
         description: ClusterExtensionRevision is the Schema for the clusterextensionrevisions

manifests/experimental-e2e.yaml

@@ -606,7 +606,14 @@ spec:
     singular: clusterextensionrevision
   scope: Cluster
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=='Available')].status
+      name: Available
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
     schema:
       openAPIV3Schema:
         description: ClusterExtensionRevision is the Schema for the clusterextensionrevisions

manifests/experimental.yaml

@@ -571,7 +571,14 @@ spec:
     singular: clusterextensionrevision
   scope: Cluster
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=='Available')].status
+      name: Available
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
     schema:
       openAPIV3Schema:
         description: ClusterExtensionRevision is the Schema for the clusterextensionrevisions