Merge pull request 'Create release-manifest for 3.6.0' (#387) from dprodanov/Factory:rm-3.6.0 into main

Reviewed-on: #387

metal3-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.22_up0.13.1
-#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.22_up0.13.1-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.23_up0.13.1
+#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.23_up0.13.1-%RELEASE%
 apiVersion: v2
 appVersion: 0.13.0
 dependencies:
@@ -15,7 +15,7 @@ dependencies:
   condition: global.enable_mariadb
   name: mariadb
   repository: file://./charts/mariadb
-  version: 0.6.2
+  version: 0.6.3
 - alias: metal3-media
   condition: global.enable_metal3_media_server
   name: media
@@ -25,4 +25,4 @@ description: A Helm chart that installs all of the dependencies needed for Metal
 icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg
 name: metal3
 type: application
-version: "%%CHART_MAJOR%%.0.22+up0.13.1"
+version: "%%CHART_MAJOR%%.0.23+up0.13.1"

metal3-chart/charts/mariadb/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: "11.8"
 description: A Helm chart for MariaDB, used by Metal3
 name: mariadb
 type: application
-version: 0.6.2
+version: 0.6.3

metal3-chart/charts/mariadb/templates/deployment.yaml

@@ -20,7 +20,7 @@ spec:
       labels:
         {{- include "mariadb.selectorLabels" . | nindent 8 }}
     spec:
-      {{- $volmounts := toYaml .Values.volumeMounts | trim | nindent 12 }}
+      {{- $volmounts := toYaml .Values.volumeMounts | trim | nindent 10 }}
       {{- $volumes := toYaml .Values.volumes | trim | nindent 8 }}
       serviceAccountName: {{ include "mariadb.serviceAccountName" . }}
       securityContext:
@@ -103,11 +103,11 @@ spec:
           successThreshold: 1
           timeoutSeconds: 10
         volumeMounts:
-            - name: mariadb-conf
-              mountPath: /etc/mysql/conf.d
-            - name: mariadb-run
-              mountPath: /run/mysql
-            {{- $volmounts }}
+          - name: mariadb-conf
+            mountPath: /etc/mysql/conf.d
+          - name: mariadb-run
+            mountPath: /run/mysql
+          {{- $volmounts }}
       {{- with .Values.global.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

release-manifest-image/Dockerfile

@@ -1,4 +1,4 @@
-#!BuildTag: %%IMG_PREFIX%%release-manifest:3.5.0
+#!BuildTag: %%IMG_PREFIX%%release-manifest:3.6.0
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION
 
@@ -7,11 +7,11 @@ FROM registry.suse.com/bci/bci-micro:$SLE_VERSION
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SUSE Edge Release Manifest"
 LABEL org.opencontainers.image.description="Release Manifest containing information about a specific SUSE Edge release"
-LABEL org.opencontainers.image.version="3.5.0"
+LABEL org.opencontainers.image.version="3.6.0"
 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%%release-manifest:3.5.0"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%release-manifest:3.6.0"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
@@ -20,4 +20,4 @@ LABEL com.suse.image-type="release-manifest"
 LABEL com.suse.release-stage="released"
 # endlabelprefix
 
-COPY release_manifest.yaml release_images.yaml tooling_manifest.yaml ./
+COPY release_manifest.yaml release_images.yaml ./

release-manifest-image/_service

@@ -18,16 +18,5 @@
     <param name="var">CHART_REPO</param>
     <param name="eval">CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
     <param name="var">CHART_MAJOR</param>
-</service>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">tooling_manifest.yaml</param>
-    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
-    <param name="var">IMG_PREFIX</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
-    <param name="var">IMG_REPO</param>
-    <param name="eval">KIWI_VERSION=$(rpm --macros=/root/.rpmmacros -E %kiwi_version)</param>
-    <param name="var">KIWI_VERSION</param>
-    <param name="eval">EIB_VERSION=$(rpm --macros=/root/.rpmmacros -E %eib_version)</param>
-    <param name="var">EIB_VERSION</param>
   </service>
 </services>

release-manifest-image/release_manifest.yaml

@@ -1,9 +1,9 @@
 apiVersion: lifecycle.suse.com/v1alpha1
 kind: ReleaseManifest
 metadata:
-  name: release-manifest-3-5-0
+  name: release-manifest-3-6-0
 spec:
-  releaseVersion: 3.5.0
+  releaseVersion: 3.6.0
   components:
     kubernetes:
       k3s:
@@ -92,7 +92,7 @@ spec:
               enabled: false
         - prettyName: Longhorn
           releaseName: longhorn
-          chart: 'oci://dp.apps.rancher.io/charts/suse-storage'
+          chart: oci://dp.apps.rancher.io/charts/suse-storage
           version: 1.10.1
         - prettyName: MetalLB
           releaseName: metallb
@@ -161,15 +161,11 @@ spec:
         - prettyName: Metal3
           releaseName: metal3
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metal3'
-          version: '%%CHART_MAJOR%%.0.22+up0.13.1'
+          version: '%%CHART_MAJOR%%.0.23+up0.13.1'
         - prettyName: RancherTurtlesProviders
           releaseName: rancher-turtles-providers
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles-providers'
           version: '%%CHART_MAJOR%%.0.4+up0.25.1'
-        - prettyName: Upgrade Controller
-          releaseName: upgrade-controller
-          chart: '%%CHART_REPO%%/%%CHART_PREFIX%%upgrade-controller'
-          version: '%%CHART_MAJOR%%.0.3+up0.1.3'
         - prettyName: CertManager
           releaseName: cert-manager
           chart: cert-manager

release-manifest-image/tooling_manifest.yaml

@@ -1,7 +0,0 @@
-kiwi:
-  version: "10.2.29.1"
-  image: "%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.2.29.1"
-
-eib:
-  version: "1.3.2"
-  image: "%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.2"