mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-12 23:54:01 +09:00
Myasnikov Daniil
0bfbff26ff
The isp-hosted preset shipped bundles.system.enabled: false with paas and
naas enabled. templates/bundles/system.yaml is gated end to end on that
flag, but it carries two separable things: a variant-selected data-plane
head (kubeovn/cilium/linstor on isp-full, a noop networking Package on
isp-hosted) and a variant-agnostic control-plane body — cozystack-engine,
the sole source of the application-definition-crd component, plus
cert-manager, prometheus-operator-crds, postgres-operator and
objectstorage-controller.
"Hosted" means the host already provides CNI, storage and virtualisation,
so only the data-plane head should be dropped. Disabling the whole bundle
also deleted the control-plane body, leaving an app catalog whose entire
dependency closure was absent: all 24 emitted Packages sat in
DependenciesNotReady, the *-rd HelmReleases failed with `no matches for
kind "ApplicationDefinition" in version "cozystack.io/v1alpha1"`, and the
cozystack-platform HelmRelease never went Ready. That the variant field
was still set to isp-hosted — and that system.yaml has an isp-hosted
branch which could never render — shows the disable was the mistake, not
the intent; iaas.yaml already refuses to render on this variant, encoding
the same "system bundle minus iaas" contract. The preset has never worked
since it was introduced in 2d022e38e.
Enable the system bundle for the preset. isp-hosted now emits 53 Packages
with every dependsOn satisfied, and installs 59 components against the 60
of the pre-refactor bundles/paas-hosted.yaml, with no LINSTOR, KubeVirt,
CAPI or Kamaji leakage.
Also move cozystack.bucket-application from the iaas bundle into the
system bundle. Its own dependsOn closure is networking,
objectstorage-controller and cozystack-engine, none of which are iaas, and
cozystack.backupstrategy-controller — a default package of the system
bundle — hard-depends on it. Any system-on/iaas-off configuration
therefore wedged backupstrategy-controller; both isp-full presets masked
this by enabling iaas.
Guard the class of bug rather than only these two instances. The existing
paas/naas/iaas guards check bundles.system.variant, which keeps its value
when the bundle is disabled, so they passed on exactly this
configuration. Make all three require bundles.system.enabled too and point
the operator at the supported topology, turning a silent multi-hour
DependenciesNotReady hang into a render-time failure.
Covered by two helm-unittest suites: one pinning the dependency closure
the catalog needs — including a case that loads values-isp-hosted.yaml
unmodified, so a regression in the preset itself is caught — and one
pinning the guards. The fix changes and the guards were mutation-tested by
reverting each in turn and confirming the suite fails.
This restores the dependency closure; it is not by itself sufficient for a
fully converged hosted install. Review surfaced further hosted-unaware
defaults that the dead bundle had been masking — notably apps/tenant
rendering cilium.io/v2 policies with no .Capabilities guard, and
extra/monitoring defaulting logsStorages to the LINSTOR-only "replicated"
StorageClass. Those are tracked separately. bundles.disabledPackages can
also still remove a dependency while its dependents stay emitted; the
guards do not cover that path.
Refs #3376
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
24 lines
993 B
YAML
24 lines
993 B
YAML
migrations:
|
|
enabled: true
|
|
bundles:
|
|
# The system bundle carries two things: a variant-selected data-plane head
|
|
# (kubeovn/cilium/linstor on isp-full, a noop networking Package here) and a
|
|
# variant-agnostic control-plane body (cozystack-engine — the sole source of
|
|
# the ApplicationDefinition CRD — plus cert-manager, prometheus-operator-crds,
|
|
# postgres-operator, objectstorage-controller and the *-application catalog).
|
|
# "Hosted" drops the data-plane head only: the host already provides CNI,
|
|
# storage and virtualisation. That is expressed by variant: isp-hosted, NOT by
|
|
# disabling the bundle — turning it off also deletes the control-plane body,
|
|
# which leaves every paas/naas application Package permanently
|
|
# DependenciesNotReady. iaas stays off; see templates/bundles/iaas.yaml, which
|
|
# refuses to render on this variant.
|
|
system:
|
|
enabled: true
|
|
variant: "isp-hosted"
|
|
iaas:
|
|
enabled: false
|
|
paas:
|
|
enabled: true
|
|
naas:
|
|
enabled: true
|