From 84673c85143d54ad0008e04f210f6a8a842474c0 Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Tue, 28 May 2024 15:59:14 +0200
Subject: [PATCH] Use iconData and iconMediatype attributes for icon (#1845)

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
---
 api/v2/checluster_types.go                                   | 3 ++-
 .../manifests/che-operator.clusterserviceversion.yaml        | 4 ++--
 .../eclipse-che/manifests/org.eclipse.che_checlusters.yaml   | 5 +++--
 config/crd/bases/org.eclipse.che_checlusters.yaml            | 3 ++-
 deploy/deployment/kubernetes/combined.yaml                   | 3 ++-
 ...checlusters.org.eclipse.che.CustomResourceDefinition.yaml | 3 ++-
 deploy/deployment/openshift/combined.yaml                    | 3 ++-
 ...checlusters.org.eclipse.che.CustomResourceDefinition.yaml | 3 ++-
 editors-definitions/che-code-insiders.yaml                   | 4 ++--
 editors-definitions/che-code-latest.yaml                     | 4 ++--
 editors-definitions/che-idea-latest.yaml                     | 4 ++--
 editors-definitions/che-idea-next.yaml                       | 4 ++--
 editors-definitions/che-idea-server-latest.yaml              | 4 ++--
 editors-definitions/che-idea-server-next.yaml                | 4 ++--
 ...checlusters.org.eclipse.che.CustomResourceDefinition.yaml | 3 ++-
 15 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/api/v2/checluster_types.go b/api/v2/checluster_types.go
index 9b8f8a90b7..fc3d4bf8d4 100644
--- a/api/v2/checluster_types.go
+++ b/api/v2/checluster_types.go
@@ -106,7 +106,7 @@ type CheClusterDevEnvironments struct {
 	// +optional
 	TrustedCerts *TrustedCerts `json:"trustedCerts,omitempty"`
 	// The default editor to workspace create with. It could be a plugin ID or a URI.
-	// The plugin ID must have `publisher/plugin/version` format.
+	// The plugin ID must have `publisher/name/version` format.
 	// The URI must start from `http://` or `https://`.
 	// +optional
 	DefaultEditor string `json:"defaultEditor,omitempty"`
@@ -473,6 +473,7 @@ type PersistentHomeConfig struct {
 
 type WorkspaceDefaultPlugins struct {
 	// The editor ID to specify default plug-ins for.
+	// The plugin ID must have `publisher/name/version` format.
 	Editor string `json:"editor,omitempty"`
 	// Default plug-in URIs for the specified editor.
 	Plugins []string `json:"plugins,omitempty"`
diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
index 20a32027e4..f6833e687f 100644
--- a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
+++ b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
@@ -100,7 +100,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che.v7.87.0-869.next
+  name: eclipse-che.v7.87.0-870.next
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1032,7 +1032,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: Eclipse Foundation
-  version: 7.87.0-869.next
+  version: 7.87.0-870.next
   webhookdefinitions:
     - admissionReviewVersions:
         - v1
diff --git a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
index 14eda48e42..ea75e1f707 100644
--- a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
+++ b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
@@ -6755,7 +6755,7 @@ spec:
                       type: array
                     defaultEditor:
                       description: The default editor to workspace create with. It
-                        could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`
+                        could be a plugin ID or a URI. The plugin ID must have `publisher/name/version`
                         format. The URI must start from `http://` or `https://`.
                       type: string
                     defaultNamespace:
@@ -6785,7 +6785,8 @@ spec:
                         properties:
                           editor:
                             description: The editor ID to specify default plug-ins
-                              for.
+                              for. The plugin ID must have `publisher/name/version`
+                              format.
                             type: string
                           plugins:
                             description: Default plug-in URIs for the specified editor.
diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml
index 9e7d9f7cd9..ad9728b5c4 100644
--- a/config/crd/bases/org.eclipse.che_checlusters.yaml
+++ b/config/crd/bases/org.eclipse.che_checlusters.yaml
@@ -6564,7 +6564,7 @@ spec:
                     type: array
                   defaultEditor:
                     description: The default editor to workspace create with. It could
-                      be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`
+                      be a plugin ID or a URI. The plugin ID must have `publisher/name/version`
                       format. The URI must start from `http://` or `https://`.
                     type: string
                   defaultNamespace:
@@ -6594,6 +6594,7 @@ spec:
                       properties:
                         editor:
                           description: The editor ID to specify default plug-ins for.
+                            The plugin ID must have `publisher/name/version` format.
                           type: string
                         plugins:
                           description: Default plug-in URIs for the specified editor.
diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml
index 84cfe53bbe..6bff83e6dc 100644
--- a/deploy/deployment/kubernetes/combined.yaml
+++ b/deploy/deployment/kubernetes/combined.yaml
@@ -6583,7 +6583,7 @@ spec:
                     type: array
                   defaultEditor:
                     description: The default editor to workspace create with. It could
-                      be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`
+                      be a plugin ID or a URI. The plugin ID must have `publisher/name/version`
                       format. The URI must start from `http://` or `https://`.
                     type: string
                   defaultNamespace:
@@ -6613,6 +6613,7 @@ spec:
                       properties:
                         editor:
                           description: The editor ID to specify default plug-ins for.
+                            The plugin ID must have `publisher/name/version` format.
                           type: string
                         plugins:
                           description: Default plug-in URIs for the specified editor.
diff --git a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
index b195c127cb..2814afb181 100644
--- a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
+++ b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -6578,7 +6578,7 @@ spec:
                     type: array
                   defaultEditor:
                     description: The default editor to workspace create with. It could
-                      be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`
+                      be a plugin ID or a URI. The plugin ID must have `publisher/name/version`
                       format. The URI must start from `http://` or `https://`.
                     type: string
                   defaultNamespace:
@@ -6608,6 +6608,7 @@ spec:
                       properties:
                         editor:
                           description: The editor ID to specify default plug-ins for.
+                            The plugin ID must have `publisher/name/version` format.
                           type: string
                         plugins:
                           description: Default plug-in URIs for the specified editor.
diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml
index 802ad11047..a9c36588f3 100644
--- a/deploy/deployment/openshift/combined.yaml
+++ b/deploy/deployment/openshift/combined.yaml
@@ -6583,7 +6583,7 @@ spec:
                     type: array
                   defaultEditor:
                     description: The default editor to workspace create with. It could
-                      be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`
+                      be a plugin ID or a URI. The plugin ID must have `publisher/name/version`
                       format. The URI must start from `http://` or `https://`.
                     type: string
                   defaultNamespace:
@@ -6613,6 +6613,7 @@ spec:
                       properties:
                         editor:
                           description: The editor ID to specify default plug-ins for.
+                            The plugin ID must have `publisher/name/version` format.
                           type: string
                         plugins:
                           description: Default plug-in URIs for the specified editor.
diff --git a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
index 32b727175b..55160f8bd8 100644
--- a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
+++ b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -6578,7 +6578,7 @@ spec:
                     type: array
                   defaultEditor:
                     description: The default editor to workspace create with. It could
-                      be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`
+                      be a plugin ID or a URI. The plugin ID must have `publisher/name/version`
                       format. The URI must start from `http://` or `https://`.
                     type: string
                   defaultNamespace:
@@ -6608,6 +6608,7 @@ spec:
                       properties:
                         editor:
                           description: The editor ID to specify default plug-ins for.
+                            The plugin ID must have `publisher/name/version` format.
                           type: string
                         plugins:
                           description: Default plug-in URIs for the specified editor.
diff --git a/editors-definitions/che-code-insiders.yaml b/editors-definitions/che-code-insiders.yaml
index c506b80f17..9ce0b1b6fb 100644
--- a/editors-definitions/che-code-insiders.yaml
+++ b/editors-definitions/che-code-insiders.yaml
@@ -25,8 +25,8 @@ metadata:
       build
     repository: https://github.com/che-incubator/che-code
     firstPublicationDate: '2021-10-31'
-    icon-mediatype: image/svg+xml
-    icon-data: |
+    iconMediatype: image/svg+xml
+    iconData: |
       <svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
       <mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="100" height="100">
       <path fill-rule="evenodd" clip-rule="evenodd" d="M70.9119 99.3171C72.4869 99.9307 74.2828 99.8914 75.8725 99.1264L96.4608 89.2197C98.6242 88.1787 100 85.9892 100 83.5872V16.4133C100 14.0113 98.6243 11.8218 96.4609 10.7808L75.8725 0.873756C73.7862 -0.130129 71.3446 0.11576 69.5135 1.44695C69.252 1.63711 69.0028 1.84943 68.769 2.08341L29.3551 38.0415L12.1872 25.0096C10.589 23.7965 8.35363 23.8959 6.86933 25.2461L1.36303 30.2549C-0.452552 31.9064 -0.454633 34.7627 1.35853 36.417L16.2471 50.0001L1.35853 63.5832C-0.454633 65.2374 -0.452552 68.0938 1.36303 69.7453L6.86933 74.7541C8.35363 76.1043 10.589 76.2037 12.1872 74.9905L29.3551 61.9587L68.769 97.9167C69.3925 98.5406 70.1246 99.0104 70.9119 99.3171ZM75.0152 27.2989L45.1091 50.0001L75.0152 72.7012V27.2989Z" fill="white"/>
diff --git a/editors-definitions/che-code-latest.yaml b/editors-definitions/che-code-latest.yaml
index edaf94a51b..c65c409516 100644
--- a/editors-definitions/che-code-latest.yaml
+++ b/editors-definitions/che-code-latest.yaml
@@ -21,8 +21,8 @@ metadata:
     title: Microsoft Visual Studio Code - Open Source IDE for Eclipse Che
     repository: https://github.com/che-incubator/che-code
     firstPublicationDate: '2021-10-31'
-    icon-mediatype: image/svg+xml
-    icon-data: |
+    iconMediatype: image/svg+xml
+    iconData: |
       <svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
       <mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="100" height="100">
       <path fill-rule="evenodd" clip-rule="evenodd" d="M70.9119 99.3171C72.4869 99.9307 74.2828 99.8914 75.8725 99.1264L96.4608 89.2197C98.6242 88.1787 100 85.9892 100 83.5872V16.4133C100 14.0113 98.6243 11.8218 96.4609 10.7808L75.8725 0.873756C73.7862 -0.130129 71.3446 0.11576 69.5135 1.44695C69.252 1.63711 69.0028 1.84943 68.769 2.08341L29.3551 38.0415L12.1872 25.0096C10.589 23.7965 8.35363 23.8959 6.86933 25.2461L1.36303 30.2549C-0.452552 31.9064 -0.454633 34.7627 1.35853 36.417L16.2471 50.0001L1.35853 63.5832C-0.454633 65.2374 -0.452552 68.0938 1.36303 69.7453L6.86933 74.7541C8.35363 76.1043 10.589 76.2037 12.1872 74.9905L29.3551 61.9587L68.769 97.9167C69.3925 98.5406 70.1246 99.0104 70.9119 99.3171ZM75.0152 27.2989L45.1091 50.0001L75.0152 72.7012V27.2989Z" fill="white"/>
diff --git a/editors-definitions/che-idea-latest.yaml b/editors-definitions/che-idea-latest.yaml
index 533a3fa4d6..9846a7d386 100644
--- a/editors-definitions/che-idea-latest.yaml
+++ b/editors-definitions/che-idea-latest.yaml
@@ -23,8 +23,8 @@ metadata:
     title: JetBrains IntelliJ IDEA Community IDE for Eclipse Che
     repository: https://github.com/che-incubator/jetbrains-editor-images
     firstPublicationDate: '2022-01-11'
-    icon-mediatype: image/svg+xml
-    icon-data: |
+    iconMediatype: image/svg+xml
+    iconData: |
       <svg xmlns="http://www.w3.org/2000/svg" width="70" height="70" fill="none" viewBox="0 0 70 70">
         <defs>
           <linearGradient id="a" x1="5.17435" x2="40.0136" y1="39.8894" y2="38.1233" gradientUnits="userSpaceOnUse">
diff --git a/editors-definitions/che-idea-next.yaml b/editors-definitions/che-idea-next.yaml
index a820486a17..7d662a09f9 100644
--- a/editors-definitions/che-idea-next.yaml
+++ b/editors-definitions/che-idea-next.yaml
@@ -23,8 +23,8 @@ metadata:
     title: JetBrains IntelliJ IDEA Community IDE for Eclipse Che - next
     repository: https://github.com/che-incubator/jetbrains-editor-images
     firstPublicationDate: '2022-01-11'
-    icon-mediatype: image/svg+xml
-    icon-data: |
+    iconMediatype: image/svg+xml
+    iconData: |
       <svg xmlns="http://www.w3.org/2000/svg" width="70" height="70" fill="none" viewBox="0 0 70 70">
         <defs>
           <linearGradient id="a" x1="5.17435" x2="40.0136" y1="39.8894" y2="38.1233" gradientUnits="userSpaceOnUse">
diff --git a/editors-definitions/che-idea-server-latest.yaml b/editors-definitions/che-idea-server-latest.yaml
index 4a202d53bb..ebb57d670f 100644
--- a/editors-definitions/che-idea-server-latest.yaml
+++ b/editors-definitions/che-idea-server-latest.yaml
@@ -23,8 +23,8 @@ metadata:
     title: JetBrains IntelliJ IDEA Ultimate dev server for Eclipse Che - latest
     repository: https://github.com/che-incubator/che-idea-dev-server
     firstPublicationDate: '2023-30-11'
-    icon-mediatype: image/svg+xml
-    icon-data: |
+    iconMediatype: image/svg+xml
+    iconData: |
       <svg xmlns="http://www.w3.org/2000/svg" width="70" height="70" fill="none" viewBox="0 0 70 70">
         <defs>
           <linearGradient id="a" x1="5.17435" x2="40.0136" y1="39.8894" y2="38.1233" gradientUnits="userSpaceOnUse">
diff --git a/editors-definitions/che-idea-server-next.yaml b/editors-definitions/che-idea-server-next.yaml
index 60a1bd5828..87faca609a 100644
--- a/editors-definitions/che-idea-server-next.yaml
+++ b/editors-definitions/che-idea-server-next.yaml
@@ -23,8 +23,8 @@ metadata:
     title: JetBrains IntelliJ IDEA Ultimate dev server for Eclipse Che - next
     repository: https://github.com/che-incubator/che-idea-dev-server
     firstPublicationDate: '2023-30-11'
-    icon-mediatype: image/svg+xml
-    icon-data: |
+    iconMediatype: image/svg+xml
+    iconData: |
       <svg xmlns="http://www.w3.org/2000/svg" width="70" height="70" fill="none" viewBox="0 0 70 70">
         <defs>
           <linearGradient id="a" x1="5.17435" x2="40.0136" y1="39.8894" y2="38.1233" gradientUnits="userSpaceOnUse">
diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
index b195c127cb..2814afb181 100644
--- a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
+++ b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -6578,7 +6578,7 @@ spec:
                     type: array
                   defaultEditor:
                     description: The default editor to workspace create with. It could
-                      be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`
+                      be a plugin ID or a URI. The plugin ID must have `publisher/name/version`
                       format. The URI must start from `http://` or `https://`.
                     type: string
                   defaultNamespace:
@@ -6608,6 +6608,7 @@ spec:
                       properties:
                         editor:
                           description: The editor ID to specify default plug-ins for.
+                            The plugin ID must have `publisher/name/version` format.
                           type: string
                         plugins:
                           description: Default plug-in URIs for the specified editor.