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
17 changed files with 54 additions and 52 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 */.osc
 */__pycache__
-.venv/
-.idea/
+.venv/
--- 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/akri-dashboard-extension-chart/Chart.yaml
+++ b/akri-dashboard-extension-chart/Chart.yaml
@@ -1,3 +1,4 @@
+#!BuildTag: %%CHART_PREFIX%%akri-dashboard-extension:%%CHART_MAJOR%%.0.2
 #!BuildTag: %%CHART_PREFIX%%akri-dashboard-extension:%%CHART_MAJOR%%.0.2_up1.3.1
 #!BuildTag: %%CHART_PREFIX%%akri-dashboard-extension:%%CHART_MAJOR%%.0.2_up1.3.1-%RELEASE%
 annotations:
--- a/edge-image-builder-image/artifacts.yaml
+++ b/edge-image-builder-image/artifacts.yaml
@@ -5,7 +5,7 @@ metallb:
 endpoint-copier-operator:
  chart: endpoint-copier-operator
  repository: "%%CHART_REPO%%/%%CHART_PREFIX%%"
-  version: "%%CHART_MAJOR%%.0.1+up0.3.0"
+  version: "%%CHART_MAJOR%%.0.0+up0.2.1"
 kubernetes:
  k3s:
    selinuxPackage: k3s-selinux-1.6-1.slemicro.noarch
--- a/endpoint-copier-operator-chart/Chart.yaml
+++ b/endpoint-copier-operator-chart/Chart.yaml
@@ -1,8 +1,8 @@
-#!BuildTag: %%CHART_PREFIX%%endpoint-copier-operator:%%CHART_MAJOR%%.0.1_up0.3.0
-#!BuildTag: %%CHART_PREFIX%%endpoint-copier-operator:%%CHART_MAJOR%%.0.1_up0.3.0-%RELEASE%
+#!BuildTag: %%CHART_PREFIX%%endpoint-copier-operator:%%CHART_MAJOR%%.0.0_up0.2.1
+#!BuildTag: %%CHART_PREFIX%%endpoint-copier-operator:%%CHART_MAJOR%%.0.0_up0.2.1-%RELEASE%
 apiVersion: v2
-appVersion: v0.3.0
+appVersion: v0.2.0
 description: A Helm chart for Kubernetes
 name: endpoint-copier-operator
 type: application
-version: "%%CHART_MAJOR%%.0.1+up0.3.0"
+version: "%%CHART_MAJOR%%.0.0+up0.2.1"
--- a/endpoint-copier-operator-chart/templates/deployment.yaml
+++ b/endpoint-copier-operator-chart/templates/deployment.yaml
@@ -20,23 +20,8 @@ spec:
      labels:
        {{- include "endpoint-copier-operator.selectorLabels" . | nindent 8 }}
    spec:
-      {{- if .Values.priorityClassName }}
-      priorityClassName: {{ .Values.priorityClassName }}
-      {{- end }}
      securityContext:
        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
      containers:
      - command:
        - /manager
--- a/endpoint-copier-operator-chart/templates/rbac/role.yaml
+++ b/endpoint-copier-operator-chart/templates/rbac/role.yaml
@@ -7,9 +7,9 @@ metadata:
  name: {{ include "endpoint-copier-operator.fullname" . }}
 rules:
 - apiGroups:
-  - "discovery.k8s.io"
+  - ""
  resources:
-  - endpointslices
+  - endpoints
  verbs:
  - create
  - delete
--- a/endpoint-copier-operator-chart/values.yaml
+++ b/endpoint-copier-operator-chart/values.yaml
@@ -8,7 +8,7 @@ image:
  repository: %%IMG_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator
  pullPolicy: IfNotPresent
  # Overrides the image tag whose default is the chart appVersion.
-  tag: "0.3.0"
+  tag: "0.2.0"

 nameOverride: "endpoint-copier-operator"
 fullnameOverride: "endpoint-copier-operator"
@@ -29,8 +29,6 @@ podSecurityContext:
  seccompProfile:
    type: RuntimeDefault

-priorityClassName: "system-cluster-critical"
-
 securityContext:
  allowPrivilegeEscalation: false
  capabilities:
@@ -39,11 +37,11 @@ securityContext:

 resources:
  limits:
-    cpu: 100m
-    memory: 64Mi
+    cpu: 500m
+    memory: 128Mi
  requests:
-    cpu: 5m
-    memory: 32Mi
+    cpu: 10m
+    memory: 64Mi

 autoscaling:
  enabled: false
--- a/endpoint-copier-operator/_service
+++ b/endpoint-copier-operator/_service
@@ -2,7 +2,7 @@
 <service name="obs_scm">
    <param name="url">https://github.com/suse-edge/endpoint-copier-operator</param>
    <param name="scm">git</param>
-    <param name="revision">v0.3.0</param>
+    <param name="revision">v0.2.0</param>
    <param name="version">_auto_</param>
    <param name="versionformat">@PARENT_TAG@</param>
    <param name="changesgenerate">enable</param>
--- a/endpoint-copier-operator/endpoint-copier-operator.spec
+++ b/endpoint-copier-operator/endpoint-copier-operator.spec
@@ -17,14 +17,14 @@


 Name:           endpoint-copier-operator
-Version:        0.3.0
-Release:        0.3.0
+Version:        0.2.0
+Release:        0.2.0
 Summary:        Implements a Kubernetes API for copying endpoint resources
 License:        Apache-2.0
 URL:            https://github.com/suse-edge/endpoint-copier-operator
 Source:         endpoint-copier-operator-%{version}.tar
 Source1:        vendor.tar.gz
