Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into connections_MUI
Browse files Browse the repository at this point in the history
  • Loading branch information
SAHU-01 committed Sep 20, 2024
2 parents 82d2ebd + 26698db commit 434faf4
Show file tree
Hide file tree
Showing 709 changed files with 69,602 additions and 648 deletions.
65 changes: 13 additions & 52 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
@@ -1,57 +1,18 @@
name: Meshery Build and Releaser (meshery-extensions channel)
name: Notify Meshery Extensions channel build
on:
workflow_dispatch:

push:
tags:
- 'v*'
jobs:
docker-build-push:
name: Docker build and push
if: github.repository == 'meshery/meshery' && github.event_name != 'pull_request' && success()
env:
RELEASE_CHANNEL: "kanvas"
notfiy-build:
name: Notify providers for Meshery Extensions channel build
if: github.repository == 'meshery/meshery'
runs-on: ubuntu-22.04
steps:
- name: Fetch latest tag
run: |
echo "LATEST_TAG=$(curl --silent "https://api.github.com/repos/meshery/meshery/releases" | jq ' .[] | ."tag_name"' | sed -n 1p$'\n' | tr -d '"')" >> $GITHUB_ENV
- name: Check out code
uses: actions/checkout@v4
with:
fetch-depth: 1
ref: ${{ inputs.branch }}
- name: Docker login
uses: azure/docker-login@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Configure Meshery UI
run: |
cat << EOF > ui/ui.config.js
module.exports = {
components: {
navigator: false, // set false to disable the navigator component ( default: true )
},
};
EOF
- name: Docker build & tag
run: |
DOCKER_BUILDKIT=1 docker build -f install/docker/Dockerfile --no-cache -t ${{ secrets.IMAGE_NAME }}:kanvas-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::8} --build-arg GIT_VERSION=${{ env.LATEST_TAG }} --build-arg RELEASE_CHANNEL=${RELEASE_CHANNEL} .
docker tag ${{ secrets.IMAGE_NAME }}:kanvas-latest ${{ secrets.IMAGE_NAME }}:kanvas-${GITHUB_SHA::8}
docker tag ${{ secrets.IMAGE_NAME }}:kanvas-latest ${{ secrets.IMAGE_NAME }}:kanvas-${{ env.LATEST_TAG }}
- name: Docker push
run: |
docker push ${{ secrets.IMAGE_NAME }}:kanvas-latest
docker push ${{ secrets.IMAGE_NAME }}:kanvas-${GITHUB_SHA::8}
docker push ${{ secrets.IMAGE_NAME }}:kanvas-${{ env.LATEST_TAG }}
call-meshery-extensions-playground-rollout:
needs:
- docker-build-push
name: Deploy CNCF Extensions Playground
uses: layer5labs/meshery-extensions-packages/.github/workflows/deploy-meshery-extensions-playground.yml@master
with:
# should we use SHA?
# As if meshery is not released but we want to deploy changes from the master branch, the release/latest tag will be same and hence the rollout will be skipped.
image: layer5/meshery:kanvas-${ GITHUB_SHA::8 }
secrets: inherit
- name: trigger plugins for edge
uses: layer5io/trigger-remote-provider-action@master
with:
name: "Build and Rollout Kanvas"
repo: layer5labs/meshery-extensions-packages
token: ${{ secrets.GH_ACCESS_TOKEN }}
40 changes: 40 additions & 0 deletions .github/workflows/first-time-contributor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: First-Time Contributor Welcome
on:
pull_request:
types: [opened]
jobs:
welcome:
runs-on: ubuntu-latest
if: github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
steps:
- name: Leave Welcome Comment
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const message = `Welcome, @${{ github.event.pull_request.user.login }}! Thank you for your first contribution! 🎉 A contributor will be by to give feedback soon. In the meantime, please review the [Newcomers' Guide](https://layer5.io/community/newcomers) and be sure to join the [community Slack](https://slack.meshery.io/).
<p align="center" width="100%">
<img src="https://github.com/user-attachments/assets/ba4699dc-18b2-4884-9dce-36ed47c38e93" width="30%" />
</p>
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://docs.meshery.io/project/contributing#general-contribution-flow).`;
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: message
});
- name: Label Pull Request (Optional)
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ['first-time contributor']
});
4 changes: 2 additions & 2 deletions .github/workflows/go-testing-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.9.0
uses: helm/kind-action@v1.10.0
with:
cluster_name: "kind-cluster"
- name: Run coverage
Expand All @@ -104,7 +104,7 @@ jobs:
- name: Upload coverage to Codecov
if: github.repository == 'meshery/meshery'
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./coverage.txt
flags: gointegrationtests
6 changes: 3 additions & 3 deletions .github/workflows/mesheryctl-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
strategy:
fail-fast: false
matrix:
k8s_version: ['v1.29.2', 'v1.28.7']
k8s_version: ['v1.29.2', 'v1.31.1']
platform: ['docker', 'kubernetes']
steps:
- name: Setup Kubernetes
uses: manusa/actions-setup-minikube@v2.10.0
uses: manusa/actions-setup-minikube@v2.11.0
with:
minikube version: 'v1.32.0'
minikube version: 'v1.34.0'
kubernetes version: ${{ matrix.k8s_version }}
driver: docker

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/meshmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
path: action
repository: layer5labs/meshmap-snapshot
- id: test_result
uses: layer5labs/[email protected].11
uses: layer5labs/[email protected].12
with:
githubToken: ${{ secrets.GITHUB_TOKEN }} # github's personal access token example: "ghp_...."
mesheryToken: ${{ secrets.MESHERY_TOKEN }} # Meshery Cloud Authentication token, signin to meshery-cloud to get one, example: ey.....
Expand Down
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,17 @@ server-stg: dep-check

