Skip to content

Commit 7cd73b7

Browse files
author
Andrea Falzetti
committed
chore(prev-env): use latest jetbrains images
1 parent 36e811e commit 7cd73b7

File tree

4 files changed

+32
-16
lines changed

4 files changed

+32
-16
lines changed

Diff for: ‎.werft/jobs/build/installer/installer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ EOF`);
196196
}
197197

198198
private configureIDE(slice: string) {
199-
exec(`yq w -i ${this.options.installerConfigPath} experimental.ide.resolveLatest false`, { slice });
199+
exec(`yq w -i ${this.options.installerConfigPath} experimental.ide.resolveLatestCode false`, { slice });
200200
exec(`yq w -i ${this.options.installerConfigPath} experimental.ide.ideMetrics.enabledErrorReporting true`, { slice });
201201
}
202202

Diff for: ‎install/installer/pkg/components/ide-service/ide_config_configmap.go

+24-10
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,25 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
3434
rubymine := "rubymine"
3535
webstorm := "webstorm"
3636

37-
resolveLatestImage := func(name string, tag string, bundledLatest versions.Versioned) string {
37+
resolveLatestImageCode := func(name string, tag string, bundledLatest versions.Versioned) string {
3838
resolveLatest := true
3939
ctx.WithExperimental(func(ucfg *experimental.Config) error {
40-
if ucfg.IDE != nil && ucfg.IDE.ResolveLatest != nil {
41-
resolveLatest = *ucfg.IDE.ResolveLatest
40+
if ucfg.IDE != nil && ucfg.IDE.ResolveLatestCode != nil {
41+
resolveLatest = *ucfg.IDE.ResolveLatestCode
42+
}
43+
return nil
44+
})
45+
if resolveLatest {
46+
return ctx.ImageName(ctx.Config.Repository, name, tag)
47+
}
48+
return ctx.ImageName(ctx.Config.Repository, name, bundledLatest.Version)
49+
}
50+
51+
resolveLatestImageJetBrains := func(name string, tag string, bundledLatest versions.Versioned) string {
52+
resolveLatest := true
53+
ctx.WithExperimental(func(ucfg *experimental.Config) error {
54+
if ucfg.IDE != nil && ucfg.IDE.ResolveLatestJetBrains != nil {
55+
resolveLatest = *ucfg.IDE.ResolveLatestJetBrains
4256
}
4357
return nil
4458
})
@@ -84,7 +98,7 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
8498
Label: "Browser",
8599
Logo: getIdeLogoPath("vscode"),
86100
Image: ctx.ImageName(ctx.Config.Repository, ide.CodeIDEImage, ide.CodeIDEImageStableVersion),
87-
LatestImage: resolveLatestImage(ide.CodeIDEImage, "nightly", ctx.VersionManifest.Components.Workspace.CodeImage),
101+
LatestImage: resolveLatestImageCode(ide.CodeIDEImage, "nightly", ctx.VersionManifest.Components.Workspace.CodeImage),
88102
},
89103
codeDesktop: {
90104
OrderKey: "02",
@@ -100,7 +114,7 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
100114
Type: ide_config.IDETypeDesktop,
101115
Logo: getIdeLogoPath("intellijIdeaLogo"),
102116
Image: ctx.ImageName(ctx.Config.Repository, ide.IntelliJDesktopIDEImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.IntelliJImage.Version),
103-
LatestImage: resolveLatestImage(ide.IntelliJDesktopIDEImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.IntelliJLatestImage),
117+
LatestImage: resolveLatestImageJetBrains(ide.IntelliJDesktopIDEImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.IntelliJLatestImage),
104118
PluginImage: jbPluginImage,
105119
PluginLatestImage: jbPluginLatestImage,
106120
},
@@ -110,7 +124,7 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
110124
Type: ide_config.IDETypeDesktop,
111125
Logo: getIdeLogoPath("golandLogo"),
112126
Image: ctx.ImageName(ctx.Config.Repository, ide.GoLandDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.GoLandImage.Version),
113-
LatestImage: resolveLatestImage(ide.GoLandDesktopIdeImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.GoLandLatestImage),
127+
LatestImage: resolveLatestImageJetBrains(ide.GoLandDesktopIdeImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.GoLandLatestImage),
114128
PluginImage: jbPluginImage,
115129
PluginLatestImage: jbPluginLatestImage,
116130
},
@@ -120,7 +134,7 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
120134
Type: ide_config.IDETypeDesktop,
121135
Logo: getIdeLogoPath("pycharmLogo"),
122136
Image: ctx.ImageName(ctx.Config.Repository, ide.PyCharmDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.PyCharmImage.Version),
123-
LatestImage: resolveLatestImage(ide.PyCharmDesktopIdeImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.PyCharmLatestImage),
137+
LatestImage: resolveLatestImageJetBrains(ide.PyCharmDesktopIdeImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.PyCharmLatestImage),
124138
PluginImage: jbPluginImage,
125139
PluginLatestImage: jbPluginLatestImage,
126140
},
@@ -130,7 +144,7 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
130144
Type: ide_config.IDETypeDesktop,
131145
Logo: getIdeLogoPath("phpstormLogo"),
132146
Image: ctx.ImageName(ctx.Config.Repository, ide.PhpStormDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.PhpStormImage.Version),
133-
LatestImage: resolveLatestImage(ide.PhpStormDesktopIdeImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.PhpStormLatestImage),
147+
LatestImage: resolveLatestImageJetBrains(ide.PhpStormDesktopIdeImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.PhpStormLatestImage),
134148
PluginImage: jbPluginImage,
135149
PluginLatestImage: jbPluginLatestImage,
136150
},
@@ -140,7 +154,7 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
140154
Type: ide_config.IDETypeDesktop,
141155
Logo: getIdeLogoPath("rubymineLogo"),
142156
Image: ctx.ImageName(ctx.Config.Repository, ide.RubyMineDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.RubyMineImage.Version),
143-
LatestImage: resolveLatestImage(ide.RubyMineDesktopIdeImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.RubyMineLatestImage),
157+
LatestImage: resolveLatestImageJetBrains(ide.RubyMineDesktopIdeImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.RubyMineLatestImage),
144158
PluginImage: jbPluginImage,
145159
PluginLatestImage: jbPluginLatestImage,
146160
},
@@ -150,7 +164,7 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
150164
Type: ide_config.IDETypeDesktop,
151165
Logo: getIdeLogoPath("webstormLogo"),
152166
Image: ctx.ImageName(ctx.Config.Repository, ide.WebStormDesktopIdeImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.WebStormImage.Version),
153-
LatestImage: resolveLatestImage(ide.WebStormDesktopIdeImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.WebStormLatestImage),
167+
LatestImage: resolveLatestImageJetBrains(ide.WebStormDesktopIdeImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.WebStormLatestImage),
154168
PluginImage: jbPluginImage,
155169
PluginLatestImage: jbPluginLatestImage,
156170
},

Diff for: ‎install/installer/pkg/config/v1/config.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ Additional config parameters that are in experimental state
146146
|`experimental.webapp.usage.defaultSpendingLimit.ForTeams`||N| ||
147147
|`experimental.webapp.usage.creditsPerMinuteByWorkspaceClass`||N| ||
148148
|`experimental.webapp.configcatKey`|string|N| ||
149-
|`experimental.ide.resolveLatest`|bool|N| | Disable resolution of latest images and use bundled latest versions instead|
149+
|`experimental.ide.resolveLatestCode`|bool|N| | Disable resolution of latest images and use bundled latest versions instead|
150+
|`experimental.ide.resolveLatestJetBrains`|bool|N| | Disable resolution of latest images and use bundled latest versions instead|
150151
|`experimental.ide.ideProxy.serviceAnnotations`||N| ||
151152
|`experimental.ide.openvsxProxy.serviceAnnotations`||N| ||
152153
|`experimental.common.podConfig`||N| ||

Diff for: ‎install/installer/pkg/config/v1/experimental/experimental.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,11 @@ type WebAppWorkspaceClass struct {
268268

269269
type IDEConfig struct {
270270
// Disable resolution of latest images and use bundled latest versions instead
271-
ResolveLatest *bool `json:"resolveLatest,omitempty"`
272-
IDEProxyConfig *IDEProxyConfig `json:"ideProxy,omitempty"`
273-
VSXProxyConfig *VSXProxyConfig `json:"openvsxProxy,omitempty"`
274-
IDEMetricsConfig *IDEMetricsConfig `json:"ideMetrics,omitempty"`
271+
ResolveLatestCode *bool `json:"resolveLatestCode,omitempty"`
272+
ResolveLatestJetBrains *bool `json:"resolveLatestJetBrains,omitempty"`
273+
IDEProxyConfig *IDEProxyConfig `json:"ideProxy,omitempty"`
274+
VSXProxyConfig *VSXProxyConfig `json:"openvsxProxy,omitempty"`
275+
IDEMetricsConfig *IDEMetricsConfig `json:"ideMetrics,omitempty"`
275276
}
276277

277278
type IDEProxyConfig struct {

0 commit comments

Comments
 (0)