Skip to content

Commit

Permalink
Merge branch 'master' into bump-github-workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
iArchitSharma authored Mar 22, 2024
2 parents 17d3a8d + 403353d commit 39464e1
Show file tree
Hide file tree
Showing 64 changed files with 1,036 additions and 1,268 deletions.
6 changes: 6 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

component/cloud-docs:
- "content/en/cloud/**/*"

component/meshmap-docs:
- "content/en/meshmap/**/*"
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
run: echo "spreadsheet_uri=" >> $GITHUB_ENV
if: inputs.spreadshet_uri != ''
echo "spreadsheet_uri=${{ inputs.spreadsheet_uri }}" >> $GITHUB_ENV

- name: Dump keys from the spreadsheet
run: |
curl -L "${{ inputs.spreadsheet_uri }}" -o "./keys.csv";
- name: Create permissions folder
run: |
[ ! -d "./assets/csv/permissions" ] && mkdir -p "./assets/csv/permissions";
mv keys.csv assets/permissions/keys.csv;
[ ! -d "./static/data/csv" ] && mkdir -p "./static/data/csv";
mv keys.csv static/data/csv/keys.csv;
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v5
with:
Expand All @@ -37,4 +37,4 @@ jobs:
commit_options: '--signoff'
commit_user_name: l5io
commit_user_email: [email protected]
commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>author of the commit that triggered the run
commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>author of the commit that triggered the run
14 changes: 14 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: "Pull Request Labeler"
on:
- pull_request_target

jobs:
triage:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-22.04
steps:
- uses: actions/labeler@v4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion CONTRIBUTING-gitflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Now, your local master branch is up-to-date with everything modified upstream.
**Create a Branch** (doing your work)
Whenever you begin work on a new feature or bugfix, it's important that you create a new branch. Not only is it proper git workflow, but it also keeps your changes organized and separated from the master branch so that you can easily submit and manage multiple pull requests for every task you complete.

To create a new branch and start working on it, peform the following flow.
To create a new branch and start working on it, perform the following flow.

## Checkout the master branch - you want your new branch to come from master
```
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Now to setup and run the site locally run:

...and then visit http://localhost:1313.

If you pull down new code from GitHub, you will occassionally need run `make setup` again. Otherwise, there's no need to re-run `make setup` each time the site is run, you can just run `make site` to get it going and have it automatically reload as you make and save site edits.
If you pull down new code from GitHub, you will occasionally need run `make setup` again. Otherwise, there's no need to re-run `make setup` each time the site is run, you can just run `make site` to get it going and have it automatically reload as you make and save site edits.

### Editing Markdown Content

Expand All @@ -43,7 +43,7 @@ The significant keys in the YAML frontmatter are:

`title` (string) - This is the title of the page that will be set in the HTML title.
`description` (string) - This is a description of the page that will be set in the HTML description.
`permalink` (string - relative file path) - canoncial location of the page
`permalink` (string - relative file path) - canonical location of the page
`category` (string) - section to which the page belongs.
`redirect_from` (string - relative file path) - in case the page was previously available elsewhere

Expand Down
545 changes: 0 additions & 545 deletions assets/csv/keys.csv

This file was deleted.

63 changes: 62 additions & 1 deletion assets/scss/_elements_project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,65 @@ div.tip {
height: 22%;
float: right;
border-radius: 50%;
}
}

.prevBtn {
$btn-color: $primary;
$btn-color-dark: shade($btn-color, 40%);
color: tint($btn-color);

&:before {
content: '';
// @include absolute(0,0,0,0);
background-color: $btn-color-dark;
transform: translateX(-100%);
}

&:hover {
color: tint($btn-color, 75%);

&:before {
transform: translateX(0);
}
}
}

.pagination-nav {
grid-gap: 1rem;
display: grid;
gap: 1rem;
grid-template-columns: repeat(2, 1fr);
}


.pagination-nav__link {
border: 1px solid $lightslategray;
border-radius: 0.4rem;
display: block;
height: 100%;
line-height: 1.25;
padding: 1rem;
transition: border-color 200ms cubic-bezier(0.08,0.52,0.52,1);
}

.pagination-nav__link:hover {
border-color: $primary;
}

.pagination-nav__link--next {
grid-column: 2 / 3;
text-align: right;
}

.pagination-nav__sublabel{
color:$light;
font-size:0.875rem;
font-weight:500;
margin-bottom: 0.25rem;
}

.pagination-nav__label {
font-size: 1rem;
font-weight: 600;
word-break: break-word;
}
7 changes: 7 additions & 0 deletions assets/scss/_styles_project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -538,3 +538,10 @@ a:not([href]):not([class]):hover {
.sc-imWYAI.sc-fTFjTM.dCEJze.hRziAa {
color: red;
}

.click-to-copy button{
aspect-ratio: 1;
box-shadow: 1px 1px 5px #636567!important;
top: 6px!important;
right: 10px!important;
}
6 changes: 3 additions & 3 deletions assets/scss/_variables_project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ $font-qanelas: "Qanelas Soft", sans-serif, -apple-system, BlinkMacSystemFont,
"Segoe UI", Roboto, "Helvetica Neue", Arial, "Apple Color Emoji",
"Segoe UI Emoji", "Segoe UI Symbol";

@if $td-enable-google-fonts {
$td-fonts-serif: prepend($td-fonts-serif, "#{$google_font_name}");
}
// @if $td-enable-google-fonts {
// $td-fonts-serif: prepend($td-fonts-serif, "#{$google_font_name}");
// }

$font-family-sans-serif: $td-fonts-serif;
$font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas,
Expand Down
30 changes: 30 additions & 0 deletions content/en/charts/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
title: Layer5 Helm Repository
description: Layer5 Helm Repository contains a collection of charts, including Layer5 Cloud, which can be deployed in any Kubernetes cluster on-premises or in Cloud using Helm.
linkTitle: Layer5 Helm Repository
type: docs
menu: {main: {weight: 3}}
weight: 1
cascade:
type: docs
---

{{< alert type="info" title="Repository Only">}}
This page only contains a brief synopsis of the Helm repository.

See the [Self-Hosted section](/cloud/self-hosted/) of the Layer5 Cloud documentation for deployment prerequisites, considerations, and instructions.
{{< /alert >}}

## Repository Contents

Contained in the Layer5 Helm repository is the [Meshery Remote Provider](https://docs.meshery.io/extensibility/providers) charts (and it's subcharts) for Layer5 Cloud. See the repository's <a href="/charts/index.yaml">full index</a> of Layer5 Helm charts</a>.

## Chart Source

<p>The source for this chart is located in the <code>layer5io/meshery-cloud</code> repository under <a href="https://github.com/layer5io/meshery-cloud/tree/master/install/kubernetes/">install/kubernetes/</a>.</p>
<br />
{{< alert type="info" title="Complete Deployment Instructions">}}
Layer5 Cloud's Helm chart supports a number of [configuration options](https://docs.layer5.io/cloud/self-hosted/deploy-with-helm/).

See the [Self-Hosted section](/cloud/self-hosted/) of the Layer5 Cloud documentation for deployment prerequisites, considerations, and instructions.
{{< /alert >}}
4 changes: 3 additions & 1 deletion content/en/cloud/catalog/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Public Catalog: https://meshery.layer5.io/catalog

The Cloud Catalog is a web-based, public catalog to facilitate easy discovery of existing designs. Designs that are published into the catalog can be, but are not always curated for known best practices and patterns. Content is published at [meshery.layer5.io/catalog](https://meshery.layer5.io/catalog), and one-click import of catalog content into Meshery Server is seamlessly integrated.

![Flow for sharing design](./images/Slide51.svg)

### Content Visibility

Each item in the catalog comes with an associated level of visibility.
Expand All @@ -37,7 +39,7 @@ Catalog content is categorized in a number of ways:
- **Patterns**: Cloud native patterns enable the business function in simple language.
- **Filters**: Embedded in the data plane of a service mesh, WebAssembly filters offer fine-grained control over service requests.
- **Programs**: Embedded in the data plane of a service mesh, eBPF programs performant, fine-grained control over service requests.
- **Policies**: Applied across the cloud native infrastructure under management, policies may be applied broadly and specificly.
- **Policies**: Applied across the cloud native infrastructure under management, policies may be applied broadly and specifically.

<!-- List design metadata and descriptions here -->

Expand Down
1 change: 1 addition & 0 deletions content/en/cloud/catalog/images/Slide51.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Creating a Design from Meshery Catalog Templates
description: With this guide, you can create amazing cloud native designs for your infrastructure from already avaliable templetes in the meshery catalog.
description: With this guide, you can create amazing cloud native designs for your infrastructure from already available templates in the meshery catalog.
weight: 2
---

Expand All @@ -10,10 +10,10 @@ weight: 2

1. Sign into [Layer5 Cloud](https://meshery.layer5.io)
2. Explore the catalogs located in the menu section.
3. Search by technology or type and find the best templete for your infrastructure. You will already see some of the information just by hovering on it.
3. Search by technology or type and find the best template for your infrastructure. You will already see some of the information just by hovering on it.
4. For detailed information just click on it.
5. Simply click the green clone button.
6. Now you have it. Navigate to [Meshery Playground](https://playground.meshery.io/)
7. Go to the MeshMap and you will see your cloned template here. If you con't see it just reload the page.

You can also publish your own design as a templete.
You can also publish your own design as a template.
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@ The first steps in starting with Layer5 are to create an account, verify your em
To sign up for an account on Layer5 Cloud, navigate to <https://cloud.layer5.io/signup>.
You may choose to either signup with your personal email or any of our supported OAuth providers like Github and Gmail. See "OAuth Providers" for more information.

![Flow for user account creation](/cloud/getting-started/images/Slide40.svg)

### 2. Verifying your email address

To ensure you can use all the features in your Layer5 plan, verify your email address after signing up for a new account. For more information, see "Verifying your email address."


<!-- considering we would want to use 2FA in future
4. Configuring two-factor authentication
Expand All @@ -30,9 +33,10 @@ Optionally, after you have configured 2FA, add a passkey to your account to enab

### 3. Signing in to Layer5 Cloud

To sign in to Layer5 Cloud, navigate to <https://cloud.layer5.io/login>. Use your new credentials to sign in. Incase you have signed up with OAuth provider, you will be redirected to the provider's login page.
To sign in to Layer5 Cloud, navigate to <https://meshery.layer5.io/login>. Use your new credentials to sign in. In case you have signed up with OAuth provider, you will be redirected to the provider's login page.
On successful login, you will be prompted to setup your first organization and workspace.


### 4. Creating an organization

Organization are unit of tenant in Layer5 Cloud. Every user on Layer5 Cloud is part of at least one organization. You can create your own organization or join an existing one. By default you are the owner of the organization you create.
Expand All @@ -45,7 +49,7 @@ Give your organization a name and a description. For more information, see "Crea

### 5. Creating a workspace

Workspaces are logical group of shared set of resources like environments, connections, credentials, infrastructural designs and more. Every user on Layer5 Cloud is part of at least one workspace. You can create your own workspace or join an existing one. By default you are the owner of the workspace you create. You can share access to resouces in your workspaces through teams.
Workspaces are logical group of shared set of resources like environments, connections, credentials, infrastructural designs and more. Every user on Layer5 Cloud is part of at least one workspace. You can create your own workspace or join an existing one. By default you are the owner of the workspace you create. You can share access to resources in your workspaces through teams.

{{< alert type="info" >}}
For more information, see [Workspaces](/cloud/workspaces/)
Expand All @@ -59,4 +63,4 @@ The dashboard is the first page you see when you sign in to Layer5 Cloud. It pro

### 7. Viewing your Layer5 profile

Your Layer5 profile tells people the story of your work through the recent activites, designs that you've published to Cloud catalog and much more. For more information, see "About your profile".
Your Layer5 profile tells people the story of your work through the recent activities, designs that you've published to Cloud catalog and much more. For more information, see "About your profile".
1 change: 1 addition & 0 deletions content/en/cloud/getting-started/images/Slide40.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions content/en/cloud/getting-started/images/Slide49.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions content/en/cloud/getting-started/support.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
title: Support
description: If you have any questions, encounter any issues, or need assistance with anything related to our platform, please don't hesitate to reach out to us.
weight: 1
---

At Layer5 Cloud, we're here to help you every step of the way. If you have any questions, encounter any issues, or need assistance with anything related to our platform, please don't hesitate to reach out to us. Our dedicated support team is committed to providing you with the help and guidance you need.

### Contacting Support

You can contact Layer5 support in the following ways:

- **Email**: Send us an email at [[email protected]](mailto:[email protected]) with your questions or concerns. Our support team will respond to you as soon as possible and assist you with resolving any issues.

- **Community Forum**: Join our vibrant [community forum](https://discuss.layer5.io/) where you can ask questions, share your experiences, and connect with other users. Our community members and moderators are here to help you and provide valuable insights and assistance.

### Account Recovery

If you've forgotten your Layer5 Cloud account password, don't worry. You can easily recover your account using the following steps:

1. Go to the Layer5 Cloud [login page](https://meshery.layer5.io/login).

2. On the login page, click on the "Forgot Password" link below the login form.

3. Enter the email address associated with your Layer5 Cloud account and click "Submit."

4. You'll receive an email with instructions on how to reset your password. Follow the instructions provided in the email to reset your password.

5. Once you've clicked the password reset link in the email, you'll be directed to a page where you can create a new password for your account. Enter your new password and confirm it, then click "Submit" to save your changes.

6. After successfully resetting your password, you can now login to your Layer5 Cloud account using your new password.

![Account Recovery](/cloud/getting-started/images/Slide49.svg)

2 changes: 1 addition & 1 deletion content/en/cloud/github-actions/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ To integrate Snapshots into your GitHub pull requests, confirm that your user ac
1. Specify the path within your Git repository where the application configurations are stored. This ensures Meshery knows where to find and visuzlie the desired state of your infrastructure.

{{%pageinfo%}}
Curently, only authorization of the Meshery GitHub App is supported. If you would like to use your GitHub user's personal access token, [please let us know](https://meshery.layer5.io/support). {{%/pageinfo%}}
Currently, only authorization of the Meshery GitHub App is supported. If you would like to use your GitHub user's personal access token, [please let us know](https://meshery.layer5.io/support). {{%/pageinfo%}}


## Customizing Snapshot Workflow Triggers in MeshMap Snapshot
Expand Down
40 changes: 0 additions & 40 deletions content/en/cloud/identity/organizations/default-permissions.md

This file was deleted.

Loading

0 comments on commit 39464e1

Please sign in to comment.