chore(ci): fix & update manifests

.semaphore/semaphore.yml

@@ -3,8 +3,8 @@ name: Traefik Mesh Pipeline
 
 agent:
   machine:
-    type: e1-standard-4
-    os_image: ubuntu1804
+    type: e2-standard-4
+    os_image: ubuntu2204
 
 auto_cancel:
   running:
@@ -40,9 +40,9 @@ blocks:
         - name: Build and check
           commands:
             - make check build
-            - cache store traefik-mesh-dist-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID dist
+            - artifact push workflow dist -d traefik-mesh-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
+            - artifact push workflow traefik-mesh-img.tar
 
   - name: Unit Tests
     run:
@@ -62,9 +62,9 @@ blocks:
     task:
       prologue:
         commands:
-          - cache restore
-          - cache restore traefik-mesh-dist-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID
-          - cache restore traefik-mesh-img-$SEMAPHORE_GIT_BRANCH-$SEMAPHORE_WORKFLOW_ID
+          - artifact pull workflow traefik-mesh-dist -d dist
+          - chmod +x dist/traefik-mesh
+          - artifact pull workflow traefik-mesh-img.tar
           - docker load < traefik-mesh-img.tar
       jobs:
         - name: ACL Enabled Suite

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

docs/content/contributing/maintainers.md

@@ -8,7 +8,7 @@ description: "In this article, you can find the list of Traefik Mesh maintainers
 - Daniel Tomcej [@dtomcej](https://github.com/dtomcej)
 - Manuel Zapf [@SantoDE](https://github.com/SantoDE)
 - Michaël Matur [@mmatur](https://github.com/mmatur)
-- Landry Benguigui [@LandryBe](https://github.com/LandryBe)
+- Landry Benguigui [@lbenguigui](https://github.com/lbenguigui)
 - Harold Ozouf [@jspdown](https://github.com/jspdown)
 - Julien Levesy [@jlevesy](https://github.com/jlevesy)
 - Brendan Le Glaunec [@Ullaakut](https://github.com/Ullaakut)

docs/requirements.txt

@@ -30,7 +30,7 @@ Pygments==2.11.2
 pymdown-extensions==7.0
 pyparsing==2.4.7
 python-dateutil==2.8.2
-PyYAML==6.0
+PyYAML==6.0.1
 pyyaml-env-tag==0.1
 requests==2.26.0
 retrying==1.3.3

integration/k3d/k3d.go

@@ -20,7 +20,7 @@ import (
 
 var (
 	k3sImage   = "rancher/k3s"
-	k3sVersion = "v1.18.20-k3s1"
+	k3sVersion = "v1.32.13-k3s1"
 )
 
 // DockerImage holds the configuration of a Docker image.
@@ -41,14 +41,14 @@ type ClusterOptionFunc func(opts *ClusterOptions)
 // WithoutTraefik tells k3d to not start a k3s cluster with Traefik already installed in.
 func WithoutTraefik() func(opts *ClusterOptions) {
 	return func(opts *ClusterOptions) {
-		opts.Cmd = append(opts.Cmd, "--k3s-server-arg", "--no-deploy=traefik")
+		opts.Cmd = append(opts.Cmd, "--k3s-arg", "--disable=traefik@server:*")
 	}
 }
 
 // WithoutCoreDNS tells k3d to not start a k3s cluster with CoreDNS already installed in.
 func WithoutCoreDNS() func(opts *ClusterOptions) {
 	return func(opts *ClusterOptions) {
-		opts.Cmd = append(opts.Cmd, "--k3s-server-arg", "--no-deploy=coredns")
+		opts.Cmd = append(opts.Cmd, "--k3s-arg", "--disable=coredns@server:*")
 	}
 }
 

integration/testdata/crds/smi-access.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: traffictargets.access.smi-spec.io
@@ -12,78 +12,83 @@ spec:
       - tt
     plural: traffictargets
     singular: traffictarget
-  version: v1alpha2
   versions:
     - name: v1alpha2
       served: true
       storage: true
-    - name: v1alpha1
-      served: false
-      storage: false
-  validation:
-    openAPIV3Schema:
-      properties:
-        spec:
-          required:
-            - destination
+      schema:
+        openAPIV3Schema:
+          type: object
           properties:
-            destination:
-              description: The destination of this traffic target.
+            spec:
               type: object
               required:
-                - name
-                - kind
+                - destination
               properties:
-                kind:
-                  description: Kind of the destination.
-                  type: string
-                name:
-                  description: Name of the destination.
-                  type: string
-                namespace:
-                  description: Namespace of the destination.
-                  type: string
-                port:
-                  description: Port number of the destination.
-                  type: number
-            rules:
-              description: Specifications of this traffic target.
-              type: array
-              items:
-                type: object
-                required:
-                  - name
-                  - kind
-                properties:
-                  kind:
-                    description: Kind of this spec.
-                    type: string
-                    enum:
-                      - HTTPRouteGroup
-                      - TCPRoute
-                  name:
-                    description: Name of this spec.
-                    type: string
-                  matches:
-                    description: Match conditions of this spec.
-                    type: array
-                    items:
+                destination:
+                  description: The destination of this traffic target.
+                  type: object
+                  required:
+                    - name
+                    - kind
+                  properties:
+                    kind:
+                      description: Kind of the destination.
+                      type: string
+                    name:
+                      description: Name of the destination.
                       type: string
-            sources:
-              description: Sources of this traffic target.
-              type: array
-              items:
-                type: object
-                required:
-                  - name
-                  - kind
-                properties:
-                  kind:
-                    description: Kind of this source.
-                    type: string
-                  name:
-                    description: Name of this source.
-                    type: string
-                  namespace:
-                    description: Namespace of this source.
-                    type: string
+                    namespace:
+                      description: Namespace of the destination.
+                      type: string
+                    port:
+                      description: Port number of the destination.
+                      type: number
+                rules:
+                  description: Specifications of this traffic target.
+                  type: array
+                  items:
+                    type: object
+                    required:
+                      - name
+                      - kind
+                    properties:
+                      kind:
+                        description: Kind of this spec.
+                        type: string
+                        enum:
+                          - HTTPRouteGroup
+                          - TCPRoute
+                      name:
+                        description: Name of this spec.
+                        type: string
+                      matches:
+                        description: Match conditions of this spec.
+                        type: array
+                        items:
+                          type: string
+                sources:
+                  description: Sources of this traffic target.
+                  type: array
+                  items:
+                    type: object
+                    required:
+                      - name
+                      - kind
+                    properties:
+                      kind:
+                        description: Kind of this source.
+                        type: string
+                      name:
+                        description: Name of this source.
+                        type: string
+                      namespace:
+                        description: Namespace of this source.
+                        type: string
+    - name: v1alpha1
+      served: false
+      storage: false
+      schema:
+        openAPIV3Schema:
+          type: object
+          x-kubernetes-preserve-unknown-fields: true