Rename to Traefik Mesh

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug Report
-about: Create a report to help us improve Maesh
+about: Create a report to help us improve Traefik Mesh.
 ---
 
 <!-- PLEASE FOLLOW THE ISSUE TEMPLATE TO HELP TRIAGE AND SUPPORT! -->
@@ -29,7 +29,7 @@ HOW TO WRITE A GOOD BUG REPORT?
 
 
 
-### Output of controller log: (_What version of Maesh are you using?_)
+### Output of controller log: (_What version of Traefik Mesh are you using?_)
 
 <!---
 `latest` is not considered as a valid version.

.github/ISSUE_TEMPLATE/config.yml

@@ -3,3 +3,4 @@ contact_links:
   - name: Question
     about: Please ask and answer questions here.
     url: https://community.containo.us/c/maesh
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature Request
-about: Propose a change to Maesh!
+about: Propose a change to Traefik Mesh!
 ---
 
 <!-- ⚠️ If you do not respect this template your issue will be closed. -->

.gitignore

@@ -9,11 +9,10 @@
 *.log
 *.exe
 cover.out
-maesh
-!maesh/
+traefik-mesh
 /dist/
 .vscode
 vendor
 pages/
-maesh-gh-pages*
+mesh-gh-pages*
 *.zip

.goreleaser.yml

@@ -1,16 +1,16 @@
-project_name: maesh
+project_name: traefik-mesh
 
 builds:
-  - binary: maesh
+  - binary: traefik-mesh
 
-    main: ./cmd/maesh/maesh.go
+    main: ./cmd/mesh/mesh.go
     env:
       - CGO_ENABLED=0
     ldflags:
       - -s -w
-      - -X github.com/containous/maesh/pkg/version.Version={{.Version}}
-      - -X github.com/containous/maesh/pkg/version.Commit={{.Commit}}
-      - -X github.com/containous/maesh/pkg/version.Date={{.Date}}
+      - -X github.com/traefik/mesh/pkg/version.Version={{.Version}}
+      - -X github.com/traefik/mesh/pkg/version.Commit={{.Commit}}
+      - -X github.com/traefik/mesh/pkg/version.Date={{.Date}}
     goos:
       - linux
       - freebsd
@@ -30,7 +30,7 @@ builds:
         goarch: arm64
 
 archives:
-  - id: maesh
+  - id: traefik-mesh
     name_template: '{{ .ProjectName }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
     format: tar.gz
     files:

.semaphore/semaphore.yml

@@ -1,5 +1,5 @@
 version: v1.0
-name: Maesh Pipeline
+name: Traefik Mesh Pipeline
 
 agent:
   machine:
@@ -33,9 +33,9 @@ blocks:
         - name: Build and check
           commands:
             - make check build
-            - cache store maesh-dist-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID dist
-            - docker save containous/maesh:latest > maesh-img.tar
-            - cache store maesh-img-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID maesh-img.tar
+            - cache store traefik-mesh-dist-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID dist
+            - docker save traefik/mesh:latest > traefik-mesh-img.tar
+            - cache store traefik-mesh-img-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID traefik-mesh-img.tar
 
   - name: Unit Tests
     skip:
@@ -62,9 +62,9 @@ blocks:
           - sudo semgo go1.15
           - checkout
           - cache restore
-          - cache restore maesh-dist-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID
-          - cache restore maesh-img-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID
-          - docker load < maesh-img.tar
+          - cache restore traefik-mesh-dist-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID
+          - cache restore traefik-mesh-img-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID
+          - docker load < traefik-mesh-img.tar
       jobs:
         - name: ACL Enabled Suite
           commands:

.travis.yml

@@ -47,10 +47,10 @@ before_deploy:
     if ! [ "$BEFORE_DEPLOY_RUN" ]; then
       export BEFORE_DEPLOY_RUN=1;
       echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin;
-      curl -sfL https://raw.githubusercontent.com/containous/structor/master/godownloader.sh | bash -s -- -b "${GOPATH}/bin" ${STRUCTOR_VERSION};
+      curl -sfL https://raw.githubusercontent.com/traefik/structor/master/godownloader.sh | bash -s -- -b "${GOPATH}/bin" ${STRUCTOR_VERSION};
       curl -sSfL https://raw.githubusercontent.com/traefik/mixtus/master/godownloader.sh | sh -s -- -b "${GOPATH}/bin" ${MIXTUS_VERSION};
