Merge pull request 'backport into 3.2 fixed versions in eib artifacts' (#43 ) from dprodanov/Factory:eib-3.2 into 3.2

Reviewed-on: #43 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>
fixed versions in eib artifacts
2024-12-04 16:16:35 +01:00 · 2024-12-04 17:12:03 +02:00 · 2024-12-04 12:25:44 +00:00 · 2024-11-28 16:23:41 +01:00 · 2024-11-28 17:16:25 +02:00 · 2024-11-27 14:08:45 +01:00
9 changed files with 177 additions and 164 deletions
--- a/.obs/common.py
+++ b/.obs/common.py
@@ -1,3 +1,3 @@
-PROJECT = "isv:SUSE:Edge:Factory"
+PROJECT = "isv:SUSE:Edge:3.2"
 REPOSITORY = "https://src.opensuse.org/suse-edge/Factory"
-BRANCH = "main"
+BRANCH = "3.2"
--- a/.obs/workflows.yml
+++ b/.obs/workflows.yml
@@ -4,225 +4,225 @@ staging_build:
  steps:
  - branch_package:
      source_package: endpoint-copier-operator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: endpoint-copier-operator-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: endpoint-copier-operator-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-agent-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-debug-echo-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-onvif-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-opcua-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-udev-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-webhook-configuration-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: obs-service-set_version
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cosign
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: frr-k8s
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubectl
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: nm-configurator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kube-rbac-proxy
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: edge-image-builder
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: hauler
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ip-address-manager
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: baremetal-operator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cluster-api-provider-metal3
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cdi-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cluster-api-provider-metal3-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: sriov-crd-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: edge-image-builder-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-ipa-downloader-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metal3-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: baremetal-operator-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: sriov-network-operator-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ip-address-manager-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-speaker-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cri-tools
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: crudini
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: fakeroot
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ipcalc
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: autoconf
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: rancher-turtles-airgap-resources-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: rancher-turtles-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kube-rbac-proxy-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-ipa-ramdisk
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubevirt-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kiwi-builder-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubevirt-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: release-manifest-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: frr-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubectl-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
--- a/edge-image-builder-image/_service
+++ b/edge-image-builder-image/_service
@@ -7,10 +7,14 @@
    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
    <param name="var">IMG_REPO</param>
    <param name="file">artifacts.yaml</param>
+    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
+    <param name="var">IMG_PREFIX</param>
    <param name="eval">CHART_REPO=$(rpm --macros=/root/.rpmmacros -E %chart_repo)</param>
    <param name="var">CHART_REPO</param>
    <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
    <param name="var">SUPPORT_LEVEL</param>
+    <param name="eval">CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>

--- a/edge-image-builder-image/artifacts.yaml
+++ b/edge-image-builder-image/artifacts.yaml
@@ -1,11 +1,11 @@
 metallb:
  chart: metallb-chart
-  repository: %%CHART_REPO%%/3.1
-  version: 0.14.9
+  repository: "%%CHART_REPO%%/%%IMG_PREFIX%%"
+  version: "%%CHART_MAJOR%%.0.0+up0.14.9"
 endpoint-copier-operator:
  chart: endpoint-copier-operator-chart
-  repository: %%CHART_REPO%%/3.1
-  version: 0.2.1
+  repository: "%%CHART_REPO%%/%%IMG_PREFIX%%"
+  version: "%%CHART_MAJOR%%.0.0+up0.2.1"
 kubernetes:
  k3s:
    selinuxPackage: k3s-selinux-1.6-1.slemicro.noarch
@@ -13,4 +13,3 @@ kubernetes:
  rke2:
    selinuxPackage: rke2-selinux
    selinuxRepository: https://rpm.rancher.io/rke2/stable/common/slemicro/noarch
-
--- a/kiwi-builder-image/Dockerfile
+++ b/kiwi-builder-image/Dockerfile
@@ -1,5 +1,6 @@
-#!BuildTag: kiwi-builder:10.1
-FROM registry.suse.com/bci/kiwi:10.1.10
+#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.0
+#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.0-%RELEASE%
+FROM registry.suse.com/bci/kiwi:10.1.16
 MAINTAINER SUSE LLC (https://www.suse.com/)

 # Define labels according to https://en.opensuse.org/Building_derived_containers
@@ -11,7 +12,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_VERSION%"
 LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.1"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.1.16.0"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
@@ -20,10 +21,6 @@ LABEL com.suse.image-type="application"
 LABEL com.suse.release-stage="released"
 # endlabelprefix

-# Install required packages for Kiwi to function as expected
-# Should be provided via https://github.com/SUSE/BCI-dockerfile-generator/pull/1770
-# RUN zypper in -y gawk && zypper clean -a
-
 # Configure Kiwi to use kpartx
 RUN echo -e "mapper:\n  - part_mapper: kpartx" > /etc/kiwi.yml

--- a/kiwi-builder-image/README
+++ b/kiwi-builder-image/README
@@ -8,32 +8,40 @@ Please ensure that you're running this on a registered SLE Micro 6.0 system, and

 Next, download the podman image:

-# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10
+# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0

 Make a local output directory (where the images will reside):

 # mkdir output

+Then, to build a standard "Base" image, run the following in podman:
+
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image
+
+To build a "Base" SelfInstall ISO, you can add additional flags, for example:
+
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Base-SelfInstall
+
 Then, to build a standard "Default" image, run the following in podman:

-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default

-To build a SelfInstall ISO, you can add additional flags, for example:
+To build a "Default" SelfInstall ISO, you can add additional flags, for example:

-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image -p Default-SelfInstall
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default-SelfInstall

 To build an image with a RealTime kernel, e.g. a RAW disk image ("Default"), use the following:

-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image -p Base-RT
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Base-RT

 To build an image that supports a large block/sectorsize (4096), use the "-b" flag, for example:

-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image -p Default-SelfInstall -b
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default-SelfInstall -b

 # mkdir mydefs/
 # cp /path/to/SL-Micro.kiwi mydefs/
 # cp /path/to/config.sh mydefs/
-# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -v ./mydefs/:/micro-sdk/defs/ -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image
+# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -v ./mydefs/:/micro-sdk/defs/ -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image

 All output will be in the local $(pwd)/output directory, for example:

--- a/kiwi-builder-image/build-image.sh
+++ b/kiwi-builder-image/build-image.sh
@@ -21,43 +21,45 @@
 #

 # Set image build defaults, blocksize is an empty string
-PROFILE="Default"
+PROFILE="Base"
 LARGEBLOCK=false

 # Print usage
 usage(){
-	cat <<-EOF
-	==============================
-	SLE Micro 6.0 Kiwi SDK Builder
-	==============================
+  cat <<-EOF
+  ==============================
+  SLE Micro 6.0 Kiwi SDK Builder
+  ==============================

-	Usage: ${0} [-p <profile>] [-b]
+  Usage: ${0} [-p <profile>] [-b]

-	Profile Options (-p):
-	* Default: RAW Disk Image with kernel-default
-	* Default-SelfInstall: SelfInstall ISO with kernel-default
-	* Base-RT: RAW Disk Image with kernel-rt
-	* Base-RT-SelfInstall: SelfInstall ISO with kernel-rt
+  Profile Options (-p):
+  * Base: RAW Disk Image with podman
+  * Base-SelfInstall: SelfInstall ISO with podman
+  * Default: RAW Disk Image with podman and kvm
+  * Default-SelfInstall: SelfInstall ISO with podman and kvm
+  * Base-RT: RAW Disk Image with kernel-rt
+  * Base-RT-SelfInstall: SelfInstall ISO with kernel-rt

-	4096 Blocksize (-b): If specified, use a 4096 blocksize (rather than 512) when generating the image.
+  4096 Blocksize (-b): If specified, use a 4096 blocksize (rather than 512) when generating the image.

-	NOTE: If both options are omitted, the "Default" profile with a standard "512" blocksize is used.
-	EOF
+  NOTE: If both options are omitted, the "Base" profile with a standard "512" blocksize is used.
+EOF
 }

 # Grab CLI options and handle
 while getopts 'p:bh' OPTION; do
-	case "${OPTION}" in
-		p)
-			PROFILE="${OPTARG}"
-			;;
-		b)
-			LARGEBLOCK=true
-			;;
-		?)
-			usage && exit 2
-			;;
-	esac
+  case "${OPTION}" in
+    p)
+      PROFILE="${OPTARG}"
+      ;;
+    b)
+      LARGEBLOCK=true
+      ;;
+    ?)
+      usage && exit 2
+      ;;
+  esac
 done

 # To avoid wasting time, perform the loop creation test first, and exit with a warning to re-run.
