diff --git a/_config b/_config index c5acb39..3c63106 100644 --- a/_config +++ b/_config @@ -23,6 +23,7 @@ Macros: Macros: %img_repo registry.suse.com/edge %chart_repo oci://registry.suse.com/edge +%chart_prefix charts/ %manifest_repo registry.suse.com/edge %support_level l3 :Macros @@ -40,6 +41,7 @@ Macros: %img_repo %(echo %{registry_url}:%{_project}:images | tr ":" "/" | tr '[:upper:]' '[:lower:]') %manifest_repo %(echo %{registry_url}:%{_project}:test_manifest_images | tr ":" "/" | tr '[:upper:]' '[:lower:]') %chart_repo oci://%(echo %{registry_url}:%{_project}:charts | tr ":" "/" | tr '[:upper:]' '[:lower:]') +%chart_prefix %(echo "") :Macros %endif @@ -69,7 +71,9 @@ BuildFlags: onlybuild:release-manifest-image BuildFlags: onlybuild:baremetal-operator BuildFlags: onlybuild:baremetal-operator-image BuildFlags: onlybuild:ca-certificates-suse + BuildFlags: onlybuild:container-build-checks BuildFlags: onlybuild:crudini + BuildFlags: onlybuild:edge-build-checks BuildFlags: onlybuild:edge-image-builder BuildFlags: onlybuild:edge-image-builder-image BuildFlags: onlybuild:endpoint-copier-operator @@ -101,6 +105,10 @@ BuildFlags: onlybuild:release-manifest-image # Publish multi-arch container images only once all archs have been built PublishFlags: archsync + + # skopeo and umoci are used by build scripts to list packages + Substitute: system-packages:podman podman buildah createrepo_c release-compare edge-build-checks skopeo umoci + %endif %if "%_repository" == "images_16.0" @@ -138,6 +146,9 @@ BuildFlags: onlybuild:release-manifest-image Repotype: helm Patterntype: none Required: perl-YAML-LibYAML + + # include edge-build-checks here + Support: edge-build-checks %endif %if "%_repository" == "standard" diff --git a/akri-chart/Chart.yaml b/akri-chart/Chart.yaml index 9d91c86..e3e2e5d 100644 --- a/akri-chart/Chart.yaml +++ b/akri-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%akri-chart:%%CHART_MAJOR%%.0.0_up0.12.20 -#!BuildTag: %%IMG_PREFIX%%akri-chart:%%CHART_MAJOR%%.0.0_up0.12.20-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%akri:%%CHART_MAJOR%%.0.0_up0.12.20 +#!BuildTag: %%CHART_PREFIX%%akri:%%CHART_MAJOR%%.0.0_up0.12.20-%RELEASE% annotations: catalog.cattle.io/display-name: Akri apiVersion: v2 diff --git a/akri-chart/_service b/akri-chart/_service index b887b22..c0c60a7 100644 --- a/akri-chart/_service +++ b/akri-chart/_service @@ -9,8 +9,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/akri-chart/values.yaml b/akri-chart/values.yaml index 2447091..2ec75a9 100644 --- a/akri-chart/values.yaml +++ b/akri-chart/values.yaml @@ -853,7 +853,7 @@ webhookConfiguration: pullPolicy: Always certImage: # reference is the webhook-certgen image reference - reference: registry.k8s.io/ingress-nginx/kube-webhook-certgen + reference: registry.rancher.com/rancher/mirrored-ingress-nginx-kube-webhook-certgen # tag is the webhook-certgen image tag tag: v1.1.1 # pullPolicy is the webhook-certgen pull policy diff --git a/akri-dashboard-extension-chart/Chart.yaml b/akri-dashboard-extension-chart/Chart.yaml index 7504856..fb879d0 100644 --- a/akri-dashboard-extension-chart/Chart.yaml +++ b/akri-dashboard-extension-chart/Chart.yaml @@ -1,6 +1,6 @@ -#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.1 -#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.1_up1.3.0 -#!BuildTag: %%IMG_PREFIX%%akri-dashboard-extension-chart:%%CHART_MAJOR%%.0.1_up1.3.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%akri-dashboard-extension:%%CHART_MAJOR%%.0.1 +#!BuildTag: %%CHART_PREFIX%%akri-dashboard-extension:%%CHART_MAJOR%%.0.1_up1.3.0 +#!BuildTag: %%CHART_PREFIX%%akri-dashboard-extension:%%CHART_MAJOR%%.0.1_up1.3.0-%RELEASE% annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/namespace: cattle-ui-plugin-system diff --git a/akri-dashboard-extension-chart/_service b/akri-dashboard-extension-chart/_service index b887b22..c0c60a7 100644 --- a/akri-dashboard-extension-chart/_service +++ b/akri-dashboard-extension-chart/_service @@ -9,8 +9,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/cdi-chart/Chart.yaml b/cdi-chart/Chart.yaml index ca5b44f..bc2e9d0 100644 --- a/cdi-chart/Chart.yaml +++ b/cdi-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%cdi-chart:%%CHART_MAJOR%%.0.0_up0.4.0 -#!BuildTag: %%IMG_PREFIX%%cdi-chart:%%CHART_MAJOR%%.0.0_up0.4.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%cdi:%%CHART_MAJOR%%.0.0_up0.4.0 +#!BuildTag: %%CHART_PREFIX%%cdi:%%CHART_MAJOR%%.0.0_up0.4.0-%RELEASE% apiVersion: v2 appVersion: 1.60.1 description: A Helm chart for Containerized Data Importer (CDI) diff --git a/cdi-chart/_service b/cdi-chart/_service index cddd72f..399e403 100644 --- a/cdi-chart/_service +++ b/cdi-chart/_service @@ -2,8 +2,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/cdi-chart/values.yaml b/cdi-chart/values.yaml index b4c1fef..b487d18 100644 --- a/cdi-chart/values.yaml +++ b/cdi-chart/values.yaml @@ -25,7 +25,7 @@ cdi: nodeSelector: kubernetes.io/os: linux -hookImage: rancher/kubectl:v1.30.2 +hookImage: registry.rancher.com/rancher/kubectl:v1.30.10 hookRestartPolicy: OnFailure hookSecurityContext: seccompProfile: diff --git a/container-build-checks/.gitattributes b/container-build-checks/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/container-build-checks/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/container-build-checks/0001-Allow-slash-prefixes-in-registry.patch b/container-build-checks/0001-Allow-slash-prefixes-in-registry.patch new file mode 100644 index 0000000..edcccdd --- /dev/null +++ b/container-build-checks/0001-Allow-slash-prefixes-in-registry.patch @@ -0,0 +1,39 @@ +From 982cfa8500250c9704448880a779ade06cc8f976 Mon Sep 17 00:00:00 2001 +From: Nicolas Belouin +Date: Thu, 3 Apr 2025 16:53:49 +0200 +Subject: [PATCH] Allow slash prefixes in registry + +Signed-off-by: Nicolas Belouin +--- + container-build-checks.py | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/container-build-checks.py b/container-build-checks.py +index b8c873c..d862f33 100755 +--- a/container-build-checks.py ++++ b/container-build-checks.py +@@ -82,13 +82,17 @@ def verify_reference(image, result, value): + return + + (registry, repo, tag) = reference_match.groups() +- allowed_registries: list[str] = config["General"].getlist("Registry") +- if len(allowed_registries) and registry not in allowed_registries: ++ raw_allowed_registries: list[str] = config["General"].getlist("Registry") ++ allowed_registries: dict[str, str] = {v[0]: v[2] for v in map(lambda a: a.partition("/"), raw_allowed_registries)} ++ ++ if len(allowed_registries) and (registry not in allowed_registries.keys() or not repo.startswith(allowed_registries[registry])): + result.warn( + f"The org.opensuse.reference label ({value}) does not use an " +- f"allowed registry: {','.join(allowed_registries)}") ++ f"allowed registry: {','.join(raw_allowed_registries)}") ++ ++ prefix = allowed_registries[registry] + +- if f"{repo}:{tag}" not in image.containerinfo["tags"]: ++ if f"{repo[len(prefix)+1:]}:{tag}" not in image.containerinfo["tags"]: + tags = ", ".join(image.containerinfo["tags"]) + result.warn(f"The org.opensuse.reference label ({value}) does not refer to an existing tag ({tags})") + elif "release" in image.containerinfo and image.containerinfo["release"] not in tag: +-- +2.49.0 + diff --git a/container-build-checks/SUSE.conf b/container-build-checks/SUSE.conf new file mode 100644 index 0000000..1baee9f --- /dev/null +++ b/container-build-checks/SUSE.conf @@ -0,0 +1,4 @@ +[General] +Vendor=com.suse +Registry=registry.suse.com +Registry+=dp.apps.rancher.io diff --git a/container-build-checks/_service b/container-build-checks/_service new file mode 100644 index 0000000..7e77766 --- /dev/null +++ b/container-build-checks/_service @@ -0,0 +1,15 @@ + + + https://github.com/openSUSE/container-build-checks.git + git + enable + + + + container-build-checks.obsinfo + + + *.tar + xz + + diff --git a/container-build-checks/_servicedata b/container-build-checks/_servicedata new file mode 100644 index 0000000..59dc5f3 --- /dev/null +++ b/container-build-checks/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/container-build-checks.git + 412e7f60c08221a549b0f00dfcc4bee7694193ab \ No newline at end of file diff --git a/container-build-checks/container-build-checks-1723452932.412e7f6.obscpio b/container-build-checks/container-build-checks-1723452932.412e7f6.obscpio new file mode 100644 index 0000000..d6f6a75 --- /dev/null +++ b/container-build-checks/container-build-checks-1723452932.412e7f6.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06b3bd5a2bc4797a8ec98e9c4d755cfc9545a6a66fd16decc70aa61dac566eb4 +size 75275 diff --git a/container-build-checks/container-build-checks.changes b/container-build-checks/container-build-checks.changes new file mode 100644 index 0000000..e2211d6 --- /dev/null +++ b/container-build-checks/container-build-checks.changes @@ -0,0 +1,101 @@ +------------------------------------------------------------------- +Mon Aug 12 11:33:57 UTC 2024 - Fabian Vogt + +- Update to version 1723452932.412e7f6: + * add test for missing substitutions + * Reject labels that are missing a substitution + +------------------------------------------------------------------- +Mon Jul 22 13:43:57 UTC 2024 - Dirk Müller + +- update SUSE.conf: allow dp.rancher.apps.io + +------------------------------------------------------------------- +Mon Jul 22 13:08:23 UTC 2024 - Fabian Vogt + +- Switch _service to mode="manual" +- Update to version 1721653643.19092fe: + * Use generic name for the python setup step + * Allow specifying more than one registry + * Use Pathlib for resolving containerinfo + * Switch to test Python 3.11 + +------------------------------------------------------------------- +Fri Apr 28 09:23:53 UTC 2023 - Fabian Vogt + +- Update to version 1682595397.5ce6d2f: + * Handle OCI style images as well + * Makefile: Add missing dependency of broken-derived on proper-base + * GitHub workflow: Update action versions + * GitHub workflow: Test python 3.6 and 3.10 + +------------------------------------------------------------------- +Mon Aug 8 11:37:19 UTC 2022 - Fabian Vogt + +- Make the URL point to GitHub + +------------------------------------------------------------------- +Thu Jul 7 13:42:05 UTC 2022 - Fabian Vogt + +- openSUSE.conf: Allow bci/* as prefix + +------------------------------------------------------------------- +Wed Apr 20 14:26:26 UTC 2022 - Fabian Vogt + +- Update to version 1650464301.a198cf9: + * Detect and treat local builds specially + +------------------------------------------------------------------- +Mon Mar 7 09:23:46 UTC 2022 - Silvio Moioli + +- Adding Uyuni prefix for https://www.uyuni-project.org/ + +------------------------------------------------------------------- +Thu Feb 03 07:44:23 UTC 2022 - fvogt@suse.com + +- Update to version 1643874076.3d0e13c: + * Avoid crash on local builds + +------------------------------------------------------------------- +Tue Dec 14 13:49:12 UTC 2021 - fvogt@suse.com + +- Update to version 1639489705.a4c5a3ab2a75: + * Don't error out when the release field is empty + * Add simple gitpod configuration + +------------------------------------------------------------------- +Tue Jun 1 09:06:12 UTC 2021 - Fabian Vogt + +- Drop obsolete Requires: grep jq + +------------------------------------------------------------------- +Fri May 28 13:57:34 UTC 2021 - Fabian Vogt + +- Update to version 1622209785.4616f4f: + * README.md: Point badge to new location + +------------------------------------------------------------------- +Fri May 28 12:47:42 UTC 2021 - Fabian Vogt + +- Update to version 1622204213.c8ecb9f: + * Add options to allow and block specific tags + +------------------------------------------------------------------- +Thu May 27 15:09:59 UTC 2021 - Fabian Vogt + +- Update to version 1622127842.b548dd8: + * Update README.md + * Add README.md + * Add broken-derived test + * Verify prefix of the image specific label prefix + * Add some comments in the Makefile + * Always check the tag used in org.opensuse.reference + * Add github workflow + * Use bash explicitly + * Make lint + * Less noise in Makefile + +------------------------------------------------------------------- +Fri Apr 30 10:04:09 UTC 2021 - Fabian Vogt + +- Initial commit diff --git a/container-build-checks/container-build-checks.obsinfo b/container-build-checks/container-build-checks.obsinfo new file mode 100644 index 0000000..3411416 --- /dev/null +++ b/container-build-checks/container-build-checks.obsinfo @@ -0,0 +1,4 @@ +name: container-build-checks +version: 1723452932.412e7f6 +mtime: 1723452932 +commit: 412e7f60c08221a549b0f00dfcc4bee7694193ab diff --git a/container-build-checks/container-build-checks.spec b/container-build-checks/container-build-checks.spec new file mode 100644 index 0000000..10ab9b3 --- /dev/null +++ b/container-build-checks/container-build-checks.spec @@ -0,0 +1,95 @@ +# +# spec file for package container-build-checks +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: container-build-checks +Version: 1723452932.412e7f6 +Release: 0 +Summary: Scripts to validate built container images +License: GPL-2.0-or-later +Group: Development/Tools/Building +URL: https://github.com/openSUSE/container-build-checks +Patch0: 0001-Allow-slash-prefixes-in-registry.patch +Source0: %{name}-%{version}.tar.xz +Source1: openSUSE.conf +Source2: SUSE.conf +Requires: %{name}-vendor +BuildArch: noarch + +%package vendor-openSUSE +Summary: openSUSE configuration for %{name} +Group: Development/Tools/Building +Requires: %{name} = %{version} +Provides: %{name}-vendor +Conflicts: %{name}-vendor + +%description vendor-openSUSE +openSUSE configuration for %{name} + +%package vendor-SUSE +Summary: SUSE configuration for %{name} +Group: Development/Tools/Building +Requires: %{name} = %{version} +Provides: %{name}-vendor +Conflicts: %{name}-vendor + +%description vendor-SUSE +SUSE configuration for %{name} + +%package strict +Summary: Strict configuration for %{name} +Group: Development/Tools/Building + +%description strict +Strict configuration for %{name} + +%description +This tool checks that built container images conform to the openSUSE container +image policies (https://en.opensuse.org/Building_derived_containers). + +%prep +%autosetup -p1 + +%build +%make_build + +%install +%make_install + +mkdir -p %{buildroot}%{_datadir}/container-build-checks/ +install -m0644 %{SOURCE1} %{buildroot}%{_datadir}/container-build-checks/openSUSE.conf +install -m0644 %{SOURCE2} %{buildroot}%{_datadir}/container-build-checks/SUSE.conf +echo -e "[General]\nFatalWarnings=true" > %{buildroot}%{_datadir}/container-build-checks/strict.conf + +%files +#%doc README +%license LICENSE +%dir %{_datadir}/container-build-checks +%dir %{_prefix}/lib/build/ +%dir %{_prefix}/lib/build/post-build-checks/ +%{_prefix}/lib/build/post-build-checks/container-build-checks + +%files vendor-openSUSE +%{_datadir}/container-build-checks/openSUSE.conf + +%files vendor-SUSE +%{_datadir}/container-build-checks/SUSE.conf + +%files strict +%{_datadir}/container-build-checks/strict.conf + +%changelog diff --git a/container-build-checks/openSUSE.conf b/container-build-checks/openSUSE.conf new file mode 100644 index 0000000..cacc470 --- /dev/null +++ b/container-build-checks/openSUSE.conf @@ -0,0 +1,10 @@ +[General] +Vendor=org.opensuse +Registry=registry.opensuse.org + +[Tags] +# To avoid conflicts with other stuff on the registry and +# avoid ambiguities with images on other registries. +Allowed+=opensuse/*,kubic/*,kubevirt/*,uyuni/*,bci/* +# Those are images, not available as namespaces +Blocked+=opensuse/tumbleweed/*,opensuse/leap/* diff --git a/edge-build-checks/10-helm-lint b/edge-build-checks/10-helm-lint new file mode 100644 index 0000000..dcaa40b --- /dev/null +++ b/edge-build-checks/10-helm-lint @@ -0,0 +1,12 @@ +#!/bin/bash + +HELM="/usr/bin/helm" +TOPDIR=/usr/src/packages/HELM +failed=0 + +if [ -x $HELM ]; then + $HELM lint "$TOPDIR"/*.tgz + failed=$? +fi + +exit $failed diff --git a/edge-build-checks/20-helm-images b/edge-build-checks/20-helm-images new file mode 100644 index 0000000..60d9884 --- /dev/null +++ b/edge-build-checks/20-helm-images @@ -0,0 +1,158 @@ +#!/usr/bin/python3 +import os +import glob +import subprocess +import yaml +import sys +import pprint + +AUTHORIZED_REPOS = [ + "registry.suse.com/suse/sles/", + "registry.rancher.com", +] + +EXTRA_CONFIG = None + +class CheckResult: + """Class to track count of issues""" + + def __init__(self): + self.hints = 0 + self.warnings = 0 + self.errors = 0 + + def hint(self, msg): + print(f"Hint: {msg}") + self.hints += 1 + + def warn(self, msg): + print(f"Warning: {msg}") + self.warnings += 1 + + def error(self, msg): + print(f"Error: {msg}") + self.errors += 1 + + +def tarballs(): + """Return a list of .helminfo files to check.""" + if "BUILD_ROOT" not in os.environ: + # Not running in an OBS build container + return glob.glob("*.tgz") + + # Running in an OBS build container + buildroot = os.environ["BUILD_ROOT"] + topdir = "/usr/src/packages" + if os.path.isdir(buildroot + "/.build.packages"): + topdir = "/.build.packages" + if os.path.islink(buildroot + "/.build.packages"): + topdir = "/" + os.readlink(buildroot + "/.build.packages") + + return glob.glob(f"{buildroot}{topdir}/HELM/*.tgz") + +def get_extra_config(): + global EXTRA_CONFIG + if EXTRA_CONFIG is not None: + return EXTRA_CONFIG + + if "BUILD_ROOT" not in os.environ: + file_path = "./.checks_helm.yaml" + else: + buildroot = os.environ["BUILD_ROOT"] + topdir = "/usr/src/packages" + file_path = f"{buildroot}{topdir}/SOURCES/.checks_helm.yaml" + try: + with open(file_path) as config_file: + EXTRA_CONFIG = yaml.safe_load(config_file) + if EXTRA_CONFIG is None: # No document in stream + EXTRA_CONFIG = {} + except OSError: + EXTRA_CONFIG = {} + return EXTRA_CONFIG + +def get_extra_params(): + config = get_extra_config() + args = [] + for api in config.get('extra_apis', []): + args.extend(['-a', api]) + return args + +def is_exception(image): + config = get_extra_config() + exceptions = config.get('image_exceptions', []) + (namespace, _, _) = image.partition(':') + return namespace in exceptions + +def get_template(tarball_path): + raw_templates = subprocess.check_output( + [ + "helm", + "template", + tarball_path, + ] + get_extra_params() + ).decode() + return yaml.safe_load_all(raw_templates) + + +def extract_key(key, var): + if hasattr(var, "items"): # hasattr(var,'items') for python 3 + for k, v in var.items(): # var.items() for python 3 + if k == key: + yield v + if isinstance(v, dict): + for result in extract_key(key, v): + yield result + elif isinstance(v, list): + for d in v: + for result in extract_key(key, d): + yield result + + +def check_template(result, template): + if template["kind"] not in [ + "Pod", + "Deployment", + "StatefulSet", + "DaemonSet", + "ReplicaSet", + "Job", + "CronJob", + ]: + return + for image in extract_key("image", template): + if not image.startswith(tuple(AUTHORIZED_REPOS)) and not is_exception(image): + result.error(f"{image} is not from authorized source") + pass + + +def main(): + result = CheckResult() + img_repo = subprocess.check_output( + [ + "rpm", + "--macros=/root/.rpmmacros", + "-E", + "%{?img_repo}", + ] + ).strip() + if img_repo: + result.hint(f"Adding '{img_repo.decode()}' to authorized repo") + AUTHORIZED_REPOS.append(img_repo.decode()) + else: + result.warn("img_repo macro not defined, will not add extra authorized repo") + for tarball in tarballs(): + print(f"Looking at {tarball}") + for template in get_template(tarball): + if template: # Exclude empty templates + check_template(result, template) + + ret = 0 + if result.errors > 0: + print("Fatal errors found.") + ret = 1 + + sys.exit(ret) + + +if __name__ == "__main__": + main() diff --git a/edge-build-checks/20-helm-tags b/edge-build-checks/20-helm-tags new file mode 100644 index 0000000..424272c --- /dev/null +++ b/edge-build-checks/20-helm-tags @@ -0,0 +1,92 @@ +#!/usr/bin/python3 +import json +import os +import glob +import sys +import re + + +class CheckResult: + """Class to track count of issues""" + + def __init__(self): + self.hints = 0 + self.warnings = 0 + self.errors = 0 + + def hint(self, msg): + print(f"Hint: {msg}") + self.hints += 1 + + def warn(self, msg): + print(f"Warning: {msg}") + self.warnings += 1 + + def error(self, msg): + print(f"Error: {msg}") + self.errors += 1 + + +TAG_RE = re.compile(r"(.*\/)?([^:]+):([^:]+)") + + +def check_tags(helminfo, result): + release_tag_found = False + version_tag_found = False + for tag in helminfo["tags"]: + (tag_prefix, tag_name, tag_version) = TAG_RE.fullmatch(tag).groups() + if tag_name != helminfo.get("name"): + result.warn( + f"Tag ({tag}) doesn't use the chart name ({helminfo.get('name')})" + ) + if "release" in helminfo and helminfo["release"] in tag_version: + release_tag_found = True + if tag_version.replace("_", "+") == helminfo["version"]: + version_tag_found = True + if not release_tag_found: + result.error( + "None of the tags are unique to a specific build of the image.\n" + + "Make sure that at least one tag contains the release." + ) + if not version_tag_found: + result.error( + "None of the tags is the equivalent of the chart's version.\n" + + "Make sure that one of the tag is the chart version." + ) + + +def helminfos(): + """Return a list of .helminfo files to check.""" + if "BUILD_ROOT" not in os.environ: + # Not running in an OBS build container + return glob.glob("*.helminfo") + + # Running in an OBS build container + buildroot = os.environ["BUILD_ROOT"] + topdir = "/usr/src/packages" + if os.path.isdir(buildroot + "/.build.packages"): + topdir = "/.build.packages" + if os.path.islink(buildroot + "/.build.packages"): + topdir = "/" + os.readlink(buildroot + "/.build.packages") + + return glob.glob(f"{buildroot}{topdir}/HELM/*.helminfo") + + +def main(): + result = CheckResult() + for helminfo in helminfos(): + print(f"Looking at {helminfo}") + with open(helminfo, "rb") as cifile: + ci_dict = json.load(cifile) + check_tags(ci_dict, result) + + ret = 0 + if result.errors > 0: + print("Fatal errors found.") + ret = 1 + + sys.exit(ret) + + +if __name__ == "__main__": + main() diff --git a/edge-build-checks/COPYING b/edge-build-checks/COPYING new file mode 100644 index 0000000..59a27f7 --- /dev/null +++ b/edge-build-checks/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/edge-build-checks/SUSE-Edge.conf b/edge-build-checks/SUSE-Edge.conf new file mode 100644 index 0000000..976bffa --- /dev/null +++ b/edge-build-checks/SUSE-Edge.conf @@ -0,0 +1,6 @@ +[General] +Vendor=com.suse +Registry=%%IMG_REPO%% + +[Tags] +Allowed=%%IMG_PREFIX%%* \ No newline at end of file diff --git a/edge-build-checks/_service b/edge-build-checks/_service new file mode 100644 index 0000000..a47fc5a --- /dev/null +++ b/edge-build-checks/_service @@ -0,0 +1,9 @@ + + + SUSE-Edge.conf + IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) + IMG_PREFIX + IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo) + IMG_REPO + + \ No newline at end of file diff --git a/edge-build-checks/edge-build-checks.spec b/edge-build-checks/edge-build-checks.spec new file mode 100644 index 0000000..21b521b --- /dev/null +++ b/edge-build-checks/edge-build-checks.spec @@ -0,0 +1,59 @@ +# +# spec file for package edge-build-checks +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: edge-build-checks +Summary: post checks for build after charts and images are created +License: GPL-2.0-or-later +Group: Development/Tools/Building +Version: 0.0.1 +Release: 0 +Source0: COPYING +Source1: 20-helm-images +Source2: 10-helm-lint +Source3: SUSE-Edge.conf +Source4: 20-helm-tags +BuildArch: noarch +Requires: container-build-checks +Requires: python3-PyYAML +Provides: container-build-checks-vendor + +%description +some scripts to check for problems in edge related helm charts and images after their creation +in OBS. + +%prep +cp %{SOURCE0} . + +%build +%define _lto_cflags %{nil} +# nothing to do + +%install +install -d $RPM_BUILD_ROOT/usr/lib/build/post-build-checks +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/build/post-build-checks +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/build/post-build-checks +install -m 755 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/build/post-build-checks +install -d %{buildroot}%{_datadir}/container-build-checks +install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/container-build-checks/SUSE-Edge.conf + +%files +%license COPYING +%{_datadir}/container-build-checks +/usr/lib/build + +%changelog diff --git a/edge-image-builder-image/_service b/edge-image-builder-image/_service index aaa349a..fcb6694 100644 --- a/edge-image-builder-image/_service +++ b/edge-image-builder-image/_service @@ -7,8 +7,8 @@ IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo) IMG_REPO artifacts.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_REPO=$(rpm --macros=/root/.rpmmacros -E %chart_repo) CHART_REPO SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level) @@ -17,4 +17,3 @@ CHART_MAJOR - diff --git a/edge-image-builder-image/artifacts.yaml b/edge-image-builder-image/artifacts.yaml index 4a4a0d8..352f358 100644 --- a/edge-image-builder-image/artifacts.yaml +++ b/edge-image-builder-image/artifacts.yaml @@ -1,10 +1,10 @@ metallb: - chart: metallb-chart - repository: "%%CHART_REPO%%/%%IMG_PREFIX%%" + chart: metallb + repository: "%%CHART_REPO%%/%%CHART_PREFIX%%" version: "%%CHART_MAJOR%%.0.0+up0.14.9" endpoint-copier-operator: - chart: endpoint-copier-operator-chart - repository: "%%CHART_REPO%%/%%IMG_PREFIX%%" + chart: endpoint-copier-operator + repository: "%%CHART_REPO%%/%%CHART_PREFIX%%" version: "%%CHART_MAJOR%%.0.0+up0.2.1" kubernetes: k3s: diff --git a/endpoint-copier-operator-chart/Chart.yaml b/endpoint-copier-operator-chart/Chart.yaml index 5450072..c8ae1d5 100644 --- a/endpoint-copier-operator-chart/Chart.yaml +++ b/endpoint-copier-operator-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator-chart:%%CHART_MAJOR%%.0.0_up0.2.1 -#!BuildTag: %%IMG_PREFIX%%endpoint-copier-operator-chart:%%CHART_MAJOR%%.0.0_up0.2.1-%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.2.0 description: A Helm chart for Kubernetes diff --git a/endpoint-copier-operator-chart/_service b/endpoint-copier-operator-chart/_service index b887b22..c0c60a7 100644 --- a/endpoint-copier-operator-chart/_service +++ b/endpoint-copier-operator-chart/_service @@ -9,8 +9,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/kiwi-builder-image/Dockerfile b/kiwi-builder-image/Dockerfile index 58fb431..d220bea 100644 --- a/kiwi-builder-image/Dockerfile +++ b/kiwi-builder-image/Dockerfile @@ -6,7 +6,7 @@ FROM registry.suse.com/bci/kiwi:${KIWIVERSION} ARG KIWIVERSION # Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.akri +# labelprefix=com.suse.application.kiwi 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." diff --git a/kiwi-builder-image/_service b/kiwi-builder-image/_service index 14f9667..254ee27 100644 --- a/kiwi-builder-image/_service +++ b/kiwi-builder-image/_service @@ -1,5 +1,6 @@ + README IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo) diff --git a/kubevirt-chart/Chart.yaml b/kubevirt-chart/Chart.yaml index ef55647..fc531f8 100644 --- a/kubevirt-chart/Chart.yaml +++ b/kubevirt-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%kubevirt-chart:%%CHART_MAJOR%%.0.0_up0.5.0-%RELEASE% -#!BuildTag: %%IMG_PREFIX%%kubevirt-chart:%%CHART_MAJOR%%.0.0_up0.5.0 +#!BuildTag: %%CHART_PREFIX%%kubevirt:%%CHART_MAJOR%%.0.0_up0.5.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%kubevirt:%%CHART_MAJOR%%.0.0_up0.5.0 apiVersion: v2 appVersion: 1.4.0 description: A Helm chart for KubeVirt diff --git a/kubevirt-chart/_service b/kubevirt-chart/_service index cddd72f..399e403 100644 --- a/kubevirt-chart/_service +++ b/kubevirt-chart/_service @@ -2,8 +2,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/kubevirt-chart/values.yaml b/kubevirt-chart/values.yaml index 2f3c89f..490b9cf 100644 --- a/kubevirt-chart/values.yaml +++ b/kubevirt-chart/values.yaml @@ -40,7 +40,7 @@ kubevirt: monitorAccount: "" monitorNamespace: "" -hookImage: rancher/kubectl:v1.30.2 +hookImage: registry.rancher.com/rancher/kubectl:v1.30.10 hookRestartPolicy: OnFailure hookSecurityContext: seccompProfile: diff --git a/kubevirt-dashboard-extension-chart/Chart.yaml b/kubevirt-dashboard-extension-chart/Chart.yaml index c10553c..af27da9 100644 --- a/kubevirt-dashboard-extension-chart/Chart.yaml +++ b/kubevirt-dashboard-extension-chart/Chart.yaml @@ -1,6 +1,6 @@ -#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.1 -#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.1_up1.3.1 -#!BuildTag: %%IMG_PREFIX%%kubevirt-dashboard-extension-chart:%%CHART_MAJOR%%.0.1_up1.3.1-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%kubevirt-dashboard-extension:%%CHART_MAJOR%%.0.1 +#!BuildTag: %%CHART_PREFIX%%kubevirt-dashboard-extension:%%CHART_MAJOR%%.0.1_up1.3.1 +#!BuildTag: %%CHART_PREFIX%%kubevirt-dashboard-extension:%%CHART_MAJOR%%.0.1_up1.3.1-%RELEASE% annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/namespace: cattle-ui-plugin-system diff --git a/kubevirt-dashboard-extension-chart/_service b/kubevirt-dashboard-extension-chart/_service index b887b22..c0c60a7 100644 --- a/kubevirt-dashboard-extension-chart/_service +++ b/kubevirt-dashboard-extension-chart/_service @@ -9,8 +9,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/metal3-chart/Chart.yaml b/metal3-chart/Chart.yaml index bdaef46..f36a268 100644 --- a/metal3-chart/Chart.yaml +++ b/metal3-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.2_up0.11.0 -#!BuildTag: %%IMG_PREFIX%%metal3-chart:%%CHART_MAJOR%%.0.2_up0.11.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.2_up0.11.0 +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.2_up0.11.0-%RELEASE% apiVersion: v2 appVersion: 0.11.0 dependencies: diff --git a/metal3-chart/_service b/metal3-chart/_service index b887b22..c0c60a7 100644 --- a/metal3-chart/_service +++ b/metal3-chart/_service @@ -9,8 +9,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/metal3-chart/charts/baremetal-operator/values.yaml b/metal3-chart/charts/baremetal-operator/values.yaml index 07bd439..10d3aa5 100644 --- a/metal3-chart/charts/baremetal-operator/values.yaml +++ b/metal3-chart/charts/baremetal-operator/values.yaml @@ -22,6 +22,8 @@ global: # Comment this out when pinning the baremetal-operator container to a specfic host. nodeSelector: {} + enable_tls: false + replicaCount: 1 images: diff --git a/metal3-chart/charts/ironic/values.yaml b/metal3-chart/charts/ironic/values.yaml index f62e089..17898b8 100644 --- a/metal3-chart/charts/ironic/values.yaml +++ b/metal3-chart/charts/ironic/values.yaml @@ -50,6 +50,8 @@ global: # Comment this out when pinning the pdns containers to a specfic host. nodeSelector: {} + enable_tls: false + replicaCount: 1 images: diff --git a/metallb-chart/Chart.yaml b/metallb-chart/Chart.yaml index d527a65..e72626c 100644 --- a/metallb-chart/Chart.yaml +++ b/metallb-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%metallb-chart:%%CHART_MAJOR%%.0.0_up0.14.9 -#!BuildTag: %%IMG_PREFIX%%metallb-chart:%%CHART_MAJOR%%.0.0_up0.14.9-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%metallb:%%CHART_MAJOR%%.0.0_up0.14.9 +#!BuildTag: %%CHART_PREFIX%%metallb:%%CHART_MAJOR%%.0.0_up0.14.9-%RELEASE% apiVersion: v2 appVersion: v0.14.9 dependencies: diff --git a/metallb-chart/_service b/metallb-chart/_service index b887b22..c0c60a7 100644 --- a/metallb-chart/_service +++ b/metallb-chart/_service @@ -9,8 +9,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/rancher-turtles-airgap-resources-chart/Chart.yaml b/rancher-turtles-airgap-resources-chart/Chart.yaml index c27aa16..c9b2c1a 100644 --- a/rancher-turtles-airgap-resources-chart/Chart.yaml +++ b/rancher-turtles-airgap-resources-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.17.0 -#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.17.0 +#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.0_up0.17.0 +#!BuildTag: %%CHART_PREFIX%%rancher-turtles-airgap-resources:%%CHART_MAJOR%%.0.0_up0.17.0-%RELEASE% apiVersion: v2 appVersion: 0.17.0 description: Rancher Turtles utility chart for airgap scenarios diff --git a/rancher-turtles-airgap-resources-chart/_service b/rancher-turtles-airgap-resources-chart/_service index cddd72f..c5ba7bc 100644 --- a/rancher-turtles-airgap-resources-chart/_service +++ b/rancher-turtles-airgap-resources-chart/_service @@ -2,8 +2,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/rancher-turtles-chart/Chart.yaml b/rancher-turtles-chart/Chart.yaml index cd0d1cd..36a7eab 100644 --- a/rancher-turtles-chart/Chart.yaml +++ b/rancher-turtles-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.17.0 -#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.17.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.0_up0.17.0 +#!BuildTag: %%CHART_PREFIX%%rancher-turtles:%%CHART_MAJOR%%.0.0_up0.17.0-%RELEASE% annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension diff --git a/rancher-turtles-chart/_service b/rancher-turtles-chart/_service index b887b22..c0c60a7 100644 --- a/rancher-turtles-chart/_service +++ b/rancher-turtles-chart/_service @@ -9,8 +9,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/rancher-turtles-chart/values.yaml b/rancher-turtles-chart/values.yaml index 23665a8..4c0d259 100644 --- a/rancher-turtles-chart/values.yaml +++ b/rancher-turtles-chart/values.yaml @@ -9,7 +9,7 @@ rancherTurtles: managerArguments: [] imagePullSecrets: [] rancherInstalled: false - kubectlImage: registry.suse.com/edge/3.2/kubectl:1.30.3 + kubectlImage: "%%IMG_REPO%%/%%IMG_PREFIX%%/kubectl:1.30.3" features: day2operations: enabled: false diff --git a/release-manifest-image/_service b/release-manifest-image/_service index 8ab2f1c..8981e39 100644 --- a/release-manifest-image/_service +++ b/release-manifest-image/_service @@ -11,8 +11,8 @@ release_manifest.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_REPO=$(rpm --macros=/root/.rpmmacros -E %chart_repo) CHART_REPO CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index 6b03193..6b5d4be 100644 --- a/release-manifest-image/release_manifest.yaml +++ b/release-manifest-image/release_manifest.yaml @@ -106,19 +106,19 @@ spec: repository: https://charts.rancher.io - prettyName: MetalLB releaseName: metallb - chart: %%CHART_REPO%%/%%IMG_PREFIX%%metallb-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%metallb version: %%CHART_MAJOR%%.0.0+up0.14.9 - prettyName: CDI releaseName: cdi - chart: %%CHART_REPO%%/%%IMG_PREFIX%%cdi-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%cdi version: %%CHART_MAJOR%%.0.0+up0.4.0 - prettyName: KubeVirt releaseName: kubevirt - chart: %%CHART_REPO%%/%%IMG_PREFIX%%kubevirt-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%kubevirt version: %%CHART_MAJOR%%.0.0+up0.4.0 addonCharts: - releaseName: kubevirt-dashboard-extension - chart: %%CHART_REPO%%/%%IMG_PREFIX%%kubevirt-dashboard-extension-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%kubevirt-dashboard-extension version: %%CHART_MAJOR%%.0.1+up1.3.1 - prettyName: NeuVector releaseName: neuvector @@ -137,7 +137,7 @@ spec: version: 2.0.1 - prettyName: EndpointCopierOperator releaseName: endpoint-copier-operator - chart: %%CHART_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%endpoint-copier-operator version: %%CHART_MAJOR%%.0.0+up0.2.1 - prettyName: Elemental releaseName: elemental-operator @@ -154,25 +154,25 @@ spec: version: 3.0.0 - prettyName: SRIOV releaseName: sriov-network-operator - chart: %%CHART_REPO%%/%%IMG_PREFIX%%sriov-network-operator-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%sriov-network-operator version: %%CHART_MAJOR%%.0.0+up1.4.0 dependencyCharts: - releaseName: sriov-crd - chart: %%CHART_REPO%%/%%IMG_PREFIX%%sriov-crd-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%sriov-crd version: %%CHART_MAJOR%%.0.0+up1.4.0 - prettyName: Akri releaseName: akri - chart: %%CHART_REPO%%/%%IMG_PREFIX%%akri-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%akri version: %%CHART_MAJOR%%.0.0+up0.12.20 addonCharts: - releaseName: akri-dashboard-extension - chart: %%CHART_REPO%%/%%IMG_PREFIX%%akri-dashboard-extension-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%akri-dashboard-extension version: %%CHART_MAJOR%%.0.1+up1.3.0 - prettyName: Metal3 releaseName: metal3 - chart: %%CHART_REPO%%/%%IMG_PREFIX%%metal3-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%metal3 version: %%CHART_MAJOR%%.0.0+up0.10.0 - prettyName: RancherTurtles releaseName: rancher-turtles - chart: %%CHART_REPO%%/%%IMG_PREFIX%%rancher-turtles-chart + chart: %%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles version: %%CHART_MAJOR%%.0.0+up0.17.0 diff --git a/sriov-crd-chart/Chart.yaml b/sriov-crd-chart/Chart.yaml index c883db6..a30299e 100644 --- a/sriov-crd-chart/Chart.yaml +++ b/sriov-crd-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:%%CHART_MAJOR%%.0.0_up1.4.0-%RELEASE% -#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:%%CHART_MAJOR%%.0.0_up1.4.0 +#!BuildTag: %%CHART_PREFIX%%sriov-crd:%%CHART_MAJOR%%.0.0_up1.4.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%sriov-crd:%%CHART_MAJOR%%.0.0_up1.4.0 annotations: catalog.cattle.io/experimental: "true" catalog.cattle.io/hidden: "true" diff --git a/sriov-crd-chart/_service b/sriov-crd-chart/_service index cddd72f..399e403 100644 --- a/sriov-crd-chart/_service +++ b/sriov-crd-chart/_service @@ -2,8 +2,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/sriov-network-operator-chart/.checks_helm.yaml b/sriov-network-operator-chart/.checks_helm.yaml new file mode 100644 index 0000000..c4e475c --- /dev/null +++ b/sriov-network-operator-chart/.checks_helm.yaml @@ -0,0 +1,10 @@ +extra_apis: + - k8s.cni.cncf.io/v1/NetworkAttachmentDefinition +image_exceptions: + - rancher/hardened-sriov-network-operator + - rancher/hardened-sriov-network-config-daemon + - rancher/hardened-sriov-cni + - rancher/hardened-ib-sriov-cni + - rancher/hardened-sriov-network-device-plugin + - rancher/hardened-sriov-network-resources-injector + - rancher/hardened-sriov-network-webhook \ No newline at end of file diff --git a/sriov-network-operator-chart/Chart.yaml b/sriov-network-operator-chart/Chart.yaml index 8b77bdf..fe27da3 100644 --- a/sriov-network-operator-chart/Chart.yaml +++ b/sriov-network-operator-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%sriov-network-operator-chart:%%CHART_MAJOR%%.0.0_up1.4.0-%RELEASE% -#!BuildTag: %%IMG_PREFIX%%sriov-network-operator-chart:%%CHART_MAJOR%%.0.0_up1.4.0 +#!BuildTag: %%CHART_PREFIX%%sriov-network-operator:%%CHART_MAJOR%%.0.0_up1.4.0-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%sriov-network-operator:%%CHART_MAJOR%%.0.0_up1.4.0 annotations: catalog.cattle.io/auto-install: sriov-crd=match catalog.cattle.io/experimental: "true" diff --git a/sriov-network-operator-chart/README.md b/sriov-network-operator-chart/README.md index 9cbb747..a9a1032 100644 --- a/sriov-network-operator-chart/README.md +++ b/sriov-network-operator-chart/README.md @@ -41,7 +41,7 @@ For additional information and methods for installing Helm, refer to the officia #### Deploy from OCI repo ``` -$ helm install -n sriov-network-operator --create-namespace --version 1.3.0 --set sriovOperatorConfig.deploy=true sriov-network-operator oci://ghcr.io/k8snetworkplumbingwg/sriov-network-operator-chart +$ helm install -n sriov-network-operator --create-namespace --version 1.3.0 --set sriovOperatorConfig.deploy=true sriov-network-operator oci://ghcr.io/k8snetworkplumbingwg/sriov-network-operator ``` #### Deploy from project sources @@ -51,7 +51,7 @@ $ helm install -n sriov-network-operator --create-namespace --version 1.3.0 --se $ git clone https://github.com/k8snetworkplumbingwg/sriov-network-operator.git ; cd sriov-network-operator # Install Operator -$ helm install -n sriov-network-operator --create-namespace --wait --set sriovOperatorConfig.deploy=true sriov-network-operator ./deployment/sriov-network-operator-chart +$ helm install -n sriov-network-operator --create-namespace --wait --set sriovOperatorConfig.deploy=true sriov-network-operator ./deployment/sriov-network-operator # View deployed resources $ kubectl -n sriov-network-operator get pods diff --git a/sriov-network-operator-chart/_service b/sriov-network-operator-chart/_service index cddd72f..5d198c7 100644 --- a/sriov-network-operator-chart/_service +++ b/sriov-network-operator-chart/_service @@ -2,8 +2,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHAT_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR diff --git a/sriov-network-operator-chart/charts/sriov-nfd/values.yaml b/sriov-network-operator-chart/charts/sriov-nfd/values.yaml index 7a06ad6..efdbc12 100644 --- a/sriov-network-operator-chart/charts/sriov-nfd/values.yaml +++ b/sriov-network-operator-chart/charts/sriov-nfd/values.yaml @@ -1,5 +1,5 @@ image: - repository: rancher/hardened-node-feature-discovery + repository: registry.rancher.com/rancher/hardened-node-feature-discovery # This should be set to 'IfNotPresent' for released version pullPolicy: IfNotPresent # tag, if defined will use the given image tag, else Chart.AppVersion will be used diff --git a/upgrade-controller-chart/Chart.yaml b/upgrade-controller-chart/Chart.yaml index 247c13e..2734273 100644 --- a/upgrade-controller-chart/Chart.yaml +++ b/upgrade-controller-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.1 -#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.1-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%upgrade-controller:%%CHART_MAJOR%%.0.0_up0.1.1 +#!BuildTag: %%CHART_PREFIX%%upgrade-controller:%%CHART_MAJOR%%.0.0_up0.1.1-%RELEASE% apiVersion: v2 appVersion: 0.1.1 dependencies: diff --git a/upgrade-controller-chart/_service b/upgrade-controller-chart/_service index fc5f6f3..66126ef 100644 --- a/upgrade-controller-chart/_service +++ b/upgrade-controller-chart/_service @@ -11,8 +11,8 @@ Chart.yaml - IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix}) - IMG_PREFIX + CHART_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?chart_prefix}) + CHART_PREFIX CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) CHART_MAJOR