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

ENTESB-11772: Generate a template from the operator configuration #6845

Merged
merged 1 commit into from Oct 7, 2019

Conversation

phantomjinx
Copy link
Contributor

  • Parses the internal operator configuration and exports an openshift
    template

  • install/install.go

  • Adds in the "forge" command for forging the template

  • eg. syndesis-operator install forge
    --operator-config ./build/conf/config.yaml
    --addons todo --eject yaml

  • install-forge.go

  • Does the work of generating the new openshift template

  • configuration.go

  • Enhances the config constants by mapping them to their descriptions,
    default values, whether required and whether generated

  • template/install.go

  • Utilise the AllConfigMap for providing the default values

@pure-bot pure-bot bot added pr/review-requested Use this if you want to have a review. pure-bot will prevent merging if set and no review given labels Oct 4, 2019
@pull-request-size pull-request-size bot added the size/xl Extra large label Oct 4, 2019
@phantomjinx phantomjinx added the pr/wip Mark work-in-progress with this label. pure-bot won't merge a PR if this is set. label Oct 4, 2019
@phantomjinx
Copy link
Contributor Author

Labelled as WIP at the moment in case major changes required.

@phantomjinx
Copy link
Contributor Author

Execute command:
syndesis-operator install forge --operator-config ./build/conf/config.yaml --addons todo --eject yaml

Generates -> syndesis.yml

@heiko-braun
Copy link
Collaborator

Pretty cool, thanks Paul

@pure-bot
Copy link
Contributor

pure-bot bot commented Oct 5, 2019

Pull request approved by @lgarciaaco - applying pr/approved label

@pure-bot pure-bot bot added the pr/approved Applied by pure-bot when a review is approved label Oct 5, 2019
@phantomjinx phantomjinx removed the pr/wip Mark work-in-progress with this label. pure-bot won't merge a PR if this is set. label Oct 7, 2019
* Parses the internal operator configuration and exports an openshift
  template

* install/install.go
 * Adds in the "forge" command for forging the template
 * eg. syndesis-operator install forge \
       --operator-config ./build/conf/config.yaml \
       --addons todo --eject yaml

* install-forge.go
 * Does the work of generating the new openshift template

* configuration.go
 * Enhances the config constants by mapping them to their descriptions,
   default values, whether required and whether generated

* template/install.go
 * Utilise the AllConfigMap for providing the default values
@phantomjinx phantomjinx merged commit 9f2393d into syndesisio:master Oct 7, 2019
@heiko-braun
Copy link
Collaborator

@lgarciaaco @phantomjinx Is there a reason not to merge to 1.8.x?

@phantomjinx
Copy link
Contributor Author

@lgarciaaco @phantomjinx Is there a reason not to merge to 1.8.x?

Just did a trial merge to 1.8.x local branch and seems straightforward so can backport if required.

@lgarciaaco
Does contain changes to the way default values are assigned. You may not want something like that backported. WDYT?

@backporting
Copy link

backporting bot commented Oct 15, 2019

The backport to 1.8.x failed:

Commits ["f4a94d33f27082ca4fc119328d46cd4350e9bc36"] could not be cherry-picked on top of 1.8.x

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport 1.8.x
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick f4a94d33f27082ca4fc119328d46cd4350e9bc36
# Create a new branch with these backported commits.
git checkout -b backport-6845-to-1.8.x
# Push it to GitHub.
git push --set-upstream origin backport-6845-to-1.8.x
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is 1.8.x and the compare/head branch is backport-6845-to-1.8.x.

@heiko-braun
Copy link
Collaborator

@phantomjinx Can you create a PR manually? The bot doesn't seem to be capable of doing it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.8.x pr/approved Applied by pure-bot when a review is approved pr/review-requested Use this if you want to have a review. pure-bot will prevent merging if set and no review given size/xl Extra large
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants