Fix old imports wrt to img_prefix

Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>
Remove forgotten suffixes
2024-10-22 12:12:02 +02:00 · 2024-10-22 11:56:05 +02:00
29 changed files with 175 additions and 133 deletions
--- a/akri-agent-image/Dockerfile
+++ b/akri-agent-image/Dockerfile
@ -1,6 +1,5 @@
-#!BuildTag: akri-agent:latest
-#!BuildTag: akri-agent:v%PACKAGE_VERSION%
-#!BuildTag: akri-agent:v%PACKAGE_VERSION%-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-agent:v%PACKAGE_VERSION%
+#!BuildTag: %%IMG_PREFIX%%akri-agent:v%PACKAGE_VERSION%-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro

@ -19,7 +18,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_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%%/akri-agent:v%PACKAGE_VERSION%-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%akri-agent:v%PACKAGE_VERSION%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/akri-agent-image/_service
+++ b/akri-agent-image/_service
@ -9,6 +9,8 @@
  </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>
  </service>
--- a/akri-chart/Chart.yaml
+++ b/akri-chart/Chart.yaml
@ -1,5 +1,5 @@
-#!BuildTag: akri-chart:0.12.20
-#!BuildTag: akri-chart:0.12.20-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-chart:0.12.20
+#!BuildTag: %%IMG_PREFIX%%akri-chart:0.12.20-%RELEASE%
 annotations:
  catalog.cattle.io/display-name: Akri
 apiVersion: v2
--- a/akri-chart/_service
+++ b/akri-chart/_service
@ -2,7 +2,14 @@
  <service mode="buildtime" name="kiwi_metainfo_helper"/>
  <service name="replace_using_env" mode="buildtime">
    <param name="file">values.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 %img_repo)</param>
    <param name="var">IMG_REPO</param>
  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <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>
+  </service>
 </services>
--- a/akri-chart/values.yaml
+++ b/akri-chart/values.yaml
@ -45,7 +45,7 @@ controller:
  enabled: true
  image:
    # repository is the Akri Controller container reference
-    repository: "%%IMG_REPO%%/akri-controller"
+    repository: "%%IMG_REPO%%/%%IMG_PREFIX%%akri-controller"
    # tag is the Akri Controller container tag
    # controller.yaml will default to v(AppVersion)[-dev]
    # with `-dev` added if `useDevelopmentContainers` is specified
@ -86,7 +86,7 @@ agent:
  enabled: true
  image:
    # repository is the Akri Agent container reference
-    repository: "%%IMG_REPO%%/akri-agent"
+    repository: "%%IMG_REPO%%/%%IMG_PREFIX%%akri-agent"
    # tag is the Akri Agent container tag
    # agent.yaml will default to v(AppVersion)[-dev]
    # with `-dev` added if `useDevelopmentContainers` is specified
@ -374,7 +374,7 @@ debugEcho:
    enabled: false
    image:
      # repository is the container reference
-      repository: "%%IMG_REPO%%/akri-debug-echo-discovery-handler"
+      repository: "%%IMG_REPO%%/%%IMG_PREFIX%%akri-debug-echo-discovery-handler"
      # tag is the container tag
      # debug-echo-configuration.yaml will default to v(AppVersion)[-dev]
      # with `-dev` added if `useDevelopmentContainers` is specified
@ -524,7 +524,7 @@ onvif:
    enabled: false
    image:
      # repository is the container reference
-      repository: "%%IMG_REPO%%/akri-onvif-discovery-handler"
+      repository: "%%IMG_REPO%%/%%IMG_PREFIX%%akri-onvif-discovery-handler"
      # tag is the container tag
      # onvif-configuration.yaml will default to v(AppVersion)[-dev]
      # with `-dev` added if `useDevelopmentContainers` is specified
@ -667,7 +667,7 @@ opcua:
    enabled: false
    image:
      # repository is the container reference
-      repository: "%%IMG_REPO%%/akri-opcua-discovery-handler"
+      repository: "%%IMG_REPO%%/%%IMG_PREFIX%%akri-opcua-discovery-handler"
      # tag is the container tag
      # opcua-configuration.yaml will default to v(AppVersion)[-dev]
      # with `-dev` added if `useDevelopmentContainers` is specified
@ -803,7 +803,7 @@ udev:
    enabled: false
    image:
      # repository is the container reference
-      repository: "%%IMG_REPO%%/akri-udev-discovery-handler"
+      repository: "%%IMG_REPO%%/%%IMG_PREFIX%%akri-udev-discovery-handler"
      # tag is the container tag
      # udev-configuration.yaml will default to v(AppVersion)[-dev]
      # with `-dev` added if `useDevelopmentContainers` is specified
@ -844,7 +844,7 @@ webhookConfiguration:
  caBundle: null
  image:
    # repository is the Akri Webhook for Configurations image reference
-    repository: "%%IMG_REPO%%/akri-webhook-configuration"
+    repository: "%%IMG_REPO%%/%%IMG_PREFIX%%akri-webhook-configuration"
    # tag is the container tag
    # webhook-configuration.yaml will default to v(AppVersion)[-dev]
    # with `-dev` added if `useDevelopmentContainers` is specified
--- a/akri-controller-image/Dockerfile
+++ b/akri-controller-image/Dockerfile
@ -1,6 +1,5 @@
-#!BuildTag: akri-controller:latest
-#!BuildTag: akri-controller:v%PACKAGE_VERSION%
-#!BuildTag: akri-controller:v%PACKAGE_VERSION%-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-controller:v%PACKAGE_VERSION%
+#!BuildTag: %%IMG_PREFIX%%akri-controller:v%PACKAGE_VERSION%-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro

@ -19,7 +18,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_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%%/akri-controller:v%PACKAGE_VERSION%-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%akri-controller:v%PACKAGE_VERSION%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/akri-controller-image/_service
+++ b/akri-controller-image/_service
@ -9,6 +9,8 @@
  </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>
  </service>
--- a/akri-dashboard-extension-chart/Chart.yaml
+++ b/akri-dashboard-extension-chart/Chart.yaml
@ -1,19 +1,20 @@
-#!BuildTag: akri-dashboard-extension-chart:1.0.0
-#!BuildTag: akri-dashboard-extension-chart:1.0.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:1.1.0
+#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:1.1.0-%RELEASE%
 annotations:
  catalog.cattle.io/certified: rancher
  catalog.cattle.io/display-name: Akri
-  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.29.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: '>= v2.8.0'
+  catalog.cattle.io/rancher-version: '>= v2.9.0'
  catalog.cattle.io/scope: management
  catalog.cattle.io/ui-component: plugins
+  catalog.cattle.io/ui-extensions-version: '>= 2.0.1'
 apiVersion: v2
-appVersion: 1.0.0
+appVersion: 1.1.0
 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.0.0
+version: 1.1.0
--- a/akri-dashboard-extension-chart/_service
+++ b/akri-dashboard-extension-chart/_service
@ -2,7 +2,14 @@
  <service mode="buildtime" name="kiwi_metainfo_helper"/>
  <service name="replace_using_env" mode="buildtime">
    <param name="file">values.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 %img_repo)</param>
    <param name="var">IMG_REPO</param>
  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <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>
+  </service>
 </services>
--- a/akri-dashboard-extension-chart/templates/_helpers.tpl
+++ b/akri-dashboard-extension-chart/templates/_helpers.tpl
@ -50,3 +50,14 @@ Selector labels
 app.kubernetes.io/name: {{ include "extension-server.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+Pkg annotations
+*/}}
+{{- define "extension-server.pluginMetadata" -}}
+{{- with .Values.plugin.metadata }}
+{{- range $key, $value := . }}
+{{ $key }}: {{ $value | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
--- a/akri-dashboard-extension-chart/templates/cr.yaml
+++ b/akri-dashboard-extension-chart/templates/cr.yaml
@ -8,5 +8,7 @@ spec:
  plugin:
    name: {{ include "extension-server.fullname" . }}
    version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }}
-    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/akri-dashboard-extension/1.0.0
+    endpoint: https://raw.githubusercontent.com/suse-edge/dashboard-extensions/gh-pages/extensions/akri-dashboard-extension/1.1.0
    noCache: {{ .Values.plugin.noCache }}
+    noAuth: {{ .Values.plugin.noAuth }}
+    metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}
--- a/akri-dashboard-extension-chart/values.yaml
+++ b/akri-dashboard-extension-chart/values.yaml
@ -4,3 +4,9 @@ plugin:
  enabled: true
  versionOverride: ""
  noCache: false
+  noAuth: false
+  metadata:
+    catalog.cattle.io/display-name: Akri
+    catalog.cattle.io/rancher-version: ">= v2.9.0"
+    catalog.cattle.io/ui-extensions-version: ">= 2.0.1"
+    catalog.cattle.io/kube-version: ">= v1.26.0-0"
--- a/akri-debug-echo-discovery-handler-image/Dockerfile
+++ b/akri-debug-echo-discovery-handler-image/Dockerfile
@ -1,6 +1,5 @@
-#!BuildTag: akri-debug-echo-discovery-handler:latest
-#!BuildTag: akri-debug-echo-discovery-handler:v%PACKAGE_VERSION%
-#!BuildTag: akri-debug-echo-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-debug-echo-discovery-handler:v%PACKAGE_VERSION%
+#!BuildTag: %%IMG_PREFIX%%akri-debug-echo-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro

@ -19,7 +18,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_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%%/akri-debug-echo-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%akri-debug-echo-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/akri-debug-echo-discovery-handler-image/_service
+++ b/akri-debug-echo-discovery-handler-image/_service
@ -9,6 +9,8 @@
  </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>
  </service>
--- a/akri-onvif-discovery-handler-image/Dockerfile
+++ b/akri-onvif-discovery-handler-image/Dockerfile
@ -1,6 +1,5 @@
-#!BuildTag: akri-onvif-discovery-handler:latest
-#!BuildTag: akri-onvif-discovery-handler:v%PACKAGE_VERSION%
-#!BuildTag: akri-onvif-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-onvif-discovery-handler:v%PACKAGE_VERSION%
+#!BuildTag: %%IMG_PREFIX%%akri-onvif-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro

@ -19,7 +18,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_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%%/akri-onvif-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%akri-onvif-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/akri-onvif-discovery-handler-image/_service
+++ b/akri-onvif-discovery-handler-image/_service
@ -9,6 +9,8 @@
  </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>
  </service>
--- a/akri-opcua-discovery-handler-image/Dockerfile
+++ b/akri-opcua-discovery-handler-image/Dockerfile
@ -1,6 +1,5 @@
-#!BuildTag: akri-opcua-discovery-handler:latest
-#!BuildTag: akri-opcua-discovery-handler:v%PACKAGE_VERSION%
-#!BuildTag: akri-opcua-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-opcua-discovery-handler:v%PACKAGE_VERSION%
+#!BuildTag: %%IMG_PREFIX%%akri-opcua-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro

@ -19,7 +18,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_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%%/akri-opcua-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%akri-opcua-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/akri-opcua-discovery-handler-image/_service
+++ b/akri-opcua-discovery-handler-image/_service
@ -9,6 +9,8 @@
  </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>
  </service>
--- a/akri-udev-discovery-handler-image/Dockerfile
+++ b/akri-udev-discovery-handler-image/Dockerfile
@ -1,6 +1,5 @@
-#!BuildTag: akri-udev-discovery-handler:latest
-#!BuildTag: akri-udev-discovery-handler:v%PACKAGE_VERSION%
-#!BuildTag: akri-udev-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-udev-discovery-handler:v%PACKAGE_VERSION%
+#!BuildTag: %%IMG_PREFIX%%akri-udev-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro

@ -19,7 +18,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_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%%/akri-udev-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%akri-udev-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/akri-udev-discovery-handler-image/_service
+++ b/akri-udev-discovery-handler-image/_service
@ -9,6 +9,8 @@
  </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>
  </service>
--- a/akri-webhook-configuration-image/Dockerfile
+++ b/akri-webhook-configuration-image/Dockerfile
@ -1,6 +1,5 @@
-#!BuildTag: akri-webhook-configuration:latest
-#!BuildTag: akri-webhook-configuration:v%PACKAGE_VERSION%
-#!BuildTag: akri-webhook-configuration:v%PACKAGE_VERSION%-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%akri-webhook-configuration:v%PACKAGE_VERSION%
+#!BuildTag: %%IMG_PREFIX%%akri-webhook-configuration:v%PACKAGE_VERSION%-%RELEASE%
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro

@ -19,7 +18,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_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%%/akri-webhook-configuration:v%PACKAGE_VERSION%-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%akri-webhook-configuration:v%PACKAGE_VERSION%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="techpreview"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/akri-webhook-configuration-image/_service
+++ b/akri-webhook-configuration-image/_service
@ -9,6 +9,8 @@
  </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>
  </service>
--- a/edge-image-builder/edge-image-builder.spec
+++ b/edge-image-builder/edge-image-builder.spec
@ -16,7 +16,7 @@
 #


-Name:           edge-image-builder-110
+Name:           edge-image-builder
 Version:        1.1.0
 Release:        0
 Summary:        Edge Image Builder
--- a/endpoint-copier-operator-chart/Chart.yaml
+++ b/endpoint-copier-operator-chart/Chart.yaml
@ -1,26 +1,8 @@
-#!BuildTag: endpoint-copier-operator-chart:0.2.0
-#!BuildTag: endpoint-copier-operator-chart:0.2.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator-chart:0.2.1
+#!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator-chart:0.2.1-%RELEASE%
 apiVersion: v2
