Report serverless operator status.

config/samples/full.yaml

@@ -75,7 +75,7 @@ spec:
 
       # Sets the collection resource's initial desiredState value to active or inactive when 
       # the CR instance is initially deployed. Post CR instance deployment, updates to 
-      # a collection's desired state can be done manually by editing each collection resource manually.
+      # a collection's desired state can be done by editing each collection resource manually.
       # A collection's desiredState value of active or inactive is what determines whether the 
       # assets associated with a collection object are activated or deactived.
       # Setting activateDefaultCollections to true sets the collection's initial desiredState to "active". 

deploy/crds/kabanero_v1alpha1_kabanero_crd.yaml

@@ -209,8 +209,8 @@ spec:
                 version:
                   type: string
               type: object
-            knativeServing:
-              description: Knative serving instance readiness status.
+            landing:
+              description: Kabanero Landing page readiness status.
               properties:
                 errorMessage:
                   type: string
@@ -219,11 +219,20 @@ spec:
                 version:
                   type: string
               type: object
-            landing:
-              description: Kabanero Landing page readiness status.
+            serverless:
+              description: OpenShift serverless operator status.
               properties:
                 errorMessage:
                   type: string
+                knativeServing:
+                  properties:
+                    errorMessage:
+                      type: string
+                    ready:
+                      type: string
+                    version:
+                      type: string
+                  type: object
                 ready:
                   type: string
                 version:

pkg/apis/kabanero/v1alpha1/kabanero_types.go

@@ -33,6 +33,7 @@ type KabaneroSpec struct {
 	Che CheCustomizationSpec `json:"che,omitempty"`
 }
 
+// InstanceCollectionConfig defines the customization entries for a set of collections.
 type InstanceCollectionConfig struct {
 	Repositories []RepositoryConfig `json:"repositories,omitempty"`
 }
@@ -47,6 +48,7 @@ type GithubConfig struct {
 	ApiUrl       string   `json:"apiUrl,omitempty"`
 }
 
+// RepositoryConfig defines customization entries for a collection.
 type RepositoryConfig struct {
 	Name                       string `json:"name,omitempty"`
 	Url                        string `json:"url,omitempty"`
@@ -60,6 +62,7 @@ type TektonCustomizationSpec struct {
 	Version  string `json:"version,omitempty"`
 }
 
+// KabaneroCliServicesCustomizationSpec defines customization entries for the Kabanero CLI.
 type KabaneroCliServicesCustomizationSpec struct {
 	//Future: Enable     bool   `json:"enable,omitempty"`
 	Version                  string `json:"version,omitempty"`
@@ -69,6 +72,7 @@ type KabaneroCliServicesCustomizationSpec struct {
 	SessionExpirationSeconds string `json:"sessionExpirationSeconds,omitempty"`
 }
 
+// KabaneroLandingCustomizationSpec defines customization entries for Kabanero landing page.
 type KabaneroLandingCustomizationSpec struct {
 	Enable  *bool  `json:"enable,omitempty"`
 	Version string `json:"version,omitempty"`
@@ -82,7 +86,7 @@ type CheCustomizationSpec struct {
 	KabaneroChe         KabaneroCheSpec         `json:"kabaneroChe,omitempty"`
 }
 
-// CheOperatorSpec defines customization entries for the Che operator
+// CheOperatorSpec defines customization entries for the Che operator.
 type CheOperatorSpec struct {
 	Version    string `json:"version,omitempty"`
 	Image      string `json:"image,omitempty"`
@@ -112,8 +116,8 @@ type KabaneroStatus struct {
 	// Knative eventing instance readiness status.
 	KnativeEventing KnativeEventingStatus `json:"knativeEventing,omitempty"`
 
-	// Knative serving instance readiness status.
-	KnativeServing KnativeServingStatus `json:"knativeServing,omitempty"`
+	// OpenShift serverless operator status.
+	Serverless ServerlessStatus `json:"serverless,omitempty"`
 
 	// Tekton instance readiness status.
 	Tekton TektonStatus `json:"tekton,omitempty"`
@@ -155,6 +159,14 @@ type KnativeEventingStatus struct {
 	Version      string `json:"version,omitempty"`
 }
 
+// ServerlessStatus defines the observed status details of Open Shift serverless.
+type ServerlessStatus struct {
+	Ready          string               `json:"ready,omitempty"`
+	ErrorMessage   string               `json:"errorMessage,omitempty"`
+	Version        string               `json:"version,omitempty"`
+	KnativeServing KnativeServingStatus `json:"knativeServing,omitempty"`
+}
+
 // KnativeServingStatus defines the observed status details of Knative Serving.
 type KnativeServingStatus struct {
 	Ready        string `json:"ready,omitempty"`

pkg/controller/kabaneroplatform/kabaneroplatform_controller.go

@@ -327,7 +327,7 @@ func processStatus(ctx context.Context, request reconcile.Request, k *kabanerov1
 	// Gather the status of all resource dependencies.
 	isAppsodyReady, _ := getAppsodyStatus(k, c, reqLogger)
 	isTektonReady, _ := getTektonStatus(k, c)
-	isKnativeServingReady, _ := getKnativeServingStatus(k, c, reqLogger)
+	isServerlessReady, _ := getServerlessStatus(k, c, reqLogger)
 	isKnativeEventingReady, _ := getKnativeEventingStatus(k, c, reqLogger)
 	isCliRouteReady, _ := getCliRouteStatus(k, reqLogger, c)
 	isKabaneroLandingReady, _ := getKabaneroLandingPageStatus(k, c)
@@ -337,7 +337,7 @@ func processStatus(ctx context.Context, request reconcile.Request, k *kabanerov1
 	// Set the overall status.
 	isKabaneroReady := isTektonReady &&
 		isKnativeEventingReady &&
-		isKnativeServingReady &&
+		isServerlessReady &&
 		isCliRouteReady &&
 		isKabaneroLandingReady &&
 		isAppsodyReady &&