Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.8.0 Release #191

Merged
merged 2 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ We offer a helm chart at <https://github.com/eclipsesource/theia-cloud-helm> whi
helm repo add theia-cloud-remote https://github.eclipsesource.com/theia-cloud-helm
helm repo update

helm install theia-cloud-base theia-cloud-remote/theia-cloud-base --set issuer.email=your-mail@example.com --devel
helm install theia-cloud-base theia-cloud-remote/theia-cloud-base --set issuer.email=your-mail@example.com

helm install theia-cloud theia-cloud-remote/theia-cloud --namespace theiacloud --create-namespace --devel
helm install theia-cloud theia-cloud-remote/theia-cloud --namespace theiacloud --create-namespace

# Optional: switch to the newly created namespace
kubectl config set-context --current --namespace=theiacloud
Expand Down
2 changes: 1 addition & 1 deletion demo/k8s/appdefinitions/theia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
spec:
downlinkLimit: 30000
host: ws.theia-cloud.io
image: theiacloud/theia-cloud-demo:0.8.0.MS10
image: theiacloud/theia-cloud-demo:0.8.0
imagePullPolicy: IfNotPresent
ingressname: theia-cloud-demo-ws-ingress
limitsCpu: "2"
Expand Down
4 changes: 2 additions & 2 deletions doc/docs/Install.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ kubectl config set-context --current --namespace=theiacloud
helm repo add theia-cloud-remote https://github.eclipsesource.com/theia-cloud-helm
helm repo update

helm install theia-cloud-base theia-cloud-remote/theia-cloud-base --set issuer.email=your-mail@example.com --devel
helm install theia-cloud-base theia-cloud-remote/theia-cloud-base --set issuer.email=your-mail@example.com

helm install theia-cloud theia-cloud-remote/theia-cloud --namespace theiacloud --create-namespace --devel
helm install theia-cloud theia-cloud-remote/theia-cloud --namespace theiacloud --create-namespace

