diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c0d1600..30f6b44 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,15 @@ cozystack.installer Release Notes Unreleased ========== +- The role docs list the minimal platform variants for + ``cozystack_platform_variant``: + ``isp-slim``, ``isp-slim-generic`` and ``isp-hosted-slim``. They need a + Cozystack release that includes cozystack/cozystack#4595. On + generic Linux use ``isp-slim-generic``: it installs the base platform + only, networking is Cilium without Kube-OVN, and the pod CIDR comes + from k3s. The chart ignores ``cozystack_pod_cidr``, + ``cozystack_pod_gateway``, ``cozystack_svc_cidr`` and + ``cozystack_join_cidr`` there. - CI: new ``hack/check-versions.sh`` invariant check runs in the ``Lint`` job and fails the build if version strings drift across the three tracked dependencies: the ``cozy-installer`` chart version must match diff --git a/README.md b/README.md index 01c33aa..9f23e9a 100644 --- a/README.md +++ b/README.md @@ -323,7 +323,7 @@ cluster-cidr: 10.42.0.0/16 service-cidr: 10.43.0.0/16 ``` -These CIDRs are the k3s defaults. The example clusters set them via the `server_config_yaml` variable consumed by `k3s.orchestration`, defined in `examples//inventory.yml`. The role variables `cozystack_pod_cidr` and `cozystack_svc_cidr` must match — they default to the same values. +These CIDRs are the k3s defaults. The example clusters set them via the `server_config_yaml` variable consumed by `k3s.orchestration`, defined in `examples//inventory.yml`. The role variables `cozystack_pod_cidr` and `cozystack_svc_cidr` must match — they default to the same values. On isp-slim-generic, the slim variant for k3s, the chart ignores both: Cilium takes pod ranges from k3s. ## Installation @@ -407,7 +407,7 @@ Runs on `server[0]` only. | `cozystack_helm_version` | `3.20.0` | Helm binary version to install | | `cozystack_helm_binary` | `/usr/local/bin/helm` | Path to Helm binary on target | | `cozystack_create_platform_package` | `true` | Create Platform Package CR after install | -| `cozystack_platform_variant` | `isp-full-generic` | Platform variant: default, isp-full, isp-hosted, isp-full-generic | +| `cozystack_platform_variant` | `isp-full-generic` | Platform variant: default, isp-full, isp-hosted, isp-full-generic. Cozystack releases that include cozystack/cozystack#4595 also accept isp-slim-generic (the minimal variant for k3s), isp-slim (its Talos counterpart) and isp-hosted-slim. | | `cozystack_root_host` | `""` | Domain for Cozystack services (empty = skip publishing) | | `cozystack_external_ips` | `[]` | List of external IPs for ingress-nginx Service. Required on platforms without a native LB (cloud VMs, bare metal). Each entry must be a valid IPv4/IPv6 address. | | `cozystack_tenant_root_ingress` | `false` | Enable ingress on the root tenant. When `true`, patches the root Tenant CR after Platform Package apply to create IngressClass and ingress-nginx controller. | diff --git a/roles/cozystack/defaults/main.yml b/roles/cozystack/defaults/main.yml index f7670ee..1171099 100644 --- a/roles/cozystack/defaults/main.yml +++ b/roles/cozystack/defaults/main.yml @@ -50,7 +50,14 @@ cozystack_helm_diff_version: "3.12.5" cozystack_create_platform_package: true # Platform Package variant (determines which platform components are deployed) -# Available: default, isp-full, isp-hosted, isp-full-generic +# Available: default, isp-full, isp-hosted, isp-full-generic. +# Newer Cozystack releases also ship isp-slim, isp-slim-generic and +# isp-hosted-slim (added by cozystack/cozystack#4595). +# They install the base platform only. isp-slim-generic is the one for +# k3s; isp-slim is its Talos counterpart. Both run Cilium without +# Kube-OVN, and isp-hosted-slim uses the host CNI, +# so the chart ignores cozystack_pod_cidr, cozystack_pod_gateway, +# cozystack_svc_cidr and cozystack_join_cidr there. cozystack_platform_variant: "isp-full-generic" # Domain for Cozystack services (dashboard, grafana, etc.)