fixes

Signed-off-by: Anatolii Bazko <[email protected]>
eclipse-che · Aug 16, 2024 · 918cad0 · 918cad0
1 parent 5d4ec54
commit 918cad0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/.github/workflows/release-next-catalog-and-operator-image.yaml b/.github/workflows/release-next-catalog-and-operator-image.yaml
@@ -78,8 +78,11 @@ jobs:
           registry: quay.io
       - name: Build catalog source
         run: |
-          ${GITHUB_WORKSPACE}/build/scripts/release/editors-definitions.sh update-manager-yaml --yaml-path ${GITHUB_WORKSPACE}/config/manager/manager.yaml
-          ${GITHUB_WORKSPACE}/build/scripts/release/samples.sh update-manager-yaml --yaml-path ${GITHUB_WORKSPACE}/config/manager/manager.yaml
+          ${GITHUB_WORKSPACE}/build/scripts/release/editors-definitions.sh update-manager-yaml \
+            --yaml-path ${GITHUB_WORKSPACE}/config/manager/manager.yaml
+          ${GITHUB_WORKSPACE}/build/scripts/release/samples.sh update-manager-yaml \
+            --yaml-path ${GITHUB_WORKSPACE}/config/manager/manager.yaml \
+            --index-json-url "https://raw.githubusercontent.com/eclipse-che/che-dashboard/main/packages/devfile-registry/air-gap/index.json"
           make update-dev-resources
           ${GITHUB_WORKSPACE}/build/scripts/release/addDigests.sh -s $(make csv-path CHANNEL=next) -t next
           ${GITHUB_WORKSPACE}/build/scripts/olm/release-catalog.sh \

diff --git a/build/scripts/release/make-release.sh b/build/scripts/release/make-release.sh
@@ -104,10 +104,13 @@ releaseManagerYaml() {
   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"
-  . "${OPERATOR_REPO}/build/scripts/release/editors-definitions.sh" update-manager-yaml --yaml-path "${OPERATOR_REPO}/config/manager/manager.yaml"
+  . "${OPERATOR_REPO}/build/scripts/release/editors-definitions.sh" update-manager-yaml \
+      -yaml-path "${OPERATOR_REPO}/config/manager/manager.yaml"
 
   echo "[INFO] releaseManagerYaml :: Update samples images"
-  . "${OPERATOR_REPO}/build/scripts/release/samples.sh" update-manager-yaml --yaml-path "${OPERATOR_REPO}/config/manager/manager.yaml"
+  . "${OPERATOR_REPO}/build/scripts/release/samples.sh" update-manager-yaml \
+      --yaml-path "${OPERATOR_REPO}/config/manager/manager.yaml" \
+      --index-json-url "https://raw.githubusercontent.com/eclipse-che/che-dashboard/${RELEASE}/packages/devfile-registry/air-gap/index.json"
 
   echo "[INFO] releaseManagerYaml :: Ensure license header"
   make license "${MANAGER_YAML}"

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -1,15 +1,3 @@
-#
-# Copyright (c) 2019-2023 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Red Hat, Inc. - initial API and implementation
-#
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -100,15 +88,17 @@ spec:
             - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR
               value: che-incubator/che-code/latest
             - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS
-              value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
+              value: '[{"name": "universal-developer-image", "container": {"image":
+                "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
             - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
               value: https://open-vsx.org
             - name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES
               value: '[{"url": "https://registry.devfile.io"}]'
             - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES
               value: 'false'
             - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_CONTAINERSECURITYCONTEXT
-              value: '{"allowPrivilegeEscalation": true,"capabilities": {"add": ["SETGID", "SETUID"]}}'
+              value: '{"allowPrivilegeEscalation": true,"capabilities": {"add": ["SETGID",
+                "SETUID"]}}'
           livenessProbe:
             httpGet:
               path: /healthz