Skip to content

Commit 1c412af

Browse files
authored
Merge branch 'master' into layer5-branch
2 parents 35b52ba + d9d206f commit 1c412af

File tree

206 files changed

+3175
-917
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+3175
-917
lines changed

.github/ISSUE_TEMPLATE/community_member_profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Let's recognize <@github-username> as a contributor and community member by crea
1616
- GitHub: <!-- username only -->
1717
- Twitter: <!-- handle only -->
1818
- LinkedIn: <!-- <profilename> only https://www.linkedin.com/in/<profilename> -->
19-
- Meshery Cloud: <!-- <user ID> only UUID https://meshery.layer5.io/user/<uuid> -->
19+
- Layer5 Cloud: <!-- <user ID> only UUID https://meshery.layer5.io/user/<uuid> -->
2020
- Link to profile picture:
2121

2222
A detailed explanation on how to set up a community member profile can be found in the [CONTRIBUTING.md](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.DEFAULT_GOAL := show-help
2+
# See <https://gist.github.com/klmr/575726c7e05d8780505a> for explanation.
3+
.PHONY: show-help
4+
show-help:
5+
@echo "$$(tput bold)Please specify a build target. The choices are:$$(tput sgr0)";echo;sed -ne"/^## /{h;s/.*//;:d" -e"H;n;s/^## //;td" -e"s/:.*//;G;s/\\n## /---/;s/\\n/ /g;p;}" ${MAKEFILE_LIST}|LC_ALL='C' sort -f|awk -F --- -v n=$$(tput cols) -v i=19 -v a="$$(tput setaf 6)" -v z="$$(tput sgr0)" '{printf"%s%*s%s ",a,-i,$$1,z;m=split($$2,w," ");l=n-i;for(j=1;j<=m;j++){l-=length(w[j])+1;if(l<= 0){l=n-i-length(w[j])-1;printf"\n%*s ",-i," ";}printf"%s ",w[j];}printf"\n";}'|more $(shell test $(shell uname) == Darwin && echo '-Xr')

.github/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ firstPRMergeComment: >
1818
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; Thank you for contributing to the Layer5 community! :tada:
1919
\
2020
\
21-
![Congrats!](https://github.com/layer5io/layer5/blob/master/.github/welcome/Layer5-celebration.webp)
21+
![Congrats!](https://raw.githubusercontent.com/layer5io/layer5/master/.github/welcome/Layer5-celebration.png)
2222
\
2323
\
2424
&nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; [Join the community](https://slack.layer5.io), if you haven't yet and please leave a :star: [star on the project](../stargazers). :smile: and

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,5 @@ default.profraw
9090
.husky/_/
9191

9292
# Lighthouse CI
93-
.lighthouseci/
93+
.lighthouseci/
94+
.gitpod.yml

.gitpod.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This configuration file was automatically generated by Gitpod.
2+
# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
3+
# and commit this file to your remote git repository to share the goodness with others.
4+
5+
# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart
6+
7+
tasks:
8+
- init: npm install && npm run build && make
9+
command: npm run start
10+
11+

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ In the styled component, we find ".logo", add the `svg` element, and within that
248248
> svg file name (`layer5-colorMode`)
249249
250250
- a separator (`_svg___`)
251-
- the class name being targetted inside the SVG (`colorMode1`)
251+
- the class name being targeted inside the SVG (`colorMode1`)
252252
> this results in the class `.layer5-colorMode_svg__colorMode1`
253253
254254
```

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
include .github/Makefile.show-help.mk
15+
include .github/build/Makefile.show-help.mk
1616

1717
setup-libs:
1818
## "DEPRECATED: This target is deprecated. Use `make setup`.
@@ -37,4 +37,4 @@ build:
3737
clean:
3838
gatsby clean && make site
3939

40-
.PHONY: setup build site clean site-fast
40+
.PHONY: setup build site clean site-fast

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
# About Layer5
2525

26-
[Layer5](https://layer5.io)'s cloud native application and infrastructure management software enables organizations to expect more from their infrastructure. We embrace _developer_-defined infrastructure. We empower developers to change how they write applications, support _operators_ in rethinking how they run modern infrastructure, and enable _product owners_ to regain full-control over their product portfolio.
26+
[Layer5](https://layer5.io)'s cloud native application and infrastructure management software enables engineers to expect more from their infrastructure. We embrace _developer_-defined infrastructure. We empower developers to change how they write applications, support _operators_ in rethinking how they run modern infrastructure, and enable _product owners_ to regain full-control over their product portfolio.
2727

2828
# Projects
2929

@@ -71,15 +71,15 @@ The <a href="https://layer5.io/landscape">Service Mesh Landscape</a> is a compre
7171

7272

7373
<p style="clear:both;">
74-
<h2><a href="https://layer5.io/projects/service-mesh-performance">Cloud Native Performance</a></h2>
75-
<a href="https://layer5.io/projects/service-mesh-performance">
74+
<h2><a href="https://layer5.io/projects/cloud-native-performance">Cloud Native Performance</a></h2>
75+
<a href="https://layer5.io/projects/cloud-native-performance">
7676
<picture align="left">
7777
<source media="(prefers-color-scheme: dark)" srcset="src/assets/images/service-mesh-performance/stacked/smp-light-text.svg">
7878
<source media="(prefers-color-scheme: light)" srcset=".github/assets/images/smp-dark-text.svg">
7979
<img align="left" src="src/assets/images/service-mesh-performance/stacked/smp-light-text.svg" alt="Shows a dark SMP logo in light mode and a white logo in dark mode" width="125px" style="float:left;margin:10px;" />
8080
</picture>
8181
</a>
82-
The <a href="https://layer5.io/projects/service-mesh-performance">Cloud Native Performance</a> is a vendor-neutral specification for capturing details of environment and infrastructure details, cloud native infrastructure and its configuration, service/application details, and bundling of statistical analysis of results.
82+
The <a href="https://layer5.io/projects/cloud-native-performance">Cloud Native Performance</a> is a vendor-neutral specification for capturing details of environment and infrastructure details, cloud native infrastructure and its configuration, service/application details, and bundling of statistical analysis of results.
8383
<br /><br /><br />
8484
</p>
8585
<br />
@@ -103,7 +103,7 @@ Image Hub supports Envoy-based data planes. It is compatible with and can be dep
103103
<img src=".github/assets/images/meshery-operator/meshery-operator-dark.svg"
104104
style="float:left;margin:10px;" width="125px" alt="Meshery operator" align="left" />
105105
</a>
106-
<a href="https://github.com/layer5io/meshery-operator">Meshery Operator</a> deploys and manages MeshSync.
106+
<a href="https://github.com/layer5io/meshery-operator"> Meshery Operator</a> deploys and manages MeshSync.
107107
<br /><br /><br /><br />
108108
</p>
109109
<br />
@@ -147,7 +147,7 @@ alt="Nighthawk" align="left" />
147147

148148

149149
<p style="clear:both;">
150-
<h2><a href="https://layer5.io/projects/catalog">Meshery Catalog</a></h2>
150+
<h2><a href="https://meshery.layer5.io/catalog">Meshery Catalog</a></h2>
151151
<a href="">
152152
<img src=".github/assets/images/catalog/catalog.svg"
153153
style="float:left;margin:10px;" width="125px"
@@ -159,7 +159,7 @@ alt="Meshery Catalog" align="left" />
159159

160160
<p style="clear:both;">
161161
<h1><a name="contributing"></a><a name="community"></a> <a href="https://layer5.io/community">Community</a> and <a href="https://layer5.io/community/handbook">Contributions</a></h1>
162-
<p> We warmly welcome all contributors! Our projects are community-built and each welcomes open collaboration. As you get started, please review this project's <a href="https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md">contributing guidelines</a>. Whether you are a user or code contributor and whether your opening an <a href="/../../issues">issue</a> or a <a href="/../../pulls">pull requests</a>, know that any form of your engagement is considered contribution and is appreciated. Contributors are expected to adhere to the <a href="https://github.com/cncf/foundation/blob/master/code-of-conduct.md">CNCF Code of Conduct</a>.
162+
<p> We warmly welcome all contributors! Our projects are community-built and each welcomes open collaboration. As you get started, please review this project's <a href="https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md">contributing guidelines</a>. Whether you are a user or code contributor and whether you're opening an <a href="/../../issues">issue</a> or a <a href="/../../pulls">pull request</a>, know that any form of your engagement is considered contribution and is appreciated. Contributors are expected to adhere to the <a href="https://github.com/cncf/foundation/blob/master/code-of-conduct.md">CNCF Code of Conduct</a>.
163163
</p>
164164
<p>
165165
Join us in the <a href="https://discuss.layer5.io">discussion forum</a> and on <a href="https://slack.layer5.io"><img src=".github/assets/images/slack.webp" height="16px" align="bottom" /> Slack</a> to learn more about Layer5 and its community! Make sure you see the <a href="https://layer5.io/community/newcomers">newcomer's guide</a> for a tour of resources available to you.

content-learn/mastering-service-meshes-for-operators/index.mdx renamed to content-learn/mastering-kubernetes-for-engineers/index.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
title: 'Mastering Service Meshes for Operators'
3-
description: 'Learn how to deploy a service mesh and manage its workloads'
2+
title: 'Mastering Kubernetes for Engineers'
3+
description: 'Learn how to configure your Kubernetes clusters and manage the lifecycle of your workloads'
44
order: 4
55
themeColor: '#3C494F'
6-
cardImage: '../../src/assets/images/service-mesh-icons/service-mesh.svg'
6+
cardImage: '../../src/assets/images/meshery/icon-only/meshery-logo-light.webp'
77
courses: 0
88
disabled: yes
99
---

content-learn/mastering-service-meshes-for-developers/advance-concepts-of-service-mesh/istio/conclusion.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
docType: "Chapter"
33
chapterTitle: "Conclusion"
4-
description: "Meshery is the cloud native management plane which offers lifecycle, configuration, and performance management of service meshes and their workloads."
4+
description: "As a self-service engineering platform, Meshery enables collaborative design and operation of cloud native infrastructure."
55
videos: 4
66
lectures: 12
77
order: 8

0 commit comments

Comments
 (0)