diff --git a/.github/codecov.yml b/.github/codecov.yml index c8ca4a865ce..2e5a7b325cd 100644 --- a/.github/codecov.yml +++ b/.github/codecov.yml @@ -33,12 +33,13 @@ flags: carryforward: true backend: paths: - - cmd - - handlers - - helpers - - internal - - mesheryctl - - meshes - - models - - router + # Accepts only glob patterns, not regex + - "*/cmd/**" + - "*/handlers/**" + - "*/helpers/**" + - "*/internal/**" + - "*/mesheryctl/**" + - "*/meshes/**" + - "*/models/**" + - "*/router/**" carryforward: true diff --git a/.github/workflows/build-and-preview-site.yml b/.github/workflows/build-and-preview-site.yml index ed4b7a26119..ca18462b900 100644 --- a/.github/workflows/build-and-preview-site.yml +++ b/.github/workflows/build-and-preview-site.yml @@ -11,11 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: actions/checkout@v2.3.1 + uses: actions/checkout@v3 with: persist-credentials: false - name: Setup Ruby - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@v1.99.0 with: ruby-version: 2.7.5 # Not needed with a .ruby-version file bundler-cache: true # runs 'bundle install' and caches installed gems automatically @@ -26,7 +26,7 @@ jobs: - name: Zip Site run: bash docs/script.sh - name: Upload files - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: site-dir path: ./site-dir.zip diff --git a/.github/workflows/build-and-release-edge.yml b/.github/workflows/build-and-release-edge.yml index 71883b9874f..fe079183417 100644 --- a/.github/workflows/build-and-release-edge.yml +++ b/.github/workflows/build-and-release-edge.yml @@ -9,13 +9,13 @@ on: jobs: build: name: Docker build and push - if: github.repository == 'meshery/meshery' + if: github.repository == 'meshery/meshery' && github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() env: RELEASE_CHANNEL: "edge" runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 1 - name: Docker login diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index fe059748609..f63a162ea38 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3.0.0 with: fetch-depth: 1 - name: Docker login @@ -43,13 +43,13 @@ jobs: runs-on: macos-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3.0.0 with: fetch-depth: 0 - name: Set up Go uses: actions/setup-go@v3.0.0 with: - go-version: ${{ secrets.GO_VERSION }} + go-version: 1.17 - name: goreleaser with tag uses: goreleaser/goreleaser-action@v2.8.0 env: diff --git a/.github/workflows/build-dde.yml b/.github/workflows/build-dde.yml index 4706e9019e0..255282f8649 100644 --- a/.github/workflows/build-dde.yml +++ b/.github/workflows/build-dde.yml @@ -11,15 +11,15 @@ on: jobs: - build: - name: Docker build and push - if: github.repository == 'meshery/meshery' + edge-build: + name: Docker build and push (edge release) + if: github.repository == 'meshery/meshery' && startsWith(github.ref, 'refs/tags/') != true && success() env: RELEASE_CHANNEL: "edge" runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 1 - name: Delete default files present at project root @@ -42,3 +42,36 @@ jobs: run: | docker push meshery/meshery-docker-desktop-extension:edge-latest docker push meshery/meshery-docker-desktop-extension:edge-${GITHUB_SHA::8} + stable-build: + name: Docker build and push (edge release) + if: github.repository == 'meshery/meshery' && github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() + env: + RELEASE_CHANNEL: "stable" + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v3 + with: + fetch-depth: 1 + - name: Delete default files present at project root + run: | + rm Dockerfile + rm .dockerignore + - name: Move files from ./install/docker-desktop-extension to project root + run: | + mv ./install/docker-desktop-extension/* ./ + - name: Docker login + uses: azure/docker-login@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Docker stable build & tag + run: | + DOCKER_BUILDKIT=1 docker build --no-cache -t meshery/meshery-docker-desktop-extension:stable-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::8} --build-arg GIT_VERSION="stable-latest" --build-arg RELEASE_CHANNEL=${RELEASE_CHANNEL} . + docker tag meshery/meshery-docker-desktop-extension:stable-latest meshery/meshery-docker-desktop-extension:stable-${GITHUB_SHA::8} + - name: Docker stable push + run: | + docker push meshery/meshery-docker-desktop-extension:stable-latest + docker push meshery/meshery-docker-desktop-extension:stable-${GITHUB_SHA::8} + + diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87b1cf887c2..54fa99e918c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3.0.0 with: - go-version: '1.16.7' + go-version: '1.17' - name: Setup Cache uses: actions/cache@v3.0.0 with: diff --git a/.github/workflows/go-testing-ci.yml b/.github/workflows/go-testing-ci.yml index 8acd376d496..ba83fe9878f 100644 --- a/.github/workflows/go-testing-ci.yml +++ b/.github/workflows/go-testing-ci.yml @@ -25,7 +25,7 @@ jobs: name: Unit tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3.0.0 with: fetch-depth: 2 - name: Install lynx for xdg-open support @@ -33,7 +33,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: "1.16.7" + go-version: "1.17" - name: Run coverage run: go test --short ./... -race -coverprofile=coverage.txt -covermode=atomic - name: Upload coverage to Codecov @@ -53,9 +53,9 @@ jobs: - name: Install lynx for xdg-open support run: sudo apt-get install lynx - name: Setup Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3.0.0 with: - go-version: "1.16.7" + go-version: "1.17" - name: Create k8s Kind Cluster uses: helm/kind-action@v1.1.0 with: diff --git a/.github/workflows/helm-chart-releaser.yml b/.github/workflows/helm-chart-releaser.yml index c9a6a63d7b9..47772b9da42 100644 --- a/.github/workflows/helm-chart-releaser.yml +++ b/.github/workflows/helm-chart-releaser.yml @@ -24,8 +24,8 @@ jobs: runs-on: ubuntu-latest if: ${{github.event_name == 'pull_request'}} steps: - - uses: actions/checkout@v2 - - uses: azure/setup-helm@v1 + - uses: actions/checkout@v3 + - uses: azure/setup-helm@v2.0 with: version: 'v3.6.0' # default is latest stable id: install @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name != 'pull_request' }} && ${{ github.ref == 'refs/heads/master' }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: set env id: vars # https://github.community/t/how-to-get-just-the-tag-name/16241/7 diff --git a/.github/workflows/mesheryctl-ci.yml b/.github/workflows/mesheryctl-ci.yml index 586e6c25e5f..ed9c3320b65 100644 --- a/.github/workflows/mesheryctl-ci.yml +++ b/.github/workflows/mesheryctl-ci.yml @@ -59,7 +59,7 @@ jobs: restore-keys: | ${{ runner.os }}-go- - name: goreleaser WITHOUT tag - uses: goreleaser/goreleaser-action@v2 + uses: goreleaser/goreleaser-action@v2.8.0 if: success() && startsWith(github.ref, 'refs/tags/') == false env: RELEASE_CHANNEL: "edge" diff --git a/Dockerfile b/Dockerfile index bf19ee58141..97dfceb4420 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16 as meshery-server +FROM golang:1.17 as meshery-server ARG TOKEN ARG GIT_VERSION ARG GIT_COMMITSHA diff --git a/cmd/main_test.go b/cmd/main_test.go new file mode 100644 index 00000000000..82e6808c1b1 --- /dev/null +++ b/cmd/main_test.go @@ -0,0 +1,13 @@ +package main + +import ( + "testing" +) + +func TestMain(t *testing.T) { + if testing.Short() { + t.Skip("Skipping test in short mode.") + } + + t.Log("Need to run main() skipping") +} diff --git a/docker-compose.yaml b/docker-compose.yaml index e12dd82ec92..88a27b19a91 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -75,12 +75,12 @@ services: - "com.centurylinklabs.watchtower.enable=true" ports: - "10010:10010" - meshery-cilium: + meshery-cilium: image: layer5/meshery-cilium:stable-latest labels: - "com.centurylinklabs.watchtower.enable=true" ports: - - "10011:10011" + - "10012:10012" # nighthawk-lg: # image: envoyproxy/nighthawk-dev:latest watchtower: diff --git a/docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md b/docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md new file mode 100644 index 00000000000..f06006ebaa2 --- /dev/null +++ b/docs/_compatibility/meshery-istio/03-22-2022-07-48-03_21a7ae54.md @@ -0,0 +1,17 @@ +--- +timestamp: "2022-03-22 07:47:48 UTC Tue" +meshery-component: meshery-istio +meshery-component-version: edge +meshery-server-version: "v0.6.0-rc-5f" +k8s-distro: minikube +k8s-version: "v1.20.1" +service-mesh: istio +service-mesh-version: "1.13.2" +tests: + istiod: "Running" + istio-egressgateway: "Running" + istio-ingressgateway: "Running" + grafana-addon: null + prometheus-addon: null +overall-status: "passing" +--- diff --git a/docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md b/docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md new file mode 100644 index 00000000000..bcf7bd800ee --- /dev/null +++ b/docs/_compatibility/meshery-istio/03-22-2022-14-03-03_1f49c36a.md @@ -0,0 +1,17 @@ +--- +timestamp: "2022-03-22 14:03:12 UTC Tue" +meshery-component: meshery-istio +meshery-component-version: edge +meshery-server-version: "v0.6.0-rc-5f" +k8s-distro: minikube +k8s-version: "v1.20.1" +service-mesh: istio +service-mesh-version: "1.13.2" +tests: + istiod: "Running" + istio-egressgateway: "Running" + istio-ingressgateway: "Running" + grafana-addon: "Running" + prometheus-addon: "Running" +overall-status: "passing" +--- diff --git a/docs/_compatibility/meshery-traefik-mesh/03-22-2022-07-58-03_26d264be.md b/docs/_compatibility/meshery-traefik-mesh/03-22-2022-07-58-03_26d264be.md new file mode 100644 index 00000000000..f7ed34dd565 --- /dev/null +++ b/docs/_compatibility/meshery-traefik-mesh/03-22-2022-07-58-03_26d264be.md @@ -0,0 +1,17 @@ +--- +timestamp: "2022-03-22 07:58:11 UTC Tue" +meshery-component: meshery-traefik-mesh +meshery-component-version: edge +meshery-server-version: "v0.6.0-rc-5f" +k8s-distro: minikube +k8s-version: "v1.20.1" +service-mesh: traefik-mesh +service-mesh-version: "" +tests: + traefik-mesh-controller: "Running" + traefik-mesh-proxy: "Running" + grafana-core: "Running" + jaeger: "Running" + prometheus-core: "Running" +overall-status: "passing" +--- diff --git a/docs/_includes/header.html b/docs/_includes/header.html index cfbeb5a0fd3..b47cda337c2 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -27,7 +27,7 @@ - {% assign versions = site.data.versions %} @@ -40,7 +40,7 @@ {%- else -%} {%- assign optionSelected = "" -%} {%- endif -%} - {% endfor %} diff --git a/docs/_releases/v0.6.0-rc-5c.md b/docs/_releases/v0.6.0-rc-5c.md new file mode 100644 index 00000000000..c80bb90f7ac --- /dev/null +++ b/docs/_releases/v0.6.0-rc-5c.md @@ -0,0 +1,86 @@ +--- +layout: release +date: 2022-03-21 +tag: v0.6.0-rc-5c +--- + +## What's New +## 🔤 General +- [WIP] Init Docker Extension UI @theBeginner86 (#5242) +- [meshery] Add support for cilium adapter @hexxdump (#5238) +- Remove whitespace from k8s generated components @Revolyssup (#5226) +- Update swagger.yaml @zahertalab (#5216) +- Add Mario to CI maintainers list @alphaX86 (#5219) +- [DOCS] Maintainers file update @Chadha93 (#5223) +- get latest wasm filters from latest release @Revolyssup (#5176) +- [WIP] Meshery perf helm @hershd23 (#5166) +- handle panic when preference load test is not provided in UserPrefsHandler @sourikghosh (#5177) +- Update README.md - Content misaligned in the main readme file @RakeshPotnuru (#5189) +- Fix #5180 @Revolyssup (#5183) +- Set appropriate metadata.name for namespace @Revolyssup (#5175) +- Transition of role for Utkarsh @leecalcote (#5178) + +## ⌨️ Meshery CLI + +- [Meshery] added cilium as component @piyushsingariya (#5234) +- Fixed spacing on error message. @cpepper96 (#5230) +- [mesheryctl] Introducing `--port-forward` in `system dashboard` @piyushsingariya (#5053) + +## 🖥 Meshery UI + +- add cilium @warunicorn19 (#5235) +- [UI] Replicate Imports for Filters and Application similar to Patterns and fix e2e failure @SAEb-ai (#5213) +- More settings options in remote provider tab @theBeginner86 (#5217) +- fix: Accept the rjsf custom components from the Meshery Extension @Abhishek-kumar09 (#5225) +- [CI] UI: OS and Arch for fsevents package @leecalcote (#5224) +- [UI] Pattern update and delete handler call 🐛 bug fix @Chadha93 (#5208) +- Revert "[UI] Replicate Imports for Filters and Applications similar to Patterns" @leecalcote (#5212) +- [UI] Replicate Imports for Filters and Applications similar to Patterns @SAEb-ai (#5203) +- removed deprecated grpc option @sourikghosh (#5200) +- Bump next from 11.1.3 to 12.1.0 in /provider-ui @dependabot (#5089) +- Bump relay-runtime from 11.0.2 to 13.1.1 in /ui @dependabot (#5135) +- [UI][Server] Update API endpoint call @Chadha93 (#5197) +- [UI] Dashboard service mesh proxy tooltip @Chadha93 (#5202) +- Bump eslint-config-next from 11.1.3 to 12.1.0 in /provider-ui @dependabot (#5133) +- Bump @babel/traverse from 7.16.3 to 7.17.3 in /ui @dependabot (#5185) +- Bump eslint-config-airbnb from 18.2.1 to 19.0.4 in /ui @dependabot (#5186) +- [UI] Fixed Context Menu peek behaviour @NikhilSharma03 (#5188) +- Bump @fortawesome/free-brands-svg-icons from 5.15.4 to 6.0.0 in /ui @dependabot (#5155) +- [UI][Bug Hunt] Enabled clickaway feature on the context-switcher | CU-232yuch @asubedy (#5181) +- Bump lint-staged from 12.3.3 to 12.3.5 in /ui @dependabot (#5182) +- Bump billboard.js from 3.2.1 to 3.3.3 in /ui @dependabot (#5156) + +## 🔋 Patterns, Filters, Applications + +- Remove UUIDs from being service name of designs and add depends-on @Revolyssup (#5218) +- Add name field for pattern request to avoid "MesheryGeneratedPatternFile" @Revolyssup (#5207) +- [UI] Pattern update and delete handler call 🐛 bug fix @Chadha93 (#5208) + +## 🧰 Maintenance + +- [CI] Update and add tests, glob expressions for backend files in CodeCov @alphaX86 (#5240) +- [Meshery] added cilium as component @piyushsingariya (#5234) +- Hardcoded image name for DDE @hershd23 (#5241) +- Workflow for Docker Desktop Extension @hershd23 (#5236) +- Fixed spacing on error message. @cpepper96 (#5230) +- [CI] Docs: Move to Ruby 2.7.5 @leecalcote (#5222) +- Bump next from 11.1.3 to 12.1.0 in /provider-ui @dependabot (#5089) +- Bump relay-runtime from 11.0.2 to 13.1.1 in /ui @dependabot (#5135) +- Bump eslint-config-next from 11.1.3 to 12.1.0 in /provider-ui @dependabot (#5133) +- Bump @babel/traverse from 7.16.3 to 7.17.3 in /ui @dependabot (#5185) +- Bump eslint-config-airbnb from 18.2.1 to 19.0.4 in /ui @dependabot (#5186) +- Bump fortio.org/fortio from 1.20.0 to 1.21.0 @dependabot (#5161) +- Bump @fortawesome/free-brands-svg-icons from 5.15.4 to 6.0.0 in /ui @dependabot (#5155) +- Bump lint-staged from 12.3.3 to 12.3.5 in /ui @dependabot (#5182) +- Bump billboard.js from 3.2.1 to 3.3.3 in /ui @dependabot (#5156) + +## 📖 Documentation + +- Update CONTRIBUTING.md @RakeshPotnuru (#5221) +- Update contributing-docs.md w/signoff @RakeshPotnuru (#5191) +- Added port 10013 to docs to reserve the port @hershd23 (#5179) + +## 👨🏽‍💻 Contributors + +Thank you to our contributors for making this release possible: +@Abhishek-kumar09, @Chadha93, @MarioArriaga92, @NikhilSharma03, @RakeshPotnuru, @Revolyssup, @SAEb-ai, @alphaX86, @asubedy, @cpepper96, @dependabot, @dependabot[bot], @hershd23, @hexxdump, @l5io, @leecalcote, @piyushsingariya, @sourikghosh, @theBeginner86, @warunicorn19 and @zahertalab diff --git a/docs/_releases/v0.6.0-rc-5d.md b/docs/_releases/v0.6.0-rc-5d.md new file mode 100644 index 00000000000..b86996779d7 --- /dev/null +++ b/docs/_releases/v0.6.0-rc-5d.md @@ -0,0 +1,16 @@ +--- +layout: release +date: 2022-03-21 +tag: v0.6.0-rc-5d +--- + +## What's New +## 🔤 General +## 🧰 Maintenance + +- [CI] Chore: Bump to Golang 1.17 @leecalcote (#5243) + +## 👨🏽‍💻 Contributors + +Thank you to our contributors for making this release possible: +@leecalcote diff --git a/docs/_releases/v0.6.0-rc-5f.md b/docs/_releases/v0.6.0-rc-5f.md new file mode 100644 index 00000000000..175963a183b --- /dev/null +++ b/docs/_releases/v0.6.0-rc-5f.md @@ -0,0 +1,16 @@ +--- +layout: release +date: 2022-03-22 +tag: v0.6.0-rc-5f +--- + +## What's New +## 🔤 General +## 📖 Documentation + +- Style the version component @AbhishekJamhoriya (#5054) + +## 👨🏽‍💻 Contributors + +Thank you to our contributors for making this release possible: +@AbhishekJamhoriya and @leecalcote diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index d989f485928..22ea2acd059 100644 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -9220,8 +9220,9 @@ button.bg-dark:focus { margin-top: 1.5rem!important } -.mr-4, -.mx-4 { + +.mx-4 , +.mr-4{ margin-right: 1.5rem!important } @@ -9289,7 +9290,8 @@ button.bg-dark:focus { .pt-1, .py-1 { - padding-top: .25rem!important + padding-top: .25rem!important; + } .pr-1, @@ -9299,7 +9301,8 @@ button.bg-dark:focus { .pb-1, .py-1 { - padding-bottom: .25rem!important + padding-bottom: .25rem!important; + } .pl-1, @@ -18034,7 +18037,7 @@ html body .md-typeset .headerlink { } .td-navbar .td-navbar-nav-scroll { max-width: 100%; - height: 2.5rem; + height: 3.5rem; margin-top: .25rem; overflow: hidden; font-size: .875rem @@ -18779,6 +18782,13 @@ footer { display: block; font-weight: bold; } +.version-selector{ + border-radius: 0.3rem; + width: auto; +} +.version-selector:focus{ + outline: none; +} /* mobile responisness for video*/ @media(min-width:1rem) and (max-width:19.9rem){ diff --git a/docs/v0.5/assets/css/style.css b/docs/v0.5/assets/css/style.css index bc2033b3ec3..bc4348d7226 100644 --- a/docs/v0.5/assets/css/style.css +++ b/docs/v0.5/assets/css/style.css @@ -1021,7 +1021,7 @@ pre { margin-top: 0; margin-bottom: 0; font-family: "SFMono-Regular", Consolas, .mt-4 { margin-top: 24px !important; } /* Set a $size margin on the right at $breakpoint */ -.mr-4 { margin-right: 24px !important; } +.mr-4 { margin-right: 24px !important;color: black; } /* Set a $size margin on the bottom at $breakpoint */ .mb-4 { margin-bottom: 24px !important; } @@ -1748,7 +1748,8 @@ pre { margin-top: 0; margin-bottom: 0; font-family: "SFMono-Regular", Consolas, .px-1 { padding-right: 4px !important; padding-left: 4px !important; } /* Set a $size padding to the top & bottom at $breakpoint */ -.py-1 { padding-top: 4px !important; padding-bottom: 4px !important; } +.py-1 { padding-top: 4px !important; padding-bottom: 4px !important; color: rgba(255, 255, 255, .75); + font-weight: 900; } /* Set a $size padding to all sides at $breakpoint */ .p-2 { padding: 8px !important; } diff --git a/docs/v0.5/concepts/architecture/adapters.html b/docs/v0.5/concepts/architecture/adapters.html index 12539953a3e..a680069364a 100644 --- a/docs/v0.5/concepts/architecture/adapters.html +++ b/docs/v0.5/concepts/architecture/adapters.html @@ -188,7 +188,7 @@