NO-ISSUE: Use max to calculate operator resources

[jhernand]

Currently the logic used to calculate resources for operators is like this:

def resource_param(base_value: int, resource_name: str, operator: str, is_sno: bool = False):
    try:
        value = base_value
        resource = consts.OperatorResource.values(is_sno)[operator][resource_name]
        if value <= resource:
            value = value + resource
        return value
     except KeyError as e:
         raise ValueError(f"Unknown operator name {e.args[0]}") from e

For example, the default for resource worker_count is 2, and with this logic there is no way to specify that 3 workers are required:

Default	Operator	Result
2	0	2
2	1	2
2	2	4
2	3	5
2	4	6

As you can see the actual value jumps from 2 to 4, and there is no way to get 3 as the result, no mather what is the requirement of the operator.

The same happens for other resources, like memory or CPU.

It would be more useful to calculate the actual value as the maximum of the default and the value required by the operator. This is what this patch does.

[openshift-ci-robot]

@jhernand: This pull request explicitly references no jira issue.

In response to this:

Currently the logic used to calculate resources for operators is like this:

def resource_param(base_value: int, resource_name: str, operator: str, is_sno: bool = False):
   try:
       value = base_value
       resource = consts.OperatorResource.values(is_sno)[operator][resource_name]
       if value <= resource:
           value = value + resource
       return value
    except KeyError as e:
        raise ValueError(f"Unknown operator name {e.args[0]}") from e

For example, the default for resource worker_count is 2, and with this logic there is no way to specify that 3 workers are required:

Default	Operator	Result
2	0	2
2	1	2
2	2	4
2	3	5
2	4	6

As you can see the actual value jumps from 2 to 4, and there is no way to get 3 as the result, no mather what is the requirement of the operator.

The same happens for other resources, like memory or CPU.

It would be more useful to calculate the actual value as the maximum of the default and the value required by the operator. This is what this patch does.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jhernand
Once this PR has been reviewed and has the lgtm label, please assign adriengentil for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci]

@jhernand: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-metal-assisted-kube-api-late-binding-single-node	4c65110	link	false	/test e2e-metal-assisted-kube-api-late-binding-single-node

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.