Fix issues with config and meta when releasing

Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>
Merge pull request '[3.3.1] - bump turtles airgap version to align with the other turtle chart version' (#189 ) from backport/turtles-airgap into 3.3
2025-06-10 16:22:34 +02:00 · 2025-06-10 13:24:34 +02:00 · 2025-06-10 13:19:21 +02:00 · 2025-06-10 12:30:40 +02:00 · 2025-06-10 12:30:02 +02:00 · 2025-06-10 11:37:24 +02:00
7 changed files with 18 additions and 19 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 */.osc
 */__pycache__
 .venv/
 .idea/
--- a/.obs/common.py
+++ b/.obs/common.py
@@ -1,3 +1,3 @@
-PROJECT = "isv:SUSE:Edge:Factory"
+PROJECT = "isv:SUSE:Edge:3.3"
 REPOSITORY = "https://src.opensuse.org/suse-edge/Factory"
-BRANCH = "main"
+BRANCH = "3.3"
--- a/rancher-turtles-airgap-resources-chart/Chart.yaml
+++ b/rancher-turtles-airgap-resources-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.3_up0.20.0
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.4_up0.20.0
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.3_up0.20.0-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.4_up0.20.0-%RELEASE%
 apiVersion: v2
 appVersion: 0.20.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: "%%CHART_MAJOR%%.0.3+up0.20.0"
+version: "%%CHART_MAJOR%%.0.4+up0.20.0"
--- a/rancher-turtles-chart/Chart.yaml
+++ b/rancher-turtles-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.3_up0.20.0
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.4_up0.20.0
-#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.3_up0.20.0-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.4_up0.20.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: "%%CHART_MAJOR%%.0.3+up0.20.0"
+version: "%%CHART_MAJOR%%.0.4+up0.20.0"
--- a/release-manifest-image/Dockerfile
+++ b/release-manifest-image/Dockerfile
@@ -1,4 +1,4 @@
-#!BuildTag: %%IMG_PREFIX%%release-manifest:3.4.0
+#!BuildTag: %%IMG_PREFIX%%release-manifest:3.3.1
 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.4.0"
+LABEL org.opencontainers.image.version="3.3.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.4.0"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%release-manifest:3.3.1"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/release-manifest-image/release_manifest.yaml
+++ b/release-manifest-image/release_manifest.yaml
@@ -1,9 +1,9 @@
 apiVersion: lifecycle.suse.com/v1alpha1
 kind: ReleaseManifest
 metadata:
-  name: release-manifest-3-4-0
+  name: release-manifest-3-3-1
 spec:
-  releaseVersion: 3.4.0
+  releaseVersion: 3.3.1
  components:
    kubernetes:
      k3s:
@@ -175,4 +175,4 @@ spec:
        - prettyName: RancherTurtles
          releaseName: rancher-turtles
          chart: "%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles"
-          version: "%%CHART_MAJOR%%.0.3+up0.20.0"
+          version: "%%CHART_MAJOR%%.0.4+up0.20.0"
--- a/upgrade-controller-chart/Chart.yaml
+++ b/upgrade-controller-chart/Chart.yaml
@@ -1,5 +1,5 @@
-#!BuildTag: %%CHART_PREFIX%%upgrade-controller:%%CHART_MAJOR%%.0.0_up0.1.1
+#!BuildTag: %%CHART_PREFIX%%upgrade-controller:%%CHART_MAJOR%%.0.1_up0.1.1
-#!BuildTag: %%CHART_PREFIX%%upgrade-controller:%%CHART_MAJOR%%.0.0_up0.1.1-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%upgrade-controller:%%CHART_MAJOR%%.0.1_up0.1.1-%RELEASE%
 apiVersion: v2
 appVersion: 0.1.1
 dependencies:
@@ -10,4 +10,4 @@ dependencies:
 description: A Helm chart for Upgrade Controller
 name: upgrade-controller
 type: application
-version: "%%CHART_MAJOR%%.0.0+up0.1.1"
+version: "%%CHART_MAJOR%%.0.1+up0.1.1"
Author	SHA256	Message	Date
Denislav Prodanov	7ed5a6d6d8	Fix issues with config and meta when releasing All checks were successful Synchronize Project Config / Update prjconf in OBS (push) Successful in 5s Details Synchronize Project Metadata / sync-prj-meta (push) Successful in -1m19s Details Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2025-06-10 16:22:34 +02:00
Denislav Prodanov	eaa7dad6f6	Merge pull request '[3.3.1] - bump turtles airgap version to align with the other turtle chart version' (#189 ) from backport/turtles-airgap into 3.3 Reviewed-on: #189 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>	2025-06-10 13:24:34 +02:00
Denislav Prodanov	9b502acd83	[3.3.1] - bump turtles airgap version to align with the other turtle chart version Some checks failed Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -1m20s Details Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 4m52s Details	2025-06-10 13:19:21 +02:00
Denislav Prodanov	49894ba16d	Merge pull request 'bump uc and turtles version as a follow up of the kubectl image bump' (#186 ) from bump-charts into 3.3 Reviewed-on: #186 Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>	2025-06-10 12:30:40 +02:00
Denislav Prodanov	43d5ffa2bd	Merge pull request 'create new kubectl image' (#187 ) from kubectl-bump into 3.3 Reviewed-on: #187 Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>	2025-06-10 12:30:02 +02:00
Denislav Prodanov	13b4cd50e2	create new kubectl image Some checks failed Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -1m19s Details Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 52m58s Details	2025-06-10 11:37:24 +02:00
Denislav Prodanov	93f5662ace	bump uc and turtles version as a follow up of the kubectl image bump All checks were successful Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -1m19s Details Build PR in OBS / Build PR in OBS (pull_request_target) Successful in -1m18s Details	2025-06-10 11:22:05 +02:00
Denislav Prodanov	a7284b5d35	Merge pull request 'release-manifest: fix version' (#182 ) from dprodanov/Factory:release-manifest-version into 3.3 Reviewed-on: #182 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org> Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>	2025-06-10 10:18:55 +02:00
Denislav Prodanov	312688449c	release-manifest: fix version Some checks failed Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 11s Details Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 10m24s Details	2025-06-10 11:02:47 +03:00
dbw7	cfc89b579d	EIB updates for 1.2.1 All checks were successful Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s Details Build PR in OBS / Build PR in OBS (pull_request_target) Successful in -1m18s Details	2025-06-09 13:57:45 -04:00
Steven Hardy	a089bf30e4	release-manifest: update rancher-turtles version All checks were successful Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -1m14s Details Build PR in OBS / Build PR in OBS (pull_request_target) Successful in -1m13s Details (cherry picked from commit `f92f3600e6`)	2025-06-06 14:28:29 +01:00
Steven Hardy	6dc2406148	rancher-turtles-airgap-resources: Updates for 0.20.0 To align with https://github.com/suse-edge/charts/pull/221 (cherry picked from commit `e379d5df4e`)	2025-06-06 14:28:13 +01:00
Steven Hardy	1928a4cc98	rancher-turtles-chart: Updates for 0.20.0 To align with https://github.com/suse-edge/charts/pull/221 (cherry picked from commit `346d6137fe`)	2025-06-06 14:27:52 +01:00
Steven Hardy	5c48860dcd	release-manifest: 3.3.1 version bumps All checks were successful Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -1m14s Details Build PR in OBS / Build PR in OBS (pull_request_target) Successful in -1m12s Details Updates to consume the latest patch releases from Rancher, RKE2/k3s and Neuvector (cherry picked from commit `9dc5ba4c52`)	2025-06-06 13:42:07 +01:00
Nicolas Belouin	2f6c9b294c	Merge pull request '[3.3] Metal3: fix BMO restart issues and NMC fix' (#170 ) from nbelouin/Factory:backport-metal3-fixes into 3.3 Reviewed-on: #170 Reviewed-by: Steven Hardy <steven.hardy@noreply.src.opensuse.org>	2025-06-06 14:20:37 +02:00
Nicolas Belouin	cfad38ccb4	Fix metal3 chart issues All checks were successful Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 2m38s Details Build PR in OBS / Build PR in OBS (pull_request_target) Successful in -1m9s Details Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `ec7da715f4`)	2025-06-05 08:41:35 +02:00
Nicolas Belouin	1872e09bdf	metal3-chart: fixup remove forgotten file Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `1ad6c99257`)	2025-06-05 08:41:35 +02:00
Steven Hardy	d15eb56f43	Bump EIB tag to 1.2.0.1 Follow up to #166 which bumped NMC and the related IPA downloader image, we also need to bump EIB since it also consumes the updated NMC version (cherry picked from commit `12e91c2102`)	2025-06-05 08:41:35 +02:00
Nicolas Belouin	c97db6d3a3	Bump ipa ramdisk version for nm-config fix Some checks failed Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 59s Details Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 25m59s Details Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `bdaa422813`)	2025-06-03 15:07:22 +02:00
Nicolas Belouin	fbdab3228e	Bump nm-configurator to 0.3.3 Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `c25bf622bc`)	2025-06-03 15:07:22 +02:00
Nicolas Belouin	e6f27f3ecc	Add annotations to force rollout of pods on config change Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `629e96dded`)	2025-06-03 15:07:22 +02:00
Nicolas Belouin	4fab8da5d5	Add bmo inotify hook Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `c190a1c800`)	2025-06-03 15:07:22 +02:00
Denislav Prodanov	1583758ffa	Merge pull request 'fix typo in network-operator' (#163 ) from dprodanov-patch-1 into 3.3 Reviewed-on: #163 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>	2025-05-20 15:38:41 +02:00
Denislav Prodanov	9cf01c4934	fix typo in network-operator Some checks failed Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 8s Details Build PR in OBS / Build PR in OBS (pull_request_target) Failing after -17s Details	2025-05-20 15:37:57 +02:00
Denislav Prodanov	5c9ab033b3	Merge pull request 'release-manifest-image: Update NeuVector Extension to 2.1.3' (#161 ) from dprodanov-patch-1 into 3.3 Reviewed-on: #161 Reviewed-by: Jiří Tomášek <jtomasek@noreply.src.opensuse.org>	2025-05-20 10:04:00 +02:00
Denislav Prodanov	8138909378	release-manifest-image: Update NeuVector Extension to 2.1.3 All checks were successful Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -1m0s Details Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 10s Details Chart: https://github.com/rancher/ui-plugin-charts/blob/main/charts/neuvector-ui-ext/2.1.3/Chart.yaml Release: https://github.com/neuvector/manager-ext/releases/tag/neuvector-ui-ext-2.1.3	2025-05-20 09:56:13 +02:00
Nicolas Belouin	e55661d20b	Merge pull request '[3.3.0] Fix rancher turtles airgap chart prefix' (#159 ) from nbelouin/Factory:fix_airgap_prefix_3.3 into 3.3 Reviewed-on: #159 Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>	2025-05-16 14:06:54 +02:00
Nicolas Belouin	7ba1026bf5	Fix rancher turtles airgap chart prefix All checks were successful Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 9s Details Build PR in OBS / Build PR in OBS (pull_request_target) Successful in -55s Details Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com> (cherry picked from commit `c37782e077`)	2025-05-16 13:14:44 +02:00
Denislav Prodanov	5b6a86f405	Update .obs/common.py All checks were successful Synchronize Project Metadata / sync-prj-meta (push) Successful in -13s Details	2025-05-16 10:41:06 +02:00