Fix service file for frr-k8s-image

Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>
Merge pull request 'Import missing package: frr-k8s-image' (#67 ) from nbelouin/Factory:import-frr-k8s-image into main
2025-01-17 09:44:56 +01:00 · 2025-01-17 09:31:28 +01:00 · 2025-01-17 09:31:10 +01:00 · 2025-01-17 09:24:32 +01:00 · 2025-01-16 15:47:33 +01:00 · 2025-01-16 15:35:46 +01:00
9 changed files with 77 additions and 15 deletions
--- a/.obs/workflows.yml
+++ b/.obs/workflows.yml
@ -210,3 +210,7 @@ staging_build:
      source_package: kubectl-image
      source_project: isv:SUSE:Edge:Factory
      target_project: isv:SUSE:Edge:Factory:Staging
+  - branch_package:
+      source_package: frr-k8s-image
+      source_project: isv:SUSE:Edge:Factory
+      target_project: isv:SUSE:Edge:Factory:Staging
--- a/akri-dashboard-extension-chart/Chart.yaml
+++ b/akri-dashboard-extension-chart/Chart.yaml
@ -1,3 +1,4 @@
+#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0
 #!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1
 #!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1-%RELEASE%
 annotations:
--- a/frr-k8s-image/Dockerfile
+++ b/frr-k8s-image/Dockerfile
@ -0,0 +1,33 @@
+# SPDX-License-Identifier: Apache-2.0
+#!BuildTag: %%IMG_PREFIX%%frr-k8s:v%%frr-k8s_version%%
+#!BuildTag: %%IMG_PREFIX%%frr-k8s:v%%frr-k8s_version%%-%RELEASE%
+#!BuildVersion: 15.6
+ARG SLE_VERSION
+FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
+
+FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base
+COPY --from=micro / /installroot/
+RUN zypper --installroot /installroot --non-interactive install --no-recommends frr-k8s; zypper -n clean; rm -rf /var/log/*
+
+FROM micro AS final
+# Define labels according to https://en.opensuse.org/Building_derived_containers
+# labelprefix=com.suse.application.endpoint-copier-operator
+LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
+LABEL org.opencontainers.image.title="SLE frr-k8s Container Image"
+LABEL org.opencontainers.image.description="frr-k8s based on the SLE Base Container Image."
+LABEL org.opencontainers.image.version="%%frr-k8s_version%%"
+LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
+LABEL org.opencontainers.image.created="%BUILDTIME%"
+LABEL org.opencontainers.image.vendor="SUSE LLC"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%frr-k8s:v%%frr-k8s_version%%-%RELEASE%"
+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="application"
+LABEL com.suse.release-stage="released"
+# endlabelprefix
+
+#Install frr-k8s
+COPY --from=base /installroot /
+ENTRYPOINT ["/frr-k8s"]
--- a/frr-k8s-image/_service
+++ b/frr-k8s-image/_service
@ -0,0 +1,19 @@
+<services>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service mode="buildtime" name="docker_label_helper"/>
+  <service name="replace_using_package_version" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%frr-k8s_version%%</param>
+    <param name="package">frr-k8s</param>
+    <param name="parse-version">patch</param>
+  </service>
+  <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="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
+    <param name="var">SUPPORT_LEVEL</param>
+  </service>
+</services>
--- a/kubevirt-dashboard-extension-chart/Chart.yaml
+++ b/kubevirt-dashboard-extension-chart/Chart.yaml
@ -1,3 +1,4 @@
+#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0
 #!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1
 #!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.0_up1.2.1-%RELEASE%
 annotations:
--- a/release-manifest-image/_service
+++ b/release-manifest-image/_service
@ -4,7 +4,7 @@
    <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="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
    <param name="var">IMG_REPO</param>
    <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
    <param name="var">SUPPORT_LEVEL</param>
--- a/release-manifest-image/release_manifest.yaml
+++ b/release-manifest-image/release_manifest.yaml
@ -7,7 +7,7 @@ spec:
  components:
    kubernetes:
      k3s:
-        version: v1.31.2+k3s1
+        version: v1.31.3+k3s1
        coreComponents:
        - name: traefik-crd
          version: 27.0.201+up27.0.2
@ -31,34 +31,34 @@ spec:
            image: rancher/mirrored-metrics-server:v0.7.2
          type: Deployment
      rke2:
-        version: v1.31.2+rke2r1
+        version: v1.31.3+rke2r1
        coreComponents:
        - name: rke2-cilium
-          version: 1.16.201
+          version: 1.16.303
          type: HelmChart
        - name: rke2-canal
-          version: v3.28.2-build2024101601
+          version: v3.29.0-build2024110400
          type: HelmChart
        - name: rke2-calico-crd
-          version: v3.28.200
+          version: v3.29.000
          type: HelmChart
        - name: rke2-calico
-          version: v3.28.200
+          version: v3.29.000
          type: HelmChart
        - name: rke2-coredns
-          version: 1.33.002
+          version: 1.33.005
          type: HelmChart
        - name: rke2-ingress-nginx
-          version: 4.10.501
+          version: 4.10.502
          type: HelmChart
        - name: rke2-metrics-server
          version: 3.12.004
          type: HelmChart
        - name: rancher-vsphere-csi
-          version: 3.3.1-rancher100
+          version: 3.3.1-rancher700
          type: HelmChart
        - name: rancher-vsphere-cpi
-          version: 1.9.000
+          version: 1.9.100
          type: HelmChart
        - name: harvester-cloud-provider
          version: 0.2.600
@ -88,8 +88,11 @@ spec:
        - prettyName: Rancher
          releaseName: rancher
          chart: rancher
-          version: v2.10.0
-          repository: https://releases.rancher.com/server-charts/stable
+          version: 2.10.1
+          repository: https://charts.rancher.com/server-charts/prime
+          values:
+            postDelete:
+              enabled: false
        - prettyName: Longhorn
          releaseName: longhorn
          chart: longhorn
--- a/upgrade-controller-chart/_service
+++ b/upgrade-controller-chart/_service
@ -6,6 +6,8 @@
    <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="eval">MANIFEST_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
+    <param name="var">MANIFEST_REPO</param>
  </service>
  <service name="replace_using_env" mode="buildtime">
    <param name="file">Chart.yaml</param>
@ -15,4 +17,3 @@
    <param name="var">CHART_MAJOR</param>
  </service>
 </services>
-
--- a/upgrade-controller-chart/values.yaml
+++ b/upgrade-controller-chart/values.yaml
@ -12,7 +12,7 @@ image:

 env:
  releaseManifest:
-    image: %%IMG_REPO%%/%%IMG_PREFIX%%release-manifest
+    image: %%MANIFEST_REPO%%/%%IMG_PREFIX%%release-manifest
  kubectl:
    image: %%IMG_REPO%%/%%IMG_PREFIX%%kubectl
    version: 1.30.3
Author	SHA256	Message	Date
Nicolas Belouin	74133c22f6	Fix service file for frr-k8s-image Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2025-01-17 09:44:56 +01:00
Nicolas Belouin	e85da96001	Merge pull request 'Import missing package: frr-k8s-image' (#67 ) from nbelouin/Factory:import-frr-k8s-image into main Reviewed-on: suse-edge/Factory#67 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2025-01-17 09:31:28 +01:00
Nicolas Belouin	dab7f36e0b	Add package to workflow All checks were successful OBS: kubectl - standard/x86_64 Details OBS SCM/CI Workflow Integration started Details Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2025-01-17 09:31:10 +01:00
Nicolas Belouin	5490ffcde2	Import missing package: frr-k8s-image All checks were successful OBS: akri-debug-echo-discovery-handler-image - images/aarch64 Details OBS: endpoint-copier-operator-image - images/x86_64 Details OBS: akri-opcua-discovery-handler-image - images/x86_64 Details OBS: crudini - standard/x86_64 Details OBS: akri-udev-discovery-handler-image - images/x86_64 Details OBS: endpoint-copier-operator-chart - charts/x86_64 Details OBS: akri-debug-echo-discovery-handler-image - images/x86_64 Details OBS: akri-onvif-discovery-handler-image - images/x86_64 Details OBS: akri-webhook-configuration-image - images/x86_64 Details OBS: akri-controller-image - images/x86_64 Details OBS: cri-tools - standard/x86_64 Details OBS: akri-controller-image - images/aarch64 Details OBS: akri-agent-image - images/aarch64 Details OBS: baremetal-operator - standard/x86_64 Details OBS: akri-webhook-configuration-image - images/aarch64 Details OBS: akri-onvif-discovery-handler-image - images/aarch64 Details OBS: fakeroot - standard/x86_64 Details OBS: endpoint-copier-operator - standard/x86_64 Details OBS: ipcalc - standard/x86_64 Details OBS: cosign - standard/x86_64 Details OBS: edge-image-builder - standard/x86_64 Details OBS: frr-image - images/x86_64 Details OBS: akri-agent-image - images/x86_64 Details OBS: edge-image-builder-image - test_manifest_images/x86_64 Details OBS: kubectl-image - images/x86_64 Details OBS: kubevirt-dashboard-extension-chart - charts/x86_64 Details OBS: kubevirt-chart - charts/x86_64 Details OBS: baremetal-operator-image - images/x86_64 Details OBS: edge-image-builder-image - images/x86_64 Details OBS: kube-rbac-proxy-image - images/x86_64 Details Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2025-01-17 09:24:32 +01:00
Nicolas Belouin	04b9c07dd5	Merge pull request 'Add an additional tag without the _up suffix to please Rancher for dashboard extensions' (#65 ) from nbelouin/Factory:add-no-up-tag-extensions into main Reviewed-on: suse-edge/Factory#65 Reviewed-by: Jiří Tomášek <jtomasek@noreply.src.opensuse.org>	2025-01-16 15:47:33 +01:00
Nicolas Belouin	25de5df782	Add an additional tag without the _up suffix to please Rancher for dashboard extensions All checks were successful OBS: baremetal-operator - standard/aarch64 Details OBS: endpoint-copier-operator-image - images/x86_64 Details OBS: cri-tools - standard/aarch64 Details OBS: rancher-turtles-airgap-resources-chart - charts/x86_64 Details OBS: obs-service-set_version - standard/x86_64 Details OBS: sriov-network-operator-chart - charts/x86_64 Details OBS: rancher-turtles-chart - charts/x86_64 Details OBS: kube-rbac-proxy - standard/x86_64 Details OBS: hauler - standard/x86_64 Details OBS: metallb - standard/x86_64 Details OBS: upgrade-controller - standard/x86_64 Details OBS: edge-image-builder-image - test_manifest_images/x86_64 Details OBS: edge-image-builder-image - images/x86_64 Details OBS: baremetal-operator-image - images/aarch64 Details OBS: ironic-ipa-downloader-image - images/x86_64 Details OBS: crudini - standard/aarch64 Details OBS: kiwi-builder-image - images/x86_64 Details OBS: ironic-image - images/x86_64 Details OBS: upgrade-controller-chart - charts/x86_64 Details OBS: release-manifest-image - test_manifest_images/x86_64 Details OBS: sriov-crd-chart - charts/x86_64 Details OBS: release-manifest-image - images/x86_64 Details OBS: kubectl-image - images/x86_64 Details OBS: upgrade-controller-image - images/x86_64 Details OBS: release-manifest-image - test_manifest_images/aarch64 Details OBS: nm-configurator - standard/x86_64 Details OBS: obs-service-set_version - standard/aarch64 Details OBS: metallb-controller-image - images/x86_64 Details OBS: kube-rbac-proxy-image - images/x86_64 Details OBS: metallb-speaker-image - images/x86_64 Details Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2025-01-16 15:35:46 +01:00
Nicolas Belouin	3f9b8c9e22	Merge pull request 'Use manifest_repo var to allow for release manifest in separate repo' (#57 ) from nbelouin/Factory:manifest-repo-var into main Reviewed-on: suse-edge/Factory#57 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2024-12-23 12:11:01 +01:00
Nicolas Belouin	2a993e342e	Use manifest_repo var to allow for release manifest in separate repo All checks were successful OBS: release-manifest-image - test_manifest_images/aarch64 Details OBS: metallb - standard/aarch64 Details OBS: upgrade-controller - standard/x86_64 Details OBS: kubevirt-chart - charts/x86_64 Details OBS: metallb - standard/x86_64 Details OBS: release-manifest-image - test_manifest_images/x86_64 Details OBS: release-manifest-image - images/aarch64 Details OBS: release-manifest-image - images/x86_64 Details OBS: hauler - standard/x86_64 Details OBS: hauler - standard/aarch64 Details OBS: baremetal-operator-image - images/aarch64 Details OBS: akri-agent-image - images/aarch64 Details OBS: endpoint-copier-operator-image - images/x86_64 Details OBS: baremetal-operator-image - images/x86_64 Details OBS: endpoint-copier-operator-image - images/aarch64 Details OBS: kube-rbac-proxy-image - images/aarch64 Details OBS: ironic-ipa-downloader-image - images/x86_64 Details OBS: upgrade-controller-image - images/aarch64 Details OBS: metallb-controller-image - images/aarch64 Details OBS: metallb-speaker-image - images/aarch64 Details OBS: ironic-image - images/x86_64 Details OBS: upgrade-controller-image - images/x86_64 Details OBS: metallb-controller-image - images/x86_64 Details OBS: akri-agent-image - images/x86_64 Details OBS: metallb-speaker-image - images/x86_64 Details OBS: edge-image-builder-image - images/aarch64 Details OBS: edge-image-builder-image - test_manifest_images/x86_64 Details OBS: edge-image-builder-image - images/x86_64 Details OBS: edge-image-builder-image - test_manifest_images/aarch64 Details OBS: kube-rbac-proxy-image - images/x86_64 Details Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2024-12-23 11:33:04 +01:00
Steven Hardy	cab6fe1bcb	release-manifest: Update to Rancher prime 2.10.1 All checks were successful OBS: kube-rbac-proxy - standard/x86_64 Details OBS: sriov-crd-chart - charts/x86_64 Details OBS: sriov-network-operator-chart - charts/x86_64 Details OBS: frr-k8s - standard/aarch64 Details OBS: release-manifest-image - test_manifest_images/x86_64 Details OBS: kiwi-builder-image - images/aarch64 Details OBS: metallb-speaker-image - images/aarch64 Details OBS: kube-rbac-proxy - standard/aarch64 Details OBS: release-manifest-image - images/aarch64 Details OBS: release-manifest-image - test_manifest_images/aarch64 Details OBS: upgrade-controller-image - images/x86_64 Details OBS: upgrade-controller - standard/x86_64 Details OBS: edge-image-builder-image - test_manifest_images/x86_64 Details OBS: edge-image-builder-image - images/x86_64 Details OBS: release-manifest-image - images/x86_64 Details OBS: kubectl-image - images/x86_64 Details OBS: upgrade-controller-chart - charts/x86_64 Details OBS: edge-image-builder-image - images/aarch64 Details OBS: metallb-controller-image - images/aarch64 Details OBS: edge-image-builder-image - test_manifest_images/aarch64 Details OBS: hauler - standard/x86_64 Details OBS: metallb - standard/x86_64 Details OBS: kube-rbac-proxy-image - images/x86_64 Details OBS: upgrade-controller-image - images/aarch64 Details OBS: metallb - standard/aarch64 Details OBS: upgrade-controller - standard/aarch64 Details OBS: nm-configurator - standard/x86_64 Details OBS: metallb-controller-image - images/x86_64 Details OBS: metallb-speaker-image - images/x86_64 Details OBS: ironic-image - images/x86_64 Details 2.10.1 was released so update to the prime version	2024-12-20 09:28:38 +00:00
Ivo Petrov	fde506f9ef	Release manifest updates in relation to corner case use-cases (#60 ) Changes: - Rancher version convention was changed from `v2.10.0` to `2.10.0` to better map to the actual version in the upstream helm chart repo which is without the `v` prefix. - Rancher's `postDelete` hook has been disabled - done to ensure that we will not hit a corner case where: 1. The Rancher helm chart upgrade fails, because of a core component not yet being ready 2. The `helm-controller` schedules a `helm uninstall` which deletes the Rancher Helm release and triggers the `postDelete` hook. 3. The problematic core component is up and running, so `helm-controller` schedules a `helm install` with the new version. 4. Due to insufficient resources, or network connection (or other unforeseen problems), the `postDelete` hook is still running and it wrongly removes the new Rancher installation resulting in a missing rancher from the cluster after an upgrade. The `postDelete` hook ensures that no accidental delete of the Rancher application will happen during an upgrade over a machine with fewer resources. Reviewed-on: suse-edge/Factory#60 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org> Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org> Reviewed-by: Atanas Dinov <atanasdinov@noreply.src.opensuse.org> Co-authored-by: Ivo Petrov <ivo.petrov@suse.com> Co-committed-by: Ivo Petrov <ivo.petrov@suse.com>	2024-12-19 12:27:23 +01:00
Ivo Petrov	f49e6be155	Bump K8s version in the release manifest (#58 ) - Bumps both RKE2 and K3s versions to the `1.31.3` version that is expected by Rancher `v2.10.1`. - Bumps the K8s core component versions to the `1.31.3` expected versions. RKE2 core component versions have been checked against the `Chart Versions` table of the said [release](https://github.com/rancher/rke2/releases/tag/v1.31.3%2Brke2r1). K3s core component versions have been checked agains the [manifests](https://github.com/k3s-io/k3s/tree/v1.31.3%2Bk3s1/manifests) directory of said release. Reviewed-on: suse-edge/Factory#58 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org> Co-authored-by: Ivo Petrov <ivo.petrov@suse.com> Co-committed-by: Ivo Petrov <ivo.petrov@suse.com>	2024-12-17 09:06:03 +01:00