Merge pull request #213 from onyiny-ang/kubectl-explain

Add custom columns to openAPI schema
kubernetes-retired · Apr 8, 2018 · 0309542 · 0309542
2 parents 09150e6 + 1e81535
commit 0309542
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/api/swagger.json b/api/swagger.json
@@ -1517,7 +1517,8 @@
       "version": "v1alpha1",
       "kind": "Cluster"
      }
-    ]
+    ],
+    "x-kubernetes-print-columns": "custom-columns=NAME:.metadata.name,CIDR:.spec.kubernetesApiEndpoints.serverEndpoints[].clientCIDR,SERVER:.spec.kubernetesApiEndpoints.serverEndpoints[].serverAddress,CREATION TIME:.metadata.creationTimestamp"
    },
    "io.k8s.cluster-registry.pkg.apis.clusterregistry.v1alpha1.ClusterList": {
     "description": "ClusterList is a list of Kubernetes clusters in the cluster registry.",

diff --git a/pkg/apis/clusterregistry/v1alpha1/generated.proto b/pkg/apis/clusterregistry/v1alpha1/generated.proto
diff --git a/pkg/apis/clusterregistry/v1alpha1/types.go b/pkg/apis/clusterregistry/v1alpha1/types.go
@@ -25,6 +25,7 @@ import (
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // Cluster contains information about a cluster in a cluster registry.
+// +k8s:openapi-gen=x-kubernetes-print-columns:custom-columns=NAME:.metadata.name,CIDR:.spec.kubernetesApiEndpoints.serverEndpoints[].clientCIDR,SERVER:.spec.kubernetesApiEndpoints.serverEndpoints[].serverAddress,CREATION TIME:.metadata.creationTimestamp
 type Cluster struct {
 	metav1.TypeMeta `json:",inline"`
 	// Standard object's metadata.

diff --git a/pkg/apis/clusterregistry/v1alpha1/zz_generated.openapi.go b/pkg/apis/clusterregistry/v1alpha1/zz_generated.openapi.go
@@ -1726,6 +1726,11 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 						},
 					},
 				},
+				VendorExtensible: spec.VendorExtensible{
+					Extensions: spec.Extensions{
+						"x-kubernetes-print-columns": "custom-columns=NAME:.metadata.name,CIDR:.spec.kubernetesApiEndpoints.serverEndpoints[].clientCIDR,SERVER:.spec.kubernetesApiEndpoints.serverEndpoints[].serverAddress,CREATION TIME:.metadata.creationTimestamp",
+					},
+				},
 			},
 			Dependencies: []string{
 				"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "k8s.io/cluster-registry/pkg/apis/clusterregistry/v1alpha1.ClusterSpec", "k8s.io/cluster-registry/pkg/apis/clusterregistry/v1alpha1.ClusterStatus"},