@@ -88,4 +90,4 @@ if [ $RESULT -eq 0 ]; then
  echo -e "\n\nINFO: Image build successful, generated images are available in the 'output' directory."
 else
  echo -e "\n\nERROR: Failed to build the image, please see above logs."
-fi
+fi
--- a/rancher-turtles-chart/templates/metal3-infrastructure.yaml
+++ b/rancher-turtles-chart/templates/metal3-infrastructure.yaml
@@ -16,6 +16,9 @@ kind: ClusterctlConfig
 metadata:
  name: clusterctl-config
  namespace: rancher-turtles-system
+  annotations:
+    "helm.sh/hook": "post-install, post-upgrade"
+    "helm.sh/hook-weight": "1"
 spec:
  providers:
  - name: metal3
--- a/release-manifest-image/release_manifest.yaml
+++ b/release-manifest-image/release_manifest.yaml
@@ -28,12 +28,12 @@ spec:
        - prettyName: Longhorn
          releaseName: longhorn
          chart: longhorn
-          version: 104.2.1+up1.7.2
+          version: 105.1.0+up1.7.2
          repository: https://charts.rancher.io
          dependencyCharts:
            - releaseName: longhorn-crd
              chart: longhorn-crd
-              version: 104.2.1+up1.7.2
+              version: 105.1.0+up1.7.2
              repository: https://charts.rancher.io
        - prettyName: MetalLB
          releaseName: metallb