## Build and run Meshery Server on your local machine.
server: dep-check
cd server; cd cmd; go mod tidy; \
BUILD="$(GIT_VERSION)" \
PROVIDER_BASE_URLS=$(MESHERY_CLOUD_PROD) \
PORT=9081 \
DEBUG=true \
APP_PATH=$(APPLICATIONCONFIGPATH) \
KEYS_PATH=$(KEYS_PATH) \
go run main.go error.go;

## Build and run Meshery Server with some Meshery Adapters on your local machine.
server-with-adapters: dep-check
cd server; cd cmd; go mod tidy; \
BUILD="$(GIT_VERSION)" \
PROVIDER_BASE_URLS=$(MESHERY_CLOUD_PROD) \
Expand Down
17 changes: 17 additions & 0 deletions docs/_catalog/176ecfd8-7e17-47f2-afa7-060dc2a27e88.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
layout: item
name: auth2
userId: a550f4d6-d3bd-44f1-9b4c-167114452062
userName: Pranav Singh
userAvatarURL: https://avatars.githubusercontent.com/u/73700530?v=4
type:
compatibility:
patternId: 176ecfd8-7e17-47f2-afa7-060dc2a27e88
image: /assets/images/webassembly_logo.svg
filterInfo: |
""
filterCaveats: |
""
URL: 'https://raw.githubusercontent.com/meshery/meshery.io/master/catalog/176ecfd8-7e17-47f2-afa7-060dc2a27e88.yaml'
downloadLink: 176ecfd8-7e17-47f2-afa7-060dc2a27e88.yaml
---
17 changes: 17 additions & 0 deletions docs/_catalog/2f104efc-31b6-4de9-ac0b-bb92f0ce3269.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
layout: item
name: Test Filter
userId: a551897f-da39-4d4d-812e-6b299e82c457
userName: Freedisch Batale
userAvatarURL: https://drive.google.com/file/d/1z3rUqsmrAIWuVn5v1fxcfepXL7JkQT_0/view?usp=drive_link
type:
compatibility:
patternId: 2f104efc-31b6-4de9-ac0b-bb92f0ce3269
image: /assets/images/webassembly_logo.svg
filterInfo: |
""
filterCaveats: |
""
URL: 'https://raw.githubusercontent.com/meshery/meshery.io/master/catalog/2f104efc-31b6-4de9-ac0b-bb92f0ce3269.yaml'
downloadLink: 2f104efc-31b6-4de9-ac0b-bb92f0ce3269.yaml
---
17 changes: 17 additions & 0 deletions docs/_catalog/35987b4f-f08a-4bda-85e4-162d7c67a2e8.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
layout: item
name: meshery-filter-iuhlv
userId: 551dcb82-7643-4709-8500-9a60e60030b9
userName: Yash Sharma
userAvatarURL: https://avatars.githubusercontent.com/u/71271069?v=4
type:
compatibility:
patternId: 35987b4f-f08a-4bda-85e4-162d7c67a2e8
image: /assets/images/webassembly_logo.svg
filterInfo: |
""
filterCaveats: |
""
URL: 'https://raw.githubusercontent.com/meshery/meshery.io/master/catalog/35987b4f-f08a-4bda-85e4-162d7c67a2e8.yaml'
downloadLink: 35987b4f-f08a-4bda-85e4-162d7c67a2e8.yaml
---
16 changes: 16 additions & 0 deletions docs/_catalog/_defaults.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
layout: item
name: Pattern Name
type: Pattern Type
compatibility:
- Service Mesh
- Service Mesh
patternId: Unique Identifier | format MESHERY001
image: Pattern Image | eg. /assets/images/patterns/service-mesh.svg
patternInfo: About the Pattern
patternCaveats: Caveats of using the Pattern
URL: Pattern URL | format https://raw.githubusercontent.com/service-mesh-patterns/service-mesh-patterns/master/samples/IstioFilterPattern.yaml
downloadLink: Pattern file Name | Uploaded in the catalog folder eg. IstioFilterPattern.yaml
by: Author
---

