Skip to content

Commit cca07f1

Browse files
akosyakovroboquat
authored andcommitted
[ide-service] remote gp-run experiment
1 parent 40830a8 commit cca07f1

File tree

24 files changed

+0
-45
lines changed

24 files changed

+0
-45
lines changed

components/ide-service-api/go/config/ideconfig.go

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const (
1212
)
1313

1414
type IDEConfig struct {
15-
GpRunImage string `json:"gpRunImage"`
1615
SupervisorImage string `json:"supervisorImage"`
1716
IdeOptions IDEOptions `json:"ideOptions"`
1817
}

components/ide-service/pkg/server/ideconfig.go

-10
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,6 @@ func ParseConfig(ctx context.Context, b []byte) (*config.IDEConfig, error) {
9393
cfg.IdeOptions.Options[id] = option
9494
}
9595

96-
if cfg.GpRunImage != "" {
97-
if resolved, err := oci_tool.Resolve(ctx, cfg.GpRunImage); err != nil {
98-
log.WithError(err).Error("ide config: cannot resolve latest image digest")
99-
cfg.GpRunImage = ""
100-
} else {
101-
log.WithField("image", cfg.GpRunImage).WithField("resolved", resolved).Info("ide config: resolved latest image digest")
102-
cfg.GpRunImage = resolved
103-
}
104-
}
105-
10696
return &cfg, nil
10797
}
10898

components/ide-service/pkg/server/server.go

-13
Original file line numberDiff line numberDiff line change
@@ -344,19 +344,6 @@ func (s *IDEServiceServer) ResolveWorkspaceConfig(ctx context.Context, req *api.
344344
resp.IdeImageLayers = append(resp.IdeImageLayers, desktopImageLayer)
345345
resp.IdeImageLayers = append(resp.IdeImageLayers, desktopUserImageLayers...)
346346
}
347-
348-
if ideConfig.GpRunImage != "" {
349-
featureFlagAttrs := experiments.Attributes{
350-
UserID: req.User.Id,
351-
UserEmail: req.User.GetEmail(),
352-
}
353-
useRunGp := s.experiemntsClient.GetBoolValue(ctx, "ide_service_experimental_rungp", false, featureFlagAttrs)
354-
log.WithField("featureFlagAttrs", featureFlagAttrs).WithField("useRunGp", useRunGp).Debug("calling configcat to check ide_service_experimental_rungp")
355-
if useRunGp {
356-
resp.IdeImageLayers = append(resp.IdeImageLayers, ideConfig.GpRunImage)
357-
log.Debug("adding gp-run layer")
358-
}
359-
}
360347
}
361348

362349
jbGW, ok := ideConfig.IdeOptions.Clients["jetbrains-gateway"]

install/installer/cmd/testdata/render/agent-smith/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/aws-setup/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/custom-pull-repository/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/customization/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/external-registry/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/gcp-setup/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/http-proxy/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/ide-config/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/kind-ide/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/kind-meta/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/message-bus-password/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/minimal/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/overrides-inline/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/pod-config/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/shortname/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/statefulset-customization/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/telemetry/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/use-pod-security-policies/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/vsxproxy-pvc/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/workspace-requests-limits/output.golden

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ func ideConfigConfigmap(ctx *common.RenderContext) ([]runtime.Object, error) {
5252
jbPluginLatestImage := resolveLatestImage(ide.JetBrainsBackendPluginImage, "latest", ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginLatestImage)
5353
jbLauncherImage := ctx.ImageName(ctx.Config.Repository, ide.JetBrainsLauncherImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsLauncherImage.Version)
5454
idecfg := ide_config.IDEConfig{
55-
GpRunImage: ctx.ImageName("registry.hub.docker.com", "gitpod/gp-run", "ak-test"),
5655
SupervisorImage: ctx.ImageName(ctx.Config.Repository, workspace.SupervisorImage, ctx.VersionManifest.Components.Workspace.Supervisor.Version),
5756
IdeOptions: ide_config.IDEOptions{
5857
Clients: map[string]ide_config.IDEClient{

0 commit comments

Comments
 (0)