Reviewing files that changed from the base of the PR and between 13e0501 and 06a25c1.

• .github/workflows/pre-commit.yml (1 hunks)
• packages/apps/kubernetes/.helmignore (1 hunks)
• packages/apps/kubernetes/Makefile (1 hunks)
• packages/apps/kubernetes/README.md (1 hunks)
• packages/apps/kubernetes/files/versions.yaml (1 hunks)
• packages/apps/kubernetes/hack/update-versions.sh (1 hunks)
• packages/apps/kubernetes/values.schema.json (2 hunks)
• packages/apps/kubernetes/values.yaml (1 hunks)
• packages/system/cozystack-resource-definitions/cozyrds/kubernetes.yaml (1 hunks)

• GitHub Check: Build

packages/apps/kubernetes/.helmignore (1)

4-4: LGTM! Appropriately excludes build tooling from Helm chart packaging.

packages/apps/kubernetes/README.md (1)

107-107: LGTM! Updated description appropriately reflects the enum-based version parameter approach.

packages/apps/kubernetes/files/versions.yaml (1)

2-6: Verify Kubernetes patch version availability in registry. The updated patch versions (v1.32.10, v1.31.14, v1.30.14, v1.29.15, v1.28.15) should be confirmed as available in the container registry used by the project. Per learnings from similar version management in other apps, these versions are auto-fetched by hack/update-versions.sh.

packages/apps/kubernetes/values.schema.json (1)

495-495: LGTM! Schema updates are well-coordinated:

• Host description properly escaped for JSON safety.
• Version enum reordered from ascending to descending (latest first), which improves UX in UI dropdowns.
• Description aligns with values.yaml and README documentation.

Enum ordering change is a minor UX improvement for the deployment UI.

Also applies to: 618-627

packages/apps/kubernetes/values.yaml (1)

49-59: LGTM! Version enum properly defined and integrated:

• Enum annotation format (@enum, @value) is correct for cozyvalues-gen documentation generation.
• Type reference {Version} correctly links parameter to enum definition.
• Default remains v1.33 as expected.
• Enum values (v1.33 → v1.28) in descending order, consistent with schema.json.

Per the Makefile workflow, hack/update-versions.sh will maintain this enum during version updates.

packages/apps/kubernetes/Makefile (1)

11-13: Critical: hack/update-versions.sh script implementation not provided for review. The new update target depends on this script, but it was not included in the files for review. Per the PR objectives, this script should:

• Read kamaji version from its Dockerfile
• Extract Kubernetes version from kamaji's kubeadm_version.go
• Update KUBERNETES_VERSION, versions.yaml, and values.yaml

Please verify the script implementation is included in your PR and functions correctly.

packages/system/cozystack-resource-definitions/cozyrds/kubernetes.yaml (1)

11-11: Verify OpenAPI schema validation changes against controller implementations. The review flags removal of required constraints from addon and controlPlane fields in the Kubernetes schema. Without access to the repository, I cannot confirm: (1) whether required fields were actually removed, (2) whether downstream controllers (Kamaji, etcd, KubeVirt operators) gracefully handle missing configurations, or (3) whether existing tests cover optional field scenarios. Confirm these details before merging.

packages/apps/kubernetes/hack/update-versions.sh (6)

1-12: Good defensive setup with proper error handling.

The script correctly sets up strict error handling (errexit, nounset, pipefail) and establishes clear file paths for all artifacts.

---

14-24: Solid prerequisite validation.

Tool checks for skopeo and jq are appropriately placed early with clear error messages.

---

188-188: Trap command uses double quotes; verify this is intentional.

Shellcheck (SC2064) flags the trap on line 188. Double quotes cause $TEMP_FILE and $TEMP_VERSIONS to expand immediately when the trap is set, not when executed. This is likely correct (since the variables are already defined), but consider single quotes if future code changes cause confusion:

# Current (double quotes—expands at trap set time):
trap "rm -f $TEMP_FILE $TEMP_VERSIONS" EXIT

# Alternative (single quotes—expands at trap execution time):
trap 'rm -f "$TEMP_FILE" "$TEMP_VERSIONS"' EXIT

The current approach is fine and common in shell scripts.

---

245-259: Makefile update logic is clean.

The awk-based update for KUBERNETES_VERSION is straightforward and correct. The conditional check before updating is appropriate.

---

129-129: Remove unused variable TOTAL_LINES.

TOTAL_LINES is assigned on line 129 but is never referenced elsewhere in the file.

-TOTAL_LINES=$(wc -l < "$TEMP_VERSIONS" | tr -d ' ')
 START_POS=$((SUPPORTED_POS - 5))

---

176-184: Critical: Script generates invalid YAML format.

The script at lines 176-184 outputs invalid YAML. The current format produces unstructured quoted lines that yq cannot parse as a valid YAML object:

"v1.31": "v1.31.4"
"v1.32": "v1.32.1"

Remove outer quotes from keys to generate valid block-style YAML:

 {
     for ver in "${VERSIONS[@]}"; do
-        echo "\"${ver}\": \"${VERSION_MAP[$ver]}\""
+        echo "${ver}: \"${VERSION_MAP[$ver]}\""
     done
 } > "$VERSIONS_FILE"

This produces valid YAML that downstream consumers like yq can parse correctly.

⛔ Skipped due to learnings

Learnt from: NickVolynkin
Repo: cozystack/cozystack PR: 1117
File: packages/apps/mysql/Makefile:8-8
Timestamp: 2025-06-26T04:29:24.830Z
Learning: The cozystack project uses yq v4+ on their CI runner, so yq v4 syntax (-o json --indent 4) is compatible and version checks are not needed.