From 70bbc47c0ebdff011e0f7d959dc05189162b60e3 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 14 Jul 2026 21:58:49 +0200 Subject: [PATCH 1/9] fix(update-platforms): correct IONOS parsing and own the YAML format The script had two problems that made it unsafe to run, so the catalog was maintained by hand instead (see the reverted 878c5c1 and the manual 7ce43a2 "do not delete ionos versions"). - IONOS versions were corrupted on every run. `ionosctl k8s version list --output json` does not return a JSON array; it returns a JSON-encoded string of a Go slice, e.g. "[1.34.2 1.33.3 1.32.7]". The script did json.loads() and then iterated the resulting string character by character, turning the digits into fake versions (7, 6, 5, ...) and wiping the real IONOS entry. Parse the slice literal into a real list and validate the result looks like versions. - The whole file was reformatted on every run because output depended on which `yq` happened to be installed (mikefarah vs the python/jq wrapper) and PyYAML's raw layout differs from the committed style. The script now owns the layout itself via _CatalogDumper (indented block sequences, double-quoted numeric versions, no anchors) and no longer shells out to yq. Output is deterministic and re-running on an unchanged catalog produces no diff. Also stop auto-creating catalog entries for unknown Replicated distributions with a hardcoded Replicated instance type (invalid for cloud distributions); warn and let a human add them with the right spec. README documents how to run the script and that platforms.yaml must not be hand-edited. --- README.md | 25 ++++++ scripts/update-platforms.py | 155 +++++++++++++++++++++++------------- 2 files changed, 125 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 31c6636..9532eb7 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,31 @@ This catalog contains the config data for the tests run in https://testing.stack See this [Nuclino page](https://app.nuclino.com/Stackable/Engineering/Configuring-Test-Jobs-4e993d84-19b4-4081-846d-738f9f38573d) for further information. +### Updating the catalog + +[`scripts/update-platforms.py`](scripts/update-platforms.py) refreshes the Kubernetes +versions in `platforms.yaml`. It fetches the latest versions from the Replicated and +IONOS APIs, keeps the latest patch per minor version line, adds ARM variants where +supported, and rewrites the file. + +The script owns the layout of `platforms.yaml` completely, so **do not hand-edit that +file** ā€” re-run the script instead. Re-running it on an unchanged catalog produces no +diff, so any diff you see is a real version change. + +Prerequisites: + +* Python 3 with `PyYAML` (`pip install pyyaml`) +* [`replicated`](https://docs.replicated.com/reference/replicated-cli-installing) CLI, + authenticated (`REPLICATED_API_TOKEN`) +* [`ionosctl`](https://github.com/ionos-cloud/ionosctl) CLI, authenticated + +Run it from the repository root and review the diff before committing: + +```bash +python3 scripts/update-platforms.py +git diff catalog/platforms.yaml +``` + ## Apps Under [apps/](apps/README.md), we maintain a bunch of Dockerized applications for the maintenance of Jenkins and to run the tests. diff --git a/scripts/update-platforms.py b/scripts/update-platforms.py index 022433b..66538e5 100755 --- a/scripts/update-platforms.py +++ b/scripts/update-platforms.py @@ -7,11 +7,15 @@ 2. Fetches available versions from `ionosctl k8s version list --output json` 3. Filters to keep only the latest patch version from each minor version line 4. Adds ARM alternatives where supported (Replicated only) -5. Updates the platforms.yaml file while preserving structure -6. Formats the YAML output using yq for consistency +5. Rewrites platforms.yaml in a canonical, deterministic style + +The script owns the layout of platforms.yaml end to end (see _CatalogDumper), +so it needs no external formatter and re-running it on an unchanged catalog +produces no diff. Do not hand-edit platforms.yaml; re-run this script instead. """ import json +import shutil import subprocess import sys from collections import defaultdict @@ -21,6 +25,42 @@ import yaml +class _CatalogDumper(yaml.SafeDumper): + """Emit YAML in the catalog's canonical style so the script fully owns the file. + + Two deviations from PyYAML's defaults keep diffs limited to real changes: + - Block sequences are indented under their key (the committed 2-space style) + rather than sitting at the parent's indentation. + - Anchors/aliases are never emitted: the script owns the whole file, so every + list is written literally. This keeps entries independent (e.g. OpenShift + and its ARM variant) instead of coupling them through a shared anchor. + """ + + def increase_indent(self, flow=False, indentless=False): + return super().increase_indent(flow, indentless=False) + + def ignore_aliases(self, data): + return True + + +def _represent_str(dumper: yaml.Dumper, data: str): + """Double-quote scalars that would otherwise parse as a non-string. + + Version lines like "1.34" must stay strings (bare 1.34 is a float). We defer + the "would this parse as a number/bool/etc.?" decision to PyYAML's own + resolver, and only override the quote character to double quotes to match the + committed convention. Genuine strings (ids, names, "1.35.0") stay unquoted. + """ + node = dumper.represent_scalar("tag:yaml.org,2002:str", data) + resolved = dumper.resolve(yaml.nodes.ScalarNode, data, (True, False)) + if resolved != "tag:yaml.org,2002:str": + node.style = '"' + return node + + +_CatalogDumper.add_representer(str, _represent_str) + + class PlatformUpdater: """Updates platforms.yaml with latest versions from Replicated and IONOS.""" @@ -72,6 +112,19 @@ def __init__(self, platforms_yaml_path: str = "catalog/platforms.yaml"): self.platforms_yaml_path = Path(platforms_yaml_path) self.replicated_data = None + def check_prerequisites(self) -> None: + """Verify the provider CLIs used to fetch versions are available.""" + print("šŸ”Ž Checking prerequisites...") + + # The version data comes from these provider CLIs; fail early with a + # clear message rather than midway through the update. + for tool in ("replicated", "ionosctl"): + if shutil.which(tool) is None: + print(f"āŒ `{tool}` not found on PATH. It is required to fetch versions.") + sys.exit(1) + + print("āœ“ Prerequisites OK") + def fetch_replicated_versions(self) -> List[Dict]: """Fetch available versions from Replicated API.""" print("šŸ“” Fetching versions from Replicated API...") @@ -104,6 +157,24 @@ def fetch_ionos_versions(self) -> List[str]: check=True, ) data = json.loads(result.stdout) + + # `ionosctl ... --output json` does not return a JSON array. It + # returns a JSON-encoded *string* holding a Go slice literal, e.g. + # "[1.34.2 1.33.3 1.32.7]" + # Iterating that string directly (as this script used to) walks it + # character by character and produces garbage versions like "7", + # "6", ... ā€” which silently wiped/corrupted the IONOS entry. Parse + # the slice literal into an actual list of version strings. + if isinstance(data, str): + data = data.strip().strip("[]").split() + + if not isinstance(data, list) or not all( + self.parse_version(v) != (0, 0, 0) for v in data + ): + print(f"āŒ Unexpected IONOS version data: {data!r}") + print(" Expected a list of versions like ['1.34.2', '1.33.3'].") + sys.exit(1) + print(f"āœ“ Fetched {len(data)} versions from IONOS") return data except subprocess.CalledProcessError as e: @@ -205,13 +276,17 @@ def create_arm_variant(self, platform: Dict, suffix: str = "-arm") -> Dict | Non if not arm_instance: return None - # Create a copy with ARM-specific changes + # Create a copy with ARM-specific changes. Copy the nested spec and + # versions too, so the ARM variant never shares mutable state with its + # x86 counterpart. arm_platform = platform.copy() arm_platform["id"] = platform["id"] + suffix # Use "-" instead of parentheses to avoid parsing issues in Jenkins arm_platform["name"] = platform["name"] + " - ARM" arm_platform["spec"] = platform["spec"].copy() arm_platform["spec"]["instance-type"] = arm_instance + if "versions" in platform: + arm_platform["versions"] = list(platform["versions"]) return arm_platform @@ -315,7 +390,13 @@ def update_platforms(self) -> Dict: arm_id ) # Track it to avoid future duplicates - # Check for missing distributions from Replicated and add them + # Warn about distributions Replicated offers that aren't in the catalog. + # We deliberately do NOT auto-create them: the correct instance-type, + # node-count and disk-size are provider-specific (a cloud distribution + # like eks/aks/gke cannot use a Replicated `r1.*` instance type), so a + # fabricated entry would be wrong and fail at test time. Adding a new + # distribution is a rare, deliberate act ā€” surface it and let a human + # add it with the right spec. print("\nšŸ” Checking for missing Replicated distributions...") for short_name, dist_data in distribution_lookup.items(): if self.should_skip_distribution(short_name): @@ -325,43 +406,11 @@ def update_platforms(self) -> Dict: if not platform_id or platform_id in existing_platform_ids: continue # Already exists or not mapped - # Create new platform for this distribution - # Generate name if not provided (rke2, oke don't have "name" field) - platform_name = dist_data.get("name", f"{short_name.upper()} on replicated.com") - print(f" āž• Adding new platform: {platform_id} ({platform_name})") - - # Get versions - latest_versions = self.get_latest_patch_versions( - dist_data["versions"], short_name + print( + f" āš ļø Replicated offers distribution '{short_name}' " + f"(would be '{platform_id}') which is not in {self.platforms_yaml_path}.\n" + f" Add it manually with the correct spec if it should be tested." ) - if len(latest_versions) > 5: - latest_versions = latest_versions[:5] - - new_platform = { - "id": platform_id, - "name": platform_name, - "provider": "replicated", - "spec": { - "distribution": short_name, - "instance-type": "r1.xlarge", # Default instance type - "node-count": 3, - "disk-size": 100, - }, - "versions": latest_versions, - } - - updated_platforms.append(new_platform) - existing_platform_ids.add(platform_id) - - # Create ARM variant - arm_platform = self.create_arm_variant(new_platform) - if arm_platform: - arm_id = arm_platform["id"] - print( - f" āž• Adding ARM variant: {arm_id} (instance: {arm_platform['spec']['instance-type']})" - ) - new_arm_platforms.append(arm_platform) - existing_platform_ids.add(arm_id) # Add new ARM platforms after their x86 counterparts final_platforms = [] @@ -381,32 +430,27 @@ def update_platforms(self) -> Dict: return platforms_data def save_platforms(self, data: Dict) -> None: - """Save updated platforms to YAML file.""" + """Save updated platforms to YAML file. + + The output is produced entirely by `_CatalogDumper`, which emits the + catalog's canonical style directly. There is deliberately no external + formatter (previously `yq`): the script owns the format on its own, so + the result is deterministic regardless of what tools are installed. + """ print(f"\nšŸ’¾ Saving updated platforms to {self.platforms_yaml_path}...") try: with open(self.platforms_yaml_path, "w") as f: - yaml.safe_dump( + yaml.dump( data, f, + Dumper=_CatalogDumper, sort_keys=True, allow_unicode=True, explicit_start=True, + default_flow_style=False, indent=2, ) print("āœ“ Saved successfully") - - # Fix YAML formatting using yq (PyYAML has known formatting issues) - # https://github.com/yaml/pyyaml/issues/234 - print("šŸ”§ Fixing YAML formatting with yq...") - result = subprocess.run( - ["yq", "-i", "-P", str(self.platforms_yaml_path)], - capture_output=True, - text=True, - ) - if result.returncode == 0: - print("āœ“ YAML formatting fixed") - else: - print(f"āš ļø yq formatting failed (non-critical): {result.stderr}") except Exception as e: print(f"āŒ Failed to save: {e}") sys.exit(1) @@ -417,6 +461,7 @@ def run(self) -> None: print("Platform Version Updater") print("=" * 60) + self.check_prerequisites() updated_data = self.update_platforms() self.save_platforms(updated_data) From 3602125b0c225f5786d5e0a25c6226918f9d6b83 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 14 Jul 2026 21:58:57 +0200 Subject: [PATCH 2/9] chore: update platform versions via update-platforms.py Regenerated with the fixed script. Changes: - Kubernetes version bumps across kind, k3s, rke2, EKS, AKS, GKE, OKE. - IONOS corrected to real versions (1.34.2, 1.33.3, 1.32.7). - OpenShift version list written literally on both x86 and ARM entries (the &id001/*id001 anchor is gone; the script owns the format). --- catalog/platforms.yaml | 85 ++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/catalog/platforms.yaml b/catalog/platforms.yaml index 81c551e..6ae5f62 100644 --- a/catalog/platforms.yaml +++ b/catalog/platforms.yaml @@ -9,11 +9,11 @@ platforms: instance-type: r1.xlarge node-count: 1 versions: - - 1.35.0 - - 1.34.3 - - 1.33.7 + - 1.36.1 + - 1.35.5 + - 1.34.8 + - 1.33.12 - 1.32.11 - - 1.31.14 - id: replicated-kind-arm name: kind on replicated.com - ARM provider: replicated @@ -23,11 +23,11 @@ platforms: instance-type: r1a.xlarge node-count: 1 versions: - - 1.35.0 - - 1.34.3 - - 1.33.7 + - 1.36.1 + - 1.35.5 + - 1.34.8 + - 1.33.12 - 1.32.11 - - 1.31.14 - id: replicated-rke2 name: RKE2 on replicated.com provider: replicated @@ -37,10 +37,10 @@ platforms: instance-type: r1.large node-count: 3 versions: - - 1.35.0 - - 1.34.3 - - 1.33.7 - - 1.32.11 + - 1.35.6 + - 1.34.9 + - 1.33.13 + - 1.32.13 - id: replicated-rke2-arm name: RKE2 on replicated.com - ARM provider: replicated @@ -50,10 +50,10 @@ platforms: instance-type: r1a.large node-count: 3 versions: - - 1.35.0 - - 1.34.3 - - 1.33.7 - - 1.32.11 + - 1.35.6 + - 1.34.9 + - 1.33.13 + - 1.32.13 - id: replicated-k3s name: k3s on replicated.com provider: replicated @@ -63,10 +63,11 @@ platforms: instance-type: r1.large node-count: 3 versions: - - 1.35.0 - - 1.34.3 - - 1.33.7 - - 1.32.11 + - 1.36.2 + - 1.35.6 + - 1.34.9 + - 1.33.13 + - 1.32.13 - id: replicated-k3s-arm name: k3s on replicated.com - ARM provider: replicated @@ -76,10 +77,11 @@ platforms: instance-type: r1a.large node-count: 3 versions: - - 1.35.0 - - 1.34.3 - - 1.33.7 - - 1.32.11 + - 1.36.2 + - 1.35.6 + - 1.34.9 + - 1.33.13 + - 1.32.13 - id: replicated-azure name: Azure AKS on replicated.com provider: replicated @@ -89,9 +91,10 @@ platforms: instance-type: Standard_D4S_v5 node-count: 3 versions: + - "1.36" + - "1.35" - "1.34" - "1.33" - - "1.32" - id: replicated-azure-arm name: Azure AKS on replicated.com - ARM provider: replicated @@ -101,9 +104,10 @@ platforms: instance-type: Standard_D4ps_v5 node-count: 3 versions: + - "1.36" + - "1.35" - "1.34" - "1.33" - - "1.32" - id: replicated-aws name: Amazon AWS EKS on replicated.com provider: replicated @@ -113,11 +117,11 @@ platforms: instance-type: m6i.large node-count: 3 versions: + - "1.36" - "1.35" - "1.34" - "1.33" - "1.32" - - "1.31" - id: replicated-aws-arm name: Amazon AWS EKS on replicated.com - ARM provider: replicated @@ -127,11 +131,11 @@ platforms: instance-type: m7g.large node-count: 3 versions: + - "1.36" - "1.35" - "1.34" - "1.33" - "1.32" - - "1.31" - id: replicated-gke name: Google GKE on replicated.com provider: replicated @@ -141,6 +145,8 @@ platforms: instance-type: e2-standard-2 node-count: 3 versions: + - "1.36" + - "1.35" - "1.34" - "1.33" - "1.32" @@ -153,6 +159,8 @@ platforms: instance-type: t2a-standard-2 node-count: 3 versions: + - "1.36" + - "1.35" - "1.34" - "1.33" - "1.32" @@ -164,7 +172,7 @@ platforms: distribution: openshift instance-type: r1.large node-count: 3 - versions: &id001 + versions: - 4.22.0-okd - 4.21.0-okd - 4.20.0-okd @@ -178,7 +186,12 @@ platforms: distribution: openshift instance-type: r1a.large node-count: 3 - versions: *id001 + versions: + - 4.22.0-okd + - 4.21.0-okd + - 4.20.0-okd + - 4.19.0-okd + - 4.18.0-okd - id: ionos-k8s name: IONOS managed K8s provider: ionos @@ -190,9 +203,9 @@ platforms: node-count: 3 ram: 8192 versions: + - 1.34.2 - 1.33.3 - - 1.32.6 - - 1.31.10 + - 1.32.7 - id: replicated-oke name: OKE on replicated.com provider: replicated @@ -202,9 +215,9 @@ platforms: instance-type: VM.Standard3.Flex.2 node-count: 3 versions: + - 1.35.2 - 1.34.2 - - 1.33.1 - - 1.32.10 + - 1.33.10 - id: replicated-oke-arm name: OKE on replicated.com - ARM provider: replicated @@ -214,9 +227,9 @@ platforms: instance-type: VM.Standard.A1.Flex.2 node-count: 3 versions: + - 1.35.2 - 1.34.2 - - 1.33.1 - - 1.32.10 + - 1.33.10 providers: - id: replicated name: replicated.com From 48245d26b823b3ee123fdc2591a29c245ffdc23b Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 14 Jul 2026 22:10:46 +0200 Subject: [PATCH 3/9] fix(catalog): guard read_platforms against a missing platforms key read_platforms indexed ["platforms"] before the guard that was meant to catch a missing key, so a malformed platforms.yaml raised KeyError instead of the intended logged failure. It also loaded the file twice. Mirror read_providers: load once, guard, then assign. --- apps/src/modules/catalog.py | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/src/modules/catalog.py b/apps/src/modules/catalog.py index 5f53bc5..aca9c44 100644 --- a/apps/src/modules/catalog.py +++ b/apps/src/modules/catalog.py @@ -36,7 +36,6 @@ def read_platforms(logger): logger logger (String-consuming function) """ global platforms - platforms = hiyapyco.load("/platforms.yaml")["platforms"] platforms_yaml = hiyapyco.load("/platforms.yaml") if "platforms" not in platforms_yaml: logger("platforms.yaml does not contain platforms.") From eae6eb3bcb7e1d572b56f978fe333de2580bac71 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 14 Jul 2026 22:10:56 +0200 Subject: [PATCH 4/9] feat(scripts): add check-catalog.py consistency validator platforms.yaml and operator-tests.yaml are maintained separately and can drift apart; today that only surfaces mid-test as "platform does not exist". This CI-friendly check verifies every platform referenced by a test exists, every platform has a known provider, and warns about platforms no test uses. Documented in the README. --- README.md | 9 ++++ scripts/check-catalog.py | 114 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100755 scripts/check-catalog.py diff --git a/README.md b/README.md index 9532eb7..b5216c4 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,15 @@ python3 scripts/update-platforms.py git diff catalog/platforms.yaml ``` +[`scripts/check-catalog.py`](scripts/check-catalog.py) validates that `platforms.yaml` +and `operator-tests.yaml` are consistent (every platform referenced by a test exists, +every platform has a known provider). It exits non-zero on errors, so it is suitable +for CI. Run it after editing either catalog file: + +```bash +python3 scripts/check-catalog.py +``` + ## Apps Under [apps/](apps/README.md), we maintain a bunch of Dockerized applications for the maintenance of Jenkins and to run the tests. diff --git a/scripts/check-catalog.py b/scripts/check-catalog.py new file mode 100755 index 0000000..b776d40 --- /dev/null +++ b/scripts/check-catalog.py @@ -0,0 +1,114 @@ +#!/usr/bin/env python3 +""" +Validate the catalog files for internal consistency. + +platforms.yaml and operator-tests.yaml are maintained separately (the former by +update-platforms.py, the latter by hand), so they can drift apart. This check is +meant to run in CI so that drift is caught at edit time instead of surfacing +mid-test as a confusing "platform does not exist" error. + +Checks: +1. Every platform's `provider` refers to a provider defined in platforms.yaml. +2. Every platform ID referenced by an operator test exists in platforms.yaml + (a dangling reference is an error). +3. Every platform defined in platforms.yaml is used by at least one operator + test (an unused platform is a warning, not an error). + +Exits non-zero if any error-level check fails. +""" + +import sys +from pathlib import Path +from typing import List + +import yaml + + +def load_yaml(path: str): + try: + with open(path) as f: + return yaml.safe_load(f) + except FileNotFoundError: + print(f"āŒ File not found: {path}") + sys.exit(1) + except yaml.YAMLError as e: + print(f"āŒ Failed to parse {path}: {e}") + sys.exit(1) + + +def check_catalog( + platforms_path: str = "catalog/platforms.yaml", + tests_path: str = "catalog/operator-tests.yaml", +) -> bool: + """Return True if the catalog is consistent, False if there are errors.""" + print("=" * 60) + print("Catalog Consistency Check") + print("=" * 60) + + platforms_yaml = load_yaml(platforms_path) + operator_tests = load_yaml(tests_path) or [] + + platforms = platforms_yaml.get("platforms") or [] + providers = platforms_yaml.get("providers") or [] + provider_ids = {p["id"] for p in providers} + platform_ids = {p["id"] for p in platforms} + + errors: List[str] = [] + warnings: List[str] = [] + + # 1. Each platform's provider must be defined. + for platform in platforms: + provider = platform.get("provider") + if provider not in provider_ids: + errors.append( + f"platform '{platform.get('id')}' has unknown provider " + f"'{provider}' (known providers: {sorted(provider_ids)})" + ) + + # 2. Operator tests may only reference platforms that exist. + referenced_ids = set() + for operator_test in operator_tests: + for platform_ref in operator_test.get("platforms", []): + ref_id = platform_ref.get("id") + referenced_ids.add(ref_id) + if ref_id not in platform_ids: + errors.append( + f"operator test '{operator_test.get('id')}' references " + f"platform '{ref_id}' which is not defined in {platforms_path}" + ) + + # 3. Platforms that no test uses are dead weight (warn only). + for unused in sorted(platform_ids - referenced_ids): + warnings.append( + f"platform '{unused}' is defined but not used by any operator test" + ) + + for warning in warnings: + print(f"āš ļø {warning}") + for error in errors: + print(f"āŒ {error}") + + print("-" * 60) + if errors: + print(f"āŒ Catalog validation FAILED with {len(errors)} error(s).") + return False + + print( + f"āœ“ Catalog OK: {len(platform_ids)} platforms, " + f"{len(operator_tests)} operator tests, {len(warnings)} warning(s)." + ) + return True + + +def main(): + # Allow running from anywhere as long as the catalog paths resolve. + if not Path("catalog/platforms.yaml").exists(): + print("āŒ Run this from the repository root (catalog/ not found).") + sys.exit(1) + + if not check_catalog(): + sys.exit(1) + + +if __name__ == "__main__": + main() From fcf4158bcdc318f6aba6de7dbb79c2c9e666c931 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 14 Jul 2026 22:10:56 +0200 Subject: [PATCH 5/9] refactor(update-platforms): hoist the version cap to one constant The "keep at most 5 versions" limit was duplicated (and inconsistently expressed) in two places. Replace with MAX_VERSIONS_PER_PLATFORM. No behaviour change. --- scripts/update-platforms.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/update-platforms.py b/scripts/update-platforms.py index 66538e5..8fc248e 100755 --- a/scripts/update-platforms.py +++ b/scripts/update-platforms.py @@ -108,6 +108,9 @@ class PlatformUpdater: # Distributions to exclude EXCLUDED_DISTRIBUTIONS = {"embedded-cluster"} + # Keep at most this many (latest) minor version lines per platform. + MAX_VERSIONS_PER_PLATFORM = 5 + def __init__(self, platforms_yaml_path: str = "catalog/platforms.yaml"): self.platforms_yaml_path = Path(platforms_yaml_path) self.replicated_data = None @@ -258,10 +261,7 @@ def update_platform_versions(self, platform: Dict, distribution_data: Dict) -> D distribution_data["versions"], distribution ) - # Limit to reasonable number of versions (e.g., last 5 minor versions) - max_versions = 5 - if len(latest_versions) > max_versions: - latest_versions = latest_versions[:max_versions] + latest_versions = latest_versions[: self.MAX_VERSIONS_PER_PLATFORM] platform["versions"] = latest_versions return platform @@ -331,9 +331,7 @@ def update_platforms(self) -> Dict: latest_versions = self.get_latest_patch_versions( ionos_versions, "ionos" ) - # Limit to 5 versions - if len(latest_versions) > 5: - latest_versions = latest_versions[:5] + latest_versions = latest_versions[: self.MAX_VERSIONS_PER_PLATFORM] platform["versions"] = latest_versions print(f" āœ“ Updated {platform_id}") From caecec2585c38b1193db8c8d8225f2c5a5fbf1fa Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 14 Jul 2026 22:31:54 +0200 Subject: [PATCH 6/9] ci: add PR checks for Python lint and catalog consistency The repo had no push/PR-triggered CI (all workflows are workflow_dispatch). Add a lightweight workflow that runs ruff over scripts/ and apps/ and executes check-catalog.py, so catalog drift and lint regressions are caught on every pull request. --- .github/workflows/checks.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/checks.yml diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml new file mode 100644 index 0000000..faceb7d --- /dev/null +++ b/.github/workflows/checks.yml @@ -0,0 +1,26 @@ +--- +name: Checks + +on: + push: + branches: [main] + pull_request: {} + +permissions: + contents: read + +jobs: + python: + name: Lint Python & validate catalog + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - name: Install tools + run: pip install --quiet pyyaml ruff + - name: Ruff (scripts) + run: ruff check scripts/ + - name: Ruff (apps) + run: ruff check apps/ + - name: Validate catalog consistency + run: python3 scripts/check-catalog.py From ad8d0dd019302e9ab74d63f3365d3f391a0ef5bc Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 14 Jul 2026 22:38:58 +0200 Subject: [PATCH 7/9] ci: use actions/checkout v7.0.0 --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index faceb7d..abe9627 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Install tools run: pip install --quiet pyyaml ruff - name: Ruff (scripts) From c34247b6d65f6679d60254ec2c86cb2398d5269b Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 14 Jul 2026 23:11:23 +0200 Subject: [PATCH 8/9] ci: align checks.yml with the build workflows' hardening pattern Match PR #144: top-level permissions: {} with an explicit per-job contents: read, and persist-credentials: false on checkout. --- .github/workflows/checks.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index abe9627..b718f72 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -6,16 +6,19 @@ on: branches: [main] pull_request: {} -permissions: - contents: read +permissions: {} jobs: python: name: Lint Python & validate catalog runs-on: ubuntu-latest + permissions: + contents: read steps: - name: Checkout uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + with: + persist-credentials: false - name: Install tools run: pip install --quiet pyyaml ruff - name: Ruff (scripts) From e1838b7b748d905173b46140f4bd89db82d06d1c Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Tue, 14 Jul 2026 23:23:22 +0200 Subject: [PATCH 9/9] change the README wording --- README.md | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index b5216c4..c0143fd 100644 --- a/README.md +++ b/README.md @@ -6,27 +6,22 @@ Configuration of our testing Jenkins (https://testing.stackable.tech) This catalog contains the config data for the tests run in https://testing.stackable.tech. -* [platforms.yaml](catalog/platforms.yaml) contains the definition of the test system vendors and platforms +* [platforms.yaml](catalog/platforms.yaml) contains the definition of the test system vendors and platforms (do not hand edit this, see below) * [operator-tests.yaml](catalog/operator-tests.yaml) defines the integration tests for our operators See this [Nuclino page](https://app.nuclino.com/Stackable/Engineering/Configuring-Test-Jobs-4e993d84-19b4-4081-846d-738f9f38573d) for further information. ### Updating the catalog -[`scripts/update-platforms.py`](scripts/update-platforms.py) refreshes the Kubernetes -versions in `platforms.yaml`. It fetches the latest versions from the Replicated and -IONOS APIs, keeps the latest patch per minor version line, adds ARM variants where -supported, and rewrites the file. +**Do not hand edit `platforms.yaml`** -The script owns the layout of `platforms.yaml` completely, so **do not hand-edit that -file** ā€” re-run the script instead. Re-running it on an unchanged catalog produces no -diff, so any diff you see is a real version change. +[`scripts/update-platforms.py`](scripts/update-platforms.py) refreshes the Kubernetes versions in `platforms.yaml`. +It fetches the latest versions from the Replicated and IONOS APIs, keeps the latest patch per minor version line, adds ARM variants where supported, and rewrites the file. Prerequisites: * Python 3 with `PyYAML` (`pip install pyyaml`) -* [`replicated`](https://docs.replicated.com/reference/replicated-cli-installing) CLI, - authenticated (`REPLICATED_API_TOKEN`) +* [`replicated`](https://docs.replicated.com/reference/replicated-cli-installing) CLI, authenticated (`REPLICATED_API_TOKEN`) * [`ionosctl`](https://github.com/ionos-cloud/ionosctl) CLI, authenticated Run it from the repository root and review the diff before committing: @@ -36,10 +31,9 @@ python3 scripts/update-platforms.py git diff catalog/platforms.yaml ``` -[`scripts/check-catalog.py`](scripts/check-catalog.py) validates that `platforms.yaml` -and `operator-tests.yaml` are consistent (every platform referenced by a test exists, -every platform has a known provider). It exits non-zero on errors, so it is suitable -for CI. Run it after editing either catalog file: +[`scripts/check-catalog.py`](scripts/check-catalog.py) validates that `platforms.yaml` and `operator-tests.yaml` are consistent (every platform referenced by a test exists, every platform has a known provider). +It exits non-zero on errors, so it is suitable for CI. +Run it after editing either catalog file: ```bash python3 scripts/check-catalog.py