Skip to content

Commit

Permalink
Merge branch 'master' into bug/mgfeller/72
Browse files Browse the repository at this point in the history
  • Loading branch information
mgfeller committed Aug 28, 2020
2 parents 0711059 + 69bd987 commit 383c523
Show file tree
Hide file tree
Showing 8 changed files with 1,604 additions and 266 deletions.
22 changes: 22 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
**Description**

This PR fixes #

**Notes for Reviewers**

**[Signed commits](../CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin)**

- [ ] Yes, I signed my commits.

<!--
Thank you for contributing to Layer5 projects!
Contributing Conventions:
1. Include descriptive PR titles with [<component-name>] prepended.
2. Build and test your changes before submitting a PR.
3. Sign your commits
By following the community's contribution conventions upfront, the review process will
be accelerated and your PR merged more quickly.
-->
3 changes: 2 additions & 1 deletion .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ firstPRMergeComment: >
Thanks for your contribution to the Layer5 community! :tada:
![Congrats!](https://raw.githubusercontent.com/layer5io/meshery/master/.github/welcome/Layer5-celebration.png)
&nbsp;
&#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; :star: Please [star the project](../stargazers) if you have yet to do so.
#-------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Meshery Consul
on:
push:
branches:
- '*'
- '**'
tags:
- 'v*'
pull_request:
Expand Down
13 changes: 13 additions & 0 deletions consul/config_templates/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
The manifest consul.yaml was generated with Helm 3 using
```
helm template consul -f consul-values.yaml -n consul hashicorp/consul --version 0.24.1 > consul-new.yaml
```

Then, `namespace: consul` was replaced with `namespace: {{.namespace}}` using sed:
```
sed -E 's/^( +)namespace: +consul *$/\1namespace: {{.namespace}}/g' consul-new.yaml > consul.yaml
```

This makes it possible to deploy Consul to the namespace specified in the Meshery UI.

Note: Helm support in this adapter is planned.
Loading

0 comments on commit 383c523

Please sign in to comment.