[JetBrains] Update IDE images to new build version (#20387)

* [JetBrains] Update IDE images to new build version

* Remove `JetBrainsPluginImagePrevious`

---------

Co-authored-by: Huiwen <[email protected]>

Author: roboquat

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"

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);
     }

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": [
@@ -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",
@@ -947,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": [
@@ -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",

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),