feat: sync devfiles samples into dashboard (#602)

* feat: Add AirGap samples Signed-off-by: Anatolii Bazko <[email protected]> --------- Signed-off-by: Anatolii Bazko <[email protected]>
redhat-developer · Aug 12, 2024 · 3058359 · 3058359
1 parent f22a53d
commit 3058359
Show file tree

Hide file tree

Showing 6 changed files with 186 additions and 2 deletions.
diff --git a/devspaces-dashboard/build/scripts/sync.sh b/devspaces-dashboard/build/scripts/sync.sh
@@ -61,6 +61,8 @@ echo ".github/
 .git/
 .gitattributes
 packages/dashboard-frontend/assets/branding/
+packages/devfile-registry/air-gap/index.json
+samples/index.json
 build/scripts/
 container.yaml
 /content_sets.*
@@ -81,6 +83,15 @@ SCRIPTS_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
 if [[ $SCRIPTS_BRANCH != "devspaces-3."*"-rhel-8" ]]; then SCRIPTS_BRANCH="devspaces-3-rhel-8"; fi
 configjson=$(curl -sSLo- https://raw.githubusercontent.com/redhat-developer/devspaces/${SCRIPTS_BRANCH}/dependencies/job-config.json)
 
+### Prepare airgap samples
+SRC_SAMPLES_JSON="${TARGETDIR}/samples/index.json"
+SAMPLES_OUTPUT_DIR="${TARGETDIR}/packages/devfile-registry/air-gap"
+# Set the correct tree in the samples index.json
+sed -i "s|tree/devspaces-[0-9.]-rhel-8|tree/${SCRIPTS_BRANCH}|g" "${SRC_SAMPLES_JSON}"
+# Copy new samples
+rm -rf "${SAMPLES_OUTPUT_DIR}"
+. "${TARGETDIR}/scripts/airgap.sh" -i "${SRC_SAMPLES_JSON}" -o "${SAMPLES_OUTPUT_DIR}"
+
 # get yarn version + download it for use in Brew; cannot use `npm i -g yarn` downstream so must install it this way
 if [[ $GET_YARN -eq 1 ]]; then
   YARN_VERSION=$(echo "${configjson}" | jq -r --arg DS_VERSION "${DS_VERSION}" '.Other["YARN_VERSION"][$DS_VERSION]');

diff --git a/devspaces-dashboard/packages/devfile-registry/air-gap/index.json b/devspaces-dashboard/packages/devfile-registry/air-gap/index.json
@@ -1,2 +1 @@
-[
-]
+[]
diff --git a/devspaces-dashboard/samples/index.json b/devspaces-dashboard/samples/index.json
diff --git a/devspaces-operator-bundle/build/scripts/sync-che-olm.sh b/devspaces-operator-bundle/build/scripts/sync-che-olm.sh
@@ -335,6 +335,7 @@ for CSVFILE in ${TARGETDIR}/manifests/devspaces.csv.yaml; do
 		["RELATED_IMAGE_che_tls_secrets_creation_job"]="DELETEME"
 		["RELATED_IMAGE_gateway_header_sidecar"]="DELETEME"
 
+    ["CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES"]="[]"
     ["CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL"]=""
     ["CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES"]="false"
     ["CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR"]="che-incubator/che-code/latest"

diff --git a/devspaces-operator-bundle/build/scripts/sync-che-operator.sh b/devspaces-operator-bundle/build/scripts/sync-che-operator.sh
@@ -213,6 +213,7 @@ declare -A operator_replacements=(
 	["RELATED_IMAGE_che_tls_secrets_creation_job"]="DELETEME"
 	["RELATED_IMAGE_gateway_header_sidecar"]="DELETEME"
 
+  ["CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES"]="[]"
   ["CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL"]=""
   ["CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES"]="false"
   ["CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR"]="che-incubator/che-code/latest"

diff --git a/devspaces-operator/build/scripts/sync-che-operator.sh b/devspaces-operator/build/scripts/sync-che-operator.sh
@@ -229,6 +229,7 @@ declare -A operator_replacements=(
 	["RELATED_IMAGE_che_tls_secrets_creation_job"]="DELETEME"
 	["RELATED_IMAGE_gateway_header_sidecar"]="DELETEME"
 
+  ["CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES"]="[]"
   ["CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL"]=""
   ["CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES"]="false"
   ["CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR"]="che-incubator/che-code/latest"
-Original file line number
+Diff line change
@@ -1,2 +1 @@
-    [
-    ]
+    []