Merge branch 'master' into add/meshery-cillium

artukryp · Mar 22, 2022 · 320cab2 · 320cab2
2 parents 591f9a2 + f9e4b52
commit 320cab2
Show file tree

Hide file tree

Showing 36 changed files with 424 additions and 46 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/[email protected]
         with:
-          go-version: ${{ secrets.GO_VERSION }}
+          go-version: 1.17
       - name: goreleaser with tag
         uses: goreleaser/[email protected]
         env:

diff --git 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
@@ -53,7 +53,7 @@ jobs:
     - name: Setup Go
       uses: actions/[email protected]
       with:
-        go-version: '1.16.7'
+        go-version: '1.17'
     - name: Setup Cache
       uses: actions/[email protected]
       with:

diff --git a/.github/workflows/go-testing-ci.yml b/.github/workflows/go-testing-ci.yml
@@ -25,15 +25,15 @@ 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
         run: sudo apt-get install lynx
       - 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/[email protected]
         with:

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -27,7 +27,7 @@
 
         <!--Version Selector -->
 
-        <select onchange="window.location=this.value" class="appearance-none flex-1 w-full px-0 py-1 placeholder-gray-900 tracking-wide bg-white focus:outline-none" name="versioningSelection" id="versioningSelection">
+        <select onchange="window.location=this.value" class="appearance-none flex-1 w-full px-0 py-1 placeholder-gray-900 tracking-wide bg-transparent focus:outline-none nav-link version-selector" name="versioningSelection" id="versioningSelection">
           <!-- <option value="">Versions</option> -->
           {% assign versions = site.data.versions  %}
 
@@ -40,7 +40,7 @@
           {%- else -%}
             {%- assign optionSelected = "" -%}
           {%- endif -%}
-          <option {{optionSelected}} value="{% if link.url %}{{ site.baseurl }}/{{ link.url }}{% endif %}" class="nav-item mr-4 mb-2 mb-lg-0">
+          <option {{optionSelected}} value="{% if link.url %}{{ site.baseurl }}/{{ link.url }}{% endif %}" class="nav-item mr-4 mb-2 mb-lg-0 text-black">
             <span>{{ link.version }}</span>
           </option>
           {% endfor %}