-
Notifications
You must be signed in to change notification settings - Fork 474
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
[OSSM-5564][hack] Fix install testing demo script to support OSSM 2.5 #6959
Conversation
c0daabc
to
719a051
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me, but I don't use these scripts so I would like someone else to also review this as well.
Also, this PR is targeting the v1.73 branch. We will need another PR to cherry pick this over to the master branch as well to keep everything in sync.
@jmazzitelli @ScriptingShrimp |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see anything here that is specifically related to Maistra (at least nothing explicitly indicating maistra is required here).
If that is true, we would want this in master if only to keep these files in sync as best we can, and thus avoid potential git conflicts in the future if we ever need to make changes that need backporting.
But with that said, if ALL of this is simply to support Maistra, and this code isn't really used outside of, say, some "IF Maistra THEN" code block somewhere, then we can avoid putting it in master.
Merging this. @mkralik3 cherry pick what you think is best to the master branch, if anything. |
demo apps installed on OCP with OSSM2.5 OK 👍 |
@jmazzitelli I think only this line is worth to backport. I will include it in backport for this #6938 |
Describe the change
Fix autoinjection for
bookinfo
andsleep
demo projects when using with OSSMDue to this change 997f544 , the bookinfo script doesn't use
ENABLE_INJECTION
anymore, however, it is needed inprepare_maistra
function.Also,
ISTIO_NAMESPACE
env is needed inprepare_mainstra
function so it was added toinstall-sleep-demo.sh
script. (in version 1.65, the sleep installation was a part ofinstall-testing-demos.sh
where the ENV was available)Issue reference
https://issues.redhat.com/browse/OSSM-5564