-      structor -o containous -r maesh --dockerfile-url="https://raw.githubusercontent.com/containous/maesh/master/docs/docs.Dockerfile" --menu.js-url="https://raw.githubusercontent.com/containous/structor/master/traefik-menu.js.gotmpl" --rqts-url="https://raw.githubusercontent.com/containous/structor/master/requirements-override.txt" --force-edit-url --exp-branch=master --debug;
-      mixtus --dst-doc-path="./mesh" --dst-owner=traefik --dst-repo-name=doc --git-user-email="30906710+traefiker@users.noreply.github.com" --git-user-name=traefiker --src-doc-path="./site" --src-owner=containous --src-repo-name=maesh;
+      structor -o traefik -r mesh --dockerfile-url="https://raw.githubusercontent.com/traefik/mesh/master/docs/docs.Dockerfile" --menu.js-url="https://raw.githubusercontent.com/traefik/structor/master/traefik-menu.js.gotmpl" --rqts-url="https://raw.githubusercontent.com/traefik/structor/master/requirements-override.txt" --force-edit-url --exp-branch=master --debug;
+      mixtus --dst-doc-path="./mesh" --dst-owner=traefik --dst-repo-name=doc --git-user-email="30906710+traefiker@users.noreply.github.com" --git-user-name=traefiker --src-doc-path="./site" --src-owner=traefik --src-repo-name=mesh;
     fi
   # Copy helm packages
   - cp -r pages/charts/. site/charts
@@ -94,5 +94,5 @@ deploy:
     skip_cleanup: true
     keep_history: true
     on:
-      repo: containous/maesh
+      repo: traefik/mesh
       all_branches: true

CONTRIBUTING.md

@@ -1,35 +1,33 @@
 # Contributing
 
-Maesh is an open source project, and your feedback and contributions
-are needed and always welcome.
+Traefik Mesh is an open source project, and your feedback and contributions are needed and always welcome.
 
-[Issues] and [Pull Requests] are opened at https://github.com/containous/maesh.
+[Issues] and [Pull Requests] are opened at https://github.com/traefik/mesh.
 
-Non trivial changes should be discussed with the project maintainers by
-opening a [Feature Request] clearly explaining rationale, background
-and possible implementation ideas. Feel free to provide code in such
-discussions.
+Non trivial changes should be discussed with the project maintainers by opening a [Feature Request] clearly explaining rationale, 
+background and possible implementation ideas. Feel free to provide code in such discussions.
 
-Once the proposal is approved, a Pull Request can be opened. If you want
-to provide early visibility to reviewers, create a [Draft Pull Request].
+Once the proposal is approved, a Pull Request can be opened. If you want to provide early visibility to reviewers, create a [Draft Pull Request].
 
-[Issues]: https://github.com/containous/maesh/issues
-[Pull Requests]: https://github.com/containous/maesh/issues
-[Feature Request]: https://github.com/containous/maesh/issues/new?template=feature_request.md
+[Issues]: https://github.com/traefik/mesh/issues
+[Pull Requests]: https://github.com/traefik/mesh/issues
+[Feature Request]: https://github.com/traefik/mesh/issues/new?template=feature_request.md
 [Draft Pull Request]: https://github.blog/2019-02-14-introducing-draft-pull-requests/
 
 ## Release Process
 
-Maesh follows the [semver](https://semver.org/) scheme when releasing new versions.
+Traefik Mesh follows the [semver](https://semver.org/) scheme when releasing new versions.
 
-Therefore, all PR's (except fixing a bug in a specific version) should be made against the `master` branch. If you're attempting to fix a bug in an already released version, please use the correct branch of that release (e.g. `v1.1`). All bug-fixes made to a specific branch will be backported to master, prior to releasing a new (major / minor) version. Patch releases will be made out of the version branch.
+Therefore, all PR's (except fixing a bug in a specific version) should be made against the `master` branch.
+If you're attempting to fix a bug in an already released version, please use the correct branch of that release (e.g. `v1.1`).
+All bug-fixes made to a specific branch will be backported to master, prior to releasing a new (major / minor) version. Patch releases will be made out of the version branch.
 
 ### Release steps
 
-In order to release a new version of Maesh, the following steps have to be done:
+In order to release a new version of Traefik Mesh, the following steps have to be done:
 
 * Create a Prepare release PR updating the chart version and app version to upcoming release
-* Prepare a list of release notes for the #maesh
+* Prepare a list of release notes for the #traefik-mesh
 * Merge Prepare release PR
 * Create and push a tag on the release commit
-* Create a new release branch (v1.x) on upstream to allow versioned docs to be built
+* Create a new release branch (v1.x) on upstream to allow versioned docs to be built

Dockerfile

@@ -1,4 +1,3 @@
-# Let's build maesh for linux-amd64
 FROM golang:1.15-alpine AS base-image
 
 # Package dependencies
@@ -16,7 +15,7 @@ RUN apk --no-cache --no-progress add \
     && update-ca-certificates \
     && rm -rf /var/cache/apk/*
 
-WORKDIR /go/src/github.com/containous/maesh
+WORKDIR /go/src/github.com/traefik/mesh
 
 # Download goreleaser binary to bin folder in $GOPATH
 RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh
@@ -42,6 +41,6 @@ RUN addgroup -g 1000 -S app && \
     adduser -u 1000 -S app -G app
 
 COPY --from=base-image /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=maker /go/src/github.com/containous/maesh/dist/maesh /app/
+COPY --from=maker /go/src/github.com/traefik/mesh/dist/traefik-mesh /app/
 
-ENTRYPOINT ["/app/maesh"]
+ENTRYPOINT ["/app/traefik-mesh"]

LICENSE

@@ -186,7 +186,8 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2019 Containous SAS
+   Copyright 2020 Containous SAS
+   Copyright 2020 Traefik Labs
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -1,11 +1,11 @@
-DOCKER_IMAGE_NAME := containous/maesh
+DOCKER_IMAGE_NAME := traefik/mesh
 UNAME := $(shell uname)
 SRCS = $(shell git ls-files '*.go' | grep -v '^vendor/')
 
-BINARY_NAME = maesh
+BINARY_NAME = traefik-mesh
 DIST_DIR = $(CURDIR)/dist
-DIST_DIR_MAESH = $(DIST_DIR)/$(BINARY_NAME)
-PROJECT ?= github.com/containous/$(BINARY_NAME)
+DIST_DIR_TRAEFIK_MESH = $(DIST_DIR)/$(BINARY_NAME)
+PROJECT ?= github.com/traefik/mesh
 
 TAG_NAME ?= $(shell git tag -l --contains HEAD)
 SHA := $(shell git rev-parse --short HEAD)
@@ -22,19 +22,19 @@ $(DIST_DIR):
 	mkdir -p $(DIST_DIR)
 
 clean:
-	rm -rf $(CURDIR)/dist/ cover.out $(CURDIR)/pages $(CURDIR)/gh-pages.zip $(CURDIR)/maesh-gh-pages
+	rm -rf $(CURDIR)/dist/ cover.out $(CURDIR)/pages $(CURDIR)/gh-pages.zip $(CURDIR)/mesh-gh-pages
 
 # Static linting of source files. See .golangci.toml for options
 local-check: $(DIST_DIR) helm-lint
 	golangci-lint run --config .golangci.toml
 
 # Local commands
 local-build: $(DIST_DIR)
-	CGO_ENABLED=0 go build -o ${DIST_DIR_MAESH} -ldflags="-s -w \
-	-X github.com/containous/$(BINARY_NAME)/pkg/version.Version=$(VERSION) \
-	-X github.com/containous/$(BINARY_NAME)/pkg/version.Commit=$(SHA) \
-	-X github.com/containous/$(BINARY_NAME)/pkg/version.Date=$(BUILD_DATE)" \
-	$(CURDIR)/cmd/$(BINARY_NAME)/*.go
+	CGO_ENABLED=0 go build -o ${DIST_DIR_TRAEFIK_MESH} -ldflags="-s -w \
+	-X github.com/traefik/mesh/pkg/version.Version=$(VERSION) \
+	-X github.com/traefik/mesh/pkg/version.Commit=$(SHA) \
+	-X github.com/traefik/mesh/pkg/version.Date=$(BUILD_DATE)" \
+	$(CURDIR)/cmd/mesh/mesh.go
 
 local-test: clean
 	go test -v -cover ./...
@@ -105,28 +105,28 @@ helm:
 	@command -v helm >/dev/null 2>&1 || curl -L https://git.io/get_helm.sh | bash -s -- -v v3.0.1
 
 helm-lint: helm
-	helm lint helm/chart/maesh
+	helm lint helm/chart/mesh
 
 k3d:
 	@command -v k3d >/dev/null 2>&1 || curl -s https://raw.githubusercontent.com/rancher/k3d/v3.0.1/install.sh | TAG=v3.0.1 bash
 
 pages:
 	mkdir -p $(CURDIR)/pages
-	rm -rf $(CURDIR)/gh-pages.zip $(CURDIR)/maesh-gh-pages
+	rm -rf $(CURDIR)/gh-pages.zip $(CURDIR)/mesh-gh-pages
 	curl -sSLO https://$(PROJECT)/archive/gh-pages.zip
 	unzip $(CURDIR)/gh-pages.zip
 	# We only keep the directory "charts" so documentation may remove files
-	cp -r $(CURDIR)/maesh-gh-pages/charts $(CURDIR)/pages/
-	rm -rf $(CURDIR)/gh-pages.zip $(CURDIR)/maesh-gh-pages
+	cp -r $(CURDIR)/mesh-gh-pages/charts $(CURDIR)/pages/
+	rm -rf $(CURDIR)/gh-pages.zip $(CURDIR)/mesh-gh-pages
 
 docs-package: pages
 	make -C $(CURDIR)/docs
 	cp -r $(CURDIR)/docs/site/* $(CURDIR)/pages/
 	cp $(CURDIR)/docs/CNAME $(CURDIR)/pages/CNAME
 
 helm-package: helm-lint pages
-	helm package --app-version $(TAG_NAME) $(CURDIR)/helm/chart/maesh
-	cp helm/chart/maesh/README.md index.md
+	helm package --app-version $(TAG_NAME) $(CURDIR)/helm/chart/mesh
+	cp helm/chart/mesh/README.md index.md
 	mkdir -p $(CURDIR)/pages/charts
 	mv *.tgz index.md $(CURDIR)/pages/charts/
 	helm repo index $(CURDIR)/pages/charts/

README.md

@@ -1,23 +1,22 @@
 <p align="center">
-<img width="400" src="docs/content/assets/img/maesh.png" alt="Maesh" title="Maesh" />
+<img width="400" src="docs/content/assets/img/traefik-mesh.png" alt="Traefik Mesh" title="Traefik Mesh" />
 </p>
 
 
-[![Travis CI Build Status](https://travis-ci.com/containous/maesh.svg?branch=master)](https://travis-ci.com/containous/maesh)
-[![Semaphore CI Build Status](https://containous.semaphoreci.com/badges/maesh/branches/master.svg?style=shields)](https://containous.semaphoreci.com/projects/maesh)
+[![Travis CI Build Status](https://travis-ci.com/traefik/mesh.svg?branch=master)](https://travis-ci.com/traefik/mesh)
+[![Semaphore CI Build Status](https://traefik.semaphoreci.com/badges/mesh/branches/master.svg?style=shields)](https://traefik.semaphoreci.com/projects/mesh)
 [![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](https://docs.mae.sh)
-[![Go Report Card](https://goreportcard.com/badge/github.com/containous/maesh)](https://goreportcard.com/report/github.com/containous/maesh)
-[![Release](https://img.shields.io/github/tag-date/containous/maesh.svg)](https://github.com/containous/maesh/releases)
-[![GitHub](https://img.shields.io/github/license/containous/maesh)](https://github.com/containous/maesh/blob/master/LICENSE)
+[![Go Report Card](https://goreportcard.com/badge/github.com/traefik/mesh)](https://goreportcard.com/report/github.com/traefik/mesh)
+[![Release](https://img.shields.io/github/tag-date/traefik/mesh.svg)](https://github.com/traefik/mesh/releases)
+[![GitHub](https://img.shields.io/github/license/traefik/mesh)](https://github.com/traefik/mesh/blob/master/LICENSE)
 [![Discourse status](https://img.shields.io/discourse/https/community.containo.us/status?label=Community&style=social)](https://community.containo.us/c/maesh)
 
-## Maesh: Simpler Service Mesh
+## Traefik Mesh: Simpler Service Mesh
 
-Maesh is a simple, yet full-featured service mesh. 
+Traefik Mesh is a simple, yet full-featured service mesh. 
 It is container-native and fits as your de-facto service mesh in your Kubernetes cluster. 
 It supports the latest Service Mesh Interface specification [SMI](https://smi-spec.io) that facilitates integration with pre-existing solution. 
-Moreover, Maesh is opt-in by default, 
-which means that your existing services are unaffected until you decide to add them to the mesh.
+Moreover, Traefik Mesh is opt-in by default, which means that your existing services are unaffected until you decide to add them to the mesh.
 
 <p align="center">
 <a href="https://smi-spec.io" target="_blank"><img width="150" src="docs/content/assets/img/smi.png" alt="SMI" title="SMI" /></a>
@@ -26,15 +25,15 @@ which means that your existing services are unaffected until you decide to add t
 
 ## Non-Invasive Service Mesh
 
-Maesh does not use any sidecar container but handles routing through proxy endpoints running on each node. 
+Traefik Mesh does not use any sidecar container but handles routing through proxy endpoints running on each node. 
 The mesh controller runs in a dedicated pod and handles all the configuration parsing and deployment to the proxy nodes. 
-Maesh supports multiple configuration options: annotations on user service objects, and SMI objects. 
-Not using sidecars means that Maesh does not modify your Kubernetes objects, and does not modify your traffic without your knowledge. 
-Using the Maesh endpoints is all that is required.
+Traefik Mesh supports multiple configuration options: annotations on user service objects, and SMI objects. 
+Not using sidecars means that Traefik Mesh does not modify your Kubernetes objects, and does not modify your traffic without your knowledge. 
+Using the Traefik Mesh endpoints is all that is required.
 
 <p align="center">
-<img width="400" src="docs/content/assets/img/before-maesh-graphic.png" alt="Maesh" title="Maesh" />
-<img width="400" src="docs/content/assets/img/after-maesh-graphic.png" alt="Maesh" title="Maesh" />
+<img width="400" src="docs/content/assets/img/before-traefik-mesh-graphic.png" alt="Traefik Mesh" title="Traefik Mesh" />
+<img width="400" src="docs/content/assets/img/after-traefik-mesh-graphic.png" alt="Traefik Mesh" title="Traefik Mesh" />
 </p>
 
 ## Prerequisites
@@ -48,9 +47,9 @@ To run this app, you require the following:
 ## Install (Helm v3 only)
 
 ```shell
-helm repo add maesh https://containous.github.io/maesh/charts
+helm repo add traefik-mesh https://traefik.github.io/mesh/charts
 helm repo update
-helm install maesh maesh/maesh
+helm install traefik-mesh traefik-mesh/traefik-mesh
 ```
 
 You can find the complete documentation at https://docs.mae.sh.

cmd/cleanup/cleanup.go

@@ -4,17 +4,17 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/containous/maesh/cmd"
-	"github.com/containous/maesh/pkg/cleanup"
-	"github.com/containous/maesh/pkg/k8s"
+	"github.com/traefik/mesh/cmd"
+	"github.com/traefik/mesh/pkg/cleanup"
+	"github.com/traefik/mesh/pkg/k8s"
 	"github.com/traefik/paerser/cli"
 )
 
 // NewCmd builds a new Cleanup command.
 func NewCmd(cConfig *cmd.CleanupConfiguration, loaders []cli.ResourceLoader) *cli.Command {
 	return &cli.Command{
 		Name:          "cleanup",
-		Description:   `Removes Maesh shadow services from a Kubernetes cluster.`,
+		Description:   `Removes Traefik Mesh shadow services from a Kubernetes cluster.`,
 		Configuration: cConfig,
 		Run: func(_ []string) error {
 			return cleanupCommand(cConfig)
@@ -31,7 +31,7 @@ func cleanupCommand(cConfig *cmd.CleanupConfiguration) error {
 		return fmt.Errorf("could not create logger: %w", err)
 	}
 
-	logger.Debug("Starting maesh cleanup...")
+	logger.Debug("Starting cleanup...")
 	logger.Debugf("Using masterURL: %q", cConfig.MasterURL)
 	logger.Debugf("Using kubeconfig: %q", cConfig.KubeConfig)