Remove SLE Micro reference from elemental-operator images

Signed-off-by: David Cassany <dcassany@suse.com>
rancher · Aug 2, 2023 · 592b78d · 592b78d
1 parent b4bd11b
commit 592b78d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/.obs/chartfile/operator/values.yaml b/.obs/chartfile/operator/values.yaml
@@ -1,17 +1,17 @@
 image:
   empty: rancher/pause:3.1
-  repository: "%%IMG_REPO%%/rancher/elemental-operator/%%SLEMICRO_VERSION%%"
+  repository: "%%IMG_REPO%%/rancher/elemental-operator"
   tag: "%VERSION%"
   imagePullPolicy: IfNotPresent
 
 seedImage:
-  repository: "%%IMG_REPO%%/rancher/seedimage-builder/%%SLEMICRO_VERSION%%"
+  repository: "%%IMG_REPO%%/rancher/seedimage-builder"
   tag: "%VERSION%"
   imagePullPolicy: IfNotPresent
 
 channel:
-  repository: "%%IMG_REPO%%/rancher/elemental-teal-channel/%%SLEMICRO_VERSION%%" 
-  tag: latest
+  repository: "%%IMG_REPO%%/rancher/elemental-teal-channel" 
+  tag: "%VESION%"
 
 # number of operator replicas to deploy
 replicas: 1

diff --git a/.obs/dockerfile/operator/Dockerfile b/.obs/dockerfile/operator/Dockerfile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0
 # Define the names/tags of the container
-#!BuildTag: rancher/elemental-operator/%%SLEMICRO_VERSION%%:latest
-#!BuildTag: rancher/elemental-operator/%%SLEMICRO_VERSION%%:%OPERATOR_VERSION%
-#!BuildTag: rancher/elemental-operator/%%SLEMICRO_VERSION%%:%OPERATOR_VERSION%-%RELEASE%
+#!BuildTag: rancher/elemental-operator:latest
+#!BuildTag: rancher/elemental-operator:%OPERATOR_VERSION%
+#!BuildTag: rancher/elemental-operator:%OPERATOR_VERSION%-%RELEASE%
 #
 
 ARG SLE_VERSION
@@ -19,9 +19,8 @@ COPY --from=BASE /installroot /
 
 RUN /usr/sbin/update-ca-certificates
 
-ARG SLEMICRO_VERSION
 ARG BUILD_REPO=%%IMG_REPO%%
-ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-operator/$SLEMICRO_VERSION
+ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-operator
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.rancher.elemental

diff --git a/.obs/dockerfile/seedimage/Dockerfile b/.obs/dockerfile/seedimage/Dockerfile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0
 # Define the names/tags of the container
-#!BuildTag: rancher/seedimage-builder/%%SLEMICRO_VERSION%%:latest
-#!BuildTag: rancher/seedimage-builder/%%SLEMICRO_VERSION%%:%OPERATOR_VERSION%
-#!BuildTag: rancher/seedimage-builder/%%SLEMICRO_VERSION%%:%OPERATOR_VERSION%-%RELEASE%
+#!BuildTag: rancher/seedimage-builder:latest
+#!BuildTag: rancher/seedimage-builder:%OPERATOR_VERSION%
+#!BuildTag: rancher/seedimage-builder:%OPERATOR_VERSION%-%RELEASE%
 #
 
 ARG SLE_VERSION
@@ -19,9 +19,8 @@ COPY --from=BASE /installroot /
 
 RUN /usr/sbin/update-ca-certificates
 
-ARG SLEMICRO_VERSION
 ARG BUILD_REPO=%%IMG_REPO%%
-ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-seedimage-builder-image/$SLEMICRO_VERSION
+ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-seedimage-builder-image
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.rancher.elemental