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.

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

Bug 1992677: validate maxocpversion to have major.minor format #169

Merged
merged 3 commits into from Aug 20, 2021

Conversation

ankitathomas
Copy link
Contributor

This PR adds validation to the api to warn on maxOpenShiftVersion with patch or pre-release set, and has olm error on the same.
It also rewords the olm upgrade error for upgrades to a minor version greater than maxOpenShiftVersion for more clarity.

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 7c2f004129b037333c4fe29ec5ac94b5e1247564
…ft#146)

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

Upstream-repository: api
Upstream-commit: 01ed866fe519bd71d8550b3f1a411f819325c422
…ft#147)

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

Upstream-repository: api
Upstream-commit: 6db422fda8df2f7872a493dd696152eaf2e8a4da
@openshift-ci openshift-ci bot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Aug 18, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 18, 2021

@ankitathomas: This pull request references Bugzilla bug 1994038, which is invalid:

  • expected the bug to target the "4.9.0" release, but it targets "4.8.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1994038: validate maxocpversion to have major.minor format

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.

@openshift-ci openshift-ci bot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Aug 18, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 18, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2021
@timflannagan
Copy link
Contributor

/lgtm

@timflannagan
Copy link
Contributor

/retitle Bug 1992677: validate maxocpversion to have major.minor format

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2021
@openshift-ci openshift-ci bot changed the title Bug 1994038: validate maxocpversion to have major.minor format Bug 1992677: validate maxocpversion to have major.minor format Aug 18, 2021
@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Aug 18, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 18, 2021

@ankitathomas: This pull request references Bugzilla bug 1992677, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

Bug 1992677: validate maxocpversion to have major.minor format

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.

@openshift-ci openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Aug 18, 2021
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

6 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@jianzhangbjz
Copy link
Contributor

/bugzilla cc-qa

@openshift-ci openshift-ci bot removed the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Aug 19, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 19, 2021

@jianzhangbjz: This pull request references Bugzilla bug 1992677, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

/bugzilla cc-qa

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.

@openshift-ci openshift-ci bot added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label Aug 19, 2021
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@kevinrizza
Copy link
Member

/hold cancel
/retest

@ankitathomas
Copy link
Contributor Author

/test e2e-aws-olm

1 similar comment
@davegord
Copy link

/test e2e-aws-olm

@kevinrizza
Copy link
Member

Our verify job is broken, see #171

/override ci/prow/verify

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 20, 2021

@kevinrizza: Overrode contexts on behalf of kevinrizza: ci/prow/verify

In response to this:

Our verify job is broken, see #171

/override ci/prow/verify

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.

@openshift-merge-robot openshift-merge-robot merged commit 40493e6 into openshift:master Aug 20, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 20, 2021

@ankitathomas: All pull requests linked via external trackers have merged:

Bugzilla bug 1992677 has been moved to the MODIFIED state.

In response to this:

Bug 1992677: validate maxocpversion to have major.minor format

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.

@timflannagan
Copy link
Contributor

/cherrypick release-4.8

@openshift-cherrypick-robot

@timflannagan: #169 failed to apply on top of branch "release-4.8":

Applying: clarify maxOpenShiftVersion upgrade error message (#2326)
Applying: warn on maxOpenShiftVersion specifying more than major.minor (#146)
Using index info to reconstruct a base tree...
A	staging/api/pkg/validation/internal/community.go
A	staging/api/pkg/validation/internal/community_test.go
A	vendor/github.com/operator-framework/api/pkg/validation/internal/community.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): vendor/github.com/operator-framework/api/pkg/validation/internal/community.go deleted in HEAD and modified in warn on maxOpenShiftVersion specifying more than major.minor (#146). Version warn on maxOpenShiftVersion specifying more than major.minor (#146) of vendor/github.com/operator-framework/api/pkg/validation/internal/community.go left in tree.
CONFLICT (modify/delete): staging/api/pkg/validation/internal/community_test.go deleted in HEAD and modified in warn on maxOpenShiftVersion specifying more than major.minor (#146). Version warn on maxOpenShiftVersion specifying more than major.minor (#146) of staging/api/pkg/validation/internal/community_test.go left in tree.
CONFLICT (modify/delete): staging/api/pkg/validation/internal/community.go deleted in HEAD and modified in warn on maxOpenShiftVersion specifying more than major.minor (#146). Version warn on maxOpenShiftVersion specifying more than major.minor (#146) of staging/api/pkg/validation/internal/community.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 warn on maxOpenShiftVersion specifying more than major.minor (#146)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.8

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.

awgreene pushed a commit to awgreene/operator-framework-olm that referenced this pull request Feb 2, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
awgreene pushed a commit to awgreene/operator-framework-olm that referenced this pull request Feb 22, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 1, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 2, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 2, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 2, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 7, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 7, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 8, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 9, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 10, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 10, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 12, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Apr 12, 2022
…t#169)

This PR implements a custom unmarshaller for the CatalogSourceSpec.UpdateStrategy.
When a value that cannot be unmarshalled to *metav1.Duration was being passed to
UpdateStrategy.RegistryPoll.Interval, the catalogSource sync loops in the catalog
operator was stuck in an infinite loop instead of backing off and performing other
syncs. The custom unmarshaller tries to unmarshall the input to the field to
*metav1.Duration, and if it fails, it sets a default value of 15m for the field.
Otherwise it accepts the value passed to the field.

Upstream-repository: api
Upstream-commit: 7c97612f258921a973da23fb55dcd77892401be4
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants