Skip to content
Snippets Groups Projects
Verified Commit 1aab7696 authored by Alper Akgun's avatar Alper Akgun :two: Committed by GitLab
Browse files

Merge branch 'vtak/update_workspaces_tools_image' into 'master'

Update gitlab-workspace-tools container image

See merge request !171557



Merged-by: Alper Akgun's avatarAlper Akgun <aakgun@gitlab.com>
Approved-by: Alper Akgun's avatarAlper Akgun <aakgun@gitlab.com>
Co-authored-by: Vishal Tak's avatarVishal Tak <vtak@gitlab.com>
parents be571e36 552df1ee
No related branches found
No related tags found
1 merge request!171557Update gitlab-workspace-tools container image
Pipeline #1529644451 passed
Showing
with 11 additions and 11 deletions
......@@ -18,7 +18,7 @@ def self.default_settings
max_hours_before_termination_limit: [120, Integer],
project_cloner_image: ["alpine/git:2.45.2", String],
tools_injector_image: [
"registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0", String
"registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0", String
],
full_reconciliation_interval_seconds: [3600, Integer],
partial_reconciliation_interval_seconds: [10, Integer],
......
......@@ -59,7 +59,7 @@ components:
mountSources: true
- name: gl-tools-injector
container:
image: registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0
image: registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0
volumeMounts:
- name: gl-workspace-data
path: /projects
......
......@@ -59,7 +59,7 @@ components:
mountSources: true
- name: gl-tools-injector
container:
image: registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0
image: registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0
volumeMounts:
- name: gl-workspace-data
path: /projects
......
......@@ -51,7 +51,7 @@ components:
size: 50Gi
- name: gl-tools-injector
container:
image: registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0
image: registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0
volumeMounts:
- name: gl-workspace-data
path: /projects
......
......@@ -53,7 +53,7 @@ components:
mountSources: true
- name: gl-tools-injector
container:
image: registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0
image: registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0
env:
- name: GL_TOOLS_DIR
value: "/projects/.gl-tools"
......
......@@ -53,7 +53,7 @@ components:
mountSources: true
- name: gl-tools-injector
container:
image: registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0
image: registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0
env:
- name: GL_TOOLS_DIR
value: "/projects/.gl-tools"
......
......@@ -53,7 +53,7 @@ components:
mountSources: true
- name: gl-tools-injector
container:
image: registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0
image: registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0
env:
- name: GL_TOOLS_DIR
value: "/projects/.gl-tools"
......
......@@ -44,7 +44,7 @@
default_max_hours_before_termination: 24,
max_hours_before_termination_limit: 120,
project_cloner_image: "alpine/git:2.45.2",
tools_injector_image: "registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0",
tools_injector_image: "registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0",
full_reconciliation_interval_seconds: 3600,
partial_reconciliation_interval_seconds: 10,
workspaces_quota: -1,
......
......@@ -53,7 +53,7 @@
end
let(:tools_injector_image_from_settings) do
"registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0"
"registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0"
end
let(:vscode_extensions_gallery) do
......
......@@ -10,7 +10,7 @@
let(:expected_processed_devfile_name) { 'example.tools-injected-devfile.yaml' }
let(:expected_processed_devfile) { YAML.safe_load(read_devfile(expected_processed_devfile_name)).to_h }
let(:tools_injector_image_from_settings) do
"registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0"
"registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0"
end
let(:settings) do
......
......@@ -870,7 +870,7 @@ def workspace_deployment(
value: "/projects"
}
],
image: "registry.gitlab.com/gitlab-org/remote-development/gitlab-workspaces-tools:2.0.0",
image: "registry.gitlab.com/gitlab-org/workspaces/gitlab-workspaces-tools:3.0.0",
imagePullPolicy: "Always",
name: "gl-tools-injector-gl-tools-injector-command-2",
resources: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment