-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into bug/mgfeller/72
- Loading branch information
Showing
8 changed files
with
1,604 additions
and
266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. | ||
--> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ name: Meshery Consul | |
on: | ||
push: | ||
branches: | ||
- '*' | ||
- '**' | ||
tags: | ||
- 'v*' | ||
pull_request: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
Oops, something went wrong.