From bf758ee966457ed4aabd4b7e0fb30a80a5cd258c Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 3 Nov 2026 00:15:18 +0100 Subject: [PATCH 1/2] chore(olm): Remove the unused listener and secret values files --- .../values/listener-operator/values.yaml | 29 ------------------ .../values/secret-operator/values.yaml | 30 ------------------- 2 files changed, 59 deletions(-) delete mode 100644 olm/resources/values/listener-operator/values.yaml delete mode 100644 olm/resources/values/secret-operator/values.yaml diff --git a/olm/resources/values/listener-operator/values.yaml b/olm/resources/values/listener-operator/values.yaml deleted file mode 100644 index e81975b..0000000 --- a/olm/resources/values/listener-operator/values.yaml +++ /dev/null @@ -1,29 +0,0 @@ -csiProvisioner: - controllerService: - resources: - limits: - memory: 256Mi - requests: - memory: 256Mi - - externalProvisioner: - resources: - requests: - memory: 128Mi - limits: - memory: 128Mi - -csiNodeDriver: - nodeService: - resources: - limits: - memory: 256Mi - requests: - memory: 256Mi - - nodeDriverRegistrar: - resources: - requests: - memory: 128Mi - limits: - memory: 128Mi diff --git a/olm/resources/values/secret-operator/values.yaml b/olm/resources/values/secret-operator/values.yaml deleted file mode 100644 index 6b6eb74..0000000 --- a/olm/resources/values/secret-operator/values.yaml +++ /dev/null @@ -1,30 +0,0 @@ -controllerService: - resources: - limits: - memory: 256Mi - requests: - memory: 256Mi - -csiNodeDriver: - nodeService: - resources: - limits: - memory: 256Mi - requests: - memory: 256Mi - - externalProvisioner: - resources: - requests: - memory: 128Mi - limits: - memory: 128Mi - - nodeDriverRegistrar: - resources: - requests: - memory: 128Mi - limits: - memory: 128Mi - - From 33fff3f09596554aca8bb7ce8ab975b99da15e04 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 3 Nov 2026 00:15:18 +0100 Subject: [PATCH 2/2] feat(olm): Set createdAt to the commit date of the release tag --- olm/build-manifests.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/olm/build-manifests.py b/olm/build-manifests.py index eaa5514..5d230ae 100755 --- a/olm/build-manifests.py +++ b/olm/build-manifests.py @@ -28,9 +28,11 @@ Requirements: - uv (https://docs.astral.sh/uv/) — installs PyYAML automatically - helm (https://helm.sh) + - git (createdAt is the commit date of the checked-out release tag) """ import argparse +import datetime import json import logging import os @@ -399,6 +401,7 @@ def generate_csv( result["spec"]["minKubeVersion"] = min_kube_version(args.release) result["metadata"]["name"] = f"{csv_name}.v{args.release}" result["metadata"]["annotations"]["containerImage"] = related_images[0]["image"] + result["metadata"]["annotations"]["createdAt"] = created_at(args.repo_operator) result["metadata"]["annotations"]["description"] = chart["description"] result["metadata"]["annotations"]["capabilities"] = listing["capabilities"] result["metadata"]["annotations"]["categories"] = listing["categories"] @@ -431,6 +434,31 @@ def generate_csv( return result +def created_at(repo: pathlib.Path) -> str: + """Return the commit date of the checked-out commit, so createdAt stays the same when the bundle is rebuilt.""" + try: + completed_proc = subprocess.run( + ["git", "-C", str(repo), "log", "-1", "--format=%ct"], + capture_output=True, + check=True, + ) + except subprocess.CalledProcessError as e: + logging.error(e.stderr.decode("utf-8")) + raise ManifestException(f'Failed to read the commit date of "{repo}"') + return format_created_at(int(completed_proc.stdout)) + + +def format_created_at(epoch_seconds: int) -> str: + """Format a Unix timestamp the way OLM bundles write createdAt, in UTC. + + >>> format_created_at(1784628000) + '2026-07-21T10:00:00Z' + """ + return datetime.datetime.fromtimestamp( + epoch_seconds, tz=datetime.timezone.utc + ).strftime("%Y-%m-%dT%H:%M:%SZ") + + def load_chart(args: argparse.Namespace) -> dict: chart_path = args.repo_operator / "deploy" / "helm" / args.op_name / "Chart.yaml" return yaml.load(chart_path.read_text(), Loader=yaml.SafeLoader)