Merge branch 'master' of /~https://github.com/layer5io/meshery-traefik-…

…mesh

.github/release-drafter.yml

@@ -1,4 +1,4 @@
-name-template: "v$NEXT_PATCH_VERSION"
+name-template: "Meshery Adapter for Traefik Mesh v$NEXT_PATCH_VERSION"
 tag-template: "v$NEXT_PATCH_VERSION"
 categories:
   - title: "🚀 Features"

.github/workflows/build-and-release.yml

@@ -36,7 +36,7 @@ jobs:
     - name: Docker edge build & tag
       if: startsWith(github.ref, 'refs/tags/') != true && success()
       run: |
-        DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:edge-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} .
+        DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:edge-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::7} --build-arg VERSION="edge-latest" .
         docker tag ${{ secrets.IMAGE_NAME }}:edge-latest ${{ secrets.IMAGE_NAME }}:edge-${GITHUB_SHA::7}
     - name: Docker edge push
       if: startsWith(github.ref, 'refs/tags/') != true && success()
@@ -46,7 +46,7 @@ jobs:
     - name: Docker stable build & tag
       if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
       run: |
-        DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:stable-latest .
+        DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:stable-latest --build-arg GIT_COMMITSHA=${GITHUB_SHA::7} --build-arg VERSION=${GITHUB_REF/refs\/tags\//} .
         docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_REF/refs\/tags\//}
         docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::7}
     - name: Docker stable push

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-go@v1
         with:
           go-version: ${{ secrets.GO_VERSION }}
-      - run: GOPROXY=direct GOSUMDB=off go get -u golang.org/x/lint/golint; go list ./nginx/... | grep -v /vendor/ | xargs -L1 /home/runner/go/bin/golint -set_exit_status
+      - run: GOPROXY=direct GOSUMDB=off go get -u golang.org/x/lint/golint; go list ./traefik/... | grep -v /vendor/ | xargs -L1 /home/runner/go/bin/golint -set_exit_status
   error_check:
     name: Error check
     runs-on: ubuntu-latest
@@ -47,7 +47,7 @@ jobs:
         uses: actions/setup-go@v1
         with:
           go-version: ${{ secrets.GO_VERSION }}
-      - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go get -u honnef.co/go/tools/cmd/staticcheck; /home/runner/go/bin/staticcheck -tags draft -checks all ./nginx/... # https://staticcheck.io/docs/checks
+      - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go get -u honnef.co/go/tools/cmd/staticcheck; /home/runner/go/bin/staticcheck -tags draft -checks all ./traefik/... # https://staticcheck.io/docs/checks
   vet:
     name: Vet
     runs-on: ubuntu-latest

Dockerfile

@@ -1,6 +1,7 @@
 FROM golang:1.15 as builder
 
-ARG CONFIG_PROVIDER="viper"
+ARG VERSION
+ARG GIT_COMMITSHA
 WORKDIR /build
 # Copy the Go Modules manifests
 COPY go.mod go.mod
@@ -13,7 +14,7 @@ COPY main.go main.go
 COPY internal/ internal/
 COPY traefik/ traefik/
 # Build
-RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -ldflags="-w -s -X main.provider=$CONFIG_PROVIDER" -a -o meshery-traefik-mesh main.go
+RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -ldflags="-w -s -X main.version=$VERSION -X main.gitsha=$GIT_COMMITSHA" -a -o meshery-traefik-mesh main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to /~https://github.com/GoogleContainerTools/distroless for more details
@@ -22,4 +23,4 @@ ENV DISTRO="debian"
 ENV GOARCH="amd64"
 WORKDIR $HOME/.meshery
 COPY --from=builder /build/meshery-traefik-mesh .
-ENTRYPOINT ["./meshery-traefik-mesh"]
+ENTRYPOINT ["./meshery-traefik-mesh"]

README.md

@@ -1,4 +1,4 @@
-<p style="text-align:center;" align="center"><a href="https://layer5.io/meshery"><img align="center" style="margin-bottom:20px;" src="https://raw.githubusercontent.com/layer5io/layer5/master/assets/images/meshery/meshery-logo-tag-light-text-side.png"  width="70%" /></a><br /><br /></p>
+<p style="text-align:center;" align="center"><a href="https://layer5.io/meshery"><img align="center" style="margin-bottom:20px;" src="img/readme/meshery-logo-light-text.svg"  width="70%" /></a><br /><br /></p>
 
 # Meshery Adapter for Traefik Mesh
 

go.mod

@@ -2,10 +2,11 @@ module github.com/layer5io/meshery-traefik-mesh
 
 go 1.15
 
-replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334
+replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f
 
 require (
-	github.com/layer5io/meshery-adapter-library v0.1.11
-	github.com/layer5io/meshkit v0.1.32
+	github.com/layer5io/meshery-adapter-library v0.1.14
+	github.com/layer5io/meshkit v0.2.7
+	github.com/layer5io/service-mesh-performance v0.3.3
 	gopkg.in/yaml.v2 v2.4.0
 )