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

openshift_secondary_metadata_parser: Accept graph-data 1.1.0 #538

Merged

Conversation

wking
Copy link
Member

@wking wking commented Sep 21, 2021

Ideally this would be parsed as SemVer with appropriate compatability resolution (minor bumps are backwards compatible). But doing that in Rust in a few minutes is beyond my abilities. This temporary hack unblocks the 1.1.0 graph-data migration, avoiding:

2021-09-21T13:09:26Z ERROR graph_builder::graph] unrecognized graph-data version 1.1.0
  ; supported versions: ["1.0.0"]

until we can get that SemVer parser in place.

Ideally this would be parsed as SemVer with appropriate compatability
resolution (minor bumps are backwards compatible [1]).  But doing that
in Rust in a few minutes is beyond my abilities.  This temporary hack
unblocks the 1.1.0 graph-data migration, avoiding:

  2021-09-21T13:09:26Z ERROR graph_builder::graph] unrecognized graph-data version 1.1.0
    ; supported versions: ["1.0.0"]

until we can get that SemVer parser in place.

[1]: https://semver.org/spec/v2.0.0.html#spec-item-7
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 21, 2021
Copy link
Member

@LalatenduMohanty LalatenduMohanty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 21, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 21, 2021

[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:
  • 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

@wking
Copy link
Member Author

wking commented Sep 21, 2021

/retest

1 similar comment
@wking
Copy link
Member Author

wking commented Sep 21, 2021

/retest

@openshift-bot
Copy link

/retest-required

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

1 similar comment
@openshift-bot
Copy link

/retest-required

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

@wking
Copy link
Member Author

wking commented Sep 21, 2021

I'm pretty sure the customrust InvalidImageName is unrelated.

/override ci/prow/customrust-e2e

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 21, 2021

@wking: Overrode contexts on behalf of wking: ci/prow/customrust-e2e

In response to this:

I'm pretty sure the customrust InvalidImageName is unrelated.

/override ci/prow/customrust-e2e

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 6b2377a into openshift:master Sep 21, 2021
@wking wking deleted the accept-graph-data-1.1.0 branch September 21, 2021 21:21
@wking wking restored the accept-graph-data-1.1.0 branch September 21, 2021 21:24
@wking wking deleted the accept-graph-data-1.1.0 branch September 22, 2021 18:46
wking added a commit to wking/cincinnati-graph-data that referenced this pull request Sep 23, 2021
So we can explain why we're blocking the different edges [1] (the
promql -> PromQL type change is in flight with [2]).

The zz in the filename for the vSphere hostname block ensures that one
sorts last alphabetically, because it's the broadest block, and legacy
Cincinnati services will prefer the final regular expression they load
for a given 'to' target.

This is basically a second attempt at my earlier 39bc2fb
(blocked-edges/4.7.4*: Targeted edge blocking and version 1.1.0,
2021-09-01, openshift#1056), which ended up getting reverted in da1254a
(Revert "blocked-edges/4.7.4*: Targeted edge blocking and version
1.1.0", 2021-09-21, openshift#1078) because the production Cincinnati was mad
about the 1.1.0 version string.  [3] taught Cincinnati to relax, and
now that's live (and we never shipped any versions that would be mad
about 1.1.0 to customers, the 4.6.0 Update Service operator went out
before [4]).

[1]: openshift/enhancements#821
[2]: openshift/enhancements#910
[3]: openshift/cincinnati#538
[4]: openshift/cincinnati#314
wking added a commit to wking/cincinnati-graph-data that referenced this pull request Sep 27, 2021
So we can explain why we're blocking the different edges [1] (the
promql -> PromQL type change is in flight with [2]).

The zz in the filename for the vSphere hostname block ensures that one
sorts last alphabetically, because it's the broadest block, and legacy
Cincinnati services will prefer the final regular expression they load
for a given 'to' target.

This is basically a second attempt at my earlier 39bc2fb
(blocked-edges/4.7.4*: Targeted edge blocking and version 1.1.0,
2021-09-01, openshift#1056), which ended up getting reverted in da1254a
(Revert "blocked-edges/4.7.4*: Targeted edge blocking and version
1.1.0", 2021-09-21, openshift#1078) because the production Cincinnati was mad
about the 1.1.0 version string.  [3] taught Cincinnati to relax, and
now that's live (and we never shipped any versions that would be mad
about 1.1.0 to customers, the 4.6.0 Update Service operator went out
before [4]).

[1]: openshift/enhancements#821
[2]: openshift/enhancements#910
[3]: openshift/cincinnati#538
[4]: openshift/cincinnati#314
wking added a commit to wking/cincinnati-graph-data that referenced this pull request Sep 27, 2021
So we can explain why we're blocking the different edges [1] (the
promql -> PromQL type change is in flight with [2]).

The zz in the filename for the vSphere hostname block ensures that one
sorts last alphabetically, because it's the broadest block, and legacy
Cincinnati services will prefer the final regular expression they load
for a given 'to' target.

This is basically a second attempt at my earlier 39bc2fb
(blocked-edges/4.7.4*: Targeted edge blocking and version 1.1.0,
2021-09-01, openshift#1056), which ended up getting reverted in da1254a
(Revert "blocked-edges/4.7.4*: Targeted edge blocking and version
1.1.0", 2021-09-21, openshift#1078) because the production Cincinnati was mad
about the 1.1.0 version string.  [3] taught Cincinnati to relax, and
now that's live (and we never shipped any versions that would be mad
about 1.1.0 to customers, the 4.6.0 Update Service operator went out
before [4]).

[1]: openshift/enhancements#821
[2]: openshift/enhancements#910
[3]: openshift/cincinnati#538
[4]: openshift/cincinnati#314
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants