Skip to content

Conversation

@openshift-bot
Copy link
Contributor

Please merge within 48 hours of https://errata.devel.redhat.com/advisory/66568 shipping live OR a Cincinnati-first release.

This should provide adequate soak time for fast channel PR #571

This PR will also enable upgrades from 4.5.22 to releases in stable-4.6

@openshift-bot openshift-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 2, 2020
@vrutkovs
Copy link

Approving stable PRs after 48 hours
/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 10, 2020
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Dec 10, 2020
@wking
Copy link
Member

wking commented Dec 10, 2020

Needed a rebase around #561, which I just pushed. #584 will likely need a rebase around this one. I will be super happy once we have openshift/enhancements#427 and, ideally, fast/stable PRs filed by our own errata monitor instead of ART, so we don't have these conflicts to manually resolve.

@wking
Copy link
Member

wking commented Dec 10, 2020

Also post-rebase:

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 10, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-bot, vrutkovs, wking

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

The pull request process is described here

Details 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

@wking
Copy link
Member

wking commented Dec 10, 2020

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 10, 2020
@openshift-merge-robot openshift-merge-robot merged commit a689f21 into master Dec 10, 2020
@sdodson sdodson deleted the pr-stable-4.5.22 branch December 14, 2020 17:57
wking added a commit to wking/cincinnati-graph-data that referenced this pull request Feb 3, 2022
…update

Following up on 38028a8
(blocked-edges/4.10.0-fc.2-modified-aws-load-balancer-service: Example
conditional update, 2022-01-31, openshift#1437) with a new invented, demo
conditional update.  The earlier demo worked locally, but did not
excercise Insights tooling, because Insights only bumped their
openshift/api vendor in fc.3 [1]:

  $ for X in fc.0 fc.1 fc.2 fc.3 fc.4 rc.0; do echo -n "${X} "; oc adm release info --commits "quay.io/openshift-release-dev/ocp-release:4.10.0-${X}-x86_64" 2>/dev/null | grep insights-operator; done
  fc.0   insights-operator                              https://github.com/openshift/insights-operator                              cafe71a62bda6ca7ea790da90753b7b7d3c006b7
  fc.1   insights-operator                              https://github.com/openshift/insights-operator                              e2887e735adefb572a2e785d5cc071ec5844b123
  fc.2   insights-operator                              https://github.com/openshift/insights-operator                              7a3ff6bbe5b59f9f49c3c6bb8c118e88618515fc
  fc.3   insights-operator                              https://github.com/openshift/insights-operator                              007dfade2f36b95cedfd90a5a5ea6f0c5e89dab3
  fc.4   insights-operator                              https://github.com/openshift/insights-operator                              007dfade2f36b95cedfd90a5a5ea6f0c5e89dab3
  rc.0   insights-operator                              https://github.com/openshift/insights-operator                              007dfade2f36b95cedfd90a5a5ea6f0c5e89dab3
  $ git --no-pager log --oneline --first-parent cafe71a62bd^..origin/release-4.10
  007dfade (HEAD -> bump-openshift-api, origin/release-4.11, origin/release-4.10, origin/master, origin/HEAD, master) Minor gathering docs update (openshift#575)
  b67157fc Remove "InsightsOperatorPullingSCA" TP feature check (openshift#574)
  5c541f9a info alert when the SCA is not available (openshift#565)
  508a6642 Bump k8s & OpenShift versions (openshift#572)
  d22988ee feat: conditional log gathers into a single gather and PrometheusOperatorSyncFailed (openshift#563)
  7a3ff6bb Remove unnecessary division into important and failable gatherers (openshift#567)
  e2887e73 Updating ose-insights-operator images to be consistent with ART (openshift#540)
  cafe71a6 Update versions for backports in our gathered data docs (openshift#566)

So fc.0 and fc.1 with the previous conditional update were having that
unrecognized-to-the-older-insights-operator property dropped.  This
commit adds a new demo conditional edge for 4.10 -> fc.4, so we can
look at running fc.3 clusters to see conditionalUpdates in Insights.

[1]: openshift/insights-operator@03a335c
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.

6 participants