That's a one-off tasks on cluster startup. Are migrations are now running faster? 🤔

@kkloss Thanks a lot 🙇

Locally, I removed all limits which improved start-up time of webservice pod from ~60s to ~40s!

Since I am testing caproni run a lot this saving is huge.

@gitlab-org/maintainers/caproni Thoughts on dropping even more limits (especially CPU) to speed-up caproni testing/usage? 🤔

Question Were you able to run ./db_migrate.sh against the toolbox now? 🤔

Adds two new optional fields to the mirror configuration.

container field on mirror target

Adds a container field to the mirror target configuration, allowing mirrord to intercept a specific container within a pod or deployment rather than the first container.

When set, the mirrord target path becomes {type}/{name}/container/{container} instead of {type}/{name}. This field is passed through to the mirrord config only — the deployment scale-down and copy logic is unaffected.

paused_image field on mirror reloader config

Adds a paused_image field to the mirror reloader configuration that controls which image the -caproni copy deployment uses:

• copy_image (default): use GL_COPY_SLEEP_IMAGE
• original: keep each container's existing image unchanged
• any other value: use it directly as a Docker image reference

Example configuration

reloaders:
  my-service:
    type: mirror
    mirror:
      paused_image: original  # or 'copy_image' (default), or an explicit image ref like 'alpine:3.20'
      target:
        namespace: my-namespace
        kubernetes_type: deployment
        name: my-deployment
        container: my-container  # optional: intercept a specific container

We could workaround the limitation by allowing to run sleep infinity (as k8s args) on original images. For example: caproni-cli!93

With that sidekiq boots but I now the gitlab shell secret is created locally because Gitlab.config.gitlab_shell.secret_file is missing in config/gitlab-secret.yml (comapred to config/gitlab.yml in webservice):

@@ -207,41 +216,23 @@
   gitlab_shell:
     path: /home/git/gitlab-shell/
     hooks_path: /home/git/gitlab-shell/hooks/
     upload_pack: true
     receive_pack: true
     ssh_port: 22
-    secret_file: /etc/gitlab/shell/.gitlab_shell_secret

and now secret_path defaults to local gitlab/ folder. Verified via mirrord:

[1] pry(main)> Gitlab.config.gitlab_shell.secret_file
=> #<Pathname:/home/peter/devel/gitlab/caproni-demo/monolith-edit-mode/gitlab/.gitlab_shell_secret>
[2] pry(main)> Gitlab.config.gitlab_shell
=> #<GitlabSettings::Options:0x00007f68087994c0
 @options=
  {"path"=>"/home/git/gitlab-shell",
   "hooks_path"=>:deprecated_use_gitlab_shell_path_instead,
   "upload_pack"=>true,
   "receive_pack"=>true,
   "ssh_port"=>22,
   "authorized_keys_file"=>"/home/peter/.ssh/authorized_keys",
   "secret_file"=>#<Pathname:/home/peter/devel/gitlab/caproni-demo/monolith-edit-mode/gitlab/.gitlab_shell_secret>,
   "ssh_host"=>"gitlab.caproni.test",
   "ssh_user"=>"git",
   "owner_group"=>"git",
   "ssh_path_prefix"=>"[email protected]:",
   "git_timeout"=>10800}>

Peter Leitzen (ecaa93b3) at 18 Mar 12:46

What

This adds a wait for the deployment to be ready before migrating.

Why

Avoids a failure of mirrord when the webservice deployment's pod is currently starting.

Links to relevant issues

Peter Leitzen (c61b7c70) at 18 Mar 12:46

... and 1 more commit

What

This adds a wait for the deployment to be ready before migrating.

Why

Avoids a failure of mirrord when the webservice deployment's pod is currently starting.

Links to relevant issues

What

This adds logic to run the edit_mode_prepare lifecycle hook after successfully updating a repository.

Why

Avoids manual action after enabling edit mode.

Links to relevant issues

See #13

@kkloss As discussed in sync we decided to merge this MR already and only add context (and potentially renaming type -> on) later. We still can either introduce config v3 and make config migrate handle the changes or emit warnings in case users still use the old style 💪

Let's focus on enabling edit_mode_start first 💪

Peter Leitzen (b9708356) at 18 Mar 12:05

👋 @nao.hashizume @kkloss

Can you retest this config? 🙏 See the updated instructions in the MR description ❗

@kkloss

the sidekiq inits correctly (I don't see Proxy encountered an error!) but I'm getting this error:

We had to adjust the mappings and now it works - even with puma 🎉

See instructions above. Note that gitlab-org/gitlab!227873 (merged) is needed for this.

/cc @nao.hashizume

See gitlab-org/gitlab!227873 (merged)

Peter Leitzen (a816ffbd) at 18 Mar 11:01