Fix missed 302 chart prefixes

The CDI chart should only use CHART_MAJOR, and the cluster-api-operator subchart doesn't need to use a prefix
Add initial release-manifest image (#26 )
2024-11-19 16:50:59 +00:00 · 2024-11-19 14:56:42 +01:00 · 2024-11-18 15:24:48 +01:00 · 2024-11-18 15:14:29 +02:00 · 2024-11-18 15:03:25 +02:00 · 2024-11-18 12:55:33 +01:00
36 changed files with 261 additions and 57 deletions
--- a/.obs/workflows.yml
+++ b/.obs/workflows.yml
@@ -214,3 +214,7 @@ staging_build:
      source_package: kubevirt-chart
      source_project: isv:SUSE:Edge:Factory
      target_project: isv:SUSE:Edge:Factory:Staging
+  - branch_package:
+      source_package: release-manifest-image
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
--- a/akri-chart/Chart.yaml
+++ b/akri-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%akri-chart:0.12.20
-#!BuildTag: %%IMG_PREFIX%%akri-chart:0.12.20-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-chart:%%CHART_MAJOR%%.0.0_up0.12.20
+#!BuildTag: %%IMG_PREFIX%%akri-chart:%%CHART_MAJOR%%.0.0_up0.12.20-%RELEASE%
 annotations:
  catalog.cattle.io/display-name: Akri
 apiVersion: v2
@@ -8,4 +8,4 @@ description: A Helm chart for Akri
 icon: https://raw.githubusercontent.com/project-akri/akri-docs/main/art/icon/akri-icon-light.svg
 name: akri
 type: application
-version: 0.12.20
+version: "%%CHART_MAJOR%%.0.0+up0.12.20"
--- a/akri-chart/_service
+++ b/akri-chart/_service
@@ -11,5 +11,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/akri-dashboard-extension-chart/Chart.yaml
+++ b/akri-dashboard-extension-chart/Chart.yaml
@@ -1,20 +1,20 @@
-#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:1.2.0
-#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:1.2.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0
+#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0-%RELEASE%
 annotations:
  catalog.cattle.io/certified: rancher
  catalog.cattle.io/display-name: Akri
-  catalog.cattle.io/kube-version: '>= v1.26.0-0'
+  catalog.cattle.io/kube-version: ">= v1.26.0-0"
  catalog.cattle.io/namespace: cattle-ui-plugin-system
  catalog.cattle.io/os: linux
  catalog.cattle.io/permits-os: linux, windows
-  catalog.cattle.io/rancher-version: '>= 2.10.0-0'
+  catalog.cattle.io/rancher-version: ">= 2.10.0-0"
  catalog.cattle.io/scope: management
  catalog.cattle.io/ui-component: plugins
-  catalog.cattle.io/ui-extensions-version: '>= 3.0.0'
+  catalog.cattle.io/ui-extensions-version: ">= 3.0.0"
 apiVersion: v2
 appVersion: 1.2.0
-description: 'SUSE Edge: Akri extension for Rancher Dashboard'
+description: "SUSE Edge: Akri extension for Rancher Dashboard"
 icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/akri/icon/color/akri-icon-color.svg
 name: akri-dashboard-extension
 type: application
-version: 1.2.0
+version: "%%CHART_MAJOR%%.0.0+up1.2.0"
--- a/akri-dashboard-extension-chart/_service
+++ b/akri-dashboard-extension-chart/_service
@@ -11,5 +11,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/cdi-chart/Chart.yaml
+++ b/cdi-chart/Chart.yaml
@@ -1,9 +1,9 @@
-#!BuildTag: %%IMG_PREFIX%%cdi-chart:0.4.0
-#!BuildTag: %%IMG_PREFIX%%cdi-chart:0.4.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%cdi-chart:%%CHART_MAJOR%%.0.0_up0.4.0
+#!BuildTag: %%IMG_PREFIX%%cdi-chart:%%CHART_MAJOR%%.0.0_up0.4.0-%RELEASE%
 apiVersion: v2
 appVersion: 1.60.1
 description: A Helm chart for Containerized Data Importer (CDI)
 icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/kubevirt/icon/color/kubevirt-icon-color.svg
 name: cdi
 type: application
-version: 0.4.0
+version: "%%CHART_MAJOR%%.0.0+up0.4.0"
--- a/cdi-chart/_service
+++ b/cdi-chart/_service
@@ -4,5 +4,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/endpoint-copier-operator-chart/Chart.yaml
+++ b/endpoint-copier-operator-chart/Chart.yaml
@@ -1,8 +1,8 @@
-#!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator-chart:0.2.1
-#!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator-chart:0.2.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator-chart:%%CHART_MAJOR%%.0.0_up0.2.1
+#!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator-chart:%%CHART_MAJOR%%.0.0_up0.2.1-%RELEASE%
 apiVersion: v2
 appVersion: v0.2.0
 description: A Helm chart for Kubernetes
 name: endpoint-copier-operator
 type: application
-version: 0.2.1
+version: "%%CHART_MAJOR%%.0.0+up0.2.1"
--- a/endpoint-copier-operator-chart/_service
+++ b/endpoint-copier-operator-chart/_service
@@ -11,5 +11,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/kubevirt-chart/Chart.yaml
+++ b/kubevirt-chart/Chart.yaml
@@ -1,9 +1,9 @@
-#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:302.0.0_up0.4.0-%RELEASE%
-#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:302.0.0_up0.4.0
+#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:%%CHART_MAJOR%%.0.0_up0.4.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:%%CHART_MAJOR%%.0.0_up0.4.0
 apiVersion: v2
 appVersion: 1.3.1
 description: A Helm chart for KubeVirt
 icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/kubevirt/icon/color/kubevirt-icon-color.svg
 name: kubevirt
 type: application
-version: 302.0.0+up0.4.0
+version: "%%CHART_MAJOR%%.0.0+up0.4.0"
--- a/kubevirt-chart/_service
+++ b/kubevirt-chart/_service
@@ -4,5 +4,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/kubevirt-dashboard-extension-chart/Chart.yaml
+++ b/kubevirt-dashboard-extension-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:1.2.0
-#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:1.2.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0
+#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.0-%RELEASE%
 annotations:
  catalog.cattle.io/certified: rancher
  catalog.cattle.io/display-name: KubeVirt
@@ -17,4 +17,4 @@ description: 'SUSE Edge: KubeVirt extension for Rancher Dashboard'
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/kubevirt/icon/color/kubevirt-icon-color.svg
 name: kubevirt-dashboard-extension
 type: application
-version: 1.2.0
+version: "%%CHART_MAJOR%%.0.0+up1.2.0"
--- a/kubevirt-dashboard-extension-chart/_service
+++ b/kubevirt-dashboard-extension-chart/_service
@@ -11,5 +11,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/metal3-chart/Chart.yaml
+++ b/metal3-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%metal3-chart:302.0.0_up0.9.0
-#!BuildTag: %%IMG_PREFIX%%metal3-chart:302.0.0_up0.9.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.0
+#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.0_up0.9.0-%RELEASE%
 apiVersion: v2
 appVersion: 0.9.0
 dependencies:
@@ -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: 302.0.0+up0.9.0
+version: "%%CHART_MAJOR%%.0.0+up0.9.0"
--- a/metal3-chart/_service
+++ b/metal3-chart/_service
@@ -11,5 +11,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/metallb-chart/Chart.yaml
+++ b/metallb-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%metallb-chart:0.14.9
-#!BuildTag: %%IMG_PREFIX%%metallb-chart:0.14.9-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%metallb-chart:%%CHART_MAJOR%%.0.0_up0.14.9
+#!BuildTag: %%IMG_PREFIX%%metallb-chart:%%CHART_MAJOR%%.0.0_up0.14.9-%RELEASE%
 apiVersion: v2
 appVersion: v0.14.3
 dependencies:
@@ -20,4 +20,4 @@ name: metallb
 sources:
 - https://github.com/metallb/metallb
 type: application
-version: 0.14.9
+version: "%%CHART_MAJOR%%.0.0+up0.14.9"
--- a/metallb-chart/_service
+++ b/metallb-chart/_service
@@ -11,5 +11,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/rancher-turtles-airgap-resources-chart/Chart.yaml
+++ b/rancher-turtles-airgap-resources-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:302.0.0_up0.13.0
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:302.0.0_up0.13.0
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.13.0
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.13.0
 apiVersion: v2
 appVersion: 0.13.0
 description: Rancher Turtles utility chart for airgap scenarios
@@ -7,4 +7,4 @@ home: https://github.com/rancher/turtles/
 icon: https://raw.githubusercontent.com/rancher/turtles/main/logos/capi.svg
 name: rancher-turtles-airgap-resources
 type: application
-version: 302.0.0+up0.13.0
+version: "%%CHART_MAJOR%%.0.0+up0.13.0"
--- a/rancher-turtles-airgap-resources-chart/_service
+++ b/rancher-turtles-airgap-resources-chart/_service
@@ -4,5 +4,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/rancher-turtles-chart/Chart.yaml
+++ b/rancher-turtles-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:302.0.0_up0.13.0
-#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:302.0.0_up0.13.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.13.0
+#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.13.0-%RELEASE%
 annotations:
  catalog.cattle.io/certified: rancher
  catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension
@@ -29,4 +29,4 @@ keywords:
 - provisioning
 name: rancher-turtles
 type: application
-version: 302.0.0+up0.13.0
+version: "%%CHART_MAJOR%%.0.0+up0.13.0"
--- a/rancher-turtles-chart/_service
+++ b/rancher-turtles-chart/_service
@@ -11,5 +11,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/release-manifest-image/Dockerfile
+++ b/release-manifest-image/Dockerfile
@@ -0,0 +1,23 @@
+#!BuildTag: %%IMG_PREFIX%%release-manifest:3.1.1
+ARG SLE_VERSION
+FROM registry.suse.com/bci/bci-micro:$SLE_VERSION
+
+# Define labels according to https://en.opensuse.org/Building_derived_containers
+# labelprefix=com.suse.edge.manifest
+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.1.1"
+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.1.1"
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
+LABEL com.suse.eula="SUSE Combined EULA February 2024"
+LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
+LABEL com.suse.image-type="release-manifest"
+LABEL com.suse.release-stage="released"
+# endlabelprefix
+
+COPY release_manifest.yaml release_manifest.yaml
--- a/release-manifest-image/_service
+++ b/release-manifest-image/_service
@@ -0,0 +1,15 @@
+<services>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile</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 %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+    <param name="file">release_manifest.yaml</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>
+  </service>
+</services>
--- a/release-manifest-image/release_manifest.yaml
+++ b/release-manifest-image/release_manifest.yaml
@@ -0,0 +1,104 @@
+apiVersion: lifecycle.suse.com/v1alpha1
+kind: ReleaseManifest
+metadata:
+  name: release-manifest-3-1-1
+spec:
+  releaseVersion: 3.1.1
+  components:
+    kubernetes:
+      k3s:
+        version: v1.30.5+k3s1
+      rke2:
+        version: v1.30.5+rke2r1
+    operatingSystem:
+      version: "6.0"
+      zypperID: "SL-Micro"
+      cpeScheme: "cpe:/o:suse:sl-micro:6.0"
+      prettyName: "SUSE Linux Micro 6.0"
+      supportedArchs:
+        - "x86_64"
+        - "aarch64"
+    workloads:
+      helm:
+        - prettyName: Rancher
+          releaseName: rancher
+          chart: rancher
+          version: v2.9.3
+          repository: https://charts.rancher.com/server-charts/prime
+        - prettyName: Longhorn
+          releaseName: longhorn
+          chart: longhorn
+          version: 104.2.0+up1.7.1
+          repository: https://charts.rancher.io
+          dependencyCharts:
+            - releaseName: longhorn-crd
+              chart: longhorn-crd
+              version: 104.2.0+up1.7.1
+              repository: https://charts.rancher.io
+        - prettyName: MetalLB
+          releaseName: metallb
+          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%metallb-chart
+          version: 0.14.9
+        - prettyName: CDI
+          releaseName: cdi
+          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%cdi-chart
+          version: 0.4.0
+        - prettyName: KubeVirt
+          releaseName: kubevirt
+          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%kubevirt-chart
+          version: 0.4.0
+          addonCharts:
+            - releaseName: kubevirt-dashboard-extension
+              chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%kubevirt-dashboard-extension-chart
+              version: 1.1.0
+        - prettyName: NeuVector
+          releaseName: neuvector
+          chart: neuvector
+          version: 104.0.2+up2.8.0
+          repository: https://charts.rancher.io
+          dependencyCharts:
+            - releaseName: neuvector-crd
+              chart: neuvector-crd
+              version: 104.0.2+up2.8.0
+              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
+        - prettyName: EndpointCopierOperator
+          releaseName: endpoint-copier-operator
+          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%endpoint-copier-operator-chart
+          version: 0.2.1
+        - prettyName: Elemental
+          releaseName: elemental-operator
+          chart: oci://registry.suse.com/rancher/elemental-operator-chart
+          version: 1.6.4
+          dependencyCharts:
+            - releaseName: elemental-operator-crds
+              chart: oci://registry.suse.com/rancher/elemental-operator-crds-chart
+              version: 1.6.4
+        - prettyName: SRIOV
+          releaseName: sriov-network-operator
+          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%sriov-network-operator-chart
+          version: 1.3.0
+          dependencyCharts:
+            - releaseName: sriov-crd
+              chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%sriov-crd-chart
+              version: 1.3.0
+        - prettyName: Akri
+          releaseName: akri
+          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%akri-chart
+          version: 0.12.20
+          addonCharts:
+            - releaseName: akri-dashboard-extension
+              chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%akri-dashboard-extension-chart
+              version: 1.1.0
+        - prettyName: Metal3
+          releaseName: metal3
+          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%metal3-chart
+          version: 0.8.3
+        - prettyName: RancherTurtles
+          releaseName: rancher-turtles
+          chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%rancher-turtles-chart
+          version: 0.3.3
--- a/sriov-crd-chart/Chart.yaml
+++ b/sriov-crd-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:1.3.0-%RELEASE%
-#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:1.3.0
+#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:%%CHART_MAJOR%%.0.0_up1.4.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:%%CHART_MAJOR%%.0.0_up1.4.0
 annotations:
  catalog.cattle.io/experimental: "true"
  catalog.cattle.io/hidden: "true"
@@ -10,4 +10,4 @@ apiVersion: v2
 description: Installs the CRDs for the SR-IOV operator
 name: sriov-crd
 type: application
-version: 1.3.0
+version: "%%CHART_MAJOR%%.0.0+up1.4.0"
--- a/sriov-crd-chart/_service
+++ b/sriov-crd-chart/_service
@@ -4,5 +4,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/sriov-network-operator-chart/Chart.yaml
+++ b/sriov-network-operator-chart/Chart.yaml
@@ -1,19 +1,19 @@
-#!BuildTag: %%IMG_PREFIX%%sriov-network-operator-chart:1.3.0-%RELEASE%
-#!BuildTag: %%IMG_PREFIX%%sriov-network-operator-chart:1.3.0
+#!BuildTag: %%IMG_PREFIX%%sriov-network-operator-chart:%%CHART_MAJOR%%.0.0_up1.4.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%sriov-network-operator-chart:%%CHART_MAJOR%%.0.0_up1.4.0
 annotations:
  catalog.cattle.io/auto-install: sriov-crd=match
  catalog.cattle.io/experimental: "true"
  catalog.cattle.io/namespace: cattle-sriov-system
  catalog.cattle.io/os: linux
  catalog.cattle.io/permits-os: linux
-  catalog.cattle.io/upstream-version: 1.3.0
+  catalog.cattle.io/upstream-version: 1.4.0
 apiVersion: v2
-appVersion: v1.3.0
+appVersion: v1.4.0
 dependencies:
 - condition: sriov-nfd.enabled
  name: sriov-nfd
  repository: file://./charts/sriov-nfd
-  version: 0.15.6
+  version: 0.15.7
 description: SR-IOV network operator configures and manages SR-IOV networks in the
  kubernetes cluster
 home: https://github.com/k8snetworkplumbingwg/sriov-network-operator
@@ -25,4 +25,4 @@ name: sriov-network-operator
 sources:
 - https://github.com/k8snetworkplumbingwg/sriov-network-operator
 type: application
-version: 1.3.0
+version: "%%CHART_MAJOR%%.0.0+up1.4.0"
--- a/sriov-network-operator-chart/README.md
+++ b/sriov-network-operator-chart/README.md
@@ -38,9 +38,20 @@ For additional information and methods for installing Helm, refer to the officia

 ### Deploy SR-IOV Network Operator

+#### Deploy from OCI repo
+
 ```
+$ helm install -n sriov-network-operator --create-namespace --version 1.3.0 --set sriovOperatorConfig.deploy=true sriov-network-operator oci://ghcr.io/k8snetworkplumbingwg/sriov-network-operator-chart
+```
+
+#### Deploy from project sources
+
+```
+# Clone project
+$ git clone https://github.com/k8snetworkplumbingwg/sriov-network-operator.git ; cd sriov-network-operator
+
 # Install Operator
-$ helm install -n sriov-network-operator --create-namespace --wait sriov-network-operator ./
+$ helm install -n sriov-network-operator --create-namespace --wait --set sriovOperatorConfig.deploy=true sriov-network-operator ./deployment/sriov-network-operator-chart

 # View deployed resources
 $ kubectl -n sriov-network-operator get pods
@@ -128,3 +139,13 @@ This section contains general parameters that apply to both the operator and dae
 | `images.sriovDevicePlugin` | SR-IOV device plugin image |
 | `images.resourcesInjector` | Resources Injector image |
 | `images.webhook` | Operator Webhook image |
+
+### Extra objects parameters
+
+**Disclaimer**:
+
+Please note that any resources deployed using the `extraDeploy` in this Helm chart are the sole responsibility of the user. It is important to review and understand the implications of these deployed resources. The maintainers of this Helm chart take no responsibility for any issues or damages caused by the deployment or operation of these resources.
+
+| Name | description |
+| ---- | ------------|
+|`extraDeploy`| Array of extra objects to deploy with the release |
--- a/sriov-network-operator-chart/_service
+++ b/sriov-network-operator-chart/_service
@@ -4,5 +4,7 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
--- a/sriov-network-operator-chart/charts/sriov-nfd/Chart.yaml
+++ b/sriov-network-operator-chart/charts/sriov-nfd/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: v0.15.6
+appVersion: v0.15.7
 description: Detects hardware features available on each node in a Kubernetes cluster,
  and advertises those features using node labels
 home: https://github.com/kubernetes-sigs/node-feature-discovery
@@ -11,4 +11,4 @@ name: sriov-nfd
 sources:
 - https://github.com/kubernetes-sigs/node-feature-discovery
 type: application
-version: 0.15.6
+version: 0.15.7
--- a/sriov-network-operator-chart/charts/sriov-nfd/values.yaml
+++ b/sriov-network-operator-chart/charts/sriov-nfd/values.yaml
@@ -3,7 +3,7 @@ image:
  # This should be set to 'IfNotPresent' for released version
  pullPolicy: IfNotPresent
  # tag, if defined will use the given image tag, else Chart.AppVersion will be used
-  tag: v0.15.6-build20240822
+  tag: v0.15.7-build20241113
 imagePullSecrets: []

 nameOverride: ""
--- a/sriov-network-operator-chart/templates/extra-list.yaml
+++ b/sriov-network-operator-chart/templates/extra-list.yaml
@@ -0,0 +1,8 @@
+{{- range .Values.extraDeploy }}
+---
+{{- if typeIs "string" . }}
+  {{- tpl . $ }}
+{{- else }}
+  {{- tpl (. | toYaml) $ }}
+{{- end }}
+{{- end }}
--- a/sriov-network-operator-chart/templates/operator.yaml
+++ b/sriov-network-operator-chart/templates/operator.yaml
@@ -20,6 +20,8 @@ spec:
      maxUnavailable: 33%
  template:
    metadata:
+      annotations:
+        openshift.io/required-scc: restricted-v2
      labels:
        name: sriov-network-operator
    spec:
--- a/sriov-network-operator-chart/values.yaml
+++ b/sriov-network-operator-chart/values.yaml
@@ -96,26 +96,27 @@ supportedExtraNICs: []
 images:
  operator:
    repository: rancher/hardened-sriov-network-operator
-    tag: v1.3.0-build20240816
+    tag: v1.4.0-build20241113
  sriovConfigDaemon:
    repository: rancher/hardened-sriov-network-config-daemon
-    tag: v1.3.0-build20240816
+    tag: v1.4.0-build20241113
  sriovCni:
    repository: rancher/hardened-sriov-cni
-    tag: v2.8.1-build20240820
+    tag: v2.8.1-build20241113
  ibSriovCni: 
    repository: rancher/hardened-ib-sriov-cni
-    tag: v1.1.1-build20240816
+    tag: v1.1.1-build20241113
  sriovDevicePlugin: 
    repository: rancher/hardened-sriov-network-device-plugin
-    tag: v3.7.0-build20240816
+    tag: v3.8.0-build20241114
  resourcesInjector: 
    repository: rancher/hardened-sriov-network-resources-injector
-    tag: v1.6.0-build20240816
+    tag: v1.6.0-build20241113
  webhook:
    repository: rancher/hardened-sriov-network-webhook
-    tag: v1.3.0-build20240816
+    tag: v1.4.0-build20241113
 imagePullSecrets: []
+extraDeploy: []
 global:
  cattle:
    systemDefaultRegistry: ""
--- a/upgrade-controller-chart/Chart.yaml
+++ b/upgrade-controller-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:0.1.0
-#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:0.1.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.0
+#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.0-%RELEASE%
 apiVersion: v2
 appVersion: 0.1.0
 dependencies:
@@ -10,4 +10,4 @@ dependencies:
 description: A Helm chart for Upgrade Controller
 name: upgrade-controller
 type: application
-version: 0.1.0
+version: "%%CHART_MAJOR%%.0.0+up0.1.0"
--- a/upgrade-controller-chart/_service
+++ b/upgrade-controller-chart/_service
@@ -11,6 +11,8 @@
    <param name="file">Chart.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_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
+    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
Author	SHA256	Message	Date
Steven Hardy	6b530a91d9	Fix missed 302 chart prefixes The CDI chart should only use CHART_MAJOR, and the cluster-api-operator subchart doesn't need to use a prefix	2024-11-19 16:50:59 +00:00
Atanas Dinov	5c2204ba3e	Add initial release-manifest image (#26 ) Copies over the [current](https://build.suse.de/package/show/ISV:SUSE:Edge:3.1/release-manifest-310-image) release-manifest image used for Edge 3.1.1. Reviewed-on: suse-edge/Factory#26 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org> Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org> Co-authored-by: Atanas Dinov <atanas.dinov@suse.com> Co-committed-by: Atanas Dinov <atanas.dinov@suse.com>	2024-11-19 14:56:42 +01:00
Denislav Prodanov	f1bf24e9dd	Merge pull request 'add templating for chart major versions' (#25 ) from template-chart-versions into main Reviewed-on: suse-edge/Factory#25 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>	2024-11-18 15:24:48 +01:00
Denislav Prodanov	4ad7e30ea7	updated _service files for the templating	2024-11-18 15:14:29 +02:00
Denislav Prodanov	e9b3caf318	add templating for chart major versions	2024-11-18 15:03:25 +02:00
Denislav Prodanov	ed9a5df069	Merge pull request 'init for chart version updates' (#14 ) from update-charts-version into main Reviewed-on: suse-edge/Factory#14 Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>	2024-11-18 12:55:33 +01:00
Denislav Prodanov	a66325901d	init for chart version updates	2024-11-18 11:53:50 +02:00
Steven Hardy	8b6dce500e	Update SR-IOV chart to v1.4.0 Aligning with https://github.com/suse-edge/charts/pull/167	2024-11-18 10:49:50 +01:00