Add the WorkspaceExposure support

Signed-off-by: David Festal <dfestal@redhat.com>
mkuznyetsov · Dec 3, 2019 · 94aa959 · 94aa959
1 parent ead14e9
commit 94aa959
Show file tree

Hide file tree

Showing 33 changed files with 1,173 additions and 181 deletions.
diff --git a/che-rest-apis/src/main/java/org/eclipse/che/incubator/crd/cherestapis/ApiService.java b/che-rest-apis/src/main/java/org/eclipse/che/incubator/crd/cherestapis/ApiService.java
@@ -23,9 +23,12 @@
 import org.eclipse.che.api.workspace.server.devfile.exception.DevfileException;
 import org.eclipse.che.api.workspace.server.devfile.exception.DevfileFormatException;
 import org.eclipse.che.api.workspace.server.devfile.validator.DevfileIntegrityValidator;
+import org.eclipse.che.api.workspace.server.dto.DtoServerImpls.RuntimeDtoImpl;
 import org.eclipse.che.api.workspace.server.DtoConverter;
 import org.eclipse.che.api.workspace.server.model.impl.WorkspaceImpl;
+import org.eclipse.che.api.workspace.shared.dto.RuntimeDto;
 import org.eclipse.che.api.workspace.shared.dto.WorkspaceDto;
+import org.eclipse.che.dto.server.DtoFactory;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -114,8 +117,13 @@ public WorkspaceDto getWorkspace(String workspaceId) {
         try {
             Map<String, Object> workspaceCustomResource = retrieveWorkspaceCustomResource();
             if (workspaceCustomResource != null) {
-                Map<String, Object> workspaceAnnotations = asMap(asMap(workspaceCustomResource.get("metadata")).get("annotations"));
-                runtimeAnnotation = (String) workspaceAnnotations.get("org.eclipse.che.workspace/runtime");
+                Map<String, Object> status = asMap(workspaceCustomResource.get("status"));
+                if (status != null) {
+                    Map<String, Object> additionalFields = asMap(status.get("additionalFields"));
+                    if (additionalFields != null) {
+                        runtimeAnnotation = (String) additionalFields.get("org.eclipse.che.workspace/runtime");
+                    }
+                }
                 devfileYaml = readDevfileFromWorkspaceCustomResource(workspaceCustomResource);
             }
         } catch (ApiException e) {
@@ -177,9 +185,9 @@ DevfileImpl parseDevFile(String devfileYaml) throws JsonProcessingException, IOE
         return devfileObj;
     }
 
-    Runtime parseRuntime(String runtimeJson) throws JsonProcessingException, IOException {
+    RuntimeDto parseRuntime(String runtimeJson) throws JsonProcessingException, IOException {
         LOGGER.info("Runtime content for workspace {}: {}", workspaceName, runtimeJson);
-        Runtime runtimeObj = jsonObjectMapper.treeToValue(yamlObjectMapper.readTree(runtimeJson), Runtime.class);
+        RuntimeDto runtimeObj = DtoFactory.getInstance().createDtoFromJson(runtimeJson, RuntimeDto.class);
         return runtimeObj;
     }
 

diff --git a/...g/eclipse/che/incubator/crd/cherestapis/graalvm/RuntimeReflectionRegistrationFeature.java b/...g/eclipse/che/incubator/crd/cherestapis/graalvm/RuntimeReflectionRegistrationFeature.java
@@ -12,7 +12,6 @@
 import com.oracle.svm.core.annotate.AutomaticFeature;
 
 import org.eclipse.che.api.workspace.server.devfile.PreferencesDeserializer;
-import org.eclipse.che.api.workspace.server.dto.DtoServerImpls.WorkspaceDtoImpl;
 import org.eclipse.che.api.workspace.server.model.impl.devfile.DevfileImpl;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
@@ -24,7 +23,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
     System.out.println("Eclipse Che compatibility layer for GraalVM native image generation");
 
     registerFully(DevfileImpl.class);
-    registerFully(WorkspaceDtoImpl.class);
+    registerFully(org.eclipse.che.api.workspace.server.dto.DtoServerImpls.class);
+    registerFully(org.eclipse.che.api.core.server.dto.DtoServerImpls.class);
     registerFully(PreferencesDeserializer.class);
   }
 

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"github.com/che-incubator/che-workspace-crd-operator/pkg/controller/registry"
 	"context"
 	"flag"
 	"fmt"
@@ -106,6 +107,16 @@ func main() {
 		os.Exit(1)
 	}
 
+	log.Info("Expose Plugin Registry Port.")
+
+	// Create Service object to expose the embedded plugin registry.
+	_, err = registry.ExposeRegistryPort(ctx, 8080)
+	if err != nil {
+		log.Info(err.Error())
+	}
+
+	log.Info("Setting up Controllers.")
+
 	// Setup all Controllers
 	if err := controller.AddToManager(mgr); err != nil {
 		log.Error(err, "")
@@ -118,6 +129,8 @@ func main() {
 		os.Exit(1)
 	}
 
+	log.Info("Expose Metrics Port.")
+
 	// Create Service object to expose the metrics port.
 	_, err = metrics.ExposeMetricsPort(ctx, metricsPort)
 	if err != nil {

diff --git a/deploy/crds/workspace_v1alpha1_workspace_crd.yaml b/deploy/crds/workspace_v1alpha1_workspace_crd.yaml
@@ -3,6 +3,19 @@ kind: CustomResourceDefinition
 metadata:
   name: workspaces.workspace.che.eclipse.org
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.workspaceId
+    name: Id
+    type: string
+  - JSONPath: .spec.started
+    name: Enabled
+    type: boolean
+  - JSONPath: .status.phase
+    name: Status
+    type: string
+  - JSONPath: .status.ideUrl
+    name: Url
+    type: string
   group: workspace.che.eclipse.org
   names:
     kind: Workspace
@@ -237,6 +250,11 @@ spec:
           type: object
         status:
           properties:
+            additionalFields:
+              additionalProperties:
+                type: string
+              description: AdditionalInfo
+              type: object
             conditions:
               description: Condition keeps track of all cluster conditions, if they
                 exist.

diff --git a/deploy/flatten/che-workspace-crd-operator.v0.0.1.clusterserviceversion-v0.0.1.yaml b/deploy/flatten/che-workspace-crd-operator.v0.0.1.clusterserviceversion-v0.0.1.yaml
@@ -140,6 +140,13 @@ spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
+    - kind: WorkspaceExposure
+      name: workspaceexposures.workspace.che.eclipse.org
+      version: v1alpha1
+      description: |
+        Defines how Eclipse Che 7 workspace will be made available
+        to the external network.
+      displayName: Che Workspace Exposure
     - kind: Workspace
       name: workspaces.workspace.che.eclipse.org
       version: v1alpha1
@@ -153,7 +160,7 @@ spec:
           displayName: Started
           path: started
           x-descriptors:
-            - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch'      
+            - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch'
       statusDescriptors:
         - description: Workspace Status
           displayName: Status
@@ -227,14 +234,24 @@ spec:
                       fieldPath: metadata.name
                 - name: OPERATOR_NAME
                   value: che-workspace-crd-operator
-                image: quay.io/che-incubator/che-workspace-crd-controller:latest
+                image: quay.io/che-incubator/che-workspace-crd-controller:7.1.0
                 imagePullPolicy: Always
                 name: che-workspace-crd-operator
                 resources: {}
                 ports:
                   - containerPort: 8383
                     name: metrics
                 terminationMessagePolicy: FallbackToLogsOnError
+              - image: quay.io/che-incubator/che-workspace-crd-plugin-registry:7.1.0-offline
+                imagePullPolicy: Always
+                name: che-plugin-registry
+                ports:
+                - containerPort: 8080
+                resources:
+                  limits:
+                    memory: 256Mi
+                  requests:
+                    memory: 16Mi
               serviceAccountName: che-workspace-crd-operator
       clusterpermissions:
       - rules:

diff --git a/deploy/flatten/workspace_v1alpha1_workspace_crd.yaml b/deploy/flatten/workspace_v1alpha1_workspace_crd.yaml
@@ -3,6 +3,19 @@ kind: CustomResourceDefinition
 metadata:
   name: workspaces.workspace.che.eclipse.org
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.workspaceId
+    name: Id
+    type: string
+  - JSONPath: .spec.started
+    name: Enabled
+    type: boolean
+  - JSONPath: .status.phase
+    name: Status
+    type: string
+  - JSONPath: .status.ideUrl
+    name: Url
+    type: string
   group: workspace.che.eclipse.org
   names:
     kind: Workspace
@@ -48,6 +61,14 @@ spec:
                             component:
                               description: The actual action command-line string
                               type: string
+                            reference:
+                              description: Working directory where the command should
+                                be executed
+                              type: string
+                            referenceContent:
+                              description: Working directory where the command should
+                                be executed
+                              type: string
                             type:
                               description: Describes component to which given action
                                 relates
@@ -56,7 +77,6 @@ spec:
                               description: Describes action type
                               type: string
                           required:
-                          - component
                           - type
                           type: object
                         type: array
@@ -79,6 +99,12 @@ spec:
                     locations
                   items:
                     properties:
+                      alias:
+                        description: Describes whether projects sources should be
+                          mount to the component. `CHE_PROJECTS_ROOT`; environment
+                          variable should contains a path where projects sources are
+                          mount
+                        type: string
                       args:
                         description: The command to run in the dockerimage component
                           instead of the default one provided in the image. Defaults
@@ -95,27 +121,8 @@ spec:
                         items:
                           properties:
                             attributes:
-                              properties:
-                                discoverable:
-                                  description: 'Identifies server as secure or non-secure.
-                                    Requests to secure servers will be authenticated
-                                    and must contain machine token - default: false'
-                                  type: boolean
-                                path:
-                                  description: Defines protocol that should be used
-                                    for communication with endpoint. Is used for endpoint
-                                    URL evaluation"
-                                  type: string
-                                protocol:
-                                  description: 'Identifies endpoint as accessible
-                                    by its name. - default: false'
-                                  type: string
-                                public:
-                                  type: boolean
-                                secure:
-                                  description: 'Identifies endpoint as workspace internally
-                                    or externally accessible - default: true'
-                                  type: boolean
+                              additionalProperties:
+                                type: string
                               type: object
                             name:
                               type: string
@@ -160,12 +167,6 @@ spec:
                           can also use the; power-of-two equivalents: Ei, Pi, Ti,
                           Gi, Mi, Ki'
                         type: boolean
-                      name:
-                        description: Describes whether projects sources should be
-                          mount to the component. `CHE_PROJECTS_ROOT`; environment
-                          variable should contains a path where projects sources are
-                          mount
-                        type: string
                       reference:
                         description: Specifies the docker image that should be used
                           for component
@@ -200,7 +201,6 @@ spec:
                           type: object
                         type: array
                     required:
-                    - name
                     - type
                     type: object
                   type: array
@@ -240,6 +240,8 @@ spec:
               required:
               - components
               type: object
+            exposureClass:
+              type: string
             started:
               type: boolean
           required:
@@ -248,6 +250,11 @@ spec:
           type: object
         status:
           properties:
+            additionalFields:
+              additionalProperties:
+                type: string
+              description: AdditionalInfo
+              type: object
             conditions:
               description: Condition keeps track of all cluster conditions, if they
                 exist.