20 changes: 20 additions & 0 deletions docs/_catalog/deployment/02413809-9fbf-4649-ae22-3d0947d264c6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
layout: item
name: Example Labels and Annotations
publishedVersion: 0.0.1
userId: 090e7114-509a-4046-81f1-9c5fb8daf724
userName: Lee Calcote
userAvatarURL: https://pbs.twimg.com/profile_images/880205475643441152/V_vhfnzb_400x400.jpg
type: deployment
compatibility:
- kubernetes
patternId: 02413809-9fbf-4649-ae22-3d0947d264c6
image: /assets/images/logos/service-mesh-pattern.svg
patternInfo: |
This%20design%20contains%20example%20of%20how%20label%20and%20annotation%20can%20be%20created%20and%20organised
patternCaveats: |
No%20caveats
permalink: catalog/deployment/example-labels-and-annotations-02413809-9fbf-4649-ae22-3d0947d264c6.html
URL: 'https://raw.githubusercontent.com/meshery/meshery.io/master/catalog/02413809-9fbf-4649-ae22-3d0947d264c6/0.0.1/design.yml'
downloadLink: 02413809-9fbf-4649-ae22-3d0947d264c6/design.yml
---
20 changes: 20 additions & 0 deletions docs/_catalog/deployment/04cf78e7-6041-45f7-bca5-999d5d7d6a19.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
layout: item
name: 'Dapr '
publishedVersion: 0.0.5
userId: 969bfd5e-28fb-4c20-a020-ee9db65da812
userName: Aabid Sofi
userAvatarURL:
type: deployment
compatibility:
- dapr
patternId: 04cf78e7-6041-45f7-bca5-999d5d7d6a19
image: https://raw.githubusercontent.com/layer5labs/meshery-extensions-packages/master/action-assets/design-assets/04cf78e7-6041-45f7-bca5-999d5d7d6a19-light.png,https://raw.githubusercontent.com/layer5labs/meshery-extensions-packages/master/action-assets/design-assets/04cf78e7-6041-45f7-bca5-999d5d7d6a19-dark.png
patternInfo: |
A%20standard%20Dapr%20control%20plane%20design.
patternCaveats: |
none
permalink: catalog/deployment/dapr-04cf78e7-6041-45f7-bca5-999d5d7d6a19.html
URL: 'https://raw.githubusercontent.com/meshery/meshery.io/master/catalog/04cf78e7-6041-45f7-bca5-999d5d7d6a19/0.0.5/design.yml'
downloadLink: 04cf78e7-6041-45f7-bca5-999d5d7d6a19/design.yml
---
20 changes: 20 additions & 0 deletions docs/_catalog/deployment/06ef6097-8f21-4a76-b025-0c9271168814.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
layout: item
name: Istio Operator
publishedVersion: 0.0.1
userId: 1cb30087-3787-4aad-8da8-addcb556ae17
userName: Bhuminjay Soni
userAvatarURL: https://avatars.githubusercontent.com/u/76656712?v=4
type: deployment
compatibility:
- istio-operator
patternId: 06ef6097-8f21-4a76-b025-0c9271168814
image: https://raw.githubusercontent.com/layer5labs/meshery-extensions-packages/master/action-assets/design-assets/06ef6097-8f21-4a76-b025-0c9271168814-light.png,https://raw.githubusercontent.com/layer5labs/meshery-extensions-packages/master/action-assets/design-assets/06ef6097-8f21-4a76-b025-0c9271168814-dark.png
patternInfo: |
This%20YAML%20defines%20a%20Kubernetes%20Deployment%20for%20the%20Istio%20Operator%20within%20the%20istio-operator%20namespace.%20The%20deployment%20ensures%20a%20single%20replica%20of%20the%20Istio%20Operator%20pod%20is%20always%20running%2C%20which%20is%20managed%20by%20a%20service%20account%20named%20istio-operator.%20The%20deployment's%20metadata%20includes%20the%20namespace%20and%20the%20deployment%20name.%20The%20pod%20selector%20matches%20pods%20with%20the%20label%20name%3A%20istio-operator%2C%20ensuring%20the%20correct%20pods%20are%20managed.%20The%20pod%20template%20specifies%20metadata%20and%20details%20for%20the%20containers%2C%20including%20the%20container%20name%20istio-operator%20and%20the%20image%20gcr.io%2Fistio-testing%2Foperator%3A1.5-dev%2C%20which%20runs%20the%20istio-operator%20command%20with%20the%20server%20argument.
patternCaveats: |
1.%20Namespace%20Configuration%3A%20Ensure%20that%20the%20istio-operator%20namespace%20exists%20before%20applying%20this%20deployment.%20If%20the%20namespace%20is%20not%20present%2C%20the%20deployment%20will%20fail.%0A%0A2.%20Image%20Version%3A%20The%20image%20specified%20(gcr.io%2Fistio-testing%2Foperator%3A1.5-dev)%20is%20a%20development%20version.%20It%20is%20crucial%20to%20verify%20the%20stability%20and%20compatibility%20of%20this%20version%20for%20production%20environments.%20Using%20a%20stable%20release%20version%20is%20generally%20recommended.%0A%0A3.%20Resource%20Allocation%3A%20The%20resource%20limits%20and%20requests%20are%20set%20to%20specific%20values%20(200m%20CPU%2C%20256Mi%20memory%20for%20limits%3B%2050m%20CPU%2C%20128Mi%20memory%20for%20requests).%20These%20values%20should%20be%20reviewed%20and%20adjusted%20based%20on%20the%20actual%20resource%20availability%20and%20requirements%20of%20your%20Kubernetes%20cluster%20to%20prevent%20resource%20contention%20or%20overallocation.%0A%0A4.%20Leader%20Election%3A%20The%20environment%20variables%20include%20LEADER_ELECTION_NAMESPACE%20which%20is%20derived%20from%20the%20pod's%20namespace.%20Ensure%20that%20the%20leader%20election%20mechanism%20is%20properly%20configured%20and%20that%20only%20one%20instance%20of%20the%20operator%20becomes%20the%20leader%20to%20avoid%20conflicts.%0A%0A5.%20Security%20Context%3A%20The%20deployment%20does%20not%20specify%20a%20security%20context%20for%20the%20container.%20It%20is%20advisable%20to%20review%20and%20define%20appropriate%20security%20contexts%20to%20enhance%20the%20security%20posture%20of%20the%20deployment%2C%20such%20as%20running%20the%20container%20as%20a%20non-root%20user.
permalink: catalog/deployment/istio-operator-06ef6097-8f21-4a76-b025-0c9271168814.html
URL: 'https://raw.githubusercontent.com/meshery/meshery.io/master/catalog/06ef6097-8f21-4a76-b025-0c9271168814/0.0.1/design.yml'
downloadLink: 06ef6097-8f21-4a76-b025-0c9271168814/design.yml
---
20 changes: 20 additions & 0 deletions docs/_catalog/deployment/08379ae3-cd9e-4b55-a190-91a47a1ff638.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
layout: item
name: Fault-tolerant batch workloads on GKE
publishedVersion: 0.0.1
userId: 62b081a5-1273-4c58-807f-b6be539275d0
userName: Shubham Pandey
userAvatarURL:
type: deployment
compatibility:
- kubernetes
patternId: 08379ae3-cd9e-4b55-a190-91a47a1ff638
image: https://raw.githubusercontent.com/layer5labs/meshery-extensions-packages/master/action-assets/design-assets/08379ae3-cd9e-4b55-a190-91a47a1ff638-light.png,https://raw.githubusercontent.com/layer5labs/meshery-extensions-packages/master/action-assets/design-assets/08379ae3-cd9e-4b55-a190-91a47a1ff638-dark.png
patternInfo: |
A%20batch%20workload%20is%20a%20process%20typically%20designed%20to%20have%20a%20start%20and%20a%20completion%20point.%20You%20should%20consider%20batch%20workloads%20on%20GKE%20if%20your%20architecture%20involves%20ingesting%2C%20processing%2C%20and%20outputting%20data%20instead%20of%20using%20raw%20data.%20Areas%20like%20machine%20learning%2C%20artificial%20intelligence%2C%20and%20high%20performance%20computing%20(HPC)%20feature%20different%20kinds%20of%20batch%20workloads%2C%20such%20as%20offline%20model%20training%2C%20batched%20prediction%2C%20data%20analytics%2C%20simulation%20of%20physical%20systems%2C%20and%20video%20processing.%0A%0ABy%20designing%20containerized%20batch%20workloads%2C%20you%20can%20leverage%20the%20following%20GKE%20benefits%3A%0A%0AAn%20open%20standard%2C%20broad%20community%2C%20and%20managed%20service.%0ACost%20efficiency%20from%20effective%20workload%20and%20infrastructure%20orchestration%20and%20specialized%20compute%20resources.%0AIsolation%20and%20portability%20of%20containerization%2C%20allowing%20the%20use%20of%20cloud%20as%20overflow%20capacity%20while%20maintaining%20data%20security.%0AAvailability%20of%20burst%20capacity%2C%20followed%20by%20rapid%20scale%20down%20of%20GKE%20clusters.
patternCaveats: |
Ensure%20proper%20networking%20of%20components%20for%20efficient%20functioning
permalink: catalog/deployment/fault-tolerant-batch-workloads-on-gke-08379ae3-cd9e-4b55-a190-91a47a1ff638.html
URL: 'https://raw.githubusercontent.com/meshery/meshery.io/master/catalog/08379ae3-cd9e-4b55-a190-91a47a1ff638/0.0.1/design.yml'
downloadLink: 08379ae3-cd9e-4b55-a190-91a47a1ff638/design.yml
---
20 changes: 20 additions & 0 deletions docs/_catalog/deployment/0a2d8c39-df40-490b-94b7-75d0fb7fc207.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
layout: item
name: default-ns
publishedVersion: 0.0.1
userId: a550f4d6-d3bd-44f1-9b4c-167114452062
userName: Pranav Singh
userAvatarURL: https://avatars.githubusercontent.com/u/73700530?v=4
type: deployment
compatibility:
- kubernetes
patternId: 0a2d8c39-df40-490b-94b7-75d0fb7fc207
image: https://raw.githubusercontent.com/layer5labs/meshery-extensions-packages/master/action-assets/design-assets/0a2d8c39-df40-490b-94b7-75d0fb7fc207-light.png,https://raw.githubusercontent.com/layer5labs/meshery-extensions-packages/master/action-assets/design-assets/0a2d8c39-df40-490b-94b7-75d0fb7fc207-dark.png
patternInfo: |
This is a sample default namespace that can be used for testing.
patternCaveats: |
No caveats. Feel free to reuse.
permalink: catalog/deployment/default-ns-0a2d8c39-df40-490b-94b7-75d0fb7fc207.html
URL: 'https://raw.githubusercontent.com/meshery/meshery.io/master/catalog/0a2d8c39-df40-490b-94b7-75d0fb7fc207/0.0.1/design.yml'
downloadLink: 0a2d8c39-df40-490b-94b7-75d0fb7fc207/design.yml
---
Loading

0 comments on commit 434faf4

Please sign in to comment.