From ba832fefc88a238ad2c06582d02f82ff838bcc27 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 10 Jan 2019 21:40:10 +0000 Subject: [PATCH 1/2] Add additionalPrinterColumns fields to CustomResourceDefintions Signed-off-by: James Munnelly --- deploy/manifests/00-crds.yaml | 57 ++++++++++++++++++++++++++++++ deploy/manifests/cert-manager.yaml | 57 ++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/deploy/manifests/00-crds.yaml b/deploy/manifests/00-crds.yaml index 95dae6825..5539334f3 100644 --- a/deploy/manifests/00-crds.yaml +++ b/deploy/manifests/00-crds.yaml @@ -5,6 +5,29 @@ metadata: labels: app: cert-manager spec: + additionalPrinterColumns: + - JSONPath: .spec.commonName + name: Common Name + type: string + - JSONPath: .spec.dnsNames + name: DNS Names + type: string + - JSONPath: .spec.issuerRef.name + name: Issuer + type: string + - JSONPath: .spec.secretName + name: Secret + type: string + - JSONPath: .status.lastFailureTime + name: Last Failure + type: date + - JSONPath: .metadata.creationTimestamp + description: |- + CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC. + + Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata + name: Age + type: date group: certmanager.k8s.io version: v1alpha1 scope: Namespaced @@ -56,6 +79,23 @@ metadata: labels: app: cert-manager spec: + additionalPrinterColumns: + - JSONPath: .status.state + name: State + type: string + - JSONPath: .spec.issuerRef.name + name: Issuer + type: string + - JSONPath: .status.reason + name: Reason + type: string + - JSONPath: .metadata.creationTimestamp + description: |- + CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC. + + Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata + name: Age + type: date group: certmanager.k8s.io version: v1alpha1 names: @@ -72,6 +112,23 @@ metadata: labels: app: cert-manager spec: + additionalPrinterColumns: + - JSONPath: .status.state + name: State + type: string + - JSONPath: .spec.dnsName + name: Domain + type: string + - JSONPath: .status.reason + name: Reason + type: string + - JSONPath: .metadata.creationTimestamp + description: |- + CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC. + + Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata + name: Age + type: date group: certmanager.k8s.io version: v1alpha1 names: diff --git a/deploy/manifests/cert-manager.yaml b/deploy/manifests/cert-manager.yaml index 91bc52fc0..3d1cbe7b1 100644 --- a/deploy/manifests/cert-manager.yaml +++ b/deploy/manifests/cert-manager.yaml @@ -5,6 +5,29 @@ metadata: labels: app: cert-manager spec: + additionalPrinterColumns: + - JSONPath: .spec.commonName + name: Common Name + type: string + - JSONPath: .spec.dnsNames + name: DNS Names + type: string + - JSONPath: .spec.issuerRef.name + name: Issuer + type: string + - JSONPath: .spec.secretName + name: Secret + type: string + - JSONPath: .status.lastFailureTime + name: Last Failure + type: date + - JSONPath: .metadata.creationTimestamp + description: |- + CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC. + + Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata + name: Age + type: date group: certmanager.k8s.io version: v1alpha1 scope: Namespaced @@ -56,6 +79,23 @@ metadata: labels: app: cert-manager spec: + additionalPrinterColumns: + - JSONPath: .status.state + name: State + type: string + - JSONPath: .spec.issuerRef.name + name: Issuer + type: string + - JSONPath: .status.reason + name: Reason + type: string + - JSONPath: .metadata.creationTimestamp + description: |- + CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC. + + Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata + name: Age + type: date group: certmanager.k8s.io version: v1alpha1 names: @@ -72,6 +112,23 @@ metadata: labels: app: cert-manager spec: + additionalPrinterColumns: + - JSONPath: .status.state + name: State + type: string + - JSONPath: .spec.dnsName + name: Domain + type: string + - JSONPath: .status.reason + name: Reason + type: string + - JSONPath: .metadata.creationTimestamp + description: |- + CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC. + + Populated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata + name: Age + type: date group: certmanager.k8s.io version: v1alpha1 names: From 3e84fe9a464d35ee6019ad3d85f0303f957622a2 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Fri, 11 Jan 2019 09:14:16 +0000 Subject: [PATCH 2/2] Use Ready condition text in printer columns Signed-off-by: James Munnelly --- deploy/manifests/00-crds.yaml | 27 +++++++++++++++++++-------- deploy/manifests/cert-manager.yaml | 27 +++++++++++++++++++-------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/deploy/manifests/00-crds.yaml b/deploy/manifests/00-crds.yaml index 5539334f3..bd2055737 100644 --- a/deploy/manifests/00-crds.yaml +++ b/deploy/manifests/00-crds.yaml @@ -6,21 +6,32 @@ metadata: app: cert-manager spec: additionalPrinterColumns: - - JSONPath: .spec.commonName - name: Common Name - type: string - - JSONPath: .spec.dnsNames - name: DNS Names - type: string - - JSONPath: .spec.issuerRef.name - name: Issuer + - JSONPath: .status.conditions[?(@.type=="Ready")].status + name: Ready type: string - JSONPath: .spec.secretName name: Secret type: string + - JSONPath: .spec.issuerRef.name + name: Issuer + type: string + priority: 1 + - JSONPath: .spec.commonName + name: Common Name + type: string + priority: 1 + - JSONPath: .spec.dnsNames + name: DNS Names + type: string + priority: 1 + - JSONPath: .status.conditions[?(@.type=="Ready")].message + name: Status + type: string + priority: 1 - JSONPath: .status.lastFailureTime name: Last Failure type: date + priority: 1 - JSONPath: .metadata.creationTimestamp description: |- CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC. diff --git a/deploy/manifests/cert-manager.yaml b/deploy/manifests/cert-manager.yaml index 3d1cbe7b1..f6c282022 100644 --- a/deploy/manifests/cert-manager.yaml +++ b/deploy/manifests/cert-manager.yaml @@ -6,21 +6,32 @@ metadata: app: cert-manager spec: additionalPrinterColumns: - - JSONPath: .spec.commonName - name: Common Name - type: string - - JSONPath: .spec.dnsNames - name: DNS Names - type: string - - JSONPath: .spec.issuerRef.name - name: Issuer + - JSONPath: .status.conditions[?(@.type=="Ready")].status + name: Ready type: string - JSONPath: .spec.secretName name: Secret type: string + - JSONPath: .spec.issuerRef.name + name: Issuer + type: string + priority: 1 + - JSONPath: .spec.commonName + name: Common Name + type: string + priority: 1 + - JSONPath: .spec.dnsNames + name: DNS Names + type: string + priority: 1 + - JSONPath: .status.conditions[?(@.type=="Ready")].message + name: Status + type: string + priority: 1 - JSONPath: .status.lastFailureTime name: Last Failure type: date + priority: 1 - JSONPath: .metadata.creationTimestamp description: |- CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.