From a6b63883982e46c9236c3330b1e9f01250db9458 Mon Sep 17 00:00:00 2001 From: Johannes Faltermeier Date: Wed, 30 Aug 2023 15:09:18 +0200 Subject: [PATCH] 0.8.1.MS2 --- demo/dockerfiles/demo-theia-monitor-theia/package.json | 2 +- demo/k8s/appdefinitions/theia.yaml | 2 +- doc/docs/Building-Internal.md | 2 -- helm/theia.cloud/valuesGKETryNow.yaml | 4 ++-- helm/theia.cloud/valuesMonitor.yaml | 4 ++-- helm/theia.cloud/valuesTestTrynowPage.yaml | 2 +- .../.settings/org.eclipse.core.resources.prefs | 1 - java/operator/org.eclipse.theia.cloud.operator/.classpath | 8 ++++++++ node/monitor-theia/package.json | 2 +- terraform/modules/helm/theia-cloud.yaml | 4 ++-- terraform/test-configurations/2-02_monitor/theia_cloud.tf | 2 +- 11 files changed, 19 insertions(+), 14 deletions(-) diff --git a/demo/dockerfiles/demo-theia-monitor-theia/package.json b/demo/dockerfiles/demo-theia-monitor-theia/package.json index 16df6417..3e216746 100644 --- a/demo/dockerfiles/demo-theia-monitor-theia/package.json +++ b/demo/dockerfiles/demo-theia-monitor-theia/package.json @@ -56,7 +56,7 @@ "@theia/variable-resolver": "^1.34.0", "@theia/vsx-registry": "^1.34.0", "@theia/workspace": "^1.34.0", - "@eclipse-theiacloud/monitor-theia": "0.8.1-alpha.1" + "@eclipse-theiacloud/monitor-theia": "0.8.1-alpha.2" }, "devDependencies": { "@theia/cli": "^1.34.0" diff --git a/demo/k8s/appdefinitions/theia.yaml b/demo/k8s/appdefinitions/theia.yaml index 55e65844..c53b289c 100644 --- a/demo/k8s/appdefinitions/theia.yaml +++ b/demo/k8s/appdefinitions/theia.yaml @@ -5,7 +5,7 @@ metadata: namespace: theiacloud spec: downlinkLimit: 30000 - image: theiacloud/theia-cloud-demo:0.8.1.OSWeek23-v3 + image: theiacloud/theia-cloud-demo:0.8.1.MS2 imagePullPolicy: IfNotPresent ingressname: theia-cloud-demo-ws-ingress limitsCpu: "2" diff --git a/doc/docs/Building-Internal.md b/doc/docs/Building-Internal.md index 7645b6b5..b0384e57 100644 --- a/doc/docs/Building-Internal.md +++ b/doc/docs/Building-Internal.md @@ -39,7 +39,6 @@ Build and push the Landing page with: ```bash docker build -t theiacloud/theia-cloud-landing-page:latest -f dockerfiles/landing-page/Dockerfile . docker push theiacloud/theia-cloud-landing-page:latest - ``` Build and push the Try Now page with: @@ -47,7 +46,6 @@ Build and push the Try Now page with: ```bash docker build -t theiacloud/theia-cloud-try-now-page:latest -f dockerfiles/try-now-page/Dockerfile . docker push theiacloud/theia-cloud-try-now-page:latest - ``` Build and push the Theia.cloud REST service with: diff --git a/helm/theia.cloud/valuesGKETryNow.yaml b/helm/theia.cloud/valuesGKETryNow.yaml index 93c0a6f3..db6d7dc3 100644 --- a/helm/theia.cloud/valuesGKETryNow.yaml +++ b/helm/theia.cloud/valuesGKETryNow.yaml @@ -8,7 +8,7 @@ issuer: email: jfaltermeier@eclipsesource.com image: - name: theiacloud/theia-cloud-demo:0.8.1.OSWeek23-v3 + name: theiacloud/theia-cloud-demo:0.8.1.MS2 pullSecret: "" timeoutStrategy: "FIXEDTIME" timeoutLimit: "30" @@ -22,7 +22,7 @@ hosts: instance: ws.theia-cloud.io landingPage: - image: theiacloud/theia-cloud-try-now-page:0.8.1.OSWeek23-v3 + image: theiacloud/theia-cloud-try-now-page:0.8.1.MS2 appDefinition: "theia-cloud-demo" ephemeralStorage: true additionalApps: diff --git a/helm/theia.cloud/valuesMonitor.yaml b/helm/theia.cloud/valuesMonitor.yaml index 49e44cf2..4c9a3d85 100644 --- a/helm/theia.cloud/valuesMonitor.yaml +++ b/helm/theia.cloud/valuesMonitor.yaml @@ -5,7 +5,7 @@ app: name: Theia Blueprint image: - name: theiacloud/theia-cloud-activity-demo:0.8.1.OSWeek23-v3 + name: theiacloud/theia-cloud-activity-demo:0.8.1.MS2 pullSecret: "" timeoutStrategy: "FIXEDTIME" timeoutLimit: "0" @@ -19,7 +19,7 @@ hosts: instance: ws.theia-cloud.io landingPage: - image: theiacloud/theia-cloud-try-now-page:0.8.1.OSWeek23-v3 + image: theiacloud/theia-cloud-try-now-page:0.8.1.MS2 appDefinition: "theia-cloud-demo" ephemeralStorage: true diff --git a/helm/theia.cloud/valuesTestTrynowPage.yaml b/helm/theia.cloud/valuesTestTrynowPage.yaml index 9eb24749..a1633291 100644 --- a/helm/theia.cloud/valuesTestTrynowPage.yaml +++ b/helm/theia.cloud/valuesTestTrynowPage.yaml @@ -15,7 +15,7 @@ hosts: instance: ws.192.168.39.3.nip.io landingPage: - image: theiacloud/theia-cloud-try-now-page:0.8.1.OSWeek23-v3 + image: theiacloud/theia-cloud-try-now-page:0.8.1.MS2 imagePullPolicy: Always appDefinition: "theia-cloud-demo" ephemeralStorage: true diff --git a/java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.core.resources.prefs b/java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.core.resources.prefs index 839d647e..f9fe3459 100644 --- a/java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.core.resources.prefs +++ b/java/common/org.eclipse.theia.cloud.common/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,4 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/java/operator/org.eclipse.theia.cloud.operator/.classpath b/java/operator/org.eclipse.theia.cloud.operator/.classpath index 0eabdbb6..ef78828c 100644 --- a/java/operator/org.eclipse.theia.cloud.operator/.classpath +++ b/java/operator/org.eclipse.theia.cloud.operator/.classpath @@ -9,6 +9,7 @@ + @@ -39,6 +40,13 @@ + + + + + + + diff --git a/node/monitor-theia/package.json b/node/monitor-theia/package.json index 7513db67..03d81ba6 100644 --- a/node/monitor-theia/package.json +++ b/node/monitor-theia/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-theiacloud/monitor-theia", - "version": "0.8.1-alpha.1", + "version": "0.8.1-alpha.2", "keywords": [ "theia-extension" ], diff --git a/terraform/modules/helm/theia-cloud.yaml b/terraform/modules/helm/theia-cloud.yaml index a923f405..d017ae88 100644 --- a/terraform/modules/helm/theia-cloud.yaml +++ b/terraform/modules/helm/theia-cloud.yaml @@ -5,7 +5,7 @@ app: name: Theia Cloud image: - name: theiacloud/theia-cloud-demo:0.8.1.OSWeek23-v3 + name: theiacloud/theia-cloud-demo:0.8.1.MS2 pullSecret: "" timeoutStrategy: "FIXEDTIME" timeoutLimit: "30" @@ -19,7 +19,7 @@ hosts: instance: instances landingPage: - image: theiacloud/theia-cloud-landing-page:0.8.1.OSWeek23-v3 + image: theiacloud/theia-cloud-landing-page:0.8.1.MS2 appDefinition: "theia-cloud-demo" ephemeralStorage: false diff --git a/terraform/test-configurations/2-02_monitor/theia_cloud.tf b/terraform/test-configurations/2-02_monitor/theia_cloud.tf index 8cb3401c..4044712d 100644 --- a/terraform/test-configurations/2-02_monitor/theia_cloud.tf +++ b/terraform/test-configurations/2-02_monitor/theia_cloud.tf @@ -77,7 +77,7 @@ resource "helm_release" "theia-cloud" { set { name = "image.name" - value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.8.1.OSWeek23-v1" : "theiacloud/theia-cloud-activity-demo-theia:0.8.1.OSWeek23-v1" + value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.8.1.MS2" : "theiacloud/theia-cloud-activity-demo-theia:0.8.1.MS2" } set {