Skip to content

Commit

Permalink
Merge pull request #64 from utkarsh-pro/utkarsh-pro/fix/rename-maesh-…
Browse files Browse the repository at this point in the history
…to-traefik-mesh

Change name from maesh to traefik mesh
  • Loading branch information
leecalcote authored Jan 5, 2021
2 parents d93b310 + a6dd13e commit 66da3ff
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Meshery-Maesh
name: Meshery-traefik-mesh
on:
push:
branches:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/slack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
steps:
- name: Get current star count
run: |
echo "STARS=$(curl --silent 'https://api.github.com/repos/layer5io/meshery-maesh' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV
echo "STARS=$(curl --silent 'https://api.github.com/repos/layer5io/meshery-traefik-mesh' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV
- name: Notify slack
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
uses: pullreminders/slack-action@master
with:
args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"Someone just starred Meshery Adapter for Maesh! (https://github.com/layer5io/meshery-maesh/stargazers) Total ⭐️: ${{env.STARS}}\"}'
args: '{\"channel\":\"CSK7N9TGX\",\"text\":\"Someone just starred Meshery Adapter for Traefik Mesh! (https://github.com/layer5io/meshery-traefik-mesh/stargazers) Total ⭐️: ${{env.STARS}}\"}'
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

.vscode

meshery-maesh
meshery-traefik-mesh
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM golang:1.13 as bd
RUN adduser --disabled-login appuser
WORKDIR /github.com/layer5io/meshery-maesh
WORKDIR /github.com/layer5io/meshery-traefik-mesh
ADD . .
RUN GOPROXY=direct GOSUMDB=off go build -ldflags="-w -s" -a -o /meshery-maesh .
RUN find . -name "*.go" -type f -delete; mv maesh /
RUN GOPROXY=https://proxy.golang.org GOSUMDB=off go build -ldflags="-w -s" -a -o /meshery-traefik-mesh .
RUN find . -name "*.go" -type f -delete; mv traefik-mesh /

FROM alpine
RUN apk --update add ca-certificates
RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
COPY --from=bd /meshery-maesh /app/
COPY --from=bd /maesh /app/maesh
COPY --from=bd /meshery-traefik-mesh /app/
COPY --from=bd /traefik-mesh /app/traefik-mesh
COPY --from=bd /etc/passwd /etc/passwd
USER appuser
WORKDIR /app
CMD ./meshery-maesh
CMD ./meshery-traefik-mesh
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ proto:
protoc -I meshes/ meshes/meshops.proto --go_out=plugins=grpc:./meshes/

docker:
docker build -t layer5/meshery-maesh .
docker build -t layer5/meshery-traefik-mesh .

docker-run:
(docker rm -f meshery-maesh) || true
docker run --name meshery-maesh -d \
(docker rm -f meshery-traefik-mesh) || true
docker run --name meshery-traefik-mesh -d \
-p 10000:10000 \
-e DEBUG=true \
layer5/meshery-maesh
layer5/meshery-traefik-mesh

run:
DEBUG=true go run main.go
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<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>

# Meshery Adapter for Maesh
# Meshery Adapter for Traefik Mesh

[![Docker Pulls](https://img.shields.io/docker/pulls/layer5/meshery-maesh.svg)](https://hub.docker.com/r/layer5/meshery-maesh)
[![Go Report Card](https://goreportcard.com/badge/github.com/layer5io/meshery-maesh)](https://goreportcard.com/report/github.com/layer5io/meshery-maesh)
[![Build Status](https://github.com/layer5io/meshery-maesh/workflows/Meshery-Maesh/badge.svg)](https://github.com/layer5io/meshery-maesh/actions)
[![Go Report Card](https://goreportcard.com/badge/github.com/layer5io/meshery-traefik-mesh)](https://goreportcard.com/report/github.com/layer5io/meshery-traefik-mesh)
[![Build Status](https://github.com/layer5io/meshery-traefik-mesh/workflows/Meshery-Maesh/badge.svg)](https://github.com/layer5io/meshery-traefik-mesh/actions)
[![GitHub](https://img.shields.io/github/license/layer5io/meshery-maesh.svg)](LICENSE)
[![GitHub issues by-label](https://img.shields.io/github/issues/layer5io/meshery-maesh/help%20wanted.svg)](https://github.com/layer5io/meshery-maesh/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
[![GitHub issues by-label](https://img.shields.io/github/issues/layer5io/meshery-traefik-mesh/help%20wanted.svg)](https://github.com/layer5io/meshery-traefik-mesh/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
[![Website](https://img.shields.io/website/https/layer5.io/meshery.svg)](https://layer5.io/meshery/)
[![Twitter Follow](https://img.shields.io/twitter/follow/layer5.svg?label=Follow&style=social)](https://twitter.com/intent/follow?screen_name=mesheryio)
[![Slack](http://slack.layer5.io/badge.svg)](http://slack.layer5.io)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/layer5io/meshery-maesh
module github.com/layer5io/meshery-traefik-mesh

go 1.15

Expand Down
8 changes: 4 additions & 4 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
const (
// TraefikMeshOperation is the default name for the install
// and uninstall commands on the traefik mesh
TraefikMeshOperation = "maesh"
TraefikMeshOperation = "traefik-mesh"
)

var (
Expand All @@ -29,14 +29,14 @@ var (

// ServerConfig is the configuration for the gRPC server
ServerConfig = map[string]string{
"name": "maesh-adapter",
"name": "traefik-mesh-adapter",
"port": "10006",
"version": "v1.0.0",
}

// MeshSpec is the spec for the service mesh associated with this adapter
MeshSpec = map[string]string{
"name": "maesh",
"name": "traefik mesh",
"status": status.None,
"traceurl": status.None,
"version": status.None,
Expand All @@ -46,7 +46,7 @@ var (
ProviderConfig = map[string]string{
configprovider.FilePath: configRootPath,
configprovider.FileType: "yaml",
configprovider.FileName: "maesh",
configprovider.FileName: "traefik-mesh",
}

// KubeConfig - Controlling the kubeconfig lifecycle with viper
Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ import (
"path"
"time"

"github.com/layer5io/meshery-maesh/traefik"
"github.com/layer5io/meshery-traefik-mesh/traefik"
"github.com/layer5io/meshkit/logger"

// "github.com/layer5io/meshkit/tracing"
"github.com/layer5io/meshery-adapter-library/adapter"
"github.com/layer5io/meshery-adapter-library/api/grpc"
configprovider "github.com/layer5io/meshery-adapter-library/config/provider"
"github.com/layer5io/meshery-maesh/internal/config"
"github.com/layer5io/meshery-traefik-mesh/internal/config"
)

var (
serviceName = "maesh-adaptor"
serviceName = "traefik-mesh-adaptor"
)

func init() {
Expand Down
5 changes: 3 additions & 2 deletions traefik/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ func (mesh *Mesh) applyHelmChart(del bool, version, namespace string) error {
Chart: chart,
Version: chartVersion,
},
Namespace: namespace,
Delete: del,
Namespace: namespace,
Delete: del,
CreateNamespace: true,
})

return err
Expand Down
2 changes: 1 addition & 1 deletion traefik/traefik.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/layer5io/meshery-adapter-library/common"
adapterconfig "github.com/layer5io/meshery-adapter-library/config"
"github.com/layer5io/meshery-adapter-library/status"
internalConfig "github.com/layer5io/meshery-maesh/internal/config"
internalConfig "github.com/layer5io/meshery-traefik-mesh/internal/config"
"github.com/layer5io/meshkit/logger"
)

Expand Down

0 comments on commit 66da3ff

Please sign in to comment.