add custom columns to "kubectl get" output for liqo CRDs

liqotech · Jul 14, 2021 · 51aca8a · 51aca8a
1 parent d397a05
commit 51aca8a
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 7 deletions.
diff --git a/apis/discovery/v1alpha1/resourcerequest_types.go b/apis/discovery/v1alpha1/resourcerequest_types.go
@@ -34,6 +34,8 @@ type ResourceRequestStatus struct {
 // +kubebuilder:subresource:status
 
 // ResourceRequest is the Schema for the ResourceRequests API.
+// +kubebuilder:printcolumn:name="Local",type=string,JSONPath=`.metadata.labels.liqo\.io/replication`
+// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 type ResourceRequest struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/apis/net/v1alpha1/networkconfig_types.go b/apis/net/v1alpha1/networkconfig_types.go
@@ -64,6 +64,12 @@ type NetworkConfigStatus struct {
 // +kubebuilder:subresource:status
 
 // NetworkConfig is the Schema for the networkconfigs API.
+// +kubebuilder:printcolumn:name="Peering Cluster ID",type=string,JSONPath=`.spec.clusterID`
+// +kubebuilder:printcolumn:name="Endpoint IP",type=string,JSONPath=`.spec.endpointIP`,priority=1
+// +kubebuilder:printcolumn:name="VPN Backend",type=string,JSONPath=`.spec.backendType`,priority=1
+// +kubebuilder:printcolumn:name="Processed",type=string,JSONPath=`.status.processed`
+// +kubebuilder:printcolumn:name="Local",type=string,JSONPath=`.metadata.labels.liqo\.io/replication`
+// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 type NetworkConfig struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/apis/net/v1alpha1/tunnel_endpoint_types.go b/apis/net/v1alpha1/tunnel_endpoint_types.go
@@ -96,9 +96,11 @@ const (
 // +kubebuilder:subresource:status
 
 // TunnelEndpoint is the Schema for the endpoints API.
-// +kubebuilder:printcolumn:name="Endpoint IP",type=string,JSONPath=`.spec.endpointIP`
+// +kubebuilder:printcolumn:name="Peering Cluster ID",type=string,JSONPath=`.spec.clusterID`
+// +kubebuilder:printcolumn:name="Endpoint IP",type=string,JSONPath=`.spec.endpointIP`,priority=1
 // +kubebuilder:printcolumn:name="Backend type",type=string,JSONPath=`.spec.backendType`
 // +kubebuilder:printcolumn:name="Connection status",type=string,JSONPath=`.status.connection.status`
+// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 type TunnelEndpoint struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/apis/sharing/v1alpha1/resourceoffer_types.go b/apis/sharing/v1alpha1/resourceoffer_types.go
@@ -73,8 +73,8 @@ type ResourceOfferStatus struct {
 
 // ResourceOffer is the Schema for the resourceOffers API.
 // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.phase`
-// +kubebuilder:printcolumn:name="Expiration",type=string,JSONPath=`.spec.timeToLive`
 // +kubebuilder:printcolumn:name="VirtualKubeletStatus",type=string,JSONPath=`.status.virtualKubeletStatus`
+// +kubebuilder:printcolumn:name="Local",type=string,JSONPath=`.metadata.labels.liqo\.io/replication`
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 type ResourceOffer struct {
 	metav1.TypeMeta   `json:",inline"`

diff --git a/deployments/liqo/crds/discovery.liqo.io_resourcerequests.yaml b/deployments/liqo/crds/discovery.liqo.io_resourcerequests.yaml
@@ -16,7 +16,14 @@ spec:
     singular: resourcerequest
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.labels.liqo\.io/replication
+      name: Local
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: ResourceRequest is the Schema for the ResourceRequests API.

diff --git a/deployments/liqo/crds/net.liqo.io_networkconfigs.yaml b/deployments/liqo/crds/net.liqo.io_networkconfigs.yaml
@@ -16,7 +16,28 @@ spec:
     singular: networkconfig
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .spec.clusterID
+      name: Peering Cluster ID
+      type: string
+    - jsonPath: .spec.endpointIP
+      name: Endpoint IP
+      priority: 1
+      type: string
+    - jsonPath: .spec.backendType
+      name: VPN Backend
+      priority: 1
+      type: string
+    - jsonPath: .status.processed
+      name: Processed
+      type: string
+    - jsonPath: .metadata.labels.liqo\.io/replication
+      name: Local
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: NetworkConfig is the Schema for the networkconfigs API.

diff --git a/deployments/liqo/crds/net.liqo.io_tunnelendpoints.yaml b/deployments/liqo/crds/net.liqo.io_tunnelendpoints.yaml
@@ -17,15 +17,22 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
+    - jsonPath: .spec.clusterID
+      name: Peering Cluster ID
+      type: string
     - jsonPath: .spec.endpointIP
       name: Endpoint IP
+      priority: 1
       type: string
     - jsonPath: .spec.backendType
       name: Backend type
       type: string
     - jsonPath: .status.connection.status
       name: Connection status
       type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
     name: v1alpha1
     schema:
       openAPIV3Schema:

diff --git a/deployments/liqo/crds/sharing.liqo.io_resourceoffers.yaml b/deployments/liqo/crds/sharing.liqo.io_resourceoffers.yaml
@@ -22,12 +22,12 @@ spec:
     - jsonPath: .status.phase
       name: Status
       type: string
-    - jsonPath: .spec.timeToLive
-      name: Expiration
-      type: string
     - jsonPath: .status.virtualKubeletStatus
       name: VirtualKubeletStatus
       type: string
+    - jsonPath: .metadata.labels.liqo\.io/replication
+      name: Local
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date