Skip to content

Commit ac2d853

Browse files
author
Vivek Vishal
authored
Merge branch 'master' into opengraph_img
2 parents cc0ceae + d138ad4 commit ac2d853

1,022 files changed

Lines changed: 4636 additions & 8943 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",

.github/stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Number of days of inactivity before an issue becomes stale
2-
daysUntilStale: 45
2+
daysUntilStale: 8
33
# Number of days of inactivity before a stale issue is closed
4-
daysUntilClose: 1
4+
daysUntilClose: 0
55
# Issues with these labels will never be considered stale
66
exemptLabels:
77
- issue/willfix

.github/workflows/kanvas.yml

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,47 @@
1-
name: Kanvas Snapshot Service
2-
on: # rebuild any PRs and main branch changes
3-
pull_request_target:
4-
types: [opened, synchronize, reopened]
5-
1+
name: Kanvas Screenshot Service
2+
'on':
3+
pull_request:
4+
types:
5+
- opened
6+
- synchronize
7+
- reopened
68
workflow_call:
79
inputs:
8-
fileName:
10+
fileName:
911
description: Relative file path from the root directory
1012
required: true
1113
type: string
1214
outputs:
1315
resource_url:
14-
description: "The URL of the generated resource."
15-
value: ${{ jobs.MeshMapScreenshot.outputs.resource_url }}
16-
permissions:
16+
description: The URL of the generated resource.
17+
value: ${{ jobs.KanvasScreenshot.outputs.resource_url }}
18+
permissions:
1719
actions: read
1820
contents: write
1921
security-events: write
2022
statuses: write
2123
pull-requests: write
2224
id-token: write
23-
2425
jobs:
25-
MeshMapScreenshot:
26-
runs-on: ubuntu-24.04
26+
KanvasScreenshot:
27+
runs-on: ubuntu-latest
2728
outputs:
2829
resource_url: ${{ steps.test_result.outputs.resource_url }}
2930
steps:
30-
- name: Set PR number # To comment the final status on the Pull-request opened in any repository
31+
- name: Set PR number
3132
run: |
3233
export pull_number=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
3334
echo "PULL_NO=$pull_number" >> $GITHUB_ENV
3435
- uses: actions/checkout@v4
35-
- uses: actions/checkout@v4 #this step would go away
36+
- uses: actions/checkout@v4
3637
with:
3738
path: action
3839
repository: layer5labs/kanvas-snapshot
3940
- id: test_result
40-
uses: layer5labs/Kanvas-Snapshot@v0.2.33
41+
uses: layer5labs/kanvas-snapshot@v0.2.34
4142
with:
42-
githubToken: ${{ secrets.GITHUB_TOKEN }} # github's personal access token example: "ghp_...."
43-
mesheryToken: ${{ secrets.MESHERY_TOKEN }} # Meshery Cloud Authentication token, signin to meshery-cloud to get one, example: ey.....
44-
prNumber: ${{ env.PULL_NO }} # auto-filled from the above step
45-
application_type: Kubernetes Manifest # your application type, could be any of three: "Kubernetes Manifest", "Docker Compose", "Helm Chart"
46-
filePath: ${{ inputs.fileName == '' && 'install/deployment_yamls/k8s' || inputs.fileName }} # relative file-path from the root directory in the github-runner env, you might require to checkout the repository as described in step 2
43+
githubToken: ${{ secrets.GITHUB_TOKEN }}
44+
mesheryToken: ${{ secrets.MESHERY_TOKEN }}
45+
prNumber: ${{ env.PULL_NO }}
46+
application_type: Kubernetes Manifest
47+
filePath: ${{ inputs.fileName == '' && 'install/deployment_yamls/k8s/meshery-deployment.yaml' || inputs.fileName }}

.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: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
const path = require("path");
9+
const fs = require("fs");
910
const slugify = require("./src/utils/slugify");
1011
const { paginate } = require("gatsby-awesome-pagination");
1112
const { createFilePath } = require("gatsby-source-filesystem");
@@ -71,9 +72,15 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
7172
redirectInBrowser: true,
7273
isPermanent: true,
7374
});
75+
createRedirect({
76+
fromPath: "/learn/workshops",
77+
toPath: "/learn/workshops",
78+
redirectInBrowser: true,
79+
isPermanent: true,
80+
});
7481
createRedirect({
7582
fromPath: "/workshops",
76-
toPath: "/learn/service-mesh-workshops",
83+
toPath: "/learn/workshops",
7784
redirectInBrowser: true,
7885
isPermanent: true,
7986
});
@@ -797,15 +804,19 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
797804

798805
components.forEach((name) => {
799806
pageTypes.forEach(({ suffix, file }) => {
800-
const path = `/projects/sistent/components/${name}${suffix}`;
807+
const pagePath = `/projects/sistent/components/${name}${suffix}`;
801808
const componentPath = `./src/sections/Projects/Sistent/components/${name}/${file}`;
802-
try {
803-
createPage({
804-
path,
805-
component: require.resolve(componentPath),
806-
});
807-
} catch (error) {
808-
console.error(`Error creating page for ${path}:`, error);
809+
if (fs.existsSync(path.resolve(componentPath))) {
810+
try {
811+
createPage({
812+
path: pagePath,
813+
component: require.resolve(componentPath),
814+
});
815+
} catch (error) {
816+
console.error(`Error creating page for "${pagePath}":`, error);
817+
}
818+
} else {
819+
console.info(`Skipping creating page "${pagePath}" - file not found: "${componentPath}"`);
809820
}
810821
});
811822
});
@@ -1101,7 +1112,7 @@ exports.createSchemaCustomization = ({ actions }) => {
11011112
createTypes(typeDefs);
11021113
};
11031114

1104-
const fs = require("fs");
1115+
11051116

11061117
exports.onPostBuild = async ({ graphql, reporter }) => {
11071118
const result = await graphql(`

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.

0 commit comments

Comments
 (0)