From a03bc8c090e2294c75272520bcb5f54e205f32dd Mon Sep 17 00:00:00 2001
From: Valeriy Svydenko <vsvydenk@redhat.com>
Date: Fri, 9 Jun 2023 16:26:53 +0300
Subject: [PATCH 1/2] add devfile.yaml to work with plugin reg

Signed-off-by: Valeriy Svydenko <vsvydenk@redhat.com>
---
 .devfile.yaml                                 | 59 +++++++++++++++++++
 .vscode/extensions.json                       | 10 ++++
 .../build/dockerfiles/Dockerfile              |  4 +-
 .../che-plugin-registry/patch-cluster.sh      | 43 ++++++++++++++
 4 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 .devfile.yaml
 create mode 100644 .vscode/extensions.json
 create mode 100755 dependencies/che-plugin-registry/patch-cluster.sh

diff --git a/.devfile.yaml b/.devfile.yaml
new file mode 100644
index 000000000..a0661b8b6
--- /dev/null
+++ b/.devfile.yaml
@@ -0,0 +1,59 @@
+schemaVersion: 2.2.0
+metadata:
+  name: ds-plugin-registry-dev
+components:
+  - name: builder
+    container:
+      image: quay.io/devfile/universal-developer-image:ubi8-latest
+      memoryRequest: 256Mi
+      memoryLimit: 8Gi
+      cpuRequest: 100m
+      cpuLimit: 2000m
+      env:
+        - name: CONCURRENTLY_OPTS
+          value: -m 1
+      endpoints:
+        - name: openvsx
+          exposure: internal
+          targetPort: 5432
+commands:
+  - id: podman-login
+    exec:
+      label: "1. Login to registry.redhat.io"
+      commandLine: podman login registry.redhat.io
+      component: builder
+  - id: build
+    exec:
+      label: "2. Build and Publish a Custom Plugin Registry"
+      component: builder
+      workingDir: ${PROJECTS_ROOT}/devspaces/dependencies/che-plugin-registry
+      commandLine: |
+          set -o xtrace;
+          rm -rf output;
+          mkdir output;
+          BUILDER=podman SKIP_TEST=true SKIP_FORMAT=true SKIP_LINT=true NODE_BUILD_OPTIONS="-max-old-space-size=1024" ./build.sh &&
+          export IMAGE=image-registry.openshift-image-registry.svc:5000/$(kubectl get sa default -o json | jq -r '.metadata.namespace')/che-plugin-registry &&
+          podman tag quay.io/devspaces/pluginregistry-rhel8:next ${IMAGE} &&
+          podman login --tls-verify=false -u $(oc whoami | tr -d :) -p $(oc whoami -t) image-registry.openshift-image-registry.svc:5000 &&
+          podman push --tls-verify=false "${IMAGE}"
+  - id: configure-custom-plugin-registry
+    exec:
+      label: "3. Configure Che to use the Custom Plugin Registry"
+      component: builder
+      workingDir: ${PROJECTS_ROOT}/devspaces/dependencies/che-plugin-registry
+      commandLine: |
+          export IMAGE=image-registry.openshift-image-registry.svc:5000/$(kubectl get sa default -o json | jq -r '.metadata.namespace')/che-plugin-registry &&
+          export CHECLUSTER_NAMESPACE="$(kubectl get checluster --all-namespaces -o json | jq -r '.items[0].metadata.namespace')" &&
+          kubectl create secret -n "${CHECLUSTER_NAMESPACE}" docker-registry regcred --docker-server=image-registry.openshift-image-registry.svc:5000 --docker-username=$(oc whoami | tr -d :) --docker-password=$(oc whoami -t) &&
+          kubectl patch serviceaccount default -n "${CHECLUSTER_NAMESPACE}" -p '{"imagePullSecrets": [{"name": "regcred"}]}' &&
+          ./patch-cluster.sh "${IMAGE}"
+  - id: enable-embedded-openvsx
+    exec:
+      label: "4. Configure Che to use the embedded Eclipse Open VSX server"
+      component: builder
+      workingDir: ${PROJECTS_ROOT}/devspaces/dependencies/che-plugin-registry
+      commandLine: |
+          export CHECLUSTER_NAME="$(kubectl get checluster --all-namespaces -o json | jq -r '.items[0].metadata.name')" &&
+          export CHECLUSTER_NAMESPACE="$(kubectl get checluster --all-namespaces -o json | jq -r '.items[0].metadata.namespace')" &&
+          export PATCH='{"spec":{"components":{"pluginRegistry":{"openVSXURL":""}}}}' &&
+          kubectl patch checluster "${CHECLUSTER_NAME}" --type=merge --patch "${PATCH}" -n "${CHECLUSTER_NAMESPACE}"
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..28c94467d
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,10 @@
+{
+    "recommendations": [
+      "arcanis.vscode-zipfs",
+      "donjayamanne.githistory",
+      "eamodio.gitlens",
+      "GitHub.vscode-pull-request-github",
+      "redhat.vscode-yaml",
+      "timonwong.shellcheck"
+    ]
+  }
diff --git a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile
index 06b5d29ed..76bea5ef8 100644
--- a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile
+++ b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile
@@ -47,7 +47,7 @@ WORKDIR /
 
 # Copy OpenVSX server files
 COPY --chown=0:0 /openvsx-server.tar.gz .
-RUN tar -xf openvsx-server.tar.gz && rm openvsx-server.tar.gz
+RUN tar --no-same-owner -xf openvsx-server.tar.gz && rm openvsx-server.tar.gz
 # Copy our configuration file for OpenVSX server
 COPY /build/dockerfiles/application.yaml /openvsx-server/config/
 RUN chmod -R g+rwx /openvsx-server
@@ -76,7 +76,7 @@ COPY README.md .htaccess /var/www/html/
 COPY /build/scripts/*.sh resources.tgz che-*.yaml /build/
 
 RUN chmod 755 /usr/local/bin/*.sh && \
-    tar -xvf /build/resources.tgz -C /build/ && \
+    tar --no-same-owner -xvf /build/resources.tgz -C /build/ && \
     rm -rf /build/output/v3/che-editors.yaml && \
     /build/list_referenced_images.sh /build/output/v3 --use-generated-content > /build/output/v3/external_images.txt && cat /build/output/v3/external_images.txt && \
     chmod -R g+rwX /build && \
diff --git a/dependencies/che-plugin-registry/patch-cluster.sh b/dependencies/che-plugin-registry/patch-cluster.sh
new file mode 100755
index 000000000..d58bb7623
--- /dev/null
+++ b/dependencies/che-plugin-registry/patch-cluster.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+#
+# Copyright (c) 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
+#
+# Arguments
+#    $1 - the new plugin registry image
+#
+
+set -e -u
+
+IMAGE=$1
+CHECLUSTER_NAME="$(kubectl get checluster --all-namespaces -o json | jq -r '.items[0].metadata.name')"
+CHECLUSTER_NAMESPACE="$(kubectl get checluster --all-namespaces -o json | jq -r '.items[0].metadata.namespace')"
+
+TMPDIR="$(mktemp -d)"
+trap 'rm -rf -- "$TMPDIR"' EXIT
+cat << EOF > "${TMPDIR}"/patch-file.yaml
+spec:
+  components:
+    pluginRegistry:
+      deployment:
+        containers:
+          - name: plugin-registry
+            image: ${IMAGE}
+EOF
+
+echo "Patching CheCluster ${CHECLUSTER_NAME} in namespace ${CHECLUSTER_NAMESPACE} to use ${IMAGE} as plugin registry image."
+echo
+echo "Original CheCluster .spec.components.pluginRegistry:"
+kubectl get  -n "${CHECLUSTER_NAMESPACE}" checluster "${CHECLUSTER_NAME}" -o json | jq '.spec.components.pluginRegistry' 
+echo
+echo "Patch file:"
+cat "${TMPDIR}"/patch-file.yaml
+echo
+kubectl patch -n "${CHECLUSTER_NAMESPACE}" checluster "${CHECLUSTER_NAME}" --type merge --patch "$(cat "${TMPDIR}"/patch-file.yaml)"
+echo
+echo "Patched CheCluster .spec.components.pluginRegistry:"
+kubectl get -n "${CHECLUSTER_NAMESPACE}" checluster "${CHECLUSTER_NAME}" -o json | jq '.spec.components.pluginRegistry'

From 8e9c8c7f01b10919f8eb344d075a06d13d0735a1 Mon Sep 17 00:00:00 2001
From: Valeriy Svydenko <vsvydenk@redhat.com>
Date: Tue, 11 Jul 2023 21:10:54 +0300
Subject: [PATCH 2/2] code cleanup

Signed-off-by: Valeriy Svydenko <vsvydenk@redhat.com>
---
 dependencies/che-plugin-registry/build/dockerfiles/Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile
index 76bea5ef8..ee6573e62 100644
--- a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile
+++ b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile
@@ -42,9 +42,6 @@ COPY ./build/dockerfiles/content_set*.repo /etc/yum.repos.d/
 COPY ./build/dockerfiles/rhel.install.sh /tmp
 RUN /tmp/rhel.install.sh && rm -f /tmp/rhel.install.sh
 
-# Use the final root filesystem as default directory
-WORKDIR /
-
 # Copy OpenVSX server files
 COPY --chown=0:0 /openvsx-server.tar.gz .
 RUN tar --no-same-owner -xf openvsx-server.tar.gz && rm openvsx-server.tar.gz