Add Sylva n-1, n-2 Kiwi images to os_images_oci_registries

What does this MR do and why?

After I wrongly merged !6093 (merged) (in my defense, it was way too early in the morning, I swear I saw green pipelines) the pipelines were failing with :

-- processing image sylva-n-1--leapmicro-6-0-plain-rke2-1-30
This is a Sylva diskimage-builder image. Updating image details from artifact at oci://172.20.136.39/proxy_cache_registry.gitlab.com/sylva-projects/sylva-elements/diskimage-builder/leapmicro-6-0-plain-rke2-1-30:0.5.13
Verifying diskimage-builder image signature for 172.20.136.39/proxy_cache_registry.gitlab.com/sylva-projects/sylva-elements/diskimage-builder/leapmicro-6-0-plain-rke2-1-30:0.5.13
WARNING: Skipping tlog verification is an insecure practice that lacks transparency and auditability verification for the signature.
WARNING: Could not fetch trusted_root.json from the TUF repository. Continuing with individual targets. Error from TUF: error getting live trusted root: failed to create TUF client failed to create initial TUF updater: mkdir /.sigstore: permission denied
Error: image tag not found: GET https://172.20.136.39/v2/proxy_cache_registry.gitlab.com/sylva-projects/sylva-elements/diskimage-builder/leapmicro-6-0-plain-rke2-1-30/manifests/0.5.13: NOT_FOUND: resource not found: repo proxy_cache_registry.gitlab.com/sylva-projects/sylva-elements/diskimage-builder/leapmicro-6-0-plain-rke2-1-30, tag 0.5.13 not found
error during command execution: image tag not found: GET https://172.20.136.39/v2/proxy_cache_registry.gitlab.com/sylva-projects/sylva-elements/diskimage-builder/leapmicro-6-0-plain-rke2-1-30/manifests/0.5.13: NOT_FOUND: resource not found: repo proxy_cache_registry.gitlab.com/sylva-projects/sylva-elements/diskimage-builder/leapmicro-6-0-plain-rke2-1-30, tag 0.5.13 not found
[ERROR] Invalid signature for 172.20.136.39/proxy_cache_registry.gitlab.com/sylva-projects/sylva-elements/diskimage-builder/leapmicro-6-0-plain-rke2-1-30:0.5.13
==== END logs for container run-script of pod sylva-system/os-images-info-5mcfx ====

This is because the sylva-n-1 and sylva-n-2 are pointing to diskimage-builder and leapmicro is not a valid image under that container registry.

This MR aims on fixing that, by adding two additional keys, sylva-n-1-kiwi and sylva-n-2-kiwi that will point to the correct registry + tag combination.

Related reference(s)

Closes #3166 (closed)

Test coverage

Tested in my dev env and the job is completing successfully:

os-images-info-pzrv2 0/1 Completed 0 5m29s

CI configuration

Below you can choose test deployment variants to run in this MR's CI.

Click to open to CI configuration

Legend:

Icon Meaning Available values
☁️ Infra Provider capd, capo, capm3
🚀 Bootstrap Provider kubeadm (alias kadm), rke2, okd, ck8s
🐧 Node OS ubuntu, suse, na, leapmicro
🛠️ Deployment Options light-deploy, dev-sources, ha, misc, maxsurge-0, logging, no-logging, cilium
🎬 Pipeline Scenarios Available scenario list and description
🟢 Enabled units Any available units name, by default apply to management and workload cluster. Can be prefixed by mgmt: or wkld: to be applied only to a specific cluster type
  • 🎬 preview ☁️ capd 🚀 kadm 🐧 ubuntu

  • 🎬 preview ☁️ capo 🚀 rke2 🐧 suse

  • 🎬 preview ☁️ capm3 🚀 rke2 🐧 ubuntu

  • ☁️ capd 🚀 kadm 🛠️ light-deploy 🐧 ubuntu

  • ☁️ capd 🚀 rke2 🛠️ light-deploy 🐧 suse

  • ☁️ capo 🚀 rke2 🎬 no-update 🐧 suse

  • ☁️ capo 🚀 rke2 🐧 leapmicro

  • ☁️ capo 🚀 kadm 🐧 ubuntu

  • ☁️ capo 🚀 kadm 🐧 ubuntu 🟢 neuvector,mgmt:harbor

  • ☁️ capo 🚀 rke2 🎬 rolling-update 🛠️ ha 🐧 ubuntu

  • ☁️ capo 🚀 kadm 🎬 wkld-k8s-upgrade 🐧 ubuntu

  • ☁️ capo 🚀 rke2 🎬 rolling-update-no-wkld 🛠️ ha 🐧 suse

  • ☁️ capo 🚀 rke2 🎬 sylva-upgrade-from-1.5.x 🛠️ ha 🐧 ubuntu

  • ☁️ capo 🚀 rke2 🎬 sylva-upgrade-from-1.5.x 🛠️ ha,misc 🐧 ubuntu

  • ☁️ capo 🚀 rke2 🛠️ ha,misc 🐧 ubuntu

  • ☁️ capo 🚀 rke2 🛠️ ha,misc,openbao🐧 suse

  • ☁️ capo 🚀 rke2 🐧 suse 🎬 upgrade-from-prev-tag

  • ☁️ capm3 🚀 rke2 🐧 suse

  • ☁️ capm3 🚀 kadm 🐧 ubuntu

  • ☁️ capm3 🚀 ck8s 🐧 ubuntu

  • ☁️ capm3 🚀 kadm 🎬 rolling-update-no-wkld 🛠️ ha,misc 🐧 ubuntu

  • ☁️ capm3 🚀 rke2 🎬 wkld-k8s-upgrade 🛠️ ha 🐧 suse

  • ☁️ capm3 🚀 kadm 🎬 rolling-update 🛠️ ha 🐧 ubuntu

  • ☁️ capm3 🚀 rke2 🎬 sylva-upgrade-from-1.5.x 🛠️ ha 🐧 suse

  • ☁️ capm3 🚀 rke2 🛠️ misc,ha 🐧 suse

  • ☁️ capm3 🚀 rke2 🎬 sylva-upgrade-from-1.5.x 🛠️ ha,misc 🐧 suse

  • ☁️ capm3 🚀 kadm 🎬 rolling-update 🛠️ ha 🐧 suse

  • ☁️ capm3 🚀 ck8s 🎬 rolling-update 🛠️ ha 🐧 ubuntu

  • ☁️ capm3 🚀 rke2|okd 🎬 no-update 🐧 ubuntu|na

  • ☁️ capm3 🚀 rke2 🐧 suse 🎬 upgrade-from-release-1.5

  • ☁️ capm3 🚀 rke2 🐧 suse 🎬 upgrade-to-main

Global config for deployment pipelines

  • autorun pipelines
  • allow failure on pipelines
  • record sylvactl events

Notes:

  • Enabling autorun will make deployment pipelines to be run automatically without human interaction
  • Disabling allow failure will make deployment pipelines mandatory for pipeline success.
  • if both autorun and allow failure are disabled, deployment pipelines will need manual triggering but will be blocking the pipeline

Be aware: after configuration change, pipeline is not triggered automatically. Please run it manually (by clicking the run pipeline button in Pipelines tab) or push new code.

Edited by Thomas Morin

Merge request reports

Loading