From dbf62d715231ab1d9a5e3dc9be96d70db4443a41 Mon Sep 17 00:00:00 2001 From: David Cassany Date: Tue, 18 Jun 2024 19:07:20 +0200 Subject: [PATCH] Add development channel for OBS builds This commit adds a development channel reference to builds done in OBS (under or branched from isv:Rancher:Elemental) Signed-off-by: David Cassany --- .obs/chartfile/operator/templates/channel-dev.yaml | 14 ++++++++++++++ .obs/chartfile/operator/templates/channel.yaml | 4 ++-- .obs/chartfile/operator/values.yaml | 3 ++- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 .obs/chartfile/operator/templates/channel-dev.yaml diff --git a/.obs/chartfile/operator/templates/channel-dev.yaml b/.obs/chartfile/operator/templates/channel-dev.yaml new file mode 100644 index 000000000..5dc5b6b1a --- /dev/null +++ b/.obs/chartfile/operator/templates/channel-dev.yaml @@ -0,0 +1,14 @@ +{{ if contains "isv/rancher/elemental" .Values.registryUrl }} + {{ if hasPrefix "registry.opensuse.org" .Values.registryUrl }} +# Unstable channel for isv:Rancher:Elemental OBS projects +apiVersion: elemental.cattle.io/v1beta1 +kind: ManagedOSVersionChannel +metadata: + name: unstable-channel + namespace: fleet-default +spec: + options: + image: {{ .Values.registryUrl }}/rancher/elemental-unstable-channel:latest + type: custom + {{ end }} +{{ end }} diff --git a/.obs/chartfile/operator/templates/channel.yaml b/.obs/chartfile/operator/templates/channel.yaml index ccb6e4d3c..7fc870d7f 100644 --- a/.obs/chartfile/operator/templates/channel.yaml +++ b/.obs/chartfile/operator/templates/channel.yaml @@ -1,8 +1,8 @@ -{{ if and .Values.channel .Values.channel.image .Values.channel.tag }} +{{ if and .Values.channel .Values.channel.image .Values.channel.tag .Values.channel.name }} apiVersion: elemental.cattle.io/v1beta1 kind: ManagedOSVersionChannel metadata: - name: elemental-channel + name: {{ .Values.channel.name }} namespace: fleet-default spec: options: diff --git a/.obs/chartfile/operator/values.yaml b/.obs/chartfile/operator/values.yaml index 37de4469f..5d98ae56d 100644 --- a/.obs/chartfile/operator/values.yaml +++ b/.obs/chartfile/operator/values.yaml @@ -10,7 +10,8 @@ seedImage: imagePullPolicy: IfNotPresent channel: - image: "%%IMG_REPO%%/rancher/elemental-channel" + name: "sle-micro-channel" + image: "registry.suse.com/rancher/elemental-channel" tag: "%VERSION%" # number of operator replicas to deploy