Skip to content

Commit fd2d995

Browse files
fix(values): correct installation values (#53)
Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>
1 parent a2d981b commit fd2d995

2 files changed

Lines changed: 34 additions & 27 deletions

File tree

content/en/docs/operating/setup/installation.md

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ Generally we recommend to use [matchconditions](https://kubernetes.io/docs/refer
8888
8989
#### Nodes
9090
91-
There is a webhook which catches interactions with the Node resource. This Webhook is mainly interesting, when you make use of [Node Metadata](/docs/tenants/enforcement/#nodes). In any other case it will just case you problems. By default the webhook is enabled, but you can disable it by setting the following value:
91+
There is a webhook which catches interactions with the Node resource. This Webhook is mainly interesting, when you make use of [Node Metadata](/docs/tenants/enforcement/#nodes). In any other case it will just case you problems. By default the webhook is **disabled**, but you can enabled it by setting the following value:
9292
9393
```yaml
9494
webhooks:
9595
hooks:
9696
nodes:
97-
enabled: false
97+
enabled: true
9898
```
9999
100-
Or you could at least consider to set the failure policy to `Ignore`:
100+
Or you could at least consider to set the failure policy to `Ignore`, if you don't want to disrupt critical nodes:
101101

102102
```yaml
103103
webhooks:
@@ -132,10 +132,6 @@ webhooks:
132132
expression: '!("system:serviceaccounts:kube-system" in request.userInfo.groups)'
133133
```
134134

135-
## Compatibility
136-
137-
The Kubernetes compatibility is announced for each [Release](https://github.com/projectcapsule/capsule/releases). Generally we are up to date with the latest upstream Kubernetes Version. Note that the Capsule project offers support only for the latest minor version of Kubernetes. Backwards compatibility with older versions of Kubernetes and OpenShift is offered by [vendors](/support/).
138-
139135
## GitOps
140136

141137
There are no specific requirements for using Capsule with GitOps tools like ArgoCD or FluxCD. You can manage Capsule resources as you would with any other Kubernetes resource.
@@ -186,14 +182,13 @@ spec:
186182
capsuleUserGroups:
187183
- oidc:kubernetes-users
188184
- system:serviceaccounts:capsule-argo-addon
189-
webhooks:
190-
hooks:
191-
nodes:
192-
failurePolicy: Ignore
193-
serviceMonitor:
194-
enabled: true
195-
annotations:
196-
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
185+
monitoring:
186+
dashboards:
187+
enabled: true
188+
serviceMonitor:
189+
enabled: true
190+
annotations:
191+
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
197192
proxy:
198193
enabled: true
199194
webhooks:
@@ -263,7 +258,7 @@ spec:
263258
chart:
264259
spec:
265260
chart: capsule
266-
version: "0.10.6"
261+
version: "0.11.0"
267262
sourceRef:
268263
kind: HelmRepository
269264
name: capsule
@@ -291,12 +286,11 @@ spec:
291286
capsuleUserGroups:
292287
- oidc:kubernetes-users
293288
- system:serviceaccounts:capsule-argo-addon
294-
webhooks:
295-
hooks:
296-
nodes:
297-
failurePolicy: Ignore
298-
serviceMonitor:
299-
enabled: true
289+
monitoring:
290+
dashboards:
291+
enabled: true
292+
serviceMonitor:
293+
enabled: true
300294
proxy:
301295
enabled: true
302296
webhooks:
@@ -387,3 +381,7 @@ To inspect the SBOM of the docker image, run the following command. Replace `<re
387381
To inspect the SBOM of the helm image, run the following command. Replace `<release_tag>` with an [available release tag](https://github.com/projectcapsule/capsule/pkgs/container/charts%2Fcapsule):
388382

389383
COSIGN_REPOSITORY=ghcr.io/projectcapsule/charts/capsule cosign download sbom ghcr.io/projectcapsule/charts/capsule:<release_tag>
384+
385+
## Compatibility
386+
387+
The Kubernetes compatibility is announced for each [Release](https://github.com/projectcapsule/capsule/releases). Generally we are up to date with the latest upstream Kubernetes Version. Note that the Capsule project offers support only for the latest minor version of Kubernetes. Backwards compatibility with older versions of Kubernetes and OpenShift is offered by [vendors](/support/).

content/en/docs/tenants/permissions.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ spec:
216216
- capsule-namespace-deleter
217217
kind: User
218218
name: alice
219+
labels:
220+
projectcapsule.dev/sample: "true"
221+
annotations:
222+
projectcapsule.dev/sample: "true"
219223
resourceQuotas:
220224
scope: Tenant
221225
status:
@@ -248,6 +252,9 @@ items:
248252
labels:
249253
capsule.clastix.io/role-binding: 8fb969aaa7a67b71
250254
capsule.clastix.io/tenant: solar
255+
projectcapsule.dev/sample: "true"
256+
annotations:
257+
projectcapsule.dev/sample: "true"
251258
name: capsule-solar-0-admin
252259
namespace: solar-production
253260
ownerReferences:
@@ -274,6 +281,9 @@ items:
274281
labels:
275282
capsule.clastix.io/role-binding: b8822dde20953fb1
276283
capsule.clastix.io/tenant: solar
284+
projectcapsule.dev/sample: "true"
285+
annotations:
286+
projectcapsule.dev/sample: "true"
277287
name: capsule-solar-1-capsule-namespace-deleter
278288
namespace: solar-production
279289
ownerReferences:
@@ -457,6 +467,10 @@ spec:
457467
- apiGroup: rbac.authorization.k8s.io
458468
kind: User
459469
name: joe
470+
labels:
471+
projectcapsule.dev/sample: "true"
472+
annotations:
473+
projectcapsule.dev/sample: "true"
460474
EOF
461475
```
462476

@@ -536,8 +550,3 @@ roleRef:
536550
With the above example, Capsule is leaving the tenant owner to create namespaced custom resources.
537551

538552
> Take Note: a tenant owner having the admin scope on its namespaces only, does not have the permission to create Custom Resources Definitions (CRDs) because this requires a cluster admin permission level. Only Bill, the cluster admin, can create CRDs. This is a known limitation of any multi-tenancy environment based on a single shared control plane.
539-
540-
541-
542-
543-

0 commit comments

Comments
 (0)