Skip to content

Commit 68401fb

Browse files
authored
Merge branch 'master' into button-scroll
2 parents eea2900 + 68daf27 commit 68401fb

510 files changed

Lines changed: 2815 additions & 1648 deletions

File tree

Some content is hidden

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

.desktop-lighthouserc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = {
1313
"http://localhost/cloud-native-management/kanvas/index.html?desktop",
1414
"http://localhost/learn/learning-paths/index.html?desktop",
1515
"http://localhost/learn/service-mesh-books/index.html?desktop",
16-
"http://localhost/learn/service-mesh-workshops/index.html?desktop",
16+
"http://localhost/learn/workshops/index.html?desktop",
1717
"http://localhost/learn/index.html?desktop",
1818
"http://localhost/blog/index.html?desktop",
1919
"http://localhost/resources/index.html?desktop",

.lighthouserc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = {
1111
"http://localhost/cloud-native-management/kanvas/index.html",
1212
"http://localhost/learn/learning-paths/index.html",
1313
"http://localhost/learn/service-mesh-books/index.html",
14-
"http://localhost/learn/service-mesh-workshops/index.html",
14+
"http://localhost/learn/workshops/index.html",
1515
"http://localhost/learn/index.html",
1616
"http://localhost/blog/index.html",
1717
"http://localhost/resources/index.html",

README.md

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,6 @@
5959
<br />
6060

6161

62-
<p style="clear:both;">
63-
<h2><a href="https://layer5.io/landscape">Service Mesh Landscape</a></h2>
64-
<a href="https://layer5.io/landscape"><img src=".github/assets/images/buttons/landscape.webp"
65-
style="float:left;margin:10px;" width="125px"
66-
alt="Service Mesh Landscape Ecosystem" align="left"/></a>
67-
The <a href="https://layer5.io/landscape">Service Mesh Landscape</a> is a comprehensive collection of prominent service mesh projects and offerings laid out in contrast to one another.
68-
<br /><br /><br />
69-
</p>
70-
<br />
71-
72-
7362
<p style="clear:both;">
7463
<h2><a href="https://layer5.io/projects/cloud-native-performance">Cloud Native Performance</a></h2>
7564
<a href="https://layer5.io/projects/cloud-native-performance">
@@ -91,7 +80,7 @@ The <a href="https://layer5.io/projects/cloud-native-performance">Cloud Native P
9180
style="float:left;margin:10px;" width="125px"
9281
alt="Image Hub" align="left" /></a>
9382
<a href="https://layer5.io/projects/image-hub">Image Hub</a> is a demo application which runs on <a href="https://docs.meshery.io/service-meshes/adapters/consul">Consul</a> and facilitates exploring WebAssembly modules used as Envoy Filters.
94-
Image Hub supports Envoy-based data planes. It is compatible with and can be deployed on Istio and Consul service meshes.
83+
Image Hub supports Envoy-based data planes. It is compatible with and can be deployed on Istio and Consul.
9584
<br /><br /><br />
9685
</p>
9786
<br />
@@ -121,18 +110,6 @@ alt="Learn Layer5" align="left" />
121110
</p>
122111
<br />
123112

124-
125-
<!-- <p style="clear:both;">
126-
<h2><a href="https://layer5.io/smi">Service Mesh Interface Conformance </a></h2>
127-
<a href="https://layer5.io/smi"><img src=".github/assets/images/smi-conformance/checklist.svg"
128-
style="float:left;margin:10px;" width="125px"
129-
alt="Service Mesh Interface Conformance" align="left" /></a>
130-
<a href="https://layer5.io/smi">SMI Conformance</a> includes all service mesh projects participating in the Service Mesh Interface specification. It is an easy-to-use, service mesh and SMI-specific tool to give service mesh projects and users a suite of repeatable conformance tests.
131-
<br /><br /><br />
132-
</p>
133-
<br />
134-
-->
135-
136113
<p style="clear:both;">
137114
<h2><a href="https://layer5.io/projects/nighthawk">Nighthawk</a></h2>
138115
<a href="https://getnighthawk.dev/">

content-learn/mastering-kubernetes-for-engineers/ambassador-edge-stack-api-gateway-with-meshery/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
docType: "Course"
33
title: "Course"
4-
description: "This course will guide you through the process of deploying and visualizing Edge Stack components with Meshery. You will learn how to install and configure the Ambassador API Gateway and explore its integration with Meshery. Additionally, you will gain hands-on experience with two popular service meshes, Istio and Linkerd. By the end of this course, you will have a solid understanding of Edge Stack deployment and be able to leverage Meshery for managing your API gateway and service mesh configurations."
4+
description: "This course will guide you through the process of deploying and visualizing Edge Stack components with Meshery. You will learn how to install and configure the Ambassador API Gateway and explore its integration with Meshery. Additionally, you will gain hands-on experience with Istio and Linkerd. By the end of this course, you will have a solid understanding of Edge Stack deployment and be able to leverage Meshery for managing your API gateway and infrastructure configurations."
55
videos: 0
66
lectures: 4
77
courseTitle: "Ambassador Edge Stack API Gateway with Meshery"

gatsby-node.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,17 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
7373
isPermanent: true,
7474
});
7575
createRedirect({
76-
fromPath: "/workshops",
76+
fromPath: "/learn/workshops",
7777
toPath: "/learn/service-mesh-workshops",
7878
redirectInBrowser: true,
7979
isPermanent: true,
8080
});
81+
createRedirect({
82+
fromPath: "/workshops",
83+
toPath: "/learn/workshops",
84+
redirectInBrowser: true,
85+
isPermanent: true,
86+
});
8187
createRedirect({
8288
fromPath: "/labs",
8389
toPath: "/learn/service-mesh-labs",

install/deployment_yamls/k8s/meshery-app-mesh-deployment.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

install/deployment_yamls/k8s/meshery-app-mesh-service.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

install/deployment_yamls/k8s/meshery-cilium-deployment.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

install/deployment_yamls/k8s/meshery-cilium-service.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

install/deployment_yamls/k8s/meshery-consul-deployment.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)