Skip to content

Commit

Permalink
feat(manager): add forbidden annotations, forbidden labels to service…
Browse files Browse the repository at this point in the history 
… options

Signed-off-by: Siarhei Rasiukevich <s.rasiukevich@gmail.com>
  • Loading branch information
@CharlieR-o-o-t @prometherion
CharlieR-o-o-t authored and prometherion committed Nov 24, 2023
1 parent 8695dfb commit b27780d
Show file tree
Hide file tree
Showing 12 changed files with 658 additions and 104 deletions.
22 changes: 22 additions & 0 deletions charts/capsule/crds/tenant-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3133,6 +3133,28 @@ spec:
type: string
type: object
type: object
forbiddenAnnotations:
description: Define the annotations that a Tenant Owner cannot
set for their Service resources.
properties:
denied:
items:
type: string
type: array
deniedRegex:
type: string
type: object
forbiddenLabels:
description: Define the labels that a Tenant Owner cannot set
for their Service resources.
properties:
denied:
items:
type: string
type: array
deniedRegex:
type: string
type: object
allowedServices:
description: Block or deny certain type of Services. Optional.
properties:
Expand Down
44 changes: 44 additions & 0 deletions config/crd/bases/capsule.clastix.io_tenants.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1873,6 +1873,28 @@ spec:
required:
- allowed
type: object
forbiddenAnnotations:
description: Define the annotations that a Tenant Owner cannot
set for their Service resources.
properties:
denied:
items:
type: string
type: array
deniedRegex:
type: string
type: object
forbiddenLabels:
description: Define the labels that a Tenant Owner cannot set
for their Service resources.
properties:
denied:
items:
type: string
type: array
deniedRegex:
type: string
type: object
type: object
storageClasses:
description: Specifies the allowed StorageClasses assigned to the
Expand Down Expand Up @@ -3125,6 +3147,28 @@ spec:
required:
- allowed
type: object
forbiddenAnnotations:
description: Define the annotations that a Tenant Owner cannot
set for their Service resources.
properties:
denied:
items:
type: string
type: array
deniedRegex:
type: string
type: object
forbiddenLabels:
description: Define the labels that a Tenant Owner cannot set
for their Service resources.
properties:
denied:
items:
type: string
type: array
deniedRegex:
type: string
type: object
type: object
storageClasses:
description: Specifies the allowed StorageClasses assigned to the
Expand Down
160 changes: 160 additions & 0 deletions docs/content/general/crds-apis.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4822,6 +4822,20 @@ Specifies options for the Service, such as additional metadata or block of certa
Specifies the external IPs that can be used in Services with type ClusterIP. An empty list means no IPs are allowed. Optional.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#tenantspecserviceoptionsforbiddenannotations-1">forbiddenAnnotations</a></b></td>
<td>object</td>
<td>
Define the annotations that a Tenant Owner cannot set for their Service resources.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#tenantspecserviceoptionsforbiddenlabels-1">forbiddenLabels</a></b></td>
<td>object</td>
<td>
Define the labels that a Tenant Owner cannot set for their Service resources.<br/>
</td>
<td>false</td>
</tr></tbody>
</table>

Expand Down Expand Up @@ -4931,6 +4945,72 @@ Specifies the external IPs that can be used in Services with type ClusterIP. An
</table>


### Tenant.spec.serviceOptions.forbiddenAnnotations



Define the annotations that a Tenant Owner cannot set for their Service resources.

<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>denied</b></td>
<td>[]string</td>
<td>
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>deniedRegex</b></td>
<td>string</td>
<td>
<br/>
</td>
<td>false</td>
</tr></tbody>
</table>


### Tenant.spec.serviceOptions.forbiddenLabels



Define the labels that a Tenant Owner cannot set for their Service resources.

<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>denied</b></td>
<td>[]string</td>
<td>
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>deniedRegex</b></td>
<td>string</td>
<td>
<br/>
</td>
<td>false</td>
</tr></tbody>
</table>


### Tenant.spec.storageClasses


Expand Down Expand Up @@ -6681,6 +6761,20 @@ Specifies options for the Service, such as additional metadata or block of certa
Specifies the external IPs that can be used in Services with type ClusterIP. An empty list means no IPs are allowed. Optional.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#tenantspecserviceoptionsforbiddenannotations">forbiddenAnnotations</a></b></td>
<td>object</td>
<td>
Define the annotations that a Tenant Owner cannot set for their Service resources.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#tenantspecserviceoptionsforbiddenlabels">forbiddenLabels</a></b></td>
<td>object</td>
<td>
Define the labels that a Tenant Owner cannot set for their Service resources.<br/>
</td>
<td>false</td>
</tr></tbody>
</table>

Expand Down Expand Up @@ -6790,6 +6884,72 @@ Specifies the external IPs that can be used in Services with type ClusterIP. An
</table>


### Tenant.spec.serviceOptions.forbiddenAnnotations



Define the annotations that a Tenant Owner cannot set for their Service resources.

<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>denied</b></td>
<td>[]string</td>
<td>
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>deniedRegex</b></td>
<td>string</td>
<td>
<br/>
</td>
<td>false</td>
</tr></tbody>
</table>


### Tenant.spec.serviceOptions.forbiddenLabels



Define the labels that a Tenant Owner cannot set for their Service resources.

<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Required</th>
</tr>
</thead>
<tbody><tr>
<td><b>denied</b></td>
<td>[]string</td>
<td>
<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>deniedRegex</b></td>
<td>string</td>
<td>
<br/>
</td>
<td>false</td>
</tr></tbody>
</table>


### Tenant.spec.storageClasses


Expand Down
Loading

0 comments on commit b27780d

Please sign in to comment.