fix e2e prometheus, operator-group, 4.11 errors#719
Merged
openshift-merge-robot merged 4 commits intoAug 19, 2022
Conversation
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
openshift-ci
Bot
added
the
approved
PratikMahajan
force-pushed
the
fix-e2e-prom-err
branch
from
ebcbdbe to
0688488
Compare
openshift-ci
Bot
removed
the
do-not-merge/work-in-progress
Contributor
Author
|
/retest |
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
PratikMahajan
force-pushed
the
fix-e2e-prom-err
branch
from
fa0e83a to
b25665a
Compare
the prometheus secret based token will no longer exist from OCP 4.11 onwards. To get the prometheus token, we need to create the secret manually to get the token. this commit creates the prometheus robot secret which we then use to get the prometheus token.
In the OperatorGroup, as seen in [1,2], to catch up with the operator moving AllNamespaces support from true to false in installModes [3]. This avoids [4]: + oc get events LAST SEEN TYPE REASON OBJECT MESSAGE 10m Warning UnsupportedOperatorGroup clusterserviceversion/update-service-operator.v5.0.0 AllNamespaces InstallModeType not supported, cannot configure to watch all namespaces [1]: https://github.com/openshift/cincinnati-operator/blob/eed7a92a5efda96545e9be90a6ec65b427026d11/docs/disconnected-updateservice-operator.md#deploy-the-updateservice-operator [2]: https://github.com/openshift/cincinnati-operator/blob/eed7a92a5efda96545e9be90a6ec65b427026d11/tools/create-sub-group.sh#L23-L25 [3]: openshift/cincinnati-operator@1137a5c#diff-ef93a20b4f66d5fb3e6d84caf1169c43d4f750684fabd1a7c27065312dbb7fcdL73-R73 [4]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_release/31237/rehearse-31237-pull-ci-openshift-cincinnati-master-e2e/1557865068975099904#1:build-log.txt%3A897-899
PratikMahajan
force-pushed
the
fix-e2e-prom-err
branch
from
ae4e7cc to
9b3ef9f
Compare
update service operator had a breaking change where the policy engine URI was changed. this resulted in two different URIs for tests on 4.10 and 4.11 clusters. this changes makes sure we're getting the URI set by the operator, so same script can work for different versions of Update Service Operator
PratikMahajan
force-pushed
the
fix-e2e-prom-err
branch
from
9b3ef9f to
7b1b9af
Compare
PratikMahajan
changed the title
openshift-ci
Bot
removed
the
do-not-merge/work-in-progress
Contributor
Author
|
/retest |
Contributor
Author
|
/retest |
wking
reviewed
Aug 18, 2022
| # Expose services | ||
| PE_URL=$(oc get route e2e-policy-engine-route -o jsonpath='{.spec.host}') | ||
| export GRAPH_URL="https://${PE_URL}/api/upgrades_info/graph" | ||
| PE_URL=$(oc -n "${NAMESPACE}" get -o jsonpath='{.status.policyEngineURI}' updateservice "e2e") |
Member
There was a problem hiding this comment.
could be a race here, if the controller hasn't populated the property yet. From our docs:
Use the following command to obtain a policy engine route:
$ while sleep 1; do POLICY_ENGINE_GRAPH_URI="$(oc -n "${NAMESPACE}" get -o jsonpath='{.status.policyEngineURI}/api/upgrades_info/v1/graph{"\n"}' updateservice "${NAME}")"; SCHEME="${POLICY_ENGINE_GRAPH_URI%%:*}"; if test "${SCHEME}" = http -o "${SCHEME}" = https; then break; fi; doneYou might need to poll until the command succeeds.
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: PratikMahajan, wking The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
|
@PratikMahajan: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.