Merge branch v1.4 into master

.github/workflows/documentation.yml

@@ -32,6 +32,9 @@ jobs:
       - name: Install Structor ${{ env.STRUCTOR_VERSION }}
         run: curl -sSfL https://raw.githubusercontent.com/traefik/structor/master/godownloader.sh | sh -s -- -b $HOME/bin ${STRUCTOR_VERSION}
 
+      - name: Install Seo-doc
+        run: curl -sSfL https://raw.githubusercontent.com/traefik/seo-doc/master/godownloader.sh | sh -s -- -b "${HOME}/bin"
+
       - name: Install Mixtus ${{ env.MIXTUS_VERSION }}
         run: curl -sSfL https://raw.githubusercontent.com/traefik/mixtus/master/godownloader.sh | sh -s -- -b $HOME/bin ${MIXTUS_VERSION}
 
@@ -40,6 +43,9 @@ jobs:
         env:
           STRUCTOR_LATEST_TAG: ${{ secrets.STRUCTOR_LATEST_TAG }}
 
+      - name: Apply seo
+        run: $HOME/bin/seo -path=./site
+
       - name: Publish documentation
         run: $HOME/bin/mixtus --dst-doc-path="./traefik-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
         env:

.github/workflows/pull_request.yml

@@ -0,0 +1,20 @@
+name: Build Documentation
+
+on:
+  pull_request:
+
+jobs:
+
+  docs:
+    name: Doc package
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Package documentation
+        run: make docs-package

.semaphore/semaphore.yml

@@ -20,20 +20,22 @@ global_job_config:
   prologue:
     commands:
       - curl -sSfL https://raw.githubusercontent.com/ldez/semgo/master/godownloader.sh | sudo sh -s -- -b "/usr/local/bin"
-      - sudo semgo go1.15
+      - sudo semgo go1.16
       - echo "${DOCKERHUB_PASSWORD}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
       - checkout
 
 blocks:
   - name: Build
-    skip:
-      when: "branch = 'gh-pages'"
+    run:
+      when: "branch =~ '.*' OR pull_request =~'.*'"
     task:
       jobs:
         - name: Cache Go dependencies
           commands:
             - cache restore
-            - go mod download -x
+            - go mod tidy
+            - git diff --exit-code go.mod
+            - git diff --exit-code go.sum
             - cache store
         - name: Build and check
           commands:
@@ -43,8 +45,8 @@ blocks:
             - cache store traefik-mesh-img-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID traefik-mesh-img.tar
 
   - name: Unit Tests
-    skip:
-      when: "branch = 'gh-pages'"
+    run:
+      when: "branch =~ '.*' OR pull_request =~'.*'"
     task:
       prologue:
         commands:
@@ -55,8 +57,8 @@ blocks:
             - make local-test
 
   - name: Integration Tests
-    skip:
-      when: "branch = 'gh-pages'"
+    run:
+      when: "branch =~ '.*' OR pull_request =~'.*'"
     task:
       prologue:
         commands:
@@ -77,3 +79,27 @@ blocks:
         - name: KubeDNS Suite
           commands:
             - "make test-integration-nobuild TESTFLAGS=\"-check.f KubeDNSSuite\""
+
+  - name: Release
+    run:
+      when: "tag =~ '.*'"
+    task:
+      secrets:
+        - name: mesh
+
+      env_vars:
+        - name: SEIHON_VERSION
+          value: v0.8.3
+
+      jobs:
+        - name: Release
+          commands:
+            - curl -sL https://git.io/goreleaser | bash -s -- --timeout="60m"
+
+        - name: Publish Images
+          commands:
+            # Install Docker image multi-arch builder
+            - curl -sfL https://raw.githubusercontent.com/ldez/seihon/master/godownloader.sh | sudo bash -s -- -b "/usr/local/bin" ${SEIHON_VERSION}
+            - seihon --version
+            - docker run --rm --privileged hypriot/qemu-register
+            - make publish-images

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine AS base-image
+FROM golang:1.16-alpine AS base-image
 
 # Package dependencies
 RUN apk --no-cache --no-progress add \

Makefile

@@ -102,7 +102,7 @@ tidy:
 	go mod tidy
 
 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
+	@command -v k3d >/dev/null 2>&1 || curl -s https://raw.githubusercontent.com/rancher/k3d/v3.4.0/install.sh | TAG=v3.4.0 bash
 
 docs-package:
 	mkdir -p $(CURDIR)/pages

docs/check.Dockerfile

@@ -10,8 +10,11 @@ RUN apk --no-cache --no-progress add \
     ruby-etc \
     ruby-ffi \
     ruby-json \
-    ruby-nokogiri
-RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=true gem install --no-document html-proofer -v 3.12.0
+    ruby-nokogiri \
+    ruby-dev \
+    build-base
+
+RUN gem install --no-document html-proofer -v 3.19.0 -- --use-system-libraries
 
 # After Ruby, some NodeJS YAY!
 RUN apk --no-cache --no-progress add \
@@ -23,8 +26,8 @@ RUN apk --no-cache --no-progress add \
 RUN npm config set unsafe-perm true
 
 RUN npm install --global \
-    markdownlint@0.16.0 \
-    markdownlint-cli@0.18.0 
+    markdownlint@0.23.1 \
+    markdownlint-cli@0.28.1
 
 # Finally the shell tools we need for later
 # tini helps to terminate properly all the parallelized tasks when sending CTRL-C

docs/content/configuration.md

@@ -51,7 +51,7 @@ If this annotation is not present, the mesh service will operate in the default
 !!! Info
     For now, the `udp` traffic type does not work when ACL mode is enabled. In ACL mode, all traffic is forbidden unless it
     is explicitly allowed with a [TrafficTarget](https://github.com/servicemeshinterface/smi-spec/blob/master/apis/traffic-access/v1alpha2/traffic-access.md#traffictarget) and
-    unfortunately the SMI specification does not yet define a [Traffic Spec](https://github.com/servicemeshinterface/smi-spec/blob/master/apis/traffic-specs/traffic-specs-WD.md) for `UDP`.
+    unfortunately the SMI specification does not yet define a [Traffic Spec](https://github.com/servicemeshinterface/smi-spec/blob/master/apis/traffic-specs/v1alpha4/traffic-specs.md) for `UDP`.
 
 #### Scheme
 
@@ -200,4 +200,4 @@ More information can be found [in the SMI specification](https://github.com/serv
 
 #### Traffic Metrics
 
-At the moment, Traefik Mesh does not implement the [Traffic Metrics specification](https://github.com/servicemeshinterface/smi-spec/blob/master/apis/traffic-metrics/traffic-metrics-WD.md).
+At the moment, Traefik Mesh does not implement the [Traffic Metrics specification](https://github.com/servicemeshinterface/smi-spec/blob/master/apis/traffic-metrics/v1alpha1/traffic-metrics.md).

docs/requirements.txt

@@ -1,4 +1,4 @@
-mkdocs==1.1
+mkdocs==1.2.2
 pymdown-extensions==7.0
 mkdocs-bootswatch==1.0
 mkdocs-traefiklabs>=100.0.7