mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-21 12:13:55 +09:00
Phase 2 moved worker nodeGroups out of apps/kubernetes into apps/kubernetes-nodes, but the ComputePlane module still passed nodeGroups to the wrapped kubernetes chart, which now ignores it: a fresh ComputePlane cluster came up with zero workers (and the pinned ingress-nginx addon stuck Pending), while existing ones were unreachable by migration 56 (it only adopts kubernetes-* releases, not computeplane-cluster). The module now emits one kubernetes-nodes child HelmRelease per nodeGroup, shaped like a natively created pool, and materialises the pre-split default md0 (roles: [ingress-nginx]) when nodeGroups is empty. The pool chart's clusterName gains an internal clusterReleaseName override so pools attach to the module's fixed computeplane-cluster release, which is off the aggregated API's kubernetes-<cluster> convention; the default keeps every API-created pool byte-identical. Signed-off-by: IvanHunters <xorokhotnikov@gmail.com>
58 lines
2.6 KiB
YAML
58 lines
2.6 KiB
YAML
---
|
|
apiVersion: cozystack.io/v1alpha1
|
|
kind: PackageSource
|
|
metadata:
|
|
name: cozystack.computeplane-application
|
|
spec:
|
|
sourceRef:
|
|
kind: OCIRepository
|
|
name: cozystack-packages
|
|
namespace: cozy-system
|
|
path: /
|
|
variants:
|
|
# The variant mirrors the kubernetes-application variant whose chart it
|
|
# re-sources: the wrapped cluster substrate is the kubevirt flavour of
|
|
# apps/kubernetes, and the artifact naming contract
|
|
# (cozystack-computeplane-application-kubevirt-*) carries that provenance.
|
|
# A future non-kubevirt substrate would arrive as a sibling variant.
|
|
- name: kubevirt
|
|
# Variant dependsOn gates only the components that carry an install:
|
|
# block — here computeplane-rd alone. cozystack-engine serves the
|
|
# ApplicationDefinition CRD that computeplane-rd installs; the
|
|
# kubernetes-application edge orders that install after the kubernetes
|
|
# machinery (CAPI providers, Kamaji, the addon artifacts) is present, so
|
|
# the ComputePlane kind is not registered — and cannot be instantiated —
|
|
# on a cluster that lacks what it provisions.
|
|
dependsOn:
|
|
- cozystack.cozystack-engine
|
|
- cozystack.kubernetes-application
|
|
libraries:
|
|
- name: cozy-lib
|
|
path: library/cozy-lib
|
|
components:
|
|
# The ComputePlane module chart (tenant module, source-only): rendered
|
|
# into the tenant namespace by the tenant chart when the module is on.
|
|
- name: computeplane
|
|
path: extra/computeplane
|
|
# The ordinary managed-kubernetes app, re-declared source-only under
|
|
# this package's own scope (cozystack-computeplane-application-kubevirt-kubernetes)
|
|
# so the module is self-contained and does not reach into another
|
|
# package's artifacts for the cluster chart itself.
|
|
- name: kubernetes
|
|
path: apps/kubernetes
|
|
libraries: ["cozy-lib"]
|
|
# The worker-pool chart, likewise re-declared source-only under this
|
|
# package's own scope (cozystack-computeplane-application-kubevirt-kubernetes-nodes).
|
|
# Since Phase 2 split worker pools out of apps/kubernetes, the module
|
|
# renders one child HelmRelease per nodeGroup against this artifact
|
|
# (see extra/computeplane/templates/cluster.yaml); keeping it in-scope
|
|
# preserves the same self-containment as the cluster chart above.
|
|
- name: kubernetes-nodes
|
|
path: apps/kubernetes-nodes
|
|
libraries: ["cozy-lib"]
|
|
- name: computeplane-rd
|
|
path: system/computeplane-rd
|
|
install:
|
|
namespace: cozy-system
|
|
releaseName: computeplane-rd
|