fixup

Signed-off-by: Anatolii Bazko <[email protected]>
redhat-developer · Jun 4, 2024 · 440214b · 440214b
1 parent f3bf978
commit 440214b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/devspaces-operator-bundle/build/scripts/sync-che-olm.sh b/devspaces-operator-bundle/build/scripts/sync-che-olm.sh
@@ -286,10 +286,13 @@ for CSVFILE in ${TARGETDIR}/manifests/devspaces.csv.yaml; do
   V1_EXAMPLE=$(echo "$ALM_EXAMPLES" | yq '(.[] | select(.apiVersion=="org.eclipse.che/v1"))')
   V2_EXAMPLE=$(echo "$ALM_EXAMPLES" | yq '(.[] | select(.apiVersion=="org.eclipse.che/v2"))')
   FIXED_V2_EXAMPLE=$(echo "$V2_EXAMPLE" | \
+    yq 'del(.spec.components.pluginRegistry.disableInternalRegistry)' | \
+    yq 'del(.spec.components.pluginRegistry | select(length == 0))') | \
     yq 'del(.spec.components.devfileRegistry.disableInternalRegistry)' | \
     yq 'del(.spec.components.devfileRegistry.externalDevfileRegistries)'| \
     yq 'del(.spec.components.devfileRegistry | select(length == 0))')
   FIXED_V1_EXAMPLE=$(echo "$V1_EXAMPLE" | \
+    yq 'del(.spec.server.externalPluginRegistry)' | \
     yq 'del(.spec.server.externalDevfileRegistry)' | \
     yq 'del(.spec.server.devfileRegistryUrl)'| \
     yq 'del(.spec.server.externalDevfileRegistries)'| \

diff --git a/devspaces-operator/build/scripts/sync-che-operator.sh b/devspaces-operator/build/scripts/sync-che-operator.sh
@@ -258,7 +258,9 @@ fi
 echo "Converted (yq #2) ${OPERATOR_DEPLOYMENT_YAML}"
 
 # https://github.com/eclipse-che/che/issues/22932
-# Updating manager.yaml is not required, see `sync-che-olm.sh`
+yq -riY "del(.spec.install.spec.deployments[].spec.template.spec.containers[0].env[] | select(.name | test(\"^RELATED_IMAGE_editor_definition_\")))" "${OPERATOR_DEPLOYMENT_YAML}"
+echo "Converted (yq #3) ${OPERATOR_DEPLOYMENT_YAML}"
+
 yq -riY "(.components[] | select(.name==\"che-code-injector\") | .container.image)=\"${CODE_IMAGE}\"" "${TARGETDIR}/editors-definitions/che-code.yaml"
 yq -riY "(.components[] | select(.name==\"che-code-runtime-description\") | .container.image)=\"${UBI_IMAGE}\"" "${TARGETDIR}/editors-definitions/che-code.yaml"
 yq -riY "(.components[] | select(.name==\"idea-rhel8-injector\") | .container.image)=\"${IDEA_IMAGE}\"" "${TARGETDIR}/editors-definitions/che-idea.yaml"

diff --git a/devspaces-operator/editors-definitions/che-code.yaml b/devspaces-operator/editors-definitions/che-code.yaml
@@ -10,8 +10,8 @@ metadata:
     repository: https://github.com/che-incubator/che-code
     firstPublicationDate: '2022-07-19'
     skipMetaYaml: true
-    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/devspaces-operator/editors-definitions/che-idea.yaml b/devspaces-operator/editors-definitions/che-idea.yaml
@@ -12,8 +12,8 @@ metadata:
     repository: https://github.com/che-incubator/jetbrains-editor-images
     firstPublicationDate: '2022-01-11'
     skipMetaYaml: true
-    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">