Merge remote-tracking branch 'upstream/main' into rhcloud-33912-updat…

…e-crd-spec-to-match-chrome-service
RedHatInsights · Oct 14, 2024 · efad664 · efad664
2 parents 5e81b35 + dfc0d44
commit efad664
Show file tree

Hide file tree

Showing 4 changed files with 188 additions and 0 deletions.
diff --git a/api/v1alpha1/frontend_types.go b/api/v1alpha1/frontend_types.go
@@ -39,6 +39,25 @@ type ServiceMonitorConfig struct {
 	Disabled bool `json:"disabled,omitempty"`
 }
 
+type SearchEntry struct {
+	ID          string   `json:"id" yaml:"id"`
+	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"`
+}
+
+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"`
+}
+
 // FrontendSpec defines the desired state of Frontend
 type FrontendSpec struct {
 	Disabled       bool                 `json:"disabled,omitempty" yaml:"disabled,omitempty"`
@@ -57,6 +76,10 @@ type FrontendSpec struct {
 	AkamaiCacheBustDisable bool `json:"akamaiCacheBustDisable,omitempty" yaml:"akamaiCacheBustDisable,omitempty"`
 	// Files to cache bust
 	AkamaiCacheBustPaths []string `json:"akamaiCacheBustPaths,omitempty" yaml:"akamaiCacheBustPaths,omitempty"`
+	// The search index partials for the resource
+	SearchEntries []*SearchEntry `json:"searchEntries,omitempty" yaml:"searchEntries,omitempty"`
+	// Data for the all services dropdown
+	ServiceTiles []*ServiceTile `json:"serviceTiles,omitempty" yaml:"serviceTiles,omitempty"`
 }
 
 var ReconciliationSuccessful = "ReconciliationSuccessful"

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/cloud.redhat.com_frontends.yaml b/config/crd/bases/cloud.redhat.com_frontends.yaml
@@ -304,13 +304,67 @@ spec:
                   - title
                   type: object
                 type: array
+              searchEntries:
+                description: The search index partials for the resource
+                items:
+                  properties:
+                    alt_title:
+                      items:
+                        type: string
+                      type: array
+                    description:
+                      type: string
+                    href:
+                      type: string
+                    id:
+                      type: string
+                    isExternal:
+                      type: boolean
+                    title:
+                      type: string
+                  required:
+                  - alt_title
+                  - description
+                  - href
+                  - id
+                  - isExternal
+                  - title
+                  type: object
+                type: array
               service:
                 type: string
               serviceMonitor:
                 properties:
                   disabled:
                     type: boolean
                 type: object
+              serviceTiles:
+                description: Data for the all services dropdown
+                items:
+                  properties:
+                    group:
+                      type: string
+                    href:
+                      type: string
+                    icon:
+                      type: string
+                    id:
+                      type: string
+                    isExternal:
+                      type: boolean
+                    section:
+                      type: string
+                    title:
+                      type: string
+                  required:
+                  - group
+                  - href
+                  - icon
+                  - id
+                  - section
+                  - title
+                  type: object
+                type: array
               title:
                 type: string
             required:

diff --git a/deploy.yml b/deploy.yml
@@ -751,13 +751,67 @@ objects:
                     - title
                     type: object
                   type: array
+                searchEntries:
+                  description: The search index partials for the resource
+                  items:
+                    properties:
+                      alt_title:
+                        items:
+                          type: string
+                        type: array
+                      description:
+                        type: string
+                      href:
+                        type: string
+                      id:
+                        type: string
+                      isExternal:
+                        type: boolean
+                      title:
+                        type: string
+                    required:
+                    - alt_title
+                    - description
+                    - href
+                    - id
+                    - isExternal
+                    - title
+                    type: object
+                  type: array
                 service:
                   type: string
                 serviceMonitor:
                   properties:
                     disabled:
                       type: boolean
                   type: object
+                serviceTiles:
+                  description: Data for the all services dropdown
+                  items:
+                    properties:
+                      group:
+                        type: string
+                      href:
+                        type: string
+                      icon:
+                        type: string
+                      id:
+                        type: string
+                      isExternal:
+                        type: boolean
+                      section:
+                        type: string
+                      title:
+                        type: string
+                    required:
+                    - group
+                    - href
+                    - icon
+                    - id
+                    - section
+                    - title
+                    type: object
+                  type: array
                 title:
                   type: string
               required: