From 01545ff78c52509c4f01ed1ffa31cb0a6ccc77a8 Mon Sep 17 00:00:00 2001 From: Simon Graband Date: Tue, 23 Jan 2024 14:14:13 +0100 Subject: [PATCH] Update to 0.9.0 Remove -next and -SNAPSHOT postfixes. Update package-lock.json files. Update values in helm module. Add release date to changelog. Update monitor *.vsix file. Contributed on behalf of STMicroelectronics --- .github/workflows/reusable-demo.yml | 2 +- .github/workflows/reusable-docker.yml | 2 +- CHANGELOG.md | 2 +- .../demo-theia-monitor-vscode/Dockerfile | 4 ++-- ...ext.vsix => theiacloud-monitor-0.9.0.vsix} | Bin dockerfiles/operator/Dockerfile | 4 ++-- dockerfiles/operator/Dockerfile.withcache | 4 ++-- dockerfiles/service/Dockerfile | 4 ++-- dockerfiles/service/Dockerfile.withcache | 4 ++-- helm/theia.cloud/valuesGKETryNow.yaml | 4 ++-- helm/theia.cloud/valuesMonitor.yaml | 4 ++-- helm/theia.cloud/valuesTestTrynowPage.yaml | 2 +- java/common/maven-conf/pom.xml | 2 +- .../org.eclipse.theia.cloud.common/pom.xml | 2 +- .../org.eclipse.theia.cloud.operator/pom.xml | 4 ++-- .../org.eclipse.theia.cloud.service/pom.xml | 4 ++-- node/common/package.json | 2 +- node/landing-page/package.json | 2 +- node/monitor-theia/package.json | 2 +- node/monitor/package.json | 2 +- node/package-lock.json | 18 +++++++++--------- node/testing-page/package.json | 2 +- node/try-now-page/package.json | 2 +- terraform/modules/helm/main.tf | 6 +++--- terraform/modules/helm/theia-cloud.yaml | 4 ++-- .../2-02_monitor/theia_cloud.tf | 2 +- 26 files changed, 45 insertions(+), 45 deletions(-) rename demo/dockerfiles/demo-theia-monitor-vscode/{theiacloud-monitor-0.9.0-next.vsix => theiacloud-monitor-0.9.0.vsix} (100%) diff --git a/.github/workflows/reusable-demo.yml b/.github/workflows/reusable-demo.yml index cde766c5..c01e94ef 100644 --- a/.github/workflows/reusable-demo.yml +++ b/.github/workflows/reusable-demo.yml @@ -26,7 +26,7 @@ on: required: true env: - VERSION: 0.9.0-next + VERSION: 0.9.0 jobs: publish-next: diff --git a/.github/workflows/reusable-docker.yml b/.github/workflows/reusable-docker.yml index 2eaae758..0ad04c1b 100644 --- a/.github/workflows/reusable-docker.yml +++ b/.github/workflows/reusable-docker.yml @@ -19,7 +19,7 @@ on: required: true env: - VERSION: 0.9.0-next + VERSION: 0.9.0 jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0313f883..47a4d464 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.9.0] - TBD (estimated 2024-01-31) +## [0.9.0] - 2024-01-23 - [node/landing-page] Make npm workspace and remove yarn references from repo [#258](https://github.com/eclipsesource/theia-cloud/pull/258) | [#45](https://github.com/eclipsesource/theia-cloud-helm/pull/45) - contributed on behalf of STMicroelectronics - [All components] Align [versioning](https://github.com/eclipsesource/theia-cloud#versioning) between all components and introduce Changelog [#258](https://github.com/eclipsesource/theia-cloud/pull/258) | [#45](https://github.com/eclipsesource/theia-cloud-helm/pull/45) - contributed on behalf of STMicroelectronics diff --git a/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile b/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile index abc68a28..32766623 100644 --- a/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile +++ b/demo/dockerfiles/demo-theia-monitor-vscode/Dockerfile @@ -1,3 +1,3 @@ -FROM theiacloud/theia-cloud-demo:0.9.0-next as production-stage +FROM theiacloud/theia-cloud-demo:0.9.0 as production-stage -COPY --chown=theia:theia theiacloud-monitor-0.9.0-next.vsix /home/theia/plugins \ No newline at end of file +COPY --chown=theia:theia theiacloud-monitor-0.9.0.vsix /home/theia/plugins \ No newline at end of file diff --git a/demo/dockerfiles/demo-theia-monitor-vscode/theiacloud-monitor-0.9.0-next.vsix b/demo/dockerfiles/demo-theia-monitor-vscode/theiacloud-monitor-0.9.0.vsix similarity index 100% rename from demo/dockerfiles/demo-theia-monitor-vscode/theiacloud-monitor-0.9.0-next.vsix rename to demo/dockerfiles/demo-theia-monitor-vscode/theiacloud-monitor-0.9.0.vsix diff --git a/dockerfiles/operator/Dockerfile b/dockerfiles/operator/Dockerfile index 7681c7b7..8af6cb75 100644 --- a/dockerfiles/operator/Dockerfile +++ b/dockerfiles/operator/Dockerfile @@ -15,7 +15,7 @@ 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.9.0-SNAPSHOT-jar-with-dependencies.jar . +COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.9.0-jar-with-dependencies.jar . # to get more debug information from the kubernetes client itself, add -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG below -ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.9.0-SNAPSHOT-jar-with-dependencies.jar" ] +ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.9.0-jar-with-dependencies.jar" ] CMD [ "" ] diff --git a/dockerfiles/operator/Dockerfile.withcache b/dockerfiles/operator/Dockerfile.withcache index 779a2085..5274a537 100644 --- a/dockerfiles/operator/Dockerfile.withcache +++ b/dockerfiles/operator/Dockerfile.withcache @@ -16,7 +16,7 @@ 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.9.0-SNAPSHOT-jar-with-dependencies.jar . +COPY --from=builder /operator/operator/org.eclipse.theia.cloud.operator/target/operator-0.9.0-jar-with-dependencies.jar . # to get more debug information from the kubernetes client itself, add -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG below -ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.9.0-SNAPSHOT-jar-with-dependencies.jar" ] +ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./operator-0.9.0-jar-with-dependencies.jar" ] CMD [ "" ] diff --git a/dockerfiles/service/Dockerfile b/dockerfiles/service/Dockerfile index 5181133b..e03d3ae6 100644 --- a/dockerfiles/service/Dockerfile +++ b/dockerfiles/service/Dockerfile @@ -12,7 +12,7 @@ RUN cd /service/common/maven-conf && \ FROM eclipse-temurin:17-jre-alpine WORKDIR /service -COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.9.0-SNAPSHOT-runner.jar . +COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.9.0-runner.jar . ENV APPID default-app-id ENV SERVICE_PORT 8081 @@ -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.9.0-SNAPSHOT-runner.jar + -jar ./service-0.9.0-runner.jar CMD [ "" ] \ No newline at end of file diff --git a/dockerfiles/service/Dockerfile.withcache b/dockerfiles/service/Dockerfile.withcache index ca857ba2..508743a9 100644 --- a/dockerfiles/service/Dockerfile.withcache +++ b/dockerfiles/service/Dockerfile.withcache @@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/root/.m2 \ FROM eclipse-temurin:17-jre-alpine WORKDIR /service -COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.9.0-SNAPSHOT-runner.jar . +COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.9.0-runner.jar . ENV APPID default-app-id ENV SERVICE_PORT 8081 @@ -30,5 +30,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.9.0-SNAPSHOT-runner.jar + -jar ./service-0.9.0-runner.jar CMD [ "" ] \ No newline at end of file diff --git a/helm/theia.cloud/valuesGKETryNow.yaml b/helm/theia.cloud/valuesGKETryNow.yaml index 59b44d60..3c866160 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.9.0-next + name: theiacloud/theia-cloud-demo:0.9.0 pullSecret: "" timeoutStrategy: "FIXEDTIME" timeoutLimit: "30" @@ -22,7 +22,7 @@ hosts: instance: ws.theia-cloud.io landingPage: - image: theiacloud/theia-cloud-try-now-page:0.9.0-next + image: theiacloud/theia-cloud-try-now-page:0.9.0 appDefinition: "theia-cloud-demo" ephemeralStorage: true additionalApps: diff --git a/helm/theia.cloud/valuesMonitor.yaml b/helm/theia.cloud/valuesMonitor.yaml index 7178b1ba..8e8b067c 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.9.0-next + name: theiacloud/theia-cloud-activity-demo:0.9.0 pullSecret: "" timeoutStrategy: "FIXEDTIME" timeoutLimit: "0" @@ -19,7 +19,7 @@ hosts: instance: ws.theia-cloud.io landingPage: - image: theiacloud/theia-cloud-try-now-page:0.9.0-next + image: theiacloud/theia-cloud-try-now-page:0.9.0 appDefinition: "theia-cloud-demo" ephemeralStorage: true diff --git a/helm/theia.cloud/valuesTestTrynowPage.yaml b/helm/theia.cloud/valuesTestTrynowPage.yaml index 16e89d3f..0655dc9a 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.9.0-next + image: theiacloud/theia-cloud-try-now-page:0.9.0 imagePullPolicy: Always appDefinition: "theia-cloud-demo" ephemeralStorage: true diff --git a/java/common/maven-conf/pom.xml b/java/common/maven-conf/pom.xml index 2d0ebbe8..6f700652 100644 --- a/java/common/maven-conf/pom.xml +++ b/java/common/maven-conf/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.theia.cloud conf - 0.9.0-SNAPSHOT + 0.9.0 pom Theia.Cloud Maven Configuration Common properties and configuration diff --git a/java/common/org.eclipse.theia.cloud.common/pom.xml b/java/common/org.eclipse.theia.cloud.common/pom.xml index 6e1d01d7..06c20dff 100644 --- a/java/common/org.eclipse.theia.cloud.common/pom.xml +++ b/java/common/org.eclipse.theia.cloud.common/pom.xml @@ -11,7 +11,7 @@ org.eclipse.theia.cloud conf - 0.9.0-SNAPSHOT + 0.9.0 ../../common/maven-conf/ diff --git a/java/operator/org.eclipse.theia.cloud.operator/pom.xml b/java/operator/org.eclipse.theia.cloud.operator/pom.xml index c7e4294d..717265ff 100644 --- a/java/operator/org.eclipse.theia.cloud.operator/pom.xml +++ b/java/operator/org.eclipse.theia.cloud.operator/pom.xml @@ -11,7 +11,7 @@ org.eclipse.theia.cloud conf - 0.9.0-SNAPSHOT + 0.9.0 ../../common/maven-conf/ @@ -23,7 +23,7 @@ org.eclipse.theia.cloud common - 0.9.0-SNAPSHOT + 0.9.0 org.json diff --git a/java/service/org.eclipse.theia.cloud.service/pom.xml b/java/service/org.eclipse.theia.cloud.service/pom.xml index f2f607b8..c38de85d 100644 --- a/java/service/org.eclipse.theia.cloud.service/pom.xml +++ b/java/service/org.eclipse.theia.cloud.service/pom.xml @@ -9,7 +9,7 @@ org.eclipse.theia.cloud conf - 0.9.0-SNAPSHOT + 0.9.0 ../../common/maven-conf/ @@ -72,7 +72,7 @@ org.eclipse.theia.cloud common - 0.9.0-SNAPSHOT + 0.9.0 io.fabric8 diff --git a/node/common/package.json b/node/common/package.json index 430b80dc..f88fe6a1 100644 --- a/node/common/package.json +++ b/node/common/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-theiacloud/common", - "version": "0.9.0-next", + "version": "0.9.0", "description": "Common functionality for Theia.cloud", "license": "EPL-2.0", "keywords": [ diff --git a/node/landing-page/package.json b/node/landing-page/package.json index 6d6110c4..f8f5a1d4 100644 --- a/node/landing-page/package.json +++ b/node/landing-page/package.json @@ -9,7 +9,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@eclipse-theiacloud/common": "0.9.0-next", + "@eclipse-theiacloud/common": "0.9.0", "@types/uuid": "^8.3.2", "axios": "^1.6.5", "core-js": "^3.6.5", diff --git a/node/monitor-theia/package.json b/node/monitor-theia/package.json index 82c5ab40..a134cf5b 100644 --- a/node/monitor-theia/package.json +++ b/node/monitor-theia/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-theiacloud/monitor-theia", - "version": "0.9.0-next", + "version": "0.9.0", "keywords": [ "theia-extension" ], diff --git a/node/monitor/package.json b/node/monitor/package.json index a94f84ff..67fc47c6 100644 --- a/node/monitor/package.json +++ b/node/monitor/package.json @@ -2,7 +2,7 @@ "name": "theiacloud-monitor", "displayName": "Theia.cloud Monitor extension", "description": "Monitor for Theia.cloud hosted tools", - "version": "0.9.0-next", + "version": "0.9.0", "license": "EPL-2.0", "author": { "name": "Theia.cloud" diff --git a/node/package-lock.json b/node/package-lock.json index f652222e..04612d02 100644 --- a/node/package-lock.json +++ b/node/package-lock.json @@ -36,7 +36,7 @@ }, "common": { "name": "@eclipse-theiacloud/common", - "version": "0.9.0-next", + "version": "0.9.0", "license": "EPL-2.0", "dependencies": { "@types/uuid": "^8.3.4", @@ -47,7 +47,7 @@ "landing-page": { "version": "0.1.0", "dependencies": { - "@eclipse-theiacloud/common": "0.9.0-next", + "@eclipse-theiacloud/common": "0.9.0", "@types/uuid": "^8.3.2", "axios": "^1.6.5", "core-js": "^3.6.5", @@ -173,7 +173,7 @@ }, "monitor": { "name": "theiacloud-monitor", - "version": "0.9.0-next", + "version": "0.9.0", "license": "EPL-2.0", "dependencies": { "express": "^4.18.1", @@ -199,7 +199,7 @@ }, "monitor-theia": { "name": "@eclipse-theiacloud/monitor-theia", - "version": "0.9.0-next", + "version": "0.9.0", "devDependencies": { "rimraf": "^3.0.2" }, @@ -25692,7 +25692,7 @@ "testing-page": { "version": "0.1.0", "dependencies": { - "@eclipse-theiacloud/common": "0.9.0-next", + "@eclipse-theiacloud/common": "0.9.0", "keycloak-js": "^17.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -25838,7 +25838,7 @@ "try-now-page": { "version": "0.1.0", "dependencies": { - "@eclipse-theiacloud/common": "0.9.0-next", + "@eclipse-theiacloud/common": "0.9.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^13.5.0", @@ -38197,7 +38197,7 @@ "landing-page": { "version": "file:landing-page", "requires": { - "@eclipse-theiacloud/common": "0.9.0-next", + "@eclipse-theiacloud/common": "0.9.0", "@types/uuid": "^8.3.2", "@vue/cli-plugin-babel": "~5.0.8", "@vue/cli-plugin-eslint": "~5.0.8", @@ -42893,7 +42893,7 @@ "testing-page": { "version": "file:testing-page", "requires": { - "@eclipse-theiacloud/common": "0.9.0-next", + "@eclipse-theiacloud/common": "0.9.0", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", @@ -43281,7 +43281,7 @@ "try-now-page": { "version": "file:try-now-page", "requires": { - "@eclipse-theiacloud/common": "0.9.0-next", + "@eclipse-theiacloud/common": "0.9.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^13.5.0", diff --git a/node/testing-page/package.json b/node/testing-page/package.json index f714d430..fd546ea7 100644 --- a/node/testing-page/package.json +++ b/node/testing-page/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@eclipse-theiacloud/common": "0.9.0-next", + "@eclipse-theiacloud/common": "0.9.0", "keycloak-js": "^17.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/node/try-now-page/package.json b/node/try-now-page/package.json index 7376d5b0..fac5b5f2 100644 --- a/node/try-now-page/package.json +++ b/node/try-now-page/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": ".", "dependencies": { - "@eclipse-theiacloud/common": "0.9.0-next", + "@eclipse-theiacloud/common": "0.9.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^13.5.0", diff --git a/terraform/modules/helm/main.tf b/terraform/modules/helm/main.tf index 43ac7395..26ac5f17 100644 --- a/terraform/modules/helm/main.tf +++ b/terraform/modules/helm/main.tf @@ -130,7 +130,7 @@ resource "helm_release" "theia-cloud-base" { name = "theia-cloud-base" repository = "https://github.eclipsesource.com/theia-cloud-helm" chart = "theia-cloud-base" - version = "0.8.1-v004-MS3" + version = "0.9.0" namespace = "theiacloud" create_namespace = true @@ -145,7 +145,7 @@ resource "helm_release" "theia-cloud-crds" { name = "theia-cloud-crds" repository = "https://github.eclipsesource.com/theia-cloud-helm" chart = "theia-cloud-crds" - version = "0.8.1-v004-MS3" + version = "0.9.0" namespace = "theiacloud" create_namespace = true } @@ -229,7 +229,7 @@ resource "helm_release" "theia-cloud" { name = "theia-cloud" repository = "https://github.eclipsesource.com/theia-cloud-helm" chart = "theia-cloud" - version = "0.8.1-v009-MS3" + version = "0.9.0" namespace = "theiacloud" create_namespace = true diff --git a/terraform/modules/helm/theia-cloud.yaml b/terraform/modules/helm/theia-cloud.yaml index 7a7513ec..3313199f 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.9.0-next + name: theiacloud/theia-cloud-demo:0.9.0 pullSecret: "" timeoutStrategy: "FIXEDTIME" timeoutLimit: "30" @@ -19,7 +19,7 @@ hosts: instance: instances landingPage: - image: theiacloud/theia-cloud-landing-page:0.9.0-next + image: theiacloud/theia-cloud-landing-page:0.9.0 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 3e8908c3..b45d8596 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.9.0-next" : "theiacloud/theia-cloud-activity-demo-theia:0.9.0-next" + value = var.use_vscode_extension ? "theiacloud/theia-cloud-activity-demo:0.9.0" : "theiacloud/theia-cloud-activity-demo-theia:0.9.0" } set {