OTA-1010: release extract: --include works for a minor level update #1954
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@hongkailiu: This pull request references OTA-1010 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. In response to this:
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
bot
added
the
do-not-merge/hold
hongkailiu
force-pushed
the
OTA-1010
branch
12 times, most recently
from
34cce22 to
8d7e2da
Compare
|
@hongkailiu: This pull request references OTA-1010 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. In response to this:
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. |
|
/retest-required |
hongkailiu
force-pushed
the
OTA-1010
branch
2 times, most recently
from
8a0072b to
959afab
Compare
|
/retest-required |
hongkailiu
force-pushed
the
OTA-1010
branch
2 times, most recently
from
cff3929 to
cbee2c7
Compare
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: hongkailiu The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
|
||
| key := configv1.ClusterVersionCapabilitySetCurrent | ||
| if clusterVersion.Spec.Capabilities != nil && clusterVersion.Spec.Capabilities.BaselineCapabilitySet != "" { | ||
| key = clusterVersion.Spec.Capabilities.BaselineCapabilitySet |
There was a problem hiding this comment.
You should use [edit: no you're right as you have it, because only config.Capabilities here (set from &clusterVersion.Status.Capabilities a few lines up), to avoid having to worry about the pre-CVO-verification Spec content.spec will include baselineCapabilitySet].
There was a problem hiding this comment.
"vCurrent" might grow for a minor level upgrade. We want to make sure it has all enabled from the BaselineCapabilitySet for the new version.
| if clusterVersion.Spec.Capabilities != nil && clusterVersion.Spec.Capabilities.BaselineCapabilitySet != "" { | ||
| key = clusterVersion.Spec.Capabilities.BaselineCapabilitySet | ||
| } | ||
| enabled := sets.New[configv1.ClusterVersionCapability](configv1.ClusterVersionCapabilitySets[key]...) |
There was a problem hiding this comment.
You'll also want to Insert config.Capabilities.AdditionalEnabledCapabilities in the enabled set.
There was a problem hiding this comment.
clusterVersion.Spec.Capabilities.AdditionalEnabledCapabilities is a list of capabilities specified by the admin.
They should be included already in cv.status.Capabilities.EnabledCapabilities.
| for _, s := range configv1.ClusterVersionCapabilitySets { | ||
| known.Insert(s...) | ||
| } | ||
| previouslyKnown := sets.New[configv1.ClusterVersionCapability](config.Capabilities.KnownCapabilities...) |
There was a problem hiding this comment.
isn't previouslyKnown just config.Capabilities.KnownCapabilities, frozen out from the cluster's current ClusterVersion status?
There was a problem hiding this comment.
Yes, it is. We just convert it to a set which is used to calculate other sets below such as deltaKnown.
Maybe I did not get your question?
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
|
/retest-required |
3 similar comments
|
/retest-required |
|
/retest-required |
|
/retest-required |
|
@hongkailiu: The following tests failed, say
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. |
This is still a patch on the
extractcommand.Comparing the the current solution that disables the net-new capabilities by default and enabled a few that handles the 4.13-4.14 upgrade only, the current patch enables the net-new capabilities by default.
The advantage is that it avoids enumeration of growing releases but the disadvantage is that it might exclude expected manifests.
The ideal solution is to compute the exact set of capabilities after upgrading to the incoming release but it would involve significant changes on the code. We plan to develop some functions in the go-lib that can be shared by oc-cli and cvo.
/cc @wking @petr-muller