Enable referencing plugin components by ID (internal-registry only)

build/Dockerfile

@@ -31,6 +31,7 @@ FROM registry.access.redhat.com/ubi8-minimal:8.2-349
 WORKDIR /
 COPY --from=builder /devworkspace-operator/_output/bin/devworkspace-controller /usr/local/bin/devworkspace-controller
 COPY --from=builder /devworkspace-operator/_output/bin/webhook-server /usr/local/bin/webhook-server
+COPY --from=builder /devworkspace-operator/internal-registry internal-registry
 
 ENV USER_UID=1001 \
     USER_NAME=devworkspace-controller

build/rhel.Dockerfile

@@ -35,6 +35,7 @@ FROM registry.access.redhat.com/ubi8-minimal:8.2-349
 WORKDIR /
 COPY --from=builder /devworkspace-operator/_output/bin/devworkspace-controller /usr/local/bin/devworkspace-controller
 COPY --from=builder /devworkspace-operator/_output/bin/webhook-server /usr/local/bin/webhook-server
+COPY --from=builder /devworkspace-operator/internal-registry internal-registry
 
 USER nonroot:nonroot
 

controllers/workspace/devworkspace_controller.go

@@ -19,6 +19,8 @@ import (
 	"strings"
 	"time"
 
+	registry "github.com/devfile/devworkspace-operator/pkg/library/flatten/internal_registry"
+
 	"github.com/devfile/devworkspace-operator/pkg/library/flatten"
 
 	containerlib "github.com/devfile/devworkspace-operator/pkg/library/container"
@@ -175,11 +177,11 @@ func (r *DevWorkspaceReconciler) Reconcile(req ctrl.Request) (reconcileResult ct
 
 	timing.SetTime(timingInfo, timing.ComponentsCreated)
 	// TODO#185 : Temporarily do devfile flattening in main reconcile loop; this should be moved to a subcontroller.
-	// TODO#185 : Implement defaulting container component for Web Terminals for compatibility
 	flattenHelpers := flatten.ResolverTools{
 		InstanceNamespace: workspace.Namespace,
 		Context:           ctx,
 		K8sClient:         r.Client,
+		InternalRegistry:  &registry.InternalRegistryImpl{},
 	}
 	flattenedWorkspace, err := flatten.ResolveDevWorkspace(workspace.Spec.Template, flattenHelpers)
 	if err != nil {

internal-registry/eclipse/cloud-shell/nightly/devworkspacetemplate.yaml

@@ -0,0 +1,25 @@
+kind: DevWorkspaceTemplate
+apiVersion: workspace.devfile.io/v1alpha2
+metadata:
+  name: cloud-shell
+spec:
+  components:
+    - name: web-terminal
+      container:
+        image: "${RELATED_IMAGE_plugin_eclipse_cloud_shell_nightly}"
+        mountSources: false
+        command: ["/go/bin/che-machine-exec",
+                  "--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
+                  "--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
+                  "--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
+                  "--use-bearer-token",
+                  "--static", "/cloud-shell"]
+        endpoints:
+          - name: cloud-shell
+            exposure: public
+            targetPort: 4444
+            protocol: http
+            secure: true
+            path: /static/
+            attributes:
+              type: ide

internal-registry/redhat-developer/web-terminal-dev/4.5.0/devworkspacetemplate.yaml

@@ -0,0 +1,26 @@
+kind: DevWorkspaceTemplate
+apiVersion: workspace.devfile.io/v1alpha2
+metadata:
+  name: web-terminal-dev
+spec:
+  components:
+    - name: web-terminal
+      container:
+        image: "${RELATED_IMAGE_plugin_redhat_developer_web_terminal_dev_4_5_0}"
+        command: ["/go/bin/che-machine-exec",
+                  "--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
+                  "--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
+                  "--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
+                  "--use-bearer-token"]
+        endpoints:
+          - name: web-terminal
+            targetPort: 4444
+            secure: true
+            exposure: public
+            protocol: http
+            attributes:
+              type: ide
+        mountSources: false
+        env:
+          - name: USE_BEARER_TOKEN
+            value: "true"

internal-registry/redhat-developer/web-terminal-dev/nightly/devworkspacetemplate.yaml

@@ -0,0 +1,26 @@
+kind: DevWorkspaceTemplate
+apiVersion: workspace.devfile.io/v1alpha2
+metadata:
+  name: web-terminal-dev
+spec:
+  components:
+    - name: web-terminal
+      container:
+        image: "${RELATED_IMAGE_plugin_redhat_developer_web_terminal_dev_nightly}"
+        command: ["/go/bin/che-machine-exec",
+                  "--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
+                  "--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
+                  "--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
+                  "--use-bearer-token"]
+        endpoints:
+          - name: web-terminal
+            targetPort: 4444
+            secure: true
+            exposure: public
+            protocol: http
+            attributes:
+              type: ide
+        mountSources: false
+        env:
+          - name: USE_BEARER_TOKEN
+            value: "true"

internal-registry/redhat-developer/web-terminal/4.5.0/devworkspacetemplate.yaml

@@ -0,0 +1,27 @@
+kind: DevWorkspaceTemplate
+apiVersion: workspace.devfile.io/v1alpha2
+metadata:
+  name: web-terminal
+spec:
+  components:
+    - name: web-terminal
+      container:
+        image: "${RELATED_IMAGE_plugin_redhat_developer_web_terminal_4_5_0}"
+        command: ["/go/bin/che-machine-exec",
+                  "--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
+                  "--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
+                  "--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
+                  "--use-bearer-token",
+                  "--use-tls"]
+        endpoints:
+          - name: web-terminal
+            targetPort: 4444
+            secure: true
+            exposure: internal
+            protocol: http
+            attributes:
+              type: ide
+        mountSources: false
+        env:
+          - name: USE_BEARER_TOKEN
+            value: "true"

internal-registry/redhat-developer/web-terminal/nightly/devworkspacetemplate.yaml

@@ -0,0 +1,27 @@
+kind: DevWorkspaceTemplate
+apiVersion: workspace.devfile.io/v1alpha2
+metadata:
+  name: web-terminal
+spec:
+  components:
+    - name: web-terminal
+      container:
+        image: "${RELATED_IMAGE_plugin_redhat_developer_web_terminal_nightly}"
+        command: ["/go/bin/che-machine-exec",
+                  "--authenticated-user-id", "$(DEVWORKSPACE_CREATOR)",
+                  "--idle-timeout", "$(DEVWORKSPACE_IDLE_TIMEOUT)",
+                  "--pod-selector", "controller.devfile.io/workspace_id=$(DEVWORKSPACE_ID)",
+                  "--use-bearer-token",
+                  "--use-tls"]
+        endpoints:
+          - name: web-terminal
+            targetPort: 4444
+            secure: true
+            exposure: internal
+            protocol: http
+            attributes:
+              type: ide
+        mountSources: false
+        env:
+          - name: USE_BEARER_TOKEN
+            value: "true"