suse-edge/Factory
SHA256
11
0
Fork 5
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix old imports wrt to img_prefix

Browse Source 
Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>
This commit is contained in:
Nicolas Belouin 2024-10-22 11:57:00 +02:00
parent ab7047e583
commit a29ea40938
27 changed files with 168 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
akri-agent-image/Dockerfile
View File

@ -1,6 +1,5 @@
#!BuildTag: akri-agent:latest #!BuildTag: %%IMG_PREFIX%%akri-agent:v%PACKAGE_VERSION%
#!BuildTag: akri-agent:v%PACKAGE_VERSION% #!BuildTag: %%IMG_PREFIX%%akri-agent:v%PACKAGE_VERSION%-%RELEASE%
#!BuildTag: akri-agent:v%PACKAGE_VERSION%-%RELEASE%
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" 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 org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview" LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

10
akri-agent-image/_service
View File

@ -8,8 +8,10 @@
<param name="parse-version">patch</param> <param name="parse-version">patch</param>
</service> </service>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param> <param name="file">Dockerfile</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param>
</service>
</services> </services>

4
akri-chart/Chart.yaml
View File

@ -1,5 +1,5 @@
#!BuildTag: akri-chart:0.12.20 #!BuildTag: %%IMG_PREFIX%%akri-chart:0.12.20
#!BuildTag: akri-chart:0.12.20-%RELEASE% #!BuildTag: %%IMG_PREFIX%%akri-chart:0.12.20-%RELEASE%
annotations: annotations:
catalog.cattle.io/display-name: Akri catalog.cattle.io/display-name: Akri
apiVersion: v2 apiVersion: v2

19
akri-chart/_service
View File

@ -1,8 +1,15 @@
<services> <services>
<service mode="buildtime" name="kiwi_metainfo_helper"/> <service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">values.yaml</param> <param name="file">values.yaml</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <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> </services>

14
akri-chart/values.yaml
View File

@ -45,7 +45,7 @@ controller:
enabled: true enabled: true
image: image:
# repository is the Akri Controller container reference # 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 # tag is the Akri Controller container tag
# controller.yaml will default to v(AppVersion)[-dev] # controller.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified # with `-dev` added if `useDevelopmentContainers` is specified
@ -86,7 +86,7 @@ agent:
enabled: true enabled: true
image: image:
# repository is the Akri Agent container reference # 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 # tag is the Akri Agent container tag
# agent.yaml will default to v(AppVersion)[-dev] # agent.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified # with `-dev` added if `useDevelopmentContainers` is specified
@ -374,7 +374,7 @@ debugEcho:
enabled: false enabled: false
image: image:
# repository is the container reference # 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 # tag is the container tag
# debug-echo-configuration.yaml will default to v(AppVersion)[-dev] # debug-echo-configuration.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified # with `-dev` added if `useDevelopmentContainers` is specified
@ -524,7 +524,7 @@ onvif:
enabled: false enabled: false
image: image:
# repository is the container reference # 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 # tag is the container tag
# onvif-configuration.yaml will default to v(AppVersion)[-dev] # onvif-configuration.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified # with `-dev` added if `useDevelopmentContainers` is specified
@ -667,7 +667,7 @@ opcua:
enabled: false enabled: false
image: image:
# repository is the container reference # 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 # tag is the container tag
# opcua-configuration.yaml will default to v(AppVersion)[-dev] # opcua-configuration.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified # with `-dev` added if `useDevelopmentContainers` is specified
@ -803,7 +803,7 @@ udev:
enabled: false enabled: false
image: image:
# repository is the container reference # 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 # tag is the container tag
# udev-configuration.yaml will default to v(AppVersion)[-dev] # udev-configuration.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified # with `-dev` added if `useDevelopmentContainers` is specified
@ -844,7 +844,7 @@ webhookConfiguration:
caBundle: null caBundle: null
image: image:
# repository is the Akri Webhook for Configurations image reference # 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 # tag is the container tag
# webhook-configuration.yaml will default to v(AppVersion)[-dev] # webhook-configuration.yaml will default to v(AppVersion)[-dev]
# with `-dev` added if `useDevelopmentContainers` is specified # with `-dev` added if `useDevelopmentContainers` is specified

7
akri-controller-image/Dockerfile
View File

@ -1,6 +1,5 @@
#!BuildTag: akri-controller:latest #!BuildTag: %%IMG_PREFIX%%akri-controller:v%PACKAGE_VERSION%
#!BuildTag: akri-controller:v%PACKAGE_VERSION% #!BuildTag: %%IMG_PREFIX%%akri-controller:v%PACKAGE_VERSION%-%RELEASE%
#!BuildTag: akri-controller:v%PACKAGE_VERSION%-%RELEASE%
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" 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 org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview" LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

10
akri-controller-image/_service
View File

@ -8,8 +8,10 @@
<param name="parse-version">patch</param> <param name="parse-version">patch</param>
</service> </service>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param> <param name="file">Dockerfile</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param>
</service>
</services> </services>

13
akri-dashboard-extension-chart/Chart.yaml
View File

@ -1,19 +1,20 @@
#!BuildTag: akri-dashboard-extension-chart:1.0.0 #!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:1.1.0
#!BuildTag: akri-dashboard-extension-chart:1.0.0-%RELEASE% #!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:1.1.0-%RELEASE%
annotations: annotations:
catalog.cattle.io/certified: rancher catalog.cattle.io/certified: rancher
catalog.cattle.io/display-name: Akri 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/namespace: cattle-ui-plugin-system
catalog.cattle.io/os: linux catalog.cattle.io/os: linux
catalog.cattle.io/permits-os: linux, windows 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/scope: management
catalog.cattle.io/ui-component: plugins catalog.cattle.io/ui-component: plugins
catalog.cattle.io/ui-extensions-version: '>= 2.0.1'
apiVersion: v2 apiVersion: v2
appVersion: 1.0.0 appVersion: 1.1.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 icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/akri/icon/color/akri-icon-color.svg
name: akri-dashboard-extension name: akri-dashboard-extension
type: application type: application
version: 1.0.0 version: 1.1.0

19
akri-dashboard-extension-chart/_service
View File

@ -1,8 +1,15 @@
<services> <services>
<service mode="buildtime" name="kiwi_metainfo_helper"/> <service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">values.yaml</param> <param name="file">values.yaml</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <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> </services>

11
akri-dashboard-extension-chart/templates/_helpers.tpl
View File

@ -50,3 +50,14 @@ Selector labels
app.kubernetes.io/name: {{ include "extension-server.name" . }} app.kubernetes.io/name: {{ include "extension-server.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }} {{- end }}
{{/*
Pkg annotations
*/}}
{{- define "extension-server.pluginMetadata" -}}
{{- with .Values.plugin.metadata }}
{{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
{{- end }}

4
akri-dashboard-extension-chart/templates/cr.yaml
View File

@ -8,5 +8,7 @@ spec:
plugin: plugin:
name: {{ include "extension-server.fullname" . }} name: {{ include "extension-server.fullname" . }}
version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }} 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 }} noCache: {{ .Values.plugin.noCache }}
noAuth: {{ .Values.plugin.noAuth }}
metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}

6
akri-dashboard-extension-chart/values.yaml
View File

@ -4,3 +4,9 @@ plugin:
enabled: true enabled: true
versionOverride: "" versionOverride: ""
noCache: false 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"

7
akri-debug-echo-discovery-handler-image/Dockerfile
View File

@ -1,6 +1,5 @@
#!BuildTag: akri-debug-echo-discovery-handler:latest #!BuildTag: %%IMG_PREFIX%%akri-debug-echo-discovery-handler:v%PACKAGE_VERSION%
#!BuildTag: akri-debug-echo-discovery-handler:v%PACKAGE_VERSION% #!BuildTag: %%IMG_PREFIX%%akri-debug-echo-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
#!BuildTag: akri-debug-echo-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" 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 org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview" LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

10
akri-debug-echo-discovery-handler-image/_service
View File

@ -8,8 +8,10 @@
<param name="parse-version">patch</param> <param name="parse-version">patch</param>
</service> </service>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param> <param name="file">Dockerfile</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param>
</service>
</services> </services>

7
akri-onvif-discovery-handler-image/Dockerfile
View File

@ -1,6 +1,5 @@
#!BuildTag: akri-onvif-discovery-handler:latest #!BuildTag: %%IMG_PREFIX%%akri-onvif-discovery-handler:v%PACKAGE_VERSION%
#!BuildTag: akri-onvif-discovery-handler:v%PACKAGE_VERSION% #!BuildTag: %%IMG_PREFIX%%akri-onvif-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
#!BuildTag: akri-onvif-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" 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 org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview" LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

10
akri-onvif-discovery-handler-image/_service
View File

@ -8,8 +8,10 @@
<param name="parse-version">patch</param> <param name="parse-version">patch</param>
</service> </service>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param> <param name="file">Dockerfile</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param>
</service>
</services> </services>

7
akri-opcua-discovery-handler-image/Dockerfile
View File

@ -1,6 +1,5 @@
#!BuildTag: akri-opcua-discovery-handler:latest #!BuildTag: %%IMG_PREFIX%%akri-opcua-discovery-handler:v%PACKAGE_VERSION%
#!BuildTag: akri-opcua-discovery-handler:v%PACKAGE_VERSION% #!BuildTag: %%IMG_PREFIX%%akri-opcua-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
#!BuildTag: akri-opcua-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" 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 org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview" LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

10
akri-opcua-discovery-handler-image/_service
View File

@ -8,8 +8,10 @@
<param name="parse-version">patch</param> <param name="parse-version">patch</param>
</service> </service>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param> <param name="file">Dockerfile</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param>
</service>
</services> </services>

7
akri-udev-discovery-handler-image/Dockerfile
View File

@ -1,6 +1,5 @@
#!BuildTag: akri-udev-discovery-handler:latest #!BuildTag: %%IMG_PREFIX%%akri-udev-discovery-handler:v%PACKAGE_VERSION%
#!BuildTag: akri-udev-discovery-handler:v%PACKAGE_VERSION% #!BuildTag: %%IMG_PREFIX%%akri-udev-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
#!BuildTag: akri-udev-discovery-handler:v%PACKAGE_VERSION%-%RELEASE%
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" 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 org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview" LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

10
akri-udev-discovery-handler-image/_service
View File

@ -8,8 +8,10 @@
<param name="parse-version">patch</param> <param name="parse-version">patch</param>
</service> </service>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param> <param name="file">Dockerfile</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param>
</service>
</services> </services>

7
akri-webhook-configuration-image/Dockerfile
View File

@ -1,6 +1,5 @@
#!BuildTag: akri-webhook-configuration:latest #!BuildTag: %%IMG_PREFIX%%akri-webhook-configuration:v%PACKAGE_VERSION%
#!BuildTag: akri-webhook-configuration:v%PACKAGE_VERSION% #!BuildTag: %%IMG_PREFIX%%akri-webhook-configuration:v%PACKAGE_VERSION%-%RELEASE%
#!BuildTag: akri-webhook-configuration:v%PACKAGE_VERSION%-%RELEASE%
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" 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 org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview" LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

10
akri-webhook-configuration-image/_service
View File

@ -8,8 +8,10 @@
<param name="parse-version">patch</param> <param name="parse-version">patch</param>
</service> </service>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param> <param name="file">Dockerfile</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param>
</service>
</services> </services>

28
endpoint-copier-operator-chart/Chart.yaml
View File

@ -1,26 +1,8 @@
#!BuildTag: endpoint-copier-operator-chart:0.2.0 #!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator-chart:0.2.1
#!BuildTag: endpoint-copier-operator-chart:0.2.0-%RELEASE% #!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator-chart:0.2.1-%RELEASE%
apiVersion: v2 apiVersion: v2
name: endpoint-copier-operator appVersion: v0.2.0
description: A Helm chart for Kubernetes description: A Helm chart for Kubernetes
name: endpoint-copier-operator
# 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.
type: application type: application
version: 0.2.1
# 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"

19
endpoint-copier-operator-chart/_service
View File

@ -1,8 +1,15 @@
<services> <services>
<service mode="buildtime" name="kiwi_metainfo_helper"/> <service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">values.yaml</param> <param name="file">values.yaml</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <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> </services>

17
endpoint-copier-operator-chart/values.yaml
View File

@ -3,13 +3,16 @@
# Declare variables to be passed into your templates. # Declare variables to be passed into your templates.
replicaCount: 2 replicaCount: 2
image: image:
repository: "%%IMG_REPO%%/endpoint-copier-operator" repository: %%IMG_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion. # Overrides the image tag whose default is the chart appVersion.
tag: "" tag: "0.2.0"
nameOverride: "endpoint-copier-operator" nameOverride: "endpoint-copier-operator"
fullnameOverride: "endpoint-copier-operator" fullnameOverride: "endpoint-copier-operator"
serviceAccount: serviceAccount:
# Specifies whether a service account should be created # Specifies whether a service account should be created
create: true create: true
@ -18,14 +21,20 @@ serviceAccount:
# The name of the service account to use. # The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template # If not set and create is true, a name is generated using the fullname template
name: "endpoint-copier-operator" name: "endpoint-copier-operator"
podAnnotations: {} podAnnotations: {}
podSecurityContext: podSecurityContext:
runAsNonRoot: true runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities: capabilities:
drop: drop:
- "ALL" - "ALL"
resources: resources:
limits: limits:
cpu: 500m cpu: 500m
@ -33,12 +42,16 @@ resources:
requests: requests:
cpu: 10m cpu: 10m
memory: 64Mi memory: 64Mi
autoscaling: autoscaling:
enabled: false enabled: false
minReplicas: 1 minReplicas: 1
maxReplicas: 100 maxReplicas: 100
targetCPUUtilizationPercentage: 80 targetCPUUtilizationPercentage: 80
# targetMemoryUtilizationPercentage: 80 # targetMemoryUtilizationPercentage: 80
nodeSelector: {} nodeSelector: {}
tolerations: [] tolerations: []
affinity: {} affinity: {}

9
endpoint-copier-operator-image/Dockerfile
View File

@ -1,8 +1,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
#!BuildTag: endpoint-copier-operator:v%%endpoint-copier-operator_version%% #!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator:%%endpoint-copier-operator_version%%
#!BuildTag: endpoint-copier-operator:v%%endpoint-copier-operator_version%%-%RELEASE% #!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator:%%endpoint-copier-operator_version%%-%RELEASE%
#!BuildTag: endpoint-copier-operator:latest #!BuildVersion: 15.6
#!BuildVersion: 15.5
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.url="https://www.suse.com/products/server/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" 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 org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="l3" LABEL com.suse.supportlevel="l3"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

10
endpoint-copier-operator-image/_service
View File

@ -8,8 +8,10 @@
<param name="parse-version">patch</param> <param name="parse-version">patch</param>
</service> </service>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param> <param name="file">Dockerfile</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %img_prefix)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_PREFIX</param>
</service> <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param>
</service>
</services> </services>