Add search index to generated configmap

.gitignore

@@ -43,3 +43,5 @@ artifacts/
 # IDE extras
 .vscode/
 build/.build_venv
+
+kuttl-report.json

api/v1alpha1/frontend_types.go

@@ -44,18 +44,19 @@ type SearchEntry struct {
 	Href        string   `json:"href" yaml:"href"`
 	Title       string   `json:"title" yaml:"title"`
 	Description string   `json:"description" yaml:"description"`
-	AltTitle    []string `json:"alt_title" yaml:"alt_title"`
-	IsExternal  bool     `json:"isExternal" yaml:"isExternal"`
+	AltTitle    []string `json:"alt_title,omitempty" yaml:"alt_title,omitempty"`
+	IsExternal  bool     `json:"isExternal,omitempty" yaml:"isExternal,omitempty"`
 }
 
 type ServiceTile struct {
-	Section    string `json:"section" yaml:"section"`
-	Group      string `json:"group" yaml:"group"`
-	ID         string `json:"id" yaml:"id"`
-	Href       string `json:"href" yaml:"href"`
-	Title      string `json:"title" yaml:"title"`
-	Icon       string `json:"icon" yaml:"icon"`
-	IsExternal bool   `json:"isExternal,omitempty" yaml:"isExternal,omitempty"`
+	Section     string `json:"section" yaml:"section"`
+	Group       string `json:"group" yaml:"group"`
+	ID          string `json:"id" yaml:"id"`
+	Href        string `json:"href" yaml:"href"`
+	Title       string `json:"title" yaml:"title"`
+	Description string `json:"description" yaml:"description"`
+	Icon        string `json:"icon" yaml:"icon"`
+	IsExternal  bool   `json:"isExternal,omitempty" yaml:"isExternal,omitempty"`
 }
 
 type WidgetHeaderLink struct {
@@ -97,7 +98,7 @@ type FrontendSpec struct {
 	EnvName        string               `json:"envName" yaml:"envName"`
 	Title          string               `json:"title" yaml:"title"`
 	DeploymentRepo string               `json:"deploymentRepo" yaml:"deploymentRepo"`
-	API            APIInfo              `json:"API" yaml:"API"`
+	API            *APIInfo             `json:"API,omitempty" yaml:"API,omitempty"`
 	Frontend       FrontendInfo         `json:"frontend" yaml:"frontend"`
 	Image          string               `json:"image,omitempty" yaml:"image,omitempty"`
 	Service        string               `json:"service,omitempty" yaml:"service,omitempty"`

api/v1alpha1/frontendenvironment_types.go

@@ -24,6 +24,33 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+type FrontendServiceCategoryGroup struct {
+	ID    string `json:"id" yaml:"id"`
+	Title string `json:"title" yaml:"title"`
+}
+
+// FrontendServiceCategory defines the category to which service can inject ServiceTiles
+// Chroming UI will use this to render the service dropdown component
+type FrontendServiceCategory struct {
+	ID    string `json:"id" yaml:"id"`
+	Title string `json:"title" yaml:"title"`
+	// +kubebuilder:validation:items:MinItems:=1
+	Groups []FrontendServiceCategoryGroup `json:"groups" yaml:"groups"`
+}
+
+type FrontendServiceCategoryGroupGenerated struct {
+	ID    string         `json:"id" yaml:"id"`
+	Title string         `json:"title" yaml:"title"`
+	Tiles *[]ServiceTile `json:"tiles" yaml:"tiles"`
+}
+
+// The categories but with the groups filled with service tiles
+type FrontendServiceCategoryGenerated struct {
+	ID     string                                  `json:"id" yaml:"id"`
+	Title  string                                  `json:"title" yaml:"title"`
+	Groups []FrontendServiceCategoryGroupGenerated `json:"groups" yaml:"groups"`
+}
+
 // FrontendEnvironmentSpec defines the desired state of FrontendEnvironment
 type FrontendEnvironmentSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
@@ -65,6 +92,8 @@ type FrontendEnvironmentSpec struct {
 	// List of namespaces that should receive a copy of the frontend configuration as a config map
 	// By configurations we mean the fed-modules.json, navigation files, etc.
 	TargetNamespaces []string `json:"targetNamespaces,omitempty" yaml:"targetNamespaces,omitempty"`
+	// For the ChromeUI to render additional global components
+	ServiceCategories *[]FrontendServiceCategory `json:"serviceCategories,omitempty" yaml:"serviceCategories,omitempty"`
 }
 
 type MonitoringConfig struct {

config/crd/bases/cloud.redhat.com_frontendenvironments.yaml

@@ -92,6 +92,35 @@ spec:
                 - disabled
                 - mode
                 type: object
+              serviceCategories:
+                description: For the ChromeUI to render additional global components
+                items:
+                  description: |-
+                    FrontendServiceCategory defines the category to which service can inject ServiceTiles
+                    Chroming UI will use this to render the service dropdown component
+                  properties:
+                    groups:
+                      items:
+                        properties:
+                          id:
+                            type: string
+                          title:
+                            type: string
+                        required:
+                        - id
+                        - title
+                        type: object
+                      type: array
+                    id:
+                      type: string
+                    title:
+                      type: string
+                  required:
+                  - groups
+                  - id
+                  - title
+                  type: object
+                type: array
               ssl:
                 description: |-
                   SSL mode requests SSL from the services in openshift and k8s and then applies them to the

config/crd/bases/cloud.redhat.com_frontends.yaml

@@ -326,11 +326,9 @@ spec:
                     title:
                       type: string
                   required:
-                  - alt_title
                   - description
                   - href
                   - id
-                  - isExternal
                   - title
                   type: object
                 type: array
@@ -345,6 +343,8 @@ spec:
                 description: Data for the all services dropdown
                 items:
                   properties:
+                    description:
+                      type: string
                     group:
                       type: string
                     href:
@@ -360,6 +360,7 @@ spec:
                     title:
                       type: string
                   required:
+                  - description
                   - group
                   - href
                   - icon
@@ -493,7 +494,6 @@ spec:
                   type: object
                 type: array
             required:
-            - API
             - deploymentRepo
             - envName
             - frontend