Skip to content

Commit 0bfc3a2

Browse files
authored
Merge pull request #43 from Svarrogh1337/chore/actions
chore(actions): fix action image
2 parents 7a059e3 + 390cd83 commit 0bfc3a2

7 files changed

Lines changed: 248 additions & 12 deletions

File tree

.github/workflows/check-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313

1414
jobs:
1515
commit_lint:
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
1919
with:

.github/workflows/diff.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
jobs:
1515
diff:
1616
name: diff
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
2020
with:

.github/workflows/docs-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ concurrency:
2020
jobs:
2121
spelling:
2222
name: Spell Check
23-
runs-on: ubuntu-20.04
23+
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
2626
with:

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ APIDOCS_GEN := $(shell pwd)/bin/crdoc
3030
APIDOCS_GEN_VERSION := latest
3131
apidocs-gen: ## Download crdoc locally if necessary.
3232
$(call go-install-tool,$(APIDOCS_GEN),fybrik.io/crdoc@$(APIDOCS_GEN_VERSION))
33-
33+
SPELL_CHECKER = npx spellchecker-cli
34+
docs-lint:
35+
cd content && $(SPELL_CHECKER) -f "*.md" "*/*.md" "!general/crds-apis.md" -d dictionary.txt
3436
# go-install-tool will 'go install' any package $2 and install it to $1.
3537
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
3638
define go-install-tool

content/dictionary.txt

Lines changed: 219 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
1+
ACL-filtered
2+
APIs
3+
Apache2
4+
Authenticator
5+
BYOD
6+
CLI
7+
CRD
8+
CRDs
9+
CRs
10+
CTO
11+
CVE-2021-25735
12+
CaaS
13+
CapsuleConfiguration
14+
CapsuleConfigurationSpec
15+
ClusterIP
16+
ClusterRole
17+
ClusterRoles
18+
ConfigMap
19+
Dependant
20+
Env
21+
ExternalName
22+
GitOps
23+
GitOps-ready
24+
GitOps-way
25+
GlobalTenantResource
26+
GlobalTenantResourceSpec
27+
GlobalTenantResourceStatus
28+
Golang
29+
Grafana
30+
HTTPS
31+
HostNetwork
32+
HostPort
33+
Hostname
34+
Hostnames
35+
IPBlock
36+
IPC
37+
IPs
38+
IngressClass
39+
IngressClasses
40+
JSON
41+
JWT
42+
Keycloak
43+
Kubebuilder
44+
Kubeconfig
45+
Kubernetes
46+
Kubernetes-native
47+
Kustomization
48+
Kustomization.
49+
Kustomizations
50+
Kustomize
51+
LimitRangeItem
52+
LimitRangeSpec
53+
LimitRanger
54+
LoadBalance
55+
LoadBalancer
56+
MTB
57+
MTB.
58+
Miscellanea
59+
MutatingAdmissionWebhook
60+
MutatingWebhookConfiguration
61+
Namespace
62+
Namespace-as-a-Service
63+
Namespace-level
64+
NamespaceSelector
65+
Namespaced-scope
66+
Namespaces
67+
NetworkPolicies
68+
NetworkPolicy
69+
NetworkPolicyEgressRule
70+
NetworkPolicyIngressRule
71+
NetworkPolicyPeer
72+
NetworkPolicyPort
73+
NetworkPolicySpec
74+
NetworkPolicySpec's
75+
NodePort
76+
NodeSelector
77+
OAuth
78+
OIDC
79+
OSS
80+
OpenSSL
81+
OwnerSpec
82+
PID
83+
PRs
84+
PV
85+
PVCs
86+
PVs
87+
PersistentVolume
88+
PersistentVolumeClaim
89+
PodNodeSelector
90+
PodSecurityPolicies
91+
PodSecurityPolicy
92+
PriorityClass
93+
PriorityClasses
94+
PromQL
95+
ProxySetting
96+
PullPolicy
97+
QoS
98+
RBAC
99+
README
100+
Reconciler
101+
Reconciler's
102+
ResourceQuota
103+
ResourceQuotaSpec
104+
Roadmap
105+
RoleBinding
106+
RuntimeClass
107+
RuntimeClasses
108+
SDK
109+
SRE
110+
SSD
111+
ScopeSelectorOperator
112+
ServiceAccount
113+
ServiceAccounts
114+
ServiceMonitor
115+
StorageClass
116+
StorageClasses
117+
TLS
118+
TLS-terminated
119+
TenantResource
120+
TenantResourceSpec
121+
TenantResourceStatus
122+
TenantSpec
123+
TenantStatus
124+
UI
125+
Uncordoning
126+
ValidatingAdmissionWebhook
127+
ValidatingWebhookConfiguration
128+
Velero
129+
Viceversa
130+
WG
131+
Webhook
132+
Webhooks
133+
Workqueue
134+
YAML
135+
additively
136+
backend
137+
balancers
138+
behaviour
139+
capsuleconfiguration
140+
clusterrole
141+
clusterrolebinding
142+
config
143+
cross-Namespace
144+
cross-namespace
145+
customizations
146+
datasource
147+
deletecollection
148+
e2e
149+
eg
150+
eg.
151+
endpointslice
152+
enum
153+
enums
154+
env
155+
etcd
156+
fastly
157+
favourite
158+
flux2-capsule-multi-tenancy
159+
flux2-multi-tenancy
160+
gitops-reconciler-kubeconfig
161+
goimports
162+
golangci-lint
163+
golint
164+
hostname
165+
hostnames
166+
imagePullPolicy
167+
init-time
168+
ipBlock
169+
k3d
170+
keycloak
171+
kubeconfig
172+
kubectl
173+
kubernetes
174+
kustomize
175+
labelled
176+
latencies
177+
lifecycle
178+
linters
179+
linux
180+
lockdown
181+
microservice
182+
multitenant
183+
naas
184+
namespace
185+
namespace-owner-reference
186+
namespaceSelector
187+
namespaced
188+
namespaces
189+
neighbour
190+
networkpolicies
191+
networkpolicy
192+
ngrok
193+
no-naas
194+
non-namespaced
195+
oauth2-proxy
196+
onboarded
197+
persistentvolumeclaims
198+
podSelector
199+
prepended
200+
priorityClasses
201+
radiuses
202+
reconcilers
203+
repo
204+
resync
205+
roadmap
206+
rolebinding
207+
rolebindings
208+
scopeSelector
209+
serviceaccount
210+
stateful
211+
uid
212+
unsetting
213+
v1alpha1
214+
v2
215+
webhook
216+
webhooks
217+
wontfix
218+
CNCF
219+
mb-4

content/en/docs/proxy/reference.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ GlobalProxySettingsSpec defines the desired state of GlobalProxySettings.
8282
| **apiGroups** | []string | APIGroups is the name of the APIGroup that contains the resources. If multiple API groups are specified, any action requested against any resource listed will be allowed. '*' represents all resources. Empty string represents v1 api resources. | true |
8383
| **resources** | []string | Resources is a list of resources this rule applies to. '*' represents all resources. | true |
8484
| **[selector](#globalproxysettingsspecrulesindexclusterresourcesindexselector)** | object | Select all cluster scoped resources with the given label selector.<br>Defining a selector which does not match any resources is considered not selectable (eg. using operation NotExists). | true |
85-
| **operations** | []enum | Operations which can be executed on the selected resources.<br>Deprecated: For all registered Routes only LIST ang GET requests will intercepted<br>Other permissions must be implemented via kubernetes native RBAC | false |
85+
| **operations** | []enum | Operations which can be executed on the selected resources.<br>Deprecated: For all registered Routes only LIST ang GET requests will intercepted<br>Other permissions must be implemented via kubernetes native RBAC<br/>*Enum*: List, Update, Delete<br/> | false |
8686

8787

8888
### GlobalProxySettings.spec.rules[index].clusterResources[index].selector
@@ -165,7 +165,7 @@ Resource is Namespace-scoped and applies the settings to the belonged Tenant.
165165
| **apiGroups** | []string | APIGroups is the name of the APIGroup that contains the resources. If multiple API groups are specified, any action requested against any resource listed will be allowed. '*' represents all resources. Empty string represents v1 api resources. | true |
166166
| **resources** | []string | Resources is a list of resources this rule applies to. '*' represents all resources. | true |
167167
| **[selector](#proxysettingspecsubjectsindexclusterresourcesindexselector)** | object | Select all cluster scoped resources with the given label selector.<br>Defining a selector which does not match any resources is considered not selectable (eg. using operation NotExists). | true |
168-
| **operations** | []enum | Operations which can be executed on the selected resources.<br>Deprecated: For all registered Routes only LIST ang GET requests will intercepted<br>Other permissions must be implemented via kubernetes native RBAC | false |
168+
| **operations** | []enum | Operations which can be executed on the selected resources.<br>Deprecated: For all registered Routes only LIST ang GET requests will intercepted<br>Other permissions must be implemented via kubernetes native RBAC<br/>*Enum*: List, Update, Delete<br/> | false |
169169

170170

171171
### ProxySetting.spec.subjects[index].clusterResources[index].selector
@@ -204,5 +204,5 @@ relates the key and values.
204204
| **Name** | **Type** | **Description** | **Required** |
205205
| :---- | :---- | :----------- | :-------- |
206206
| **kind** | enum | <br/>*Enum*: Nodes, StorageClasses, IngressClasses, PriorityClasses, RuntimeClasses, PersistentVolumes<br/> | true |
207-
| **operations** | []enum | | true |
207+
| **operations** | []enum | <br/>*Enum*: List, Update, Delete<br/> | true |
208208

content/en/docs/reference.md

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ CapsuleConfigurationSpec defines the Capsule configuration.
5555
| :---- | :---- | :----------- | :-------- |
5656
| **enableTLSReconciler** | boolean | Toggles the TLS reconciler, the controller that is able to generate CA and certificates for the webhooks<br>when not using an already provided CA and certificate, or when these are managed externally with Vault, or cert-manager.<br/>*Default*: true<br/> | true |
5757
| **forceTenantPrefix** | boolean | Enforces the Tenant owner, during Namespace creation, to name it using the selected Tenant name as prefix,<br>separated by a dash. This is useful to avoid Namespace name collision in a public CaaS environment.<br/>*Default*: false<br/> | false |
58+
| **ignoreUserWithGroups** | []string | Define groups which when found in the request of a user will be ignored by the Capsule<br>this might be useful if you have one group where all the users are in, but you want to separate administrators from normal users with additional groups. | false |
5859
| **[nodeMetadata](#capsuleconfigurationspecnodemetadata)** | object | Allows to set the forbidden metadata for the worker nodes that could be patched by a Tenant.<br>This applies only if the Tenant has an active NodeSelector, and the Owner have right to patch their nodes. | false |
5960
| **[overrides](#capsuleconfigurationspecoverrides)** | object | Allows to set different name rather than the canonical one for the Capsule configuration objects,<br>such as webhook secret or configurations.<br/>*Default*: map[TLSSecretName:capsule-tls mutatingWebhookConfigurationName:capsule-mutating-webhook-configuration validatingWebhookConfigurationName:capsule-validating-webhook-configuration]<br/> | false |
6061
| **protectedNamespaceRegex** | string | Disallow creation of namespaces, whose name matches this regexp | false |
61-
| **userGroups** | []string | Names of the groups for Capsule users.<br/>*Default*: [capsule.clastix.io]<br/> | false |
62+
| **userGroups** | []string | Names of the groups considered as Capsule users.<br/>*Default*: [capsule.clastix.io]<br/> | false |
63+
| **userNames** | []string | Names of the users considered as Capsule users. | false |
6264

6365

6466
### CapsuleConfiguration.spec.nodeMetadata
@@ -484,6 +486,7 @@ GlobalResourceQuotaStatus defines the observed state of GlobalResourceQuota.
484486
| **[allocation](#resourcepoolstatusallocation)** | object | Tracks the Usage from Claimed against what has been granted from the pool | false |
485487
| **claimCount** | integer | Amount of claims<br/>*Default*: 0<br/> | false |
486488
| **[claims](#resourcepoolstatusclaimskeyindex)** | map[string][]object | Tracks the quotas for the Resource. | false |
489+
| **[exhaustions](#resourcepoolstatusexhaustionskey)** | map[string]object | Exhaustions from claims associated with the pool | false |
487490
| **namespaceCount** | integer | How many namespaces are considered<br/>*Default*: 0<br/> | false |
488491
| **namespaces** | []string | Namespaces which are considered for claims | false |
489492

@@ -514,6 +517,18 @@ ResourceQuotaClaimStatus defines the observed state of ResourceQuotaClaim.
514517
| **namespace** | string | Namespace | false |
515518
| **uid** | string | UID of the tracked Tenant to pin point tracking | false |
516519

520+
521+
### ResourcePool.status.exhaustions[key]
522+
523+
524+
525+
526+
527+
| **Name** | **Type** | **Description** | **Required** |
528+
| :---- | :---- | :----------- | :-------- |
529+
| **available** | int or string | Available Resources to be claimed | false |
530+
| **requesting** | int or string | Requesting Resources | false |
531+
517532
## TenantResource
518533

519534

@@ -697,7 +712,7 @@ TenantSpec defines the desired state of Tenant.
697712
| **cordoned** | boolean | Toggling the Tenant resources cordoning, when enable resources cannot be deleted.<br/>*Default*: false<br/> | false |
698713
| **forceTenantPrefix** | boolean | Use this if you want to disable/enable the Tenant name prefix to specific Tenants, overriding global forceTenantPrefix in CapsuleConfiguration.<br>When set to 'true', it enforces Namespaces created for this Tenant to be named with the Tenant name prefix,<br>separated by a dash (i.e. for Tenant 'foo', namespace names must be prefixed with 'foo-'),<br>this is useful to avoid Namespace name collision.<br>When set to 'false', it allows Namespaces created for this Tenant to be named anything.<br>Overrides CapsuleConfiguration global forceTenantPrefix for the Tenant only.<br>If unset, Tenant uses CapsuleConfiguration's forceTenantPrefix<br>Optional | false |
699714
| **[gatewayOptions](#tenantspecgatewayoptions)** | object | Specifies options for the GatewayClass resources. | false |
700-
| **imagePullPolicies** | []enum | Specify the allowed values for the imagePullPolicies option in Pod resources. Capsule assures that all Pod resources created in the Tenant can use only one of the allowed policy. Optional. | false |
715+
| **imagePullPolicies** | []enum | Specify the allowed values for the imagePullPolicies option in Pod resources. Capsule assures that all Pod resources created in the Tenant can use only one of the allowed policy. Optional.<br/>*Enum*: Always, Never, IfNotPresent<br/> | false |
701716
| **[ingressOptions](#tenantspecingressoptions-1)** | object | Specifies options for the Ingress resources, such as allowed hostnames and IngressClass. Optional. | false |
702717
| **[limitRanges](#tenantspeclimitranges-1)** | object | Specifies the resource min/max usage restrictions to the Tenant. The assigned values are inherited by any namespace created in the Tenant. Optional. | false |
703718
| **[namespaceOptions](#tenantspecnamespaceoptions-1)** | object | Specifies options for the Namespaces, such as additional metadata or maximum number of namespaces allowed for that Tenant. Once the namespace quota assigned to the Tenant has been reached, the Tenant owner cannot create further namespaces. Optional. | false |
@@ -735,7 +750,7 @@ TenantSpec defines the desired state of Tenant.
735750
| **Name** | **Type** | **Description** | **Required** |
736751
| :---- | :---- | :----------- | :-------- |
737752
| **kind** | enum | <br/>*Enum*: Nodes, StorageClasses, IngressClasses, PriorityClasses, RuntimeClasses, PersistentVolumes<br/> | true |
738-
| **operations** | []enum | | true |
753+
| **operations** | []enum | <br/>*Enum*: List, Update, Delete<br/> | true |
739754

740755

741756
### Tenant.spec.additionalRoleBindings[index]
@@ -1585,7 +1600,7 @@ TenantSpec defines the desired state of Tenant.
15851600
| **[owners](#tenantspecownersindex)** | []object | Specifies the owners of the Tenant. Mandatory. | true |
15861601
| **[additionalRoleBindings](#tenantspecadditionalrolebindingsindex)** | []object | Specifies additional RoleBindings assigned to the Tenant. Capsule will ensure that all namespaces in the Tenant always contain the RoleBinding for the given ClusterRole. Optional. | false |
15871602
| **[containerRegistries](#tenantspeccontainerregistries)** | object | Specifies the trusted Image Registries assigned to the Tenant. Capsule assures that all Pods resources created in the Tenant can use only one of the allowed trusted registries. Optional. | false |
1588-
| **imagePullPolicies** | []enum | Specify the allowed values for the imagePullPolicies option in Pod resources. Capsule assures that all Pod resources created in the Tenant can use only one of the allowed policy. Optional. | false |
1603+
| **imagePullPolicies** | []enum | Specify the allowed values for the imagePullPolicies option in Pod resources. Capsule assures that all Pod resources created in the Tenant can use only one of the allowed policy. Optional.<br/>*Enum*: Always, Never, IfNotPresent<br/> | false |
15891604
| **[ingressOptions](#tenantspecingressoptions)** | object | Specifies options for the Ingress resources, such as allowed hostnames and IngressClass. Optional. | false |
15901605
| **[limitRanges](#tenantspeclimitranges)** | object | Specifies the resource min/max usage restrictions to the Tenant. The assigned values are inherited by any namespace created in the Tenant. Optional. | false |
15911606
| **[namespaceOptions](#tenantspecnamespaceoptions)** | object | Specifies options for the Namespaces, such as additional metadata or maximum number of namespaces allowed for that Tenant. Once the namespace quota assigned to the Tenant has been reached, the Tenant owner cannot create further namespaces. Optional. | false |
@@ -1619,7 +1634,7 @@ TenantSpec defines the desired state of Tenant.
16191634
| **Name** | **Type** | **Description** | **Required** |
16201635
| :---- | :---- | :----------- | :-------- |
16211636
| **kind** | enum | <br/>*Enum*: Nodes, StorageClasses, IngressClasses, PriorityClasses<br/> | true |
1622-
| **operations** | []enum | | true |
1637+
| **operations** | []enum | <br/>*Enum*: List, Update, Delete<br/> | true |
16231638

16241639

16251640
### Tenant.spec.additionalRoleBindings[index]

0 commit comments

Comments
 (0)