From f94c65afa1a29936fef15d475381dfd8d669ed0c Mon Sep 17 00:00:00 2001 From: Robo Quat Date: Mon, 25 Nov 2024 08:35:50 +0000 Subject: [PATCH 1/2] [JetBrains] Update IDE images to new build version --- WORKSPACE.yaml | 4 ++-- .../components/ide-service/ide-configmap.json | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml index 475be7acb35cb3..993a2d6f949f02 100644 --- a/WORKSPACE.yaml +++ b/WORKSPACE.yaml @@ -20,8 +20,8 @@ defaultArgs: rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2024.3.tar.gz" webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2024.3.tar.gz" riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.tar.gz" - clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.2.3.tar.gz" - rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.2.5.tar.gz" + clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.3.tar.gz" + rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.3.tar.gz" jbBackendVersion: "latest" dockerVersion: "20.10.24" dockerComposeVersion: "2.27.0-gitpod.0" diff --git a/install/installer/pkg/components/ide-service/ide-configmap.json b/install/installer/pkg/components/ide-service/ide-configmap.json index 086c17602c0923..ca368787941bda 100644 --- a/install/installer/pkg/components/ide-service/ide-configmap.json +++ b/install/installer/pkg/components/ide-service/ide-configmap.json @@ -882,6 +882,14 @@ ], "allowPin": true, "versions": [ + { + "version": "2024.2.3", + "image": "{{.Repository}}/ide/clion:commit-08d82bcac5ec4e6a3a6376b664c765f233dfd827", + "imageLayers": [ + "{{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6", + "{{.Repository}}/ide/jb-launcher:commit-08d82bcac5ec4e6a3a6376b664c765f233dfd827" + ] + }, { "version": "2024.2.2", "image": "{{.Repository}}/ide/clion:commit-c0c9b747905872fcade355a5347e4de98711a0a0", @@ -959,6 +967,14 @@ ], "allowPin": true, "versions": [ + { + "version": "2024.2.5", + "image": "{{.Repository}}/ide/rustrover:commit-08d82bcac5ec4e6a3a6376b664c765f233dfd827", + "imageLayers": [ + "{{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6", + "{{.Repository}}/ide/jb-launcher:commit-08d82bcac5ec4e6a3a6376b664c765f233dfd827" + ] + }, { "version": "2024.2.4", "image": "{{.Repository}}/ide/rustrover:commit-97baff58c516062d23b11c3c5eeeffc2113834df", From 25bbbaad1bf4eca1aa15b261593a151ffb7a729a Mon Sep 17 00:00:00 2001 From: Huiwen Date: Tue, 26 Nov 2024 08:28:22 +0000 Subject: [PATCH 2/2] Remove `JetBrainsPluginImagePrevious` --- dev/preview/workflow/preview/patch-ide-configmap.js | 2 +- .../pkg/components/ide-service/ide-configmap.json | 8 ++++---- .../pkg/components/ide-service/ide_config_configmap.go | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dev/preview/workflow/preview/patch-ide-configmap.js b/dev/preview/workflow/preview/patch-ide-configmap.js index eca041aa1e6aed..42202a40be96be 100644 --- a/dev/preview/workflow/preview/patch-ide-configmap.js +++ b/dev/preview/workflow/preview/patch-ide-configmap.js @@ -38,7 +38,7 @@ for (let ide in json.ideOptions.options) { } // TODO(hw): remove me - if (["intellij", "clion", "rustrover"].includes(ide)) { + if (["intellij"].includes(ide)) { json.ideOptions.options[ide].pluginImage = replaceImage2(json.ideOptions.options[ide].pluginImage); json.ideOptions.options[ide].imageLayers = json.ideOptions.options[ide].imageLayers.map(replaceImage2); } diff --git a/install/installer/pkg/components/ide-service/ide-configmap.json b/install/installer/pkg/components/ide-service/ide-configmap.json index ca368787941bda..896c8183f19b1f 100644 --- a/install/installer/pkg/components/ide-service/ide-configmap.json +++ b/install/installer/pkg/components/ide-service/ide-configmap.json @@ -870,10 +870,10 @@ "logo": "{{.IdeLogoBase}}/clionLogo.svg", "image": "{{.Repository}}/ide/clion:{{.WorkspaceVersions.Workspace.DesktopIdeImages.CLionImage.Version}}", "latestImage": "{{.ResolvedJBImageLatest.CLion}}", - "pluginImage": "{{.JetBrainsPluginImagePrevious}}", + "pluginImage": "{{.JetBrainsPluginImage}}", "pluginLatestImage": "{{.JetBrainsPluginLatestImage}}", "imageLayers": [ - "{{.JetBrainsPluginImagePrevious}}", + "{{.JetBrainsPluginImage}}", "{{.JetBrainsLauncherImage}}" ], "latestImageLayers": [ @@ -955,10 +955,10 @@ "logo": "{{.IdeLogoBase}}/rustroverLogo.svg", "image": "{{.Repository}}/ide/rustrover:{{.WorkspaceVersions.Workspace.DesktopIdeImages.RustRoverImage.Version}}", "latestImage": "{{.ResolvedJBImageLatest.RustRover}}", - "pluginImage": "{{.JetBrainsPluginImagePrevious}}", + "pluginImage": "{{.JetBrainsPluginImage}}", "pluginLatestImage": "{{.JetBrainsPluginLatestImage}}", "imageLayers": [ - "{{.JetBrainsPluginImagePrevious}}", + "{{.JetBrainsPluginImage}}", "{{.JetBrainsLauncherImage}}" ], "latestImageLayers": [ diff --git a/install/installer/pkg/components/ide-service/ide_config_configmap.go b/install/installer/pkg/components/ide-service/ide_config_configmap.go index 239ad44e318286..023829ceb398bf 100644 --- a/install/installer/pkg/components/ide-service/ide_config_configmap.go +++ b/install/installer/pkg/components/ide-service/ide_config_configmap.go @@ -58,7 +58,6 @@ func GenerateIDEConfigmap(ctx *common.RenderContext) (*ide_config.IDEConfig, err CodeWebExtensionImage string JetBrainsPluginImage string - JetBrainsPluginImagePrevious string JetBrainsPluginLatestImage string JetBrainsPluginRiderImage string JetBrainsPluginLatestRiderImage string @@ -68,9 +67,6 @@ func GenerateIDEConfigmap(ctx *common.RenderContext) (*ide_config.IDEConfig, err WorkspaceVersions versions.Components } - // {{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6 - previousStableJetBrainsBackendPluginVersion := "commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6" - configTmpl := ConfigTemplate{ Repository: ctx.Config.Repository, IdeLogoBase: fmt.Sprintf("https://ide.%s/image/ide-logo", ctx.Config.Domain), @@ -80,7 +76,6 @@ func GenerateIDEConfigmap(ctx *common.RenderContext) (*ide_config.IDEConfig, err CodeWebExtensionImage: ctx.ImageName(ctx.Config.Repository, ide.CodeWebExtensionImage, ctx.VersionManifest.Components.Workspace.CodeWebExtensionImage.Version), JetBrainsPluginImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginImage.Version), - JetBrainsPluginImagePrevious: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, previousStableJetBrainsBackendPluginVersion), JetBrainsPluginLatestImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginLatestImage.Version), JetBrainsPluginRiderImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginRiderImage.Version), JetBrainsPluginLatestRiderImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginLatestRiderImage.Version),