You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit d1dddd7
Browse filesBrowse the repository at this point in the historyBrowse files
Gate the Proxied ingress Service on _namespace.etcd like the addon
HelmRelease it fronts, so an etcd-less tenant with the addon pinned on does
not get a selector-less Service (+ test). Correct the secrets framing: the
tenant-visible surface is an allowlist (include: [] withholds everything),
so drop the never-load-bearing exclude entry, the bats cross-check and the
rename-coupling comments, and state the real mechanism. Fix the etcd
prerequisite docs (an ancestor's etcd satisfies the wrapped chart; the
awaiting-etcd beacon is the diagnostic), reword the tenant toggle to stop
advertising the not-yet-shipped placement routing, require maxReplicas >= 1
on the ingress-role node group, and fix comment drift (Service name after
the release rename, placement-hook label, package-guard lookup semantics).
Assisted-By: Claude <[email protected]>
Signed-off-by: Andrei Kvapil <[email protected]>
Copy file name to clipboardExpand all lines: packages/apps/tenant/README.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -82,7 +82,7 @@ tenant-u1
82
82
|`ingress`| Deploy own Ingress Controller. |`bool`|`false`|
83
83
|`gateway`| Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default), the chart auto-enables the Gateway for tenants whose apex is derived from the parent (i.e. `host` is empty), and leaves it off for tenants with a custom non-derived apex. Set to `true` or `false` explicitly to override that auto-behaviour. Note: leave the key absent (do not write `gateway: null`) — the chart distinguishes "unset" via missing-key, not via null value, to satisfy the JSON schema generated from this comment. |`bool`|`false`|
84
84
|`seaweedfs`| Deploy own SeaweedFS. |`bool`|`false`|
85
-
|`computeplane`| Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. Applications with placement: ComputePlane are routed onto it. The tenant receives no admin kubeconfig for it. See design-proposals/compute-plane in cozystack/community. |`bool`|`false`|
85
+
|`computeplane`| Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. The tenant receives no admin kubeconfig for it. Automatic routing of catalog applications onto it (placement: ComputePlane) is a planned follow-up and is not available yet; until it lands, external catalogs target the cluster via its computeplane-cluster-admin-kubeconfig Secret. See design-proposals/compute-plane in cozystack/community.|`bool`|`false`|
86
86
|`schedulingClass`| The name of a SchedulingClass CR to apply scheduling constraints for this tenant's workloads. |`string`|`""`|
87
87
|`resourceQuotas`| Define resource quotas for the tenant. |`map[string]quantity`|`{}`|
Copy file name to clipboardExpand all lines: packages/apps/tenant/values.schema.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -32,7 +32,7 @@
32
32
"default": false
33
33
},
34
34
"computeplane": {
35
-
"description": "Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. Applications with placement: ComputePlane are routed onto it. The tenant receives no admin kubeconfig for it. See design-proposals/compute-plane in cozystack/community.",
35
+
"description": "Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. The tenant receives no admin kubeconfig for it. Automatic routing of catalog applications onto it (placement: ComputePlane) is a planned follow-up and is not available yet; until it lands, external catalogs target the cluster via its computeplane-cluster-admin-kubeconfig Secret. See design-proposals/compute-plane in cozystack/community.",
Copy file name to clipboardExpand all lines: packages/apps/tenant/values.yaml
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -19,7 +19,7 @@ ingress: false
19
19
## @param {bool} seaweedfs - Deploy own SeaweedFS.
20
20
seaweedfs: false
21
21
22
-
## @param {bool} computeplane - Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. Applications with placement: ComputePlane are routed onto it. The tenant receives no admin kubeconfig for it. See design-proposals/compute-plane in cozystack/community.
22
+
## @param {bool} computeplane - Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. The tenant receives no admin kubeconfig for it. Automatic routing of catalog applications onto it (placement: ComputePlane) is a planned follow-up and is not available yet; until it lands, external catalogs target the cluster via its computeplane-cluster-admin-kubeconfig Secret. See design-proposals/compute-plane in cozystack/community.
23
23
computeplane: false
24
24
25
25
## @param {string} [schedulingClass] - The name of a SchedulingClass CR to apply scheduling constraints for this tenant's workloads.
Copy file name to clipboardExpand all lines: packages/extra/computeplane/templates/cluster.yaml
+12-7Lines changed: 12 additions & 7 deletions
Original file line number
Diff line number
Diff line change
@@ -16,9 +16,10 @@
16
16
Kamaji therefore writes the cluster's admin kubeconfig to the Secret
17
17
`computeplane-cluster-admin-kubeconfig`(key super-admin.svc) — the derived
18
18
contract consumed by the HelmReleases of `placement: ComputePlane`
19
-
applications, and the exact name computeplane-rd withholds from
20
-
tenant-visible secrets. Renaming this object renames the Secret and breaks
21
-
both; don't.
19
+
applications. The tenant never sees it: tenant-visible secrets are an
20
+
allowlist (computeplane-rd declares include: [], which withholds
21
+
everything), so the withholding is rename-proof by construction. Renaming
22
+
this object still renames the Secret and dangles every consumer; don't.
22
23
23
24
Everything security-relevant is fixed here and unreachable by the tenant:
24
25
the tenant holds no admin kubeconfig for this cluster and the module exposes
@@ -41,12 +42,12 @@
41
42
{{- if .Values.nodeGroups }}
42
43
{{- $hasIngressRole := false }}
43
44
{{- range $name, $group := .Values.nodeGroups }}
44
-
{{- if has "ingress-nginx" (default (list) $group.roles) }}
45
+
{{- if and (has "ingress-nginx" (default (list) $group.roles)) (gt (int (default 0 $group.maxReplicas)) 0) }}
45
46
{{- $hasIngressRole = true }}
46
47
{{- end }}
47
48
{{- end }}
48
49
{{- if not $hasIngressRole }}
49
-
{{- fail "computeplane: at least one nodeGroup must carry roles: [ingress-nginx] — the module pins the ingress-nginx addon on, and its controller only schedules onto ingress-nginx nodes" }}
50
+
{{- fail "computeplane: at least one nodeGroup must carry roles: [ingress-nginx] with maxReplicas >= 1 — the module pins the ingress-nginx addon on, and its controller only schedules onto ingress-nginx nodes" }}
50
51
{{- end }}
51
52
{{- end }}
52
53
apiVersion: helm.toolkit.fluxcd.io/v2
@@ -55,6 +56,9 @@ metadata:
55
56
name: computeplane-cluster
56
57
labels:
57
58
sharding.fluxcd.io/key: tenants
59
+
# No in-tree reader yet: this is the selector hook for the deferred
60
+
# placement: ComputePlane routing in cozystack-api (and for operators
61
+
# locating ComputePlane cluster releases) — do not remove as dead.
58
62
internal.cozystack.io/computeplane: "true"
59
63
spec:
60
64
chartRef:
@@ -102,8 +106,9 @@ spec:
102
106
enabled: true
103
107
# Expose the ComputePlane ingress-nginx via the Proxied NodePort Service so a
104
108
# ComputePlane app's per-app management Ingress can route to it without a
105
-
# management LoadBalancer. The Service (computeplane-ingress-nginx) is created
106
-
# whenever exposeMethod is Proxied, independent of any hosts list.
109
+
# management LoadBalancer. The Service (computeplane-cluster-ingress-nginx,
110
+
# named after the cluster release) is created whenever the addon is enabled
111
+
# with exposeMethod Proxied, independent of any hosts list.
0 commit comments