@@ -54,18 +54,18 @@ spec:
        - prettyName: NeuVector
          releaseName: neuvector
          chart: neuvector
-          version: 104.0.2+up2.8.0
+          version: 105.0.0+up2.8.3
          repository: https://charts.rancher.io
          dependencyCharts:
            - releaseName: neuvector-crd
              chart: neuvector-crd
-              version: 104.0.2+up2.8.0
+              version: 105.0.0+up2.8.3
              repository: https://charts.rancher.io
          addonCharts:
            - releaseName: neuvector-ui-ext
              chart: neuvector-ui-ext
              repository: https://github.com/rancher/ui-plugin-charts/raw/main
-              version: 2.0.0
+              version: 2.0.1
        - prettyName: EndpointCopierOperator
          releaseName: endpoint-copier-operator
          chart: %%CHART_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator-chart
Author	SHA256	Message	Date
Denislav Prodanov	dfc8bb30d9	Merge pull request 'backport into 3.2 fixed versions in eib artifacts' (#43 ) from dprodanov/Factory:eib-3.2 into 3.2 Reviewed-on: #43 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>	2024-12-04 16:16:35 +01:00
Denislav Prodanov	33f56e8b23	fixed versions in eib artifacts All checks were successful OBS SCM/CI Workflow Integration started Details OBS: akri-chart - charts/x86_64 Details OBS: akri-dashboard-extension-chart - charts/x86_64 Details OBS: cdi-chart - charts/x86_64 Details OBS: autoconf - standard/x86_64 Details OBS: akri-onvif-discovery-handler-image - images/x86_64 Details OBS: akri-debug-echo-discovery-handler-image - images/x86_64 Details OBS: endpoint-copier-operator-image - images/aarch64 Details OBS: akri-controller-image - images/x86_64 Details OBS: endpoint-copier-operator-image - images/x86_64 Details OBS: akri-opcua-discovery-handler-image - images/x86_64 Details OBS: akri-agent-image - images/x86_64 Details OBS: akri-webhook-configuration-image - images/x86_64 Details OBS: akri-udev-discovery-handler-image - images/x86_64 Details OBS: baremetal-operator-image - images/x86_64 Details OBS: cluster-api-provider-metal3-image - images/x86_64 Details OBS: baremetal-operator - standard/x86_64 Details	2024-12-04 17:12:03 +02:00
Steven Hardy	744d04b40a	kiwi-builder-image: Align with OBS latest version All checks were successful OBS: sriov-crd-chart - charts/x86_64 Details OBS: sriov-network-operator-chart - charts/x86_64 Details OBS: release-manifest-image - images/x86_64 Details OBS: ip-address-manager-image - images/x86_64 Details OBS: upgrade-controller-chart - charts/x86_64 Details OBS: metallb - standard/x86_64 Details OBS: kube-rbac-proxy-image - images/x86_64 Details OBS: upgrade-controller - standard/x86_64 Details OBS: nm-configurator - standard/x86_64 Details OBS: metallb - standard/aarch64 Details OBS: metallb-controller-image - images/x86_64 Details OBS: metallb-speaker-image - images/x86_64 Details OBS: ironic-image - images/x86_64 Details OBS: upgrade-controller-image - images/x86_64 Details OBS: endpoint-copier-operator-image - images/aarch64 Details OBS: akri - standard/x86_64 Details OBS: hauler - standard/aarch64 Details OBS: edge-image-builder-image - images/x86_64 Details OBS: nm-configurator - standard/aarch64 Details OBS: metallb-speaker-image - images/aarch64 Details OBS: metallb-controller-image - images/aarch64 Details OBS: edge-image-builder-image - images/aarch64 Details OBS: akri-onvif-discovery-handler-image - images/x86_64 Details OBS: akri-controller-image - images/x86_64 Details OBS: akri-udev-discovery-handler-image - images/x86_64 Details OBS: akri-opcua-discovery-handler-image - images/x86_64 Details OBS: akri-debug-echo-discovery-handler-image - images/x86_64 Details OBS: akri-agent-image - images/x86_64 Details OBS: akri-webhook-configuration-image - images/x86_64 Details OBS: ironic-ipa-ramdisk - standard/x86_64 Details Aligns with the latest fixes in isv:SUSE:Edge:KiwiBuilder/kiwi-builder-10 (cherry picked from commit `8a93aae7c5`)	2024-12-04 12:25:44 +00:00
Denislav Prodanov	5e098df843	Merge pull request 'updated longhorn and neuvector to latest 105 charts' (#39 ) from dprodanov/Factory:upstream-3.2 into 3.2 Reviewed-on: #39 Reviewed-by: Ivo Petrov <ipetrov117@noreply.src.opensuse.org>	2024-11-28 16:23:41 +01:00
Denislav Prodanov	7555048917	updated longhorn and neuvector to latest 105 charts	2024-11-28 17:16:25 +02:00
Denislav Prodanov	e92a50d110	Merge pull request '[3.2 backport] rancher-turtles: Fix issue in 0.4.0 chart' (#37 ) from steven.hardy/Factory:turtles_fix_3.2 into 3.2 Reviewed-on: #37 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org> Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-11-27 14:08:45 +01:00
Steven Hardy	da2ad77951	rancher-turtles: Fix issue in 0.4.0 chart The previous import was based on a pre-merge copy of the following PR - an issue was discovered during SV validation which required an additional change to ensure CRDs are created before creating the ClusterctlConfig CR https://github.com/suse-edge/charts/pull/166 (cherry picked from commit `636493adba`)	2024-11-27 11:16:59 +00:00
Denislav Prodanov	be4fae4b18	3.2 branching	2024-11-25 15:59:33 +02:00