-BuildRequires:  golang(API) = 1.24
+BuildRequires:  golang(API) = 1.20
 ExcludeArch:    s390
 ExcludeArch:    %{ix86}

--- a/kiwi-builder-image/Dockerfile
+++ b/kiwi-builder-image/Dockerfile
@@ -1,7 +1,6 @@
-#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.2.12.0-%RELEASE%
-#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.2.12.0
+#!BuildTag: %%IMG_PREFIX%%kiwi-builder:%%kiwi_version%%.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%kiwi-builder:%%kiwi_version%%.0

-# Base image version, should match the tag above
 ARG KIWIVERSION="10.2.12"
 FROM registry.suse.com/bci/kiwi:${KIWIVERSION}
 ARG KIWIVERSION
@@ -11,11 +10,11 @@ ARG KIWIVERSION
 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
 LABEL org.opencontainers.image.title="SLE Kiwi Builder Container Image"
 LABEL org.opencontainers.image.description="kiwi-builder based on the SLE Base Container Image."
-LABEL org.opencontainers.image.version="${KIWIVERSION}"
+LABEL org.opencontainers.image.version="%%kiwi_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:${KIWIVERSION}.0-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:%%kiwi_version%%.0-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
@@ -24,6 +23,9 @@ LABEL com.suse.image-type="application"
 LABEL com.suse.release-stage="released"
 # endlabelprefix

+# help the build service understand the need for python3-kiwi
+RUN zypper -n install -d -D python3-kiwi; [ "%%kiwi_version%%" = "${KIWIVERSION}" ] || { echo "expected kiwi version ${KIWIVERSION}: version mismatch"; exit 1; }
+
 # Copy build script into image and make it executable
 ADD build-image.sh /usr/bin/build-image
 RUN chmod a+x /usr/bin/build-image
--- a/kiwi-builder-image/_service
+++ b/kiwi-builder-image/_service
@@ -2,8 +2,14 @@
  <service mode="buildtime" name="kiwi_metainfo_helper"/>
  <service name="docker_label_helper" mode="buildtime"/>
  <service name="replace_using_env" mode="buildtime">
-    <param name="file">Dockerfile</param>
    <param name="file">README</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
+    <param name="var">IMG_PREFIX</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>
@@ -11,4 +17,14 @@
    <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
    <param name="var">SUPPORT_LEVEL</param>
  </service>
+  <service mode="buildtime" name="replace_using_package_version">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%kiwi_version%%</param>
+    <param name="package">python3-kiwi</param>
+  </service>
+  <service mode="buildtime" name="replace_using_package_version">
+    <param name="file">README</param>
+    <param name="regex">%%kiwi_version%%</param>
+    <param name="package">python3-kiwi</param>
+  </service>
 </services>
--- a/kube-rbac-proxy/_service
+++ b/kube-rbac-proxy/_service
@@ -2,7 +2,7 @@
 <service name="obs_scm">
    <param name="url">https://github.com/brancz/kube-rbac-proxy</param>
    <param name="scm">git</param>
-    <param name="revision">v0.18.2</param>
+    <param name="revision">v0.18.1</param>
    <param name="version">_auto_</param>
    <param name="versionformat">@PARENT_TAG@</param>
    <param name="changesgenerate">enable</param>
--- a/kube-rbac-proxy/kube-rbac-proxy.spec
+++ b/kube-rbac-proxy/kube-rbac-proxy.spec
@@ -17,8 +17,8 @@


 Name:           kube-rbac-proxy
-Version:        0.18.2
-Release:        0.18.2
+Version:        0.18.1
+Release:        0.18.1
 Summary:        The kube-rbac-proxy is a small HTTP proxy for a single upstream
 License:        Apache-2.0
 URL:            https://github.com/brancz/kube-rbac-proxy
--- a/kubevirt-dashboard-extension-chart/Chart.yaml
+++ b/kubevirt-dashboard-extension-chart/Chart.yaml
@@ -1,3 +1,4 @@
+#!BuildTag: %%CHART_PREFIX%%kubevirt-dashboard-extension:%%CHART_MAJOR%%.0.2
 #!BuildTag: %%CHART_PREFIX%%kubevirt-dashboard-extension:%%CHART_MAJOR%%.0.2_up1.3.2
 #!BuildTag: %%CHART_PREFIX%%kubevirt-dashboard-extension:%%CHART_MAJOR%%.0.2_up1.3.2-%RELEASE%
 annotations:
--- 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:
@@ -138,7 +138,7 @@ spec:
        - prettyName: EndpointCopierOperator
          releaseName: endpoint-copier-operator
          chart: "%%CHART_REPO%%/%%CHART_PREFIX%%endpoint-copier-operator"
-          version: "%%CHART_MAJOR%%.0.1+up0.3.0"
+          version: "%%CHART_MAJOR%%.0.0+up0.2.1"
        - prettyName: Elemental
          releaseName: elemental-operator
          chart: oci://registry.suse.com/rancher/elemental-operator-chart
Author	SHA256	Message	Date
Denislav Prodanov	7ed5a6d6d8	Fix issues with config and meta when releasing 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: suse-edge/Factory#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	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: suse-edge/Factory#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: suse-edge/Factory#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	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	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: suse-edge/Factory#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	2025-06-10 11:02:47 +03:00
dbw7	cfc89b579d	EIB updates for 1.2.1	2025-06-09 13:57:45 -04:00
Steven Hardy	a089bf30e4	release-manifest: update rancher-turtles version (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 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: suse-edge/Factory#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 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 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: suse-edge/Factory#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	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: suse-edge/Factory#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 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: suse-edge/Factory#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 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	2025-05-16 10:41:06 +02:00