Skip to content

Commit 25bbbaa

Browse files
committed
Remove JetBrainsPluginImagePrevious
1 parent f94c65a commit 25bbbaa

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

dev/preview/workflow/preview/patch-ide-configmap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ for (let ide in json.ideOptions.options) {
3838
}
3939

4040
// TODO(hw): remove me
41-
if (["intellij", "clion", "rustrover"].includes(ide)) {
41+
if (["intellij"].includes(ide)) {
4242
json.ideOptions.options[ide].pluginImage = replaceImage2(json.ideOptions.options[ide].pluginImage);
4343
json.ideOptions.options[ide].imageLayers = json.ideOptions.options[ide].imageLayers.map(replaceImage2);
4444
}

install/installer/pkg/components/ide-service/ide-configmap.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -870,10 +870,10 @@
870870
"logo": "{{.IdeLogoBase}}/clionLogo.svg",
871871
"image": "{{.Repository}}/ide/clion:{{.WorkspaceVersions.Workspace.DesktopIdeImages.CLionImage.Version}}",
872872
"latestImage": "{{.ResolvedJBImageLatest.CLion}}",
873-
"pluginImage": "{{.JetBrainsPluginImagePrevious}}",
873+
"pluginImage": "{{.JetBrainsPluginImage}}",
874874
"pluginLatestImage": "{{.JetBrainsPluginLatestImage}}",
875875
"imageLayers": [
876-
"{{.JetBrainsPluginImagePrevious}}",
876+
"{{.JetBrainsPluginImage}}",
877877
"{{.JetBrainsLauncherImage}}"
878878
],
879879
"latestImageLayers": [
@@ -955,10 +955,10 @@
955955
"logo": "{{.IdeLogoBase}}/rustroverLogo.svg",
956956
"image": "{{.Repository}}/ide/rustrover:{{.WorkspaceVersions.Workspace.DesktopIdeImages.RustRoverImage.Version}}",
957957
"latestImage": "{{.ResolvedJBImageLatest.RustRover}}",
958-
"pluginImage": "{{.JetBrainsPluginImagePrevious}}",
958+
"pluginImage": "{{.JetBrainsPluginImage}}",
959959
"pluginLatestImage": "{{.JetBrainsPluginLatestImage}}",
960960
"imageLayers": [
961-
"{{.JetBrainsPluginImagePrevious}}",
961+
"{{.JetBrainsPluginImage}}",
962962
"{{.JetBrainsLauncherImage}}"
963963
],
964964
"latestImageLayers": [

install/installer/pkg/components/ide-service/ide_config_configmap.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func GenerateIDEConfigmap(ctx *common.RenderContext) (*ide_config.IDEConfig, err
5858
CodeWebExtensionImage string
5959

6060
JetBrainsPluginImage string
61-
JetBrainsPluginImagePrevious string
6261
JetBrainsPluginLatestImage string
6362
JetBrainsPluginRiderImage string
6463
JetBrainsPluginLatestRiderImage string
@@ -68,9 +67,6 @@ func GenerateIDEConfigmap(ctx *common.RenderContext) (*ide_config.IDEConfig, err
6867
WorkspaceVersions versions.Components
6968
}
7069

71-
// {{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6
72-
previousStableJetBrainsBackendPluginVersion := "commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6"
73-
7470
configTmpl := ConfigTemplate{
7571
Repository: ctx.Config.Repository,
7672
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
8076
CodeWebExtensionImage: ctx.ImageName(ctx.Config.Repository, ide.CodeWebExtensionImage, ctx.VersionManifest.Components.Workspace.CodeWebExtensionImage.Version),
8177

8278
JetBrainsPluginImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginImage.Version),
83-
JetBrainsPluginImagePrevious: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, previousStableJetBrainsBackendPluginVersion),
8479
JetBrainsPluginLatestImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginLatestImage.Version),
8580
JetBrainsPluginRiderImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginRiderImage.Version),
8681
JetBrainsPluginLatestRiderImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginLatestRiderImage.Version),

0 commit comments

Comments
 (0)