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

Fix 2327: Detecting OLM existence before start to install #2334

Merged
merged 2 commits into from
Aug 31, 2021

Conversation

morningspace
Copy link
Contributor

Signed-off-by: Ying Mo morningspace@yahoo.com

Description of the change:

Adding logic in install.sh to check if OLM has already been installed in olm namespace before going forward.

Motivation for the change:

This PR is aimed to fix the issue documented here

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /doc
  • Commit messages sensible and descriptive

Signed-off-by: Ying Mo <morningspace@yahoo.com>
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 20, 2021
@openshift-ci
Copy link

openshift-ci bot commented Aug 20, 2021

Hi @morningspace. Thanks for your PR.

I'm waiting for a operator-framework member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 20, 2021
scripts/install.sh Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2021
Signed-off-by: Ying Mo <morningspace@yahoo.com>
Copy link
Contributor

@timflannagan timflannagan left a comment

Choose a reason for hiding this comment

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

Thanks

$ kind create cluster
$ kubectx kind-kind
$ ./scripts/install.sh v0.18.3
customresourcedefinition.apiextensions.k8s.io/catalogsources.operators.coreos.com created
customresourcedefinition.apiextensions.k8s.io/clusterserviceversions.operators.coreos.com created
customresourcedefinition.apiextensions.k8s.io/installplans.operators.coreos.com created
...
$ ./scripts/install.sh v0.18.3
OLM is already installed in olm namespace. Exiting...
$ k create ns openshift-operator-lifecycle-manager
$ k apply -f https://raw.githubusercontent.com/openshift/operator-framework-olm/master/manifests/0000_50_olm_07-olm-operator.deployment.yaml
deployment.apps/olm-operator created
$ ./scripts/install.sh v0.18.3
OLM is already installed in a different configuration. This is common if you are not running a vanilla Kubernetes cluster. Exiting...

@timflannagan
Copy link
Contributor

/lgtm

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

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 26, 2021
@morningspace
Copy link
Contributor Author

@timflannagan I am seeing the e2e test is failed due to error occurred at https://github.com/operator-framework/operator-lifecycle-manager/blob/master/test/e2e/util_test.go#L497. But I could not image that's caused by this PR. Is it because of test-run slowness or something happens randomly?

Failure details could be found at: https://github.com/operator-framework/operator-lifecycle-manager/runs/3434684793?check_suite_focus=true#step:4:2106 There are two CSVs created by the test case were not able to be deleted after waiting about 60.003s.

@timflannagan
Copy link
Contributor

@morningspace I wouldn't worry too much about those e2e failures as the testing suite can be flaky at times. IIRC, we don't actually use the install.sh bash script anywhere in the default testing environment. It looks like running make e2e-local, which is what the e2e-tests/run-e2e-tests workflow is running under-the-hood, is using helm to scaffold and create an installation in the testing executable.

@kevinrizza
Copy link
Member

/approve

@openshift-ci
Copy link

openshift-ci bot commented Aug 31, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kevinrizza, morningspace, timflannagan

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 31, 2021
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-merge-robot openshift-merge-robot merged commit 03493b5 into operator-framework:master Aug 31, 2021
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants