Skip to content

Commit

Permalink
Merge branch 'master' into aabidsofi/k8s-switcher
Browse files Browse the repository at this point in the history
  • Loading branch information
aabidsofi19 authored Sep 7, 2023
2 parents ef95e97 + 08962df commit b430bbc
Show file tree
Hide file tree
Showing 85 changed files with 2,101 additions and 34,410 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ assignees: ''
- 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
- 🎨 Wireframes and designs for Meshery UI in [Figma](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
- 🧪 [Meshery Test Plan Spreadsheet](https://docs.google.com/spreadsheets/d/13Ir4gfaKoAX9r8qYjAFFl_U9ntke4X5ndREY1T7bnVs/edit#gid=0)

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: 🙋🏾🙋🏼‍Question
url: https://discuss.layer5.io
url: http://discuss.meshery.io
about: Submit your question on the discussion forum.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ assignees: ''
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/contributing/build-and-release)
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/fbug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ assignees: ''
- 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ assignees: ''
- 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
- 🎨 Wireframes and designs for Meshery UI in [Figma](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/meshery-extensions_bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ assignees: ''
- 🎨 UI Design For Meshery Extensions [Figma](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
- 📚 [Meshery Extensibility Providers](https://docs.meshery.io/extensibility/providers)
- ⌨️ [Meshery API Docs](https://docs.meshery.io/extensibility/api)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/meshery-extensions_feature.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ assignees: ''
- 🎨 UI Design For Meshery Extensions [Figma](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
- 📚 [Meshery Extensibility Providers](https://docs.meshery.io/extensibility/providers)
- ⌨️ [Meshery API Docs](https://docs.meshery.io/extensibility/api)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/meshery-ui_bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ assignees: ''

- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
- 🖥 [Contributing to Meshery UI](https://docs.meshery.io/project/contributing/contributing-ui)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/meshery-ui_feature.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ assignees: ''

- 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
- 🖥 [Contributing to Meshery UI](https://docs.meshery.io/project/contributing/contributing-ui)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/mesheryctl_bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ _See [mesheryctl Command Tracker](https://bit.ly/3dqXy1q) for current status of
- 📺 [Beginner's guide to contributing to Meshery and mesheryctl](https://youtu.be/hh_kFLZx3G4)
- ⌨️ [mesheryctl Command Tracker](https://docs.google.com/spreadsheets/d/1q63sIGAuCnIeDs8PeM-0BAkNj8BBgPUXhLbe1Y-318o/edit#gid=0)
- ⌨️ [Meshery CLI Commands and Documentation](https://docs.google.com/document/d/1xRlFpElRmybJ3WacgPKXgCSiQ2poJl3iCCV1dAalf0k/edit#heading=h.5fucij4hc5wt)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/mesheryctl_feature.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ _See [mesheryctl Command Tracker](https://bit.ly/3dqXy1q) for current status of
- [Beginner's guide to contributing to Meshery and mesheryctl](https://youtu.be/hh_kFLZx3G4)
- [mesheryctl Command Tracker](https://docs.google.com/spreadsheets/d/1q63sIGAuCnIeDs8PeM-0BAkNj8BBgPUXhLbe1Y-318o/edit#gid=0)
- [Meshery CLI Commands and Documentation](https://docs.google.com/document/d/1xRlFpElRmybJ3WacgPKXgCSiQ2poJl3iCCV1dAalf0k/edit#heading=h.5fucij4hc5wt)
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](http://discuss.meshery.io) and [Layer5 Community Slack](https://slack.meshery.io)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/meshmodel.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ assignees: ''

- [MeshModel Repository](https://github.com/meshery/meshery/tree/master/server/meshmodel)
- 🖥 [MeshModel Overview](https://docs.google.com/presentation/d/1SQMfyu5shjpGKlYONdVzOtd7UYTgLWBcgUvHMLCZ2tY/edit#slide=id.g226f5de5180_19_259)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](https://discuss.layer5.io) and [Community Slack](http://slack.layer5.io)
- 🙋🏾🙋🏼 Questions: [Discussion Forum](http://discuss.meshery.io) and [Community Slack](https://slack.meshery.io)

## How to make updates to MeshModel

Expand Down
4 changes: 2 additions & 2 deletions .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
# Comment to be posted to on first time issues
newIssueWelcomeComment: >
Thanks for opening this issue. A contributor will be by to give feedback soon. In the meantime, please review the [Contributors' Welcome Guide](https://docs.meshery.io/project/community), engage in the [discussion forum](https://discuss.layer5.io), and be sure to join the [community Slack](http://slack.meshery.io/).
Thanks for opening this issue. A contributor will be by to give feedback soon. In the meantime, please review the [Contributors' Welcome Guide](https://docs.meshery.io/project/community), engage in the [discussion forum](http://discuss.meshery.io), and be sure to join the [community Slack](http://slack.meshery.io/).
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
Yay, your first pull request! :thumbsup: A contributor will be by to give feedback soon. In the meantime, you can find updates in the [#github-notifications](https://layer5io.slack.com/archives/CLVT4TSG4) channel in the [community Slack](https://slack.layer5.io).
Yay, your first pull request! :thumbsup: A contributor will be by to give feedback soon. In the meantime, you can find updates in the [#github-notifications](https://layer5io.slack.com/archives/CLVT4TSG4) channel in the [community Slack](https://slack.meshery.io).
Be sure to double-check that you have signed your commits. Here are instructions for [making signing an implicit activity while performing a commit](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin).
Expand Down
2 changes: 1 addition & 1 deletion .github/label-commenter-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ comment:
# header: "Please note the following requirement:"
footer: "\
---\n\n
>   	   	   	   	 Be sure to [join the community](http://slack.layer5.io), if you haven't yet and please leave a :star: [star on the project](../stargazers) :smile:
>   	   	   	   	 Be sure to [join the community](https://slack.meshery.io), if you haven't yet and please leave a :star: [star on the project](../stargazers) :smile:
"

labels:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/discussions-data-files-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
- name: Fetch data for mesheryctl tag
run: curl https://discuss.layer5.io/tag/mesheryctl.json -o docs/_data/discuss/mesheryctl.json
run: curl http://discuss.meshery.io/tag/mesheryctl.json -o docs/_data/discuss/mesheryctl.json
- name: Fetch data for meshery tag
run: curl https://discuss.layer5.io/tag/meshery.json -o docs/_data/discuss/meshery.json
run: curl http://discuss.meshery.io/tag/meshery.json -o docs/_data/discuss/meshery.json
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Please do! Thank you for your help in improving Meshery! :balloon:

<summary><h3>Find the complete set of contributor guides at https://docs.meshery.io/project/contributing</h3></summary>

All contributors are welcome. Not sure where to start? Please see the [newcomers welcome guide](https://layer5.io/community/handbook/repository-overview) for how, where, and why to contribute. This project is community-built and welcomes collaboration. Contributors are expected to adhere to our [Code of Conduct](CODE_OF_CONDUCT.md).
All contributors are welcome. Not sure where to start? Please see the [newcomers welcome guide](https://layer5.io/community/newcomers) for how, where, and why to contribute. This project is community-built and welcomes collaboration. Contributors are expected to adhere to our [Code of Conduct](CODE_OF_CONDUCT.md).

All set to contribute? Grab an open issue with the [help-wanted label](../../labels/help%20wanted) and jump in. Join our [Slack channel](http://slack.layer5.io) and engage in conversation. Create a [new issue](/../../issues/new/choose) if needed. All [pull requests](/../../pulls) should ideally reference an open [issue](/../../issues). Include keywords in your pull request descriptions, as well as commit messages, to [automatically close related issues in GitHub](https://help.github.com/en/github/managing-your-work-on-github/closing-issues-using-keywords).
All set to contribute? Grab an open issue with the [help-wanted label](../../labels/help%20wanted) and jump in. Join our [Slack channel](https://slack.meshery.io) and engage in conversation. Create a [new issue](/../../issues/new/choose) if needed. All [pull requests](/../../pulls) should ideally reference an open [issue](/../../issues). Include keywords in your pull request descriptions, as well as commit messages, to [automatically close related issues in GitHub](https://help.github.com/en/github/managing-your-work-on-github/closing-issues-using-keywords).

**Sections**

Expand Down Expand Up @@ -283,7 +283,7 @@ We are using ES-Lint to maintain code quality & consistency in our UI Code. To m
- Remember to run `make ui-lint` & `make ui-provider-lint` if you are making changes in Meshery-UI & Provider-UI respectively.
- The above commands will only fix some basic indenting rules. You will have to manually check your code to ensure there are no duplications, un-used variables or un-declared constants.
- We will soon be adding Pre-Commit Hooks to make sure you get to know your errors before you commit the code.
- In case you are unable to fix your lint errors, ping us on our [Slack](http://slack.layer5.io).
- In case you are unable to fix your lint errors, ping us on our [Slack](https://slack.meshery.io).

## <a name="contributing-mesheryctl">Mesheryctl Documentation</a>

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ alt="Meshery Logo" width="70%" /></picture></a><br /><br /></p>
<img src="https://img.shields.io/github/actions/workflow/status/meshery/meshery/build-and-release-stable.yml?branch=master" /></a>
<a href="https://bestpractices.coreinfrastructure.org/projects/3564" alt="CLI Best Practices">
<img src="https://bestpractices.coreinfrastructure.org/projects/3564/badge" /></a>
<a href="https://discuss.layer5.io" alt="Discuss Users">
<a href="http://discuss.meshery.io" alt="Discuss Users">
<img src="https://img.shields.io/discourse/users?label=discuss&logo=discourse&server=https%3A%2F%2Fdiscuss.layer5.io" /></a>
<a href="https://slack.meshery.io" alt="Join Slack">
<img src="https://img.shields.io/badge/Slack-@layer5.svg?logo=slack" /></a>
Expand Down Expand Up @@ -318,12 +318,12 @@ Find out more on the <a href="https://layer5.io/community#meshmate">Layer5 commu
✔️ <em><strong>Watch</strong></em> community <a href="https://www.youtube.com/playlist?list=PL3A-A6hPO2IMPPqVjuzgqNU5xwnFFn3n0">meeting recordings</a>.<br />
✔️ <em>Fill-in</em> a <a href="https://layer5.io/newcomers">community member form</a> to gain access to community resources.
<br />
✔️ <em><strong>Discuss</strong></em> in the <a href="https://discuss.layer5.io">Community Forum</a>.<br />
✔️ <em><strong>Discuss</strong></em> in the <a href="http://discuss.meshery.io">Community Forum</a>.<br />
✔️ <em><strong>Explore more</strong></em> in the <a href="https://layer5.io/community/handbook">Community Handbook</a>.<br />
</p>
</div><br /><br />
<div>
<a href="http://slack.layer5.io">
<a href="https://slack.meshery.io">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/meshery/meshery/master/.github/assets/images/readme/slack.svg" width="110px" />
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/meshery/meshery/master/.github/assets/images/readme/slack.svg" width="110px" />
Expand Down
8 changes: 7 additions & 1 deletion docs/_data/discuss/meshery.json

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion docs/_data/discuss/mesheryctl.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions docs/_data/mesheryctlcommands/cmds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ perf:
file:
name: --file
arg: apply
description: "Path to service mesh performance test configuration file (default: empty string)."
description: "Path to cloud native performance test configuration file (default: empty string)."
usage: mesheryctl perf apply [profile-name] --url [URL] --file [path to file]
example: mesheryctl perf apply local-perf --url https://192.168.1.15/productpage --file perf-config.yaml
load-generator:
Expand All @@ -465,7 +465,7 @@ perf:
mesh:
name: --mesh
arg: apply
description: Name of the service mesh.
description: Name of the system under test.
usage: mesheryctl perf apply [profile-name] --url [URL] --mesh [name]
example: mesheryctl perf apply local-perf --url https://192.168.1.15/productpage --mesh istio
name:
Expand Down Expand Up @@ -550,12 +550,12 @@ perf:

mesh:
name: mesh
description: Lifecycle management of service meshes
description: Lifecycle management of cloud native infrastructure

subcommands:
validate:
name: validate
description: validate service mesh conformance to different standard specifications
description: validate configuration conformance to different standard specifications
flags:
adapter:
name: --adapter, -a
Expand All @@ -580,7 +580,7 @@ mesh:

remove:
name: remove
description: Remove service mesh in the connected kubernetes cluster
description: Remove service mesh in the connected Kubernetes cluster
usage: mesheryctl mesh remove [args] [flags] [args]
flags:
namespace:
Expand Down Expand Up @@ -615,7 +615,7 @@ mesh:

pattern:
name: pattern
description: Manage service meshes using predefined patterns
description: Manage cloud native infrastructure using predefined patterns
usage: mesheryctl pattern [flags] or mesheryctl pattern [command]
example: mesheryctl pattern list
flags:
Expand Down Expand Up @@ -643,7 +643,7 @@ pattern:

delete:
name: delete
description: Deprovision the resources/ service mesh using the pattern file
description: Deprovision cloud native infrastructure using a design /pattern file
usage: mesheryctl pattern delete [flags]
flags:
file:
Expand Down Expand Up @@ -680,7 +680,7 @@ pattern:

app:
name: app
description: Service Mesh application management
description: Cloud native infrastructure and application management
usage: mesheryctl app [command] [app-name/flag] [flags]
# flags:
# file:
Expand Down
Loading

0 comments on commit b430bbc

Please sign in to comment.