chore: Removes devfile-registry deployment component

api/v2/checluster_types.go

@@ -368,7 +368,7 @@ type PluginRegistry struct {
 // Configuration settings related to the devfile registry used by the Che installation.
 // +k8s:openapi-gen=true
 type DevfileRegistry struct {
-	// Deployment override options.
+	// Deprecated deployment override options.
 	// +optional
 	Deployment *Deployment `json:"deployment,omitempty"`
 	// Disables internal devfile registry.
@@ -893,7 +893,7 @@ type CheClusterStatus struct {
 
 // The `CheCluster` custom resource allows defining and managing Eclipse Che server installation.
 // Based on these settings, the  Operator automatically creates and maintains several ConfigMaps:
-// `che`, `plugin-registry`, `devfile-registry` that will contain the appropriate environment variables
+// `che`, `plugin-registry` that will contain the appropriate environment variables
 // of the various components of the installation. These generated ConfigMaps must NOT be updated manually.
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:object:root=true

build/scripts/minikube-tests/minikube-checluster-patch.yaml

@@ -35,14 +35,6 @@ spec:
                 cpu: '20m'
               limits:
                 cpu: '20m'
-    devfileRegistry:
-      deployment:
-        containers:
-          - resources:
-              request:
-                cpu: '20m'
-              limits:
-                cpu: '20m'
     cheServer:
       deployment:
         containers:

build/scripts/minikube-tests/test-helm.sh

@@ -57,9 +57,7 @@ runTest() {
 
   # Patch CheCluster CR to limit resources (see minikube-checluster-patch.yaml)
   CHECLUSTER_CR="${HELMCHART_DIR}"/templates/org_v2_checluster.yaml
-  yq -riY '.spec.components = null' ${CHECLUSTER_CR}
-  yq -riY '.spec.components.pluginRegistry.openVSXURL = "https://open-vsx.org"' ${CHECLUSTER_CR}
-  for component in pluginRegistry devfileRegistry dashboard; do
+  for component in dashboard; do
     yq -riY '.spec.components.'${component}'.deployment.containers[0].resources = {limits: {cpu: "50m"}, request: {cpu: "50m"}}' ${CHECLUSTER_CR}
   done
   yq -riY '.spec.components.cheServer.deployment.containers[0].resources.limits.cpu = "500m"' ${CHECLUSTER_CR}

build/scripts/release/addDigests.sh

@@ -84,8 +84,6 @@ do
   source=$(echo "${mapping}" | sed -e 's;\(.*\)=.*=.*;\1;')
   # Image with digest.
   dest=$(echo "${mapping}" | sed -e 's;.*=.*=\(.*\);\1;')
-  # Image label to set image target. For example: 'devfile-registry-image'
-  imageLabel=$(echo "${mapping}" | sed -e 's;.*=\(.*\)=.*;\1;')
   name=$(echo "${dest}" | sed -e 's;.*/\([^\/][^\/]*\)@.*;\1;')
   tagOrDigest=""
   if [[ ${source} == *"@"* ]]; then
@@ -94,20 +92,6 @@ do
     tagOrDigest="${source#*:}"
   fi
 
-  if [[ ${imageLabel} == "devfile-registry-image" ]]; then
-    # Image tag could contains invalid for Env variable name characters, so let's encode it using base32.
-    # But alphabet of base32 uses one invalid for env variable name character '=' at the end of the line, so let's replace it by '_'.
-    # To recovery original tag should be done opposite actions: replace '_' to '=', and decode string using 'base32 -d'.
-    encodedTag=$(echo "${tagOrDigest}" | base32 -w 0 | tr "=" "_")
-    relatedImageEnvName=$(echo "${RELATED_IMAGE_PREFIX}${name}_${imageLabel}_${encodedTag}" | sed -r 's/[-.]/_/g')
-    ENV="{ name: \"${relatedImageEnvName}\", value: \"${dest}\"}"
-    if [[ -z ${RELATED_IMAGES_ENV} ]]; then
-      RELATED_IMAGES_ENV="${ENV}"
-    elif [[ ! ${RELATED_IMAGES_ENV} =~ ${relatedImageEnvName} ]]; then
-      RELATED_IMAGES_ENV="${RELATED_IMAGES_ENV}, ${ENV}"
-    fi
-  fi
-
   relatedImageName=${name}-${tagOrDigest}
   RELATED_IMAGE="{ name: \"${relatedImageName}\", image: \"${dest}\", tag: \"${source}\"}"
   if [[ -z ${RELATED_IMAGES} ]]; then
@@ -131,7 +115,7 @@ if [[ ${OPERATOR_FILE} ]]; then
   i=0
   while [ "${i}" -lt "${envVarLength}" ]; do
     envVarName=$(cat "${OPERATOR_FILE}" | yq -r '.spec.template.spec.containers[0].env['${i}'].name')
-    if [[ ${envVarName} =~ plugin_registry_image ]] || [[ ${envVarName} =~ devfile_registry_image ]]; then
+    if [[ ${envVarName} =~ editor_definition ]]; then
       yq -riY 'del(.spec.template.spec.containers[0].env['${i}'])' ${OPERATOR_FILE}
       i=$((i-1))
     fi

build/scripts/release/buildDigestMap.sh

@@ -46,13 +46,6 @@ setOperatorImage() {
     OPERATOR_IMAGE=$(yq -r '.spec.install.spec.deployments[].spec.template.spec.containers[0].image' "${CSV}")
 }
 
-setDevfileRegistryList() {
-    registry=$(yq -r '.spec.install.spec.deployments[].spec.template.spec.containers[].env[] | select(.name | test("RELATED_IMAGE_.*devfile_registry"; "g")) | .value' "${CSV}")
-
-    setRegistryImages "${registry}"
-    DEVFILE_REGISTRY_LIST=${registryImages}
-}
-
 setRegistryImages() {
     registry="${1}"
     registry="${registry/\@sha256:*/:${IMAGE_TAG}}" # remove possible existing @sha256:... and use current tag instead
@@ -139,9 +132,6 @@ setImagesFromDeploymentEnv
 setOperatorImage
 echo "${OPERATOR_IMAGE}"
 
-setDevfileRegistryList
-echo "${DEVFILE_REGISTRY_LIST}"
-
 DIGEST_FILE=${SCRIPTS_DIR}/generated/digests-mapping.txt
 rm -Rf "${DIGEST_FILE}"
 touch "${DIGEST_FILE}"
@@ -151,7 +141,3 @@ writeDigest "${OPERATOR_IMAGE}" "operator-image"
 for image in ${REQUIRED_IMAGES}; do
   writeDigest "${image}" "required-image"
 done
-
-for image in ${DEVFILE_REGISTRY_LIST}; do
-  writeDigest "${image}" "devfile-registry-image"
-done

build/scripts/release/make-release.sh

@@ -35,7 +35,6 @@ init() {
   CHE_SERVER_IMAGE=$(yq -r '.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_che_server") | .value' "${MANAGER_YAML}" | sed -e "s/\(.*:\).*/\1${RELEASE}/")
   CHE_DASHBOARD_IMAGE=$(yq -r '.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_dashboard") | .value' "${MANAGER_YAML}" | sed -e "s/\(.*:\).*/\1${RELEASE}/")
   CHE_PLUGIN_REGISTRY_IMAGE=$(yq -r '.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_plugin_registry") | .value' "${MANAGER_YAML}" | sed -e "s/\(.*:\).*/\1${RELEASE}/")
-  CHE_DEVFILE_REGISTRY_IMAGE=$(yq -r '.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_devfile_registry") | .value' "${MANAGER_YAML}" | sed -e "s/\(.*:\).*/\1${RELEASE}/")
   CHE_GATEWAY_IMAGE=$(yq -r '.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_single_host_gateway_config_sidecar") | .value' "${MANAGER_YAML}" | sed -e "s/\(.*:\).*/\1${RELEASE}/")
 
   if [[ $# -lt 1 ]]; then usage; exit; fi
@@ -102,7 +101,6 @@ releaseManagerYaml() {
   yq -riY '(.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_che_server") | .value) = "'${CHE_SERVER_IMAGE}'"' "${MANAGER_YAML}"
   yq -riY '(.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_dashboard") | .value) = "'${CHE_DASHBOARD_IMAGE}'"' "${MANAGER_YAML}"
   yq -riY '(.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_plugin_registry") | .value) = "'${CHE_PLUGIN_REGISTRY_IMAGE}'"' "${MANAGER_YAML}"
-  yq -riY '(.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_devfile_registry") | .value) = "'${CHE_DEVFILE_REGISTRY_IMAGE}'"' "${MANAGER_YAML}"
   yq -riY '(.spec.template.spec.containers[0].env[] | select(.name=="RELATED_IMAGE_single_host_gateway_config_sidecar") | .value) = "'${CHE_GATEWAY_IMAGE}'"' "${MANAGER_YAML}"
 
   echo "[INFO] releaseManagerYaml :: Update editors definitions images"

bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml

@@ -104,18 +104,17 @@ 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.89.0-876.next
+  name: eclipse-che.v7.90.0-877.next
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
       - description: 'The `CheCluster` custom resource allows defining and managing
           Eclipse Che server installation. Based on these settings, the  Operator
-          automatically creates and maintains several ConfigMaps: `che`, `plugin-registry`,
-          `devfile-registry` that will contain the appropriate environment variables
-          of the various components of the installation. These generated ConfigMaps
-          must NOT be updated manually.'
+          automatically creates and maintains several ConfigMaps: `che`, `plugin-registry`
+          that will contain the appropriate environment variables of the various components
+          of the installation. These generated ConfigMaps must NOT be updated manually.'
         displayName: Eclipse Che instance Specification
         kind: CheCluster
         name: checlusters.org.eclipse.che
@@ -881,8 +880,6 @@ spec:
                         value: quay.io/eclipse/che-dashboard:next
                       - name: RELATED_IMAGE_plugin_registry
                         value: quay.io/eclipse/che-plugin-registry:next
-                      - name: RELATED_IMAGE_devfile_registry
-                        value: quay.io/eclipse/che-devfile-registry:next
                       - name: RELATED_IMAGE_che_tls_secrets_creation_job
                         value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34
                       - name: RELATED_IMAGE_single_host_gateway
@@ -1036,7 +1033,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: Eclipse Foundation
-  version: 7.89.0-876.next
+  version: 7.90.0-877.next
   webhookdefinitions:
     - admissionReviewVersions:
         - v1