-name: endpoint-copier-operator
+appVersion: v0.2.0
 description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+name: endpoint-copier-operator
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "v0.2.0"
+version: 0.2.1
--- a/endpoint-copier-operator-chart/_service
+++ b/endpoint-copier-operator-chart/_service
@ -2,7 +2,14 @@
  <service mode="buildtime" name="kiwi_metainfo_helper"/>
  <service name="replace_using_env" mode="buildtime">
    <param name="file">values.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 %img_repo)</param>
    <param name="var">IMG_REPO</param>
  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <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>
+  </service>
 </services>
--- a/endpoint-copier-operator-chart/values.yaml
+++ b/endpoint-copier-operator-chart/values.yaml
@ -3,13 +3,16 @@
 # Declare variables to be passed into your templates.

 replicaCount: 2
+
 image:
-  repository: "%%IMG_REPO%%/endpoint-copier-operator"
+  repository: %%IMG_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator
  pullPolicy: IfNotPresent
  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
+  tag: "0.2.0"
+
 nameOverride: "endpoint-copier-operator"
 fullnameOverride: "endpoint-copier-operator"
+
 serviceAccount:
  # Specifies whether a service account should be created
  create: true
@ -18,14 +21,20 @@ serviceAccount:
  # The name of the service account to use.
  # If not set and create is true, a name is generated using the fullname template
  name: "endpoint-copier-operator"
+
 podAnnotations: {}
+
 podSecurityContext:
  runAsNonRoot: true
+  seccompProfile:
+    type: RuntimeDefault
+
 securityContext:
  allowPrivilegeEscalation: false
  capabilities:
    drop:
      - "ALL"
+
 resources:
  limits:
    cpu: 500m
@ -33,12 +42,16 @@ resources:
  requests:
    cpu: 10m
    memory: 64Mi
+
 autoscaling:
  enabled: false
  minReplicas: 1
  maxReplicas: 100
  targetCPUUtilizationPercentage: 80
  # targetMemoryUtilizationPercentage: 80
+
 nodeSelector: {}
+
 tolerations: []
+
 affinity: {}
--- a/endpoint-copier-operator-image/Dockerfile
+++ b/endpoint-copier-operator-image/Dockerfile
@ -1,8 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: endpoint-copier-operator:v%%endpoint-copier-operator_version%%
-#!BuildTag: endpoint-copier-operator:v%%endpoint-copier-operator_version%%-%RELEASE%
-#!BuildTag: endpoint-copier-operator:latest
-#!BuildVersion: 15.5
+#!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator:%%endpoint-copier-operator_version%%
+#!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator:%%endpoint-copier-operator_version%%-%RELEASE%
+#!BuildVersion: 15.6
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro

@ -20,7 +19,7 @@ LABEL org.opencontainers.image.version="%%endpoint-copier-operator_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%%/endpoint-copier-operator:v%%endpoint-copier-operator_version%%-%RELEASE%"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator:%%endpoint-copier-operator_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="l3"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"
--- a/endpoint-copier-operator-image/_service
+++ b/endpoint-copier-operator-image/_service
@ -9,6 +9,8 @@
  </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>
  </service>
--- a/metallb/metallb.spec
+++ b/metallb/metallb.spec
@ -28,24 +28,22 @@ BuildRequires:  golang(API) = 1.22
 ExcludeArch:    s390
 ExcludeArch:    %{ix86}

-%define version_suffix 0148
-
 %description
 MetalLB is a load-balancer implementation for bare metal Kubernetes clusters, using standard routing protocols.

-%package controller-%{version_suffix}
+%package controller
 Summary:        MetalLB controller binary
 Group:          System/Management

-%description controller-%{version_suffix}
+%description controller
 MetalLB is a load-balancer implementation for bare metal Kubernetes clusters, using standard routing protocols.
 This package contains the controller binary.

-%package speaker-%{version_suffix}
+%package speaker
 Summary:        MetalLB speaker binary
 Group:          System/Management

-%description speaker-%{version_suffix}
+%description speaker
 MetalLB is a load-balancer implementation for bare metal Kubernetes clusters, using standard routing protocols.
 This package contains the speaker binary.

@ -67,11 +65,11 @@ install -D -m 0755 $HOME/go/bin/speaker %{buildroot}/
 install -D -m 0755 $HOME/go/bin/frr-metrics %{buildroot}/
 install -D -m 0755 frr-reloader.sh %{buildroot}/

-%files controller-%{version_suffix}
+%files controller
 %license LICENSE
 /controller

-%files speaker-%{version_suffix}
+%files speaker
 %license LICENSE
 /speaker
 /frr-metrics
Author	SHA256	Message	Date
Nicolas Belouin	a29ea40938	Fix old imports wrt to img_prefix Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2024-10-22 12:12:02 +02:00
Nicolas Belouin	ab7047e583	Remove forgotten suffixes Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>	2024-10-22 11:56:05 +02:00