# Uninstall
helm uninstall theia-cloud -n theiacloud
Expand Down
62 changes: 35 additions & 27 deletions doc/docs/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,33 @@
},
"components" : {
"schemas" : {
"EnvironmentVars" : {
"description" : "An object to hold all the ways environment variables can be passed. Not to be used by itself.",
"type" : "object",
"properties" : {
"fromMap" : {
"description" : "Map of environment variables to be passed to Deployment. Ignored if Theia applications are started eagerly. Empty by default.",
"type" : "object",
"additionalProperties" : {
"type" : "string"
}
},
"fromConfigMaps" : {
"description" : "List of ConfigMaps (by name) containing environment variables to be passed to Deployment as envFrom.configMapRef. Ignored if Theia applications are started eagerly. Empty by default.",
"type" : "array",
"items" : {
"type" : "string"
}
},
"fromSecrets" : {
"description" : "List of Secrets (by name) containing environment variables to be passed to Deployment as envFrom.secretRef. Ignored if Theia applications are started eagerly. Empty by default.",
"type" : "array",
"items" : {
"type" : "string"
}
}
}
},
"LaunchRequest" : {
"description" : "A request to launch a new session.",
"required" : [ "appId", "user" ],
Expand Down Expand Up @@ -431,39 +458,13 @@
},
"env" : {
"allOf" : [ {
"$ref" : "#/components/schemas/LaunchRequest.Env"
"$ref" : "#/components/schemas/EnvironmentVars"
}, {
"description" : "Environment variables"
} ]
}
}
},
"LaunchRequest.Env" : {
"type" : "object",
"properties" : {
"fromMap" : {
"description" : "Map of environment variables to be passed to Deployment. Ignored if Theia applications are started eagerly. Empty by default.",
"type" : "object",
"additionalProperties" : {
"type" : "string"
}
},
"fromConfigMaps" : {
"description" : "List of ConfigMaps (by name) containing environment variables to be passed to Deployment as envFrom.configMapRef. Ignored if Theia applications are started eagerly. Empty by default.",
"type" : "array",
"items" : {
"type" : "string"
}
},
"fromSecrets" : {
"description" : "List of Secrets (by name) containing environment variables to be passed to Deployment as envFrom.secretRef. Ignored if Theia applications are started eagerly. Empty by default.",
"type" : "array",
"items" : {
"type" : "string"
}
}
}
},
"PingRequest" : {
"description" : "Request to ping the availability of the service.",
"required" : [ "appId" ],
Expand Down Expand Up @@ -616,6 +617,13 @@
"format" : "int32",
"description" : "Number of minutes to wait for session launch. Default is 3 Minutes.",
"type" : "integer"
},
"env" : {
"allOf" : [ {
"$ref" : "#/components/schemas/EnvironmentVars"
}, {
"description" : "Environment variables"
} ]
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ RUN mkdir /templates
WORKDIR /log-config
COPY java/operator/org.eclipse.theia.cloud.operator/log4j2.xml .
WORKDIR /operator
COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.8.0-SNAPSHOT-jar-with-dependencies.jar .
ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.8.0-SNAPSHOT-jar-with-dependencies.jar" ]
COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.8.1-SNAPSHOT-jar-with-dependencies.jar .
ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.8.1-SNAPSHOT-jar-with-dependencies.jar" ]
CMD [ "" ]
4 changes: 2 additions & 2 deletions dockerfiles/operator/Dockerfile.withcache
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ RUN mkdir /templates
WORKDIR /log-config
COPY java/operator/org.eclipse.theia.cloud.operator/log4j2.xml .
WORKDIR /operator
COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.8.0-SNAPSHOT-jar-with-dependencies.jar .
ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.8.0-SNAPSHOT-jar-with-dependencies.jar" ]
COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.8.1-SNAPSHOT-jar-with-dependencies.jar .
ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.8.1-SNAPSHOT-jar-with-dependencies.jar" ]
CMD [ "" ]
4 changes: 2 additions & 2 deletions dockerfiles/service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN cd /service/common/maven-conf && \

FROM openjdk:11-jre-slim-buster
WORKDIR /service
COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.8.0-SNAPSHOT-runner.jar .
COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.8.1-SNAPSHOT-runner.jar .
ENV APPID default-app-id
ENV SERVICE_PORT 8081

Expand All @@ -28,5 +28,5 @@ ENTRYPOINT java -Dtheia.cloud.app.id=${APPID} \
-Dquarkus.oidc.auth-server-url=${KEYCLOAK_SERVERURL} \
-Dquarkus.oidc.client-id=${KEYCLOAK_CLIENTID} \
-Dquarkus.oidc.credentials.secret=${KEYCLOAK_CLIENTSECRET} \
-jar ./service-0.8.0-SNAPSHOT-runner.jar
-jar ./service-0.8.1-SNAPSHOT-runner.jar
CMD [ "" ]
4 changes: 2 additions & 2 deletions dockerfiles/service/Dockerfile.withcache
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN --mount=type=cache,target=/root/.m2 \

FROM openjdk:11-jre-slim-buster
WORKDIR /service
COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.8.0-SNAPSHOT-runner.jar .
COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.8.1-SNAPSHOT-runner.jar .
ENV APPID default-app-id
ENV SERVICE_PORT 8081

Expand All @@ -29,5 +29,5 @@ ENTRYPOINT java -Dtheia.cloud.app.id=${APPID} \
-Dquarkus.oidc.auth-server-url=${KEYCLOAK_SERVERURL} \
-Dquarkus.oidc.client-id=${KEYCLOAK_CLIENTID} \
-Dquarkus.oidc.credentials.secret=${KEYCLOAK_CLIENTSECRET} \
-jar ./service-0.8.0-SNAPSHOT-runner.jar
-jar ./service-0.8.1-SNAPSHOT-runner.jar
CMD [ "" ]
4 changes: 2 additions & 2 deletions helm/theia.cloud/valuesGKETryNow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ issuer:
email: jfaltermeier@eclipsesource.com

image:
name: theiacloud/theia-cloud-demo:0.8.0.MS10
name: theiacloud/theia-cloud-demo:0.8.0
pullSecret: ""
timeoutStrategy: "FIXEDTIME"
timeoutLimit: "30"
Expand All @@ -22,7 +22,7 @@ hosts:
instance: ws.theia-cloud.io

landingPage:
image: theiacloud/theia-cloud-try-now-page:0.8.0.MS10v2
image: theiacloud/theia-cloud-try-now-page:0.8.0
appDefinition: "theia-cloud-demo"
ephemeralStorage: true
additionalApps:
Expand Down
51 changes: 51 additions & 0 deletions helm/theia.cloud/valuesMonitor.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
imagePullPolicy: Always

app:
id: asdfghjkl
name: Theia Blueprint

image:
name: theiacloud/theia-cloud-activity-demo:0.8.0
pullSecret: ""
timeoutStrategy: "FIXEDTIME"
timeoutLimit: "0"
imagePullPolicy: IfNotPresent

hosts:
usePaths: true
paths:
baseHost: my-ip.nip.io
service: servicex
landing: theiacloud
instance: instances

landingPage:
image: theiacloud/theia-cloud-landing-page:0.8.0
ephemeralStorage: true

keycloak:
enable: false
keycloakRealm: "TheiaCloud"
keycloakClientId: "theia-cloud"
clientSecret: "publicbutoauth2proxywantsasecret"
cookieSecret: "s-p4GxfRlPa_BI1XsLuvE2ihNOqYD1vmewWcXcpYjr0="

operator:
cloudProvider: MINIKUBE
imagePullPolicy: Always

service:
imagePullPolicy: Always

ingress:
clusterIssuer: theia-cloud-selfsigned-issuer
theiaCloudCommonName: true

monitor:
enable: true
port: 8081
activityTracker:
enable: true
interval: 1
timeoutAfter: 4
notifyAfter: 2
52 changes: 0 additions & 52 deletions helm/theia.cloud/valuesTestLandingPageMonitor.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion helm/theia.cloud/valuesTestTrynowPage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ hosts:
instance: ws.192.168.39.3.nip.io

landingPage:
image: theiacloud/theia-cloud-try-now-page:0.8.0.MS10
image: theiacloud/theia-cloud-try-now-page:0.8.0
imagePullPolicy: Always
appDefinition: "theia-cloud-demo"
ephemeralStorage: true
Expand Down
2 changes: 1 addition & 1 deletion java/common/maven-conf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>conf</artifactId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Theia.Cloud Maven Configuration</name>
<description>Common properties and configuration</description>
Expand Down
2 changes: 1 addition & 1 deletion java/common/org.eclipse.theia.cloud.common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>conf</artifactId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.1-SNAPSHOT</version>
<relativePath>../../common/maven-conf/</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions java/operator/org.eclipse.theia.cloud.operator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>conf</artifactId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.1-SNAPSHOT</version>
<relativePath>../../common/maven-conf/</relativePath>
</parent>

Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>common</artifactId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
Expand Down
4 changes: 2 additions & 2 deletions java/service/org.eclipse.theia.cloud.service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>conf</artifactId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.1-SNAPSHOT</version>
<relativePath>../../common/maven-conf/</relativePath>
</parent>

Expand Down Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>org.eclipse.theia.cloud</groupId>
<artifactId>common</artifactId>
<version>0.8.0-SNAPSHOT</version>
<version>0.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
import org.eclipse.microprofile.openapi.annotations.OpenAPIDefinition;
import org.eclipse.microprofile.openapi.annotations.info.Info;

@OpenAPIDefinition(info = @Info(title = "Theia.cloud API", version = "0.8.0"))
@OpenAPIDefinition(info = @Info(title = "Theia.cloud API", version = "0.8.1"))
public class TheiaCloudApiApplication extends Application {
}
2 changes: 1 addition & 1 deletion node/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eclipse-theiacloud/common",
"version": "0.8.0-alpha.23",
"version": "0.8.1-alpha.1",
"description": "Common functionality for Theia.cloud",
"license": "EPL-2.0",
"keywords": [
Expand Down
Loading