Adding method from cvo for capabilities

[LalatenduMohanty]

Moving include() method from CVO

as the code will be reused in OC CLI and CVO. The include() method currently exists in https://github.com/openshift/cluster-version-operator/blob/master/pkg/payload/payload.go#L221 and will be replaced by the code from library-go in future.

[LalatenduMohanty]

/test unit

[jottofar]

With the proposed change to not filter on capabilities at load time but rather at apply time I changed include to return the capabilities from a given manifest or an error if an unknown capability is found. That then also replaces method CheckResourceEnablement with GetResourceCapabilities. Like so:

func include(excludeIdentifier string, includeTechPreview bool, profile string, capabilities capability.ClusterCapabilities, manifest *manifest.Manifest) (error, []configv1.ClusterVersionCapability) { ... return capability.GetResourceCapabilities(annotations, capabilities) }

`func GetResourceCapabilities(annotations map[string]string, capabilities ClusterCapabilities) (error, []configv1.ClusterVersionCapability) {
val, ok := annotations[CapabilityAnnotation]
if !ok {
return nil, nil
}
caps := strings.Split(val, "+")
numCaps := len(caps)
unknownCaps := make([]string, 0, numCaps)
allCaps := make([]configv1.ClusterVersionCapability, 0, numCaps)

    for _, c := range caps {
            if _, ok = capabilities.KnownCapabilities[configv1.ClusterVersionCapability(c)]; !ok {
                    unknownCaps = append(unknownCaps, c)
            } else {
                    allCaps = append(allCaps, configv1.ClusterVersionCapability(c))
            }
    }
    if len(unknownCaps) > 0 {
            return fmt.Errorf("unrecognized capability names: %s", strings.Join(unknownCaps, ", ")), nil
    }
    return nil, allCaps

}`

[LalatenduMohanty]

With the proposed change to not filter on capabilities at load time but rather at apply time I changed include to return the capabilities from a given manifest or an error if an unknown capability is found. That then also replaces method CheckResourceEnablement with GetResourceCapabilities

I checked openshift/cluster-version-operator#754 and we should move ahead with this PR merge and once openshift/cluster-version-operator#754 is merged we can move the changes to this repo or even doing the changes directly in this repo. It depends on on the timing of merge of this PR. I am optimistic that we can get this PR merged asap.

[LalatenduMohanty]

/retest

[wking]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LalatenduMohanty, wking

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

The pull request process is described here

Needs approval from an approver in each of these files:

• pkg/manifest/OWNERS [LalatenduMohanty,wking]

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

[jottofar]

/hold
This is not the include interface my CVO PR needs. Why not use what I have defined in my PR for include and checkResourceEnablement that returns the resource's validated capabilities?

[LalatenduMohanty]

/test unit

[openshift-ci]

@LalatenduMohanty: all tests passed!

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/test-infra repository. I understand the commands that are listed here.

[wking]

Talked with @LalatenduMohanty and @jottofar , and we think this is ok as it stands. And we can always come back and tweak if we're missing something now.

/hold cancel