Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding domains field to auto-approval config #1013

Merged
merged 3 commits into from
Apr 25, 2024
Merged

Adding domains field to auto-approval config #1013

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fc70fa
Adding domains field to auto-approval config
dperaza4dustbit Apr 21, 2024
09b67fa
More description for Auto-approval changes
dperaza4dustbit Apr 24, 2024
a58053b
Merge branch 'master' into auto_aproval_api
MatousJobanek Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 9 additions & 31 deletions config/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,42 +47,20 @@ spec:
automaticApproval:
description: Keeps parameters necessary for automatic approval
properties:
domains:
description: 'Comma-separated email domains to consider for
auto-approval. For example: "domain.com,anotherdomain.org"
If domains is not set and enabled is true, it will default
to auto approving all authenticated emails. If domains is
set and enabled is true, it will allow auto approving only
for authenticated emails under the domains entered. If enabled
is false domains will be ignored.'
type: string
enabled:
description: Defines if the automatic approval is enabled
or not
type: boolean
type: object
capacityThresholds:
description: 'Keeps parameters necessary for configuring capacity
limits Deprecated: This is no longer used for anything.'
properties:
maxNumberOfSpacesPerMemberCluster:
additionalProperties:
type: integer
description: 'Contains a map of maximal number of spaces that
can be provisioned per member cluster mapped by the cluster
name Deprecated: This is no longer used for anything.'
type: object
x-kubernetes-map-type: atomic
resourceCapacityThreshold:
description: 'Contains capacity threshold configuration Deprecated:
This is no longer used for anything.'
properties:
defaultThreshold:
description: It is the default capacity threshold (in
percentage of usage) to be used for all member clusters
if no special threshold is defined
type: integer
specificPerMemberCluster:
additionalProperties:
type: integer
description: Contains a map of specific capacity thresholds
(in percentage of usage) for particular member clusters
mapped by their names
type: object
x-kubernetes-map-type: atomic
type: object
type: object
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was picked up when I rebased and generated CRD again. Looks to related to changes in this PR: https://github.com/codeready-toolchain/api/pull/411/files

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this PR needs to be merged before this one then I can rebase: https://github.com/codeready-toolchain/host-operator/pull/1000/files

deactivation:
description: Keeps parameters concerned with user deactivation
properties:
Expand Down
Loading