ability-to-add-second-logo-pt6

Author: cajieh

openapi/generated_openapi/zz_generated.openapi.go

@@ -27048,10 +27048,15 @@
           "x-kubernetes-list-type": "map"
         },
         "customLogoFile": {
-          "description": "customLogoFile replaces the default OpenShift logo in the masthead and about dialog. It is a reference to a ConfigMap in the openshift-config namespace. This can be created with a command like 'oc create configmap custom-logo --from-file=/path/to/file -n openshift-config'. Image size must be less than 1 MB due to constraints on the ConfigMap size. The ConfigMap key should include a file extension so that the console serves the file with the correct MIME type. Recommended logo specifications: Dimensions: Max height of 68px and max width of 200px SVG format preferred",
+          "description": "customLogoFile replaces the default OpenShift logo in the masthead and about dialog. It is a reference to a ConfigMap in the openshift-config namespace. This can be created with a command like 'oc create configmap custom-logo --from-file=/path/to/file -n openshift-config'. Image size must be less than 1 MB due to constraints on the ConfigMap size. The ConfigMap key should include a file extension so that the console serves the file with the correct MIME type. Recommended logo specifications: Dimensions: Max height of 68px and max width of 200px SVG format preferred Deprecated: Use customLogoFiles instead.",
           "default": {},
           "$ref": "#/definitions/com.github.openshift.api.config.v1.ConfigMapFileReference"
         },
+        "customLogoFiles": {
+          "description": "customLogoFiles replaces the default OpenShift logo in the masthead and about dialog. It is a reference to a ConfigMap in the openshift-config namespace. This can be created with a command like 'oc create configmap custom-logo --from-file=/path/to/file -n openshift-config'. Image size must be less than 1 MB due to constraints on the ConfigMap size. The ConfigMap keys should include file extensions for dark and light themes so that the console serves these files with the correct MIME type. Recommended logo specifications: Dimensions: Max height of 68px and max width of 200px SVG format preferred",
+          "default": {},
+          "$ref": "#/definitions/com.github.openshift.api.operator.v1.CustomFiles"
+        },
         "customProductName": {
           "description": "customProductName is the name that will be displayed in page titles, logo alt text, and the about dialog instead of the normal OpenShift product name.",
           "type": "string"
@@ -27255,6 +27260,26 @@
         }
       }
     },
+    "com.github.openshift.api.operator.v1.CustomFiles": {
+      "description": "CustomFiles defines a configuration based on theme types for the console UI logo.",
+      "type": "object",
+      "required": [
+        "type",
+        "path"
+      ],
+      "properties": {
+        "path": {
+          "description": "path is the reference to the ConfigMap in the openshift-config namespace.",
+          "default": {},
+          "$ref": "#/definitions/com.github.openshift.api.config.v1.ConfigMapFileReference"
+        },
+        "type": {
+          "description": "type of the theme for the console UI.",
+          "type": "string",
+          "default": ""
+        }
+      }
+    },
     "com.github.openshift.api.operator.v1.DNS": {
       "description": "DNS manages the CoreDNS component to provide a name resolution service for pods and services in the cluster.\n\nThis supports the DNS-based service discovery specification: https://github.com/kubernetes/dns/blob/master/docs/specification.md\n\nMore details: https://kubernetes.io/docs/tasks/administer-cluster/coredns\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).",
       "type": "object",

openapi/openapi.json

@@ -143,8 +143,42 @@ type Capability struct {
 	Visibility CapabilityVisibility `json:"visibility"`
 }
 
+// ThemeType defines the type of the theme for the console UI.
+type ThemeType string
+
+// ThemeType values
+const (
+	// DarkTheme represents the dark theme for the console UI.
+	DarkTheme ThemeType = "Dark"
+	// LightTheme represents the light theme for the console UI.
+	LightTheme ThemeType = "Light"
+)
+
+// CustomFiles defines a configuration based on theme types for the console UI logo.
+type CustomFiles struct {
+	// type of the theme for the console UI.
+	// +unionDiscriminator
+	// +kubebuilder:validation:Enum:="Dark";"Light"
+	// +required
+	Type ThemeType `json:"type"`
+	// path is the reference to the ConfigMap in the openshift-config namespace.
+	// +required
+	Path configv1.ConfigMapFileReference `json:"path"`
+}
+
 // ConsoleCustomization defines a list of optional configuration for the console UI.
 type ConsoleCustomization struct {
+	// customLogoFiles replaces the default OpenShift logo in the masthead and about dialog. It is a reference to a
+	// ConfigMap in the openshift-config namespace. This can be created with a command like
+	// 'oc create configmap custom-logo --from-file=/path/to/file -n openshift-config'.
+	// Image size must be less than 1 MB due to constraints on the ConfigMap size.
+	// The ConfigMap keys should include file extensions for dark and light themes so that the console serves these files
+	// with the correct MIME type.
+	// Recommended logo specifications:
+	// Dimensions: Max height of 68px and max width of 200px
+	// SVG format preferred
+	// +optional
+	CustomLogoFiles CustomFiles `json:"customLogoFiles,omitempty"`
 	// capabilities defines an array of capabilities that can be interacted with in the console UI.
 	// Each capability defines a visual state that can be interacted with the console to render in the UI.
 	// Available capabilities are LightspeedButton and GettingStartedBanner.
@@ -180,6 +214,7 @@ type ConsoleCustomization struct {
 	// Recommended logo specifications:
 	// Dimensions: Max height of 68px and max width of 200px
 	// SVG format preferred
+	// Deprecated: Use customLogoFiles instead.
 	// +optional
 	CustomLogoFile configv1.ConfigMapFileReference `json:"customLogoFile,omitempty"`
 	// developerCatalog allows to configure the shown developer catalog categories (filters) and types (sub-catalogs).

operator/v1/types_console.go

@@ -139,6 +139,7 @@ spec:
                       Recommended logo specifications:
                       Dimensions: Max height of 68px and max width of 200px
                       SVG format preferred
+                      Deprecated: Use customLogoFiles instead.
                     properties:
                       key:
                         description: key allows pointing to a specific key/value inside
@@ -147,6 +148,40 @@ spec:
                       name:
                         type: string
                     type: object
+                  customLogoFiles:
+                    description: |-
+                      customLogoFiles replaces the default OpenShift logo in the masthead and about dialog. It is a reference to a
+                      ConfigMap in the openshift-config namespace. This can be created with a command like
+                      'oc create configmap custom-logo --from-file=/path/to/file -n openshift-config'.
+                      Image size must be less than 1 MB due to constraints on the ConfigMap size.
+                      The ConfigMap keys should include file extensions for dark and light themes so that the console serves these files
+                      with the correct MIME type.
+                      Recommended logo specifications:
+                      Dimensions: Max height of 68px and max width of 200px
+                      SVG format preferred
+                    properties:
+                      path:
+                        description: path is the reference to the ConfigMap in the
+                          openshift-config namespace.
+                        properties:
+                          key:
+                            description: key allows pointing to a specific key/value
+                              inside of the configmap.  This is useful for logical
+                              file references.
+                            type: string
+                          name:
+                            type: string
+                        type: object
+                      type:
+                        description: type of the theme for the console UI.
+                        enum:
+                        - Dark
+                        - Light
+                        type: string
+                    required:
+                    - path
+                    - type
+                    type: object
                   customProductName:
                     description: |-
                       customProductName is the name that will be displayed in page titles, logo alt text, and the about dialog

operator/v1/zz_generated.crd-manifests/0000_50_console_01_consoles.crd.yaml

@@ -140,6 +140,7 @@ spec:
                       Recommended logo specifications:
                       Dimensions: Max height of 68px and max width of 200px
                       SVG format preferred
+                      Deprecated: Use customLogoFiles instead.
                     properties:
                       key:
                         description: key allows pointing to a specific key/value inside
@@ -148,6 +149,40 @@ spec:
                       name:
                         type: string
                     type: object
+                  customLogoFiles:
+                    description: |-
+                      customLogoFiles replaces the default OpenShift logo in the masthead and about dialog. It is a reference to a
+                      ConfigMap in the openshift-config namespace. This can be created with a command like
+                      'oc create configmap custom-logo --from-file=/path/to/file -n openshift-config'.
+                      Image size must be less than 1 MB due to constraints on the ConfigMap size.
+                      The ConfigMap keys should include file extensions for dark and light themes so that the console serves these files
+                      with the correct MIME type.
+                      Recommended logo specifications:
+                      Dimensions: Max height of 68px and max width of 200px
+                      SVG format preferred
+                    properties:
+                      path:
+                        description: path is the reference to the ConfigMap in the
+                          openshift-config namespace.
+                        properties:
+                          key:
+                            description: key allows pointing to a specific key/value
+                              inside of the configmap.  This is useful for logical
+                              file references.
+                            type: string
+                          name:
+                            type: string
+                        type: object
+                      type:
+                        description: type of the theme for the console UI.
+                        enum:
+                        - Dark
+                        - Light
+                        type: string
+                    required:
+                    - path
+                    - type
+                    type: object
                   customProductName:
                     description: |-
                       customProductName is the name that will be displayed in page titles, logo alt text, and the about dialog