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

Addresses logging failure and ENTESB-12633 #218

Merged
merged 3 commits into from Feb 19, 2020

Conversation

phantomjinx
Copy link
Contributor

Despite ENTESB-12969, this creates a default syndesis CR in code ...

  • Retains --datavirt and --camel-k for enabling those addons (and since these are conditional easier to create the file contents in code rather than modifying a static file);
  • Retains the --custom-resource switch to allow for a user-defined custom-resource turning on any other addons, changing any other properties, eg. routeHostname.

* Sourcing base_functions.sh multiple times generates multiple temp log
  files, allocating the latest one to ERROR_FILE. This means no error ever
  gets properly logged.

* Only generate new temp log file, the first time base_functions.sh is
  sourced.

* Some errors from go scripts and openshift have 'error' in lowercase so
  are not properly handled by check_error. Upper-cases all error msgs to
  ensure latter properly handles them.

* Surround oc commands with set -/+e in order to allow check_error to
  handle whatever errors may result. Ensures errors are added to ERROR_FILE
  and displayed at conclusion of script.
* Custom resource used to turn on those elements expected in the product
  including jaeger.
* default-cr.yml
 * The custom resource that is always loaded by the install_ocp.sh script

* install_ocp.sh
 * Removes switches relating to changing the CR from the script
 * Simply passes the filename of the default-cr.yml to the operator rather
   than doing anything in code
 * Installs the camel-k crds by default to allow for possibility of that
   addon being enabled later on
 * Retains --force to actually recreate CR if required
@phantomjinx
Copy link
Contributor Author

Updated PR with extra commit which ...

ENTESB-12633: Modifies to move default CR to file

* default-cr.yml
 * The custom resource that is always loaded by the install_ocp.sh script

* install_ocp.sh
 * Removes switches relating to changing the CR from the script
 * Simply passes the filename of the default-cr.yml to the operator rather
   than doing anything in code
 * Installs the camel-k crds by default to allow for possibility of that
   addon being enabled later on
 * Retains --force to actually recreate CR if required

@heiko-braun heiko-braun merged commit 9a82cd6 into syndesisio:master Feb 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants