From a83d7a4b3642ae0b803dbd2e7d47cce065056a11 Mon Sep 17 00:00:00 2001 From: David Cassany Date: Thu, 8 Aug 2024 17:04:00 +0200 Subject: [PATCH 1/2] Add new Micro 6.0 channels Signed-off-by: David Cassany --- .obs/chartfile/operator/values.yaml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.obs/chartfile/operator/values.yaml b/.obs/chartfile/operator/values.yaml index 9cd7c4db..657440b5 100644 --- a/.obs/chartfile/operator/values.yaml +++ b/.obs/chartfile/operator/values.yaml @@ -17,23 +17,29 @@ seedImage: # default Elemental channels defaultChannels: - sleMicro55: + slMicro60Baremetal: included: true - name: sle-micro-5.5 + name: sl-micro-6.0-baremetal enabled: false - image: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-channel/sle-micro:5.5 + image: registry.suse.com/elemental-channel/sl-micro:6.0-baremetal deleteNoLongerInSyncVersions: true - sleMicro55KVM: + slMicro60Base: + included: true + name: sl-micro-6.0-base + enabled: false + image: registry.suse.com/elemental-channel/sl-micro:6.0-base + deleteNoLongerInSyncVersions: true + slMicro60KVM: included: true - name: sle-micro-5.5-kvm + name: sl-micro-6.0-kvm enabled: false - image: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-channel/sle-micro:5.5-kvm + image: registry.suse.com/elemental-channel/sl-micro:6.0-kvm deleteNoLongerInSyncVersions: true - sleMicro55RT: + slMicro60RT: included: true - name: sle-micro-5.5-rt + name: sle-micro-6.0-rt enabled: false - image: registry.opensuse.org/isv/rancher/elemental/dev/containers/rancher/elemental-channel/sle-micro:5.5-rt + image: registry.suse.com/elemental-channel/sl-micro:6.0-rt deleteNoLongerInSyncVersions: true # number of operator replicas to deploy From 9c1326fc6296619da6f9160f9b9fc7945b0874a5 Mon Sep 17 00:00:00 2001 From: David Cassany Date: Thu, 8 Aug 2024 17:10:33 +0200 Subject: [PATCH 2/2] Use the proper dynamic URI for channel images Signed-off-by: David Cassany --- .obs/chartfile/operator/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.obs/chartfile/operator/values.yaml b/.obs/chartfile/operator/values.yaml index 657440b5..60be9000 100644 --- a/.obs/chartfile/operator/values.yaml +++ b/.obs/chartfile/operator/values.yaml @@ -21,25 +21,25 @@ defaultChannels: included: true name: sl-micro-6.0-baremetal enabled: false - image: registry.suse.com/elemental-channel/sl-micro:6.0-baremetal + image: "%%IMG_REPO%%/rancher/elemental-channel/sl-micro:6.0-baremetal" deleteNoLongerInSyncVersions: true slMicro60Base: included: true name: sl-micro-6.0-base enabled: false - image: registry.suse.com/elemental-channel/sl-micro:6.0-base + image: "%%IMG_REPO%%/rancher/elemental-channel/sl-micro:6.0-base" deleteNoLongerInSyncVersions: true slMicro60KVM: included: true name: sl-micro-6.0-kvm enabled: false - image: registry.suse.com/elemental-channel/sl-micro:6.0-kvm + image: "%%IMG_REPO%%/rancher/elemental-channel/sl-micro:6.0-kvm" deleteNoLongerInSyncVersions: true slMicro60RT: included: true name: sle-micro-6.0-rt enabled: false - image: registry.suse.com/elemental-channel/sl-micro:6.0-rt + image: "%%IMG_REPO%%/rancher/elemental-channel/sl-micro:6.0-rt" deleteNoLongerInSyncVersions: true # number of operator replicas to deploy