Merge pull request #188 from openshift-bot/synchronize-upstream

NO-ISSUE: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

api/v1alpha1/clusterextension_types.go

@@ -510,6 +510,11 @@ type ClusterExtensionInstallStatus struct {
 //+kubebuilder:object:root=true
 //+kubebuilder:resource:scope=Cluster
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Installed Bundle",type=string,JSONPath=`.status.install.bundle.name`
+//+kubebuilder:printcolumn:name=Version,type=string,JSONPath=`.status.install.bundle.version`
+//+kubebuilder:printcolumn:name="Installed",type=string,JSONPath=`.status.conditions[?(@.type=='Installed')].status`
+//+kubebuilder:printcolumn:name="Progressing",type=string,JSONPath=`.status.conditions[?(@.type=='Progressing')].status`
+//+kubebuilder:printcolumn:name=Age,type=date,JSONPath=`.metadata.creationTimestamp`
 
 // ClusterExtension is the Schema for the clusterextensions API
 type ClusterExtension struct {

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: cfd4bec28827a94e717f824a111ddcac3a144709
+expectedMergeBase: 6bda277736597142d5863e9884f872b2ffd77b63
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml

@@ -14,7 +14,23 @@ spec:
     singular: clusterextension
   scope: Cluster
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .status.install.bundle.name
+      name: Installed Bundle
+      type: string
+    - jsonPath: .status.install.bundle.version
+      name: Version
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Installed')].status
+      name: Installed
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Progressing')].status
+      name: Progressing
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: ClusterExtension is the Schema for the clusterextensions API

openshift/manifests/01-customresourcedefinition-clusterextensions.olm.operatorframework.io.yml

@@ -14,7 +14,23 @@ spec:
     singular: clusterextension
   scope: Cluster
   versions:
-    - name: v1alpha1
+    - additionalPrinterColumns:
+        - jsonPath: .status.install.bundle.name
+          name: Installed Bundle
+          type: string
+        - jsonPath: .status.install.bundle.version
+          name: Version
+          type: string
+        - jsonPath: .status.conditions[?(@.type=='Installed')].status
+          name: Installed
+          type: string
+        - jsonPath: .status.conditions[?(@.type=='Progressing')].status
+          name: Progressing
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
+      name: v1alpha1
       schema:
         openAPIV3Schema:
           description: ClusterExtension is the Schema for the clusterextensions API