Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: leecalcote <leecalcote@gmail.com>
  • Loading branch information
leecalcote committed Jan 14, 2021
1 parent 4a8ee68 commit b69cc91
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ back Meshery security vulnerabilities. We investigate every report thoroughly.

## Reporting a vulnerability
To make a report, send an email to the private
[meshery-security-vulns-reports@layer5.io](mailto:meshery-security-vulns-reports@layer5.io)
[meshery-security-vulns-reports@meshery.dev](mailto:meshery-security-vulns-reports@meshery.dev)
mailing list with the vulnerability details. For normal product bugs
unrelated to latent security vulnerabilities, please head to
the appropriate repository and submit a [new issue](https://github.com/layer5io/meshery/issues/new/choose).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ We are very grateful to the security researchers and users that report
back Meshery security vulnerabilities. We investigate every report thoroughly.

To make a report, send an email to the private
[meshery-security-vulns-reports@layer5.io](mailto:meshery-security-vulns-reports@layer5.io)
[meshery-security-vulns-reports@meshery.dev](mailto:meshery-security-vulns-reports@meshery.dev)
mailing list with the vulnerability details. For normal product bugs
unrelated to latent security vulnerabilities, please head to
the appropriate repository and submit a [new issue](https://github.com/layer5io/meshery/issues/new/choose).
Expand Down
10 changes: 7 additions & 3 deletions docs/pages/guides/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ type: Guides

## Upgrading Meshery Server, Adapters, and UI

Various components of Meshery will need to be upgraded as new releases become available. Meshery is comprised of a number of components including a server, adapters, UI, and CLI. As an application, Meshery is a composition of different functional components.
Various components of Meshery will need to be upgraded as new releases become available. Meshery is comprised of a number of components including a server, adapters, UI, and CLI. As an application, Meshery is a composition of different functional components.

<a href="{{site.baseurl}}/assets/img/architecture/upgrading-meshery.svg"><img src="{{site.baseurl}}/assets/img/architecture/upgrading-meshery.svg" width="20%" /></a>
<a href="{{site.baseurl}}/assets/img/architecture/upgrading-meshery.svg">
<img src="{{site.baseurl}}/assets/img/architecture/upgrading-meshery.svg" width="20%" />
</a>

Some of the components must be upgraded simultaneously, while others may be upgraded independently. The following table depicts components, their versions, and deployment units (deployment groups).

Expand Down Expand Up @@ -57,7 +59,7 @@ Docker Deployment: Watchtower updates this component in accordance with the user
<ul>
<li><code>system start</code> calls system update by default, which updates server and existing adapters, but doesn’t update meshery.yaml.</li>
<li><code>system reset</code> retrieving docker-compose.yaml from GitHub (use git tag to reset to the right Meshery version).</li>
<li><code>system context<c/ode> manages config.yaml, which manages meshery.yaml. </li>
<li><code>system context</code> manages config.yaml, which manages meshery.yaml. </li>
<li><code>mesheryctl</code> should generally be checking for latest release and informing user.</li>
</ul>
</td>
Expand All @@ -72,6 +74,8 @@ Docker Deployment: Watchtower updates this component in accordance with the user
<td> Static Extension: Integrators manage the lifecycle of their Meshery Extensions. Process is unique per provider.</td>
</tr>
</table>


Sub-components deploy as a unit, however, they do not share the same version number.

### Meshery Docker Deployments
Expand Down

0 comments on commit b69cc91

Please sign in to comment.