From 4fc70fa39ca88d3bbb12c312b542e26f3320de5f Mon Sep 17 00:00:00 2001 From: David Peraza Date: Sun, 21 Apr 2024 15:58:25 -0400 Subject: [PATCH 1/2] Adding domains field to auto-approval config Implements: ASC-444 Signed-off-by: David Peraza --- .../bases/toolchain.dev.openshift.com_toolchainconfigs.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yaml b/config/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yaml index b21b922d6..8d8651b7f 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yaml @@ -47,6 +47,10 @@ spec: automaticApproval: description: Keeps parameters necessary for automatic approval properties: + domains: + description: 'Comma-separated email domains to consider for + auto-approval. For example: "redhat.com,ibm.com"' + type: string enabled: description: Defines if the automatic approval is enabled or not From 09b67fa89a961edb6935a55244c66f5e2b1915c9 Mon Sep 17 00:00:00 2001 From: David Peraza Date: Wed, 24 Apr 2024 14:35:28 -0400 Subject: [PATCH 2/2] More description for Auto-approval changes Signed-off-by: David Peraza --- ...in.dev.openshift.com_toolchainconfigs.yaml | 38 +++---------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/config/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yaml b/config/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yaml index 8d8651b7f..457d650f2 100644 --- a/config/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yaml +++ b/config/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yaml @@ -49,44 +49,18 @@ spec: properties: domains: description: 'Comma-separated email domains to consider for - auto-approval. For example: "redhat.com,ibm.com"' + 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 deactivation: description: Keeps parameters concerned with user deactivation properties: