Merge pull request #286 from signadot/gatewayapi-integration

daniel-de-vera · web-flow · commit 5e32124031d5 · 2026-01-16T17:14:34.000-03:00
Gateway API overlays
diff --git a/k8s/components/get-gatewayapi-routes/kustomization.yaml b/k8s/components/get-gatewayapi-routes/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - routes.yaml
+
+
diff --git a/k8s/components/get-gatewayapi-routes/routes.yaml b/k8s/components/get-gatewayapi-routes/routes.yaml
@@ -0,0 +1,46 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: frontend
+spec:
+  parentRefs:
+    - name: frontend
+      kind: Service
+      group: ""
+      port: 8080
+  rules:
+    - backendRefs:
+        - name: frontend
+          port: 8080
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: location
+spec:
+  parentRefs:
+    - name: location
+      kind: Service
+      group: ""
+      port: 8081
+  rules:
+    - backendRefs:
+        - name: location
+          port: 8081
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: GRPCRoute
+metadata:
+  name: route
+spec:
+  parentRefs:
+    - name: route
+      kind: Service
+      group: ""
+      port: 8083
+  rules:
+    - backendRefs:
+        - name: route
+          port: 8083
+
+
diff --git a/k8s/components/inject-devmesh/driver-devmesh-annotation.yaml b/k8s/components/inject-devmesh/driver-devmesh-annotation.yaml
@@ -7,3 +7,5 @@ spec:
     metadata:
       annotations:
         sidecar.signadot.com/inject: "true"
+
+
diff --git a/k8s/components/inject-devmesh/frontend-devmesh-annotation.yaml b/k8s/components/inject-devmesh/frontend-devmesh-annotation.yaml
@@ -7,3 +7,5 @@ spec:
     metadata:
       annotations:
         sidecar.signadot.com/inject: "true"
+
+
diff --git a/k8s/components/inject-devmesh/kustomization.yaml b/k8s/components/inject-devmesh/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: frontend-devmesh-annotation.yaml
+  - path: location-devmesh-annotation.yaml
+  - path: driver-devmesh-annotation.yaml
+  - path: route-devmesh-annotation.yaml
+
+
diff --git a/k8s/components/inject-devmesh/location-devmesh-annotation.yaml b/k8s/components/inject-devmesh/location-devmesh-annotation.yaml
@@ -7,3 +7,5 @@ spec:
     metadata:
       annotations:
         sidecar.signadot.com/inject: "true"
+
+
diff --git a/k8s/components/inject-devmesh/route-devmesh-annotation.yaml b/k8s/components/inject-devmesh/route-devmesh-annotation.yaml
@@ -7,3 +7,5 @@ spec:
     metadata:
       annotations:
         sidecar.signadot.com/inject: "true"
+
+
diff --git a/k8s/components/inject-istio/driver-istio-label.yaml b/k8s/components/inject-istio/driver-istio-label.yaml
@@ -7,3 +7,5 @@ spec:
     metadata:
       labels:
         sidecar.istio.io/inject: "true"
+
+
diff --git a/k8s/components/inject-istio/frontend-istio-label.yaml b/k8s/components/inject-istio/frontend-istio-label.yaml
@@ -7,3 +7,5 @@ spec:
     metadata:
       labels:
         sidecar.istio.io/inject: "true"
+
+
diff --git a/k8s/components/inject-istio/kustomization.yaml b/k8s/components/inject-istio/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: frontend-istio-label.yaml
+  - path: location-istio-label.yaml
+  - path: driver-istio-label.yaml
+  - path: route-istio-label.yaml
+
+
diff --git a/k8s/components/inject-istio/location-istio-label.yaml b/k8s/components/inject-istio/location-istio-label.yaml
@@ -7,3 +7,5 @@ spec:
     metadata:
       labels:
         sidecar.istio.io/inject: "true"
+
+
diff --git a/k8s/components/inject-istio/route-istio-label.yaml b/k8s/components/inject-istio/route-istio-label.yaml
@@ -7,3 +7,5 @@ spec:
     metadata:
       labels:
         sidecar.istio.io/inject: "true"
+
+
diff --git a/k8s/components/inject-linkerd/driver-linkerd-annotation.yaml b/k8s/components/inject-linkerd/driver-linkerd-annotation.yaml
@@ -7,4 +7,5 @@ spec:
     metadata:
       annotations:
         linkerd.io/inject: enabled
-        sidecar.signadot.com/inject: "true"
+
+
diff --git a/k8s/components/inject-linkerd/frontend-linkerd-annotation.yaml b/k8s/components/inject-linkerd/frontend-linkerd-annotation.yaml
@@ -7,4 +7,5 @@ spec:
     metadata:
       annotations:
         linkerd.io/inject: enabled
-        sidecar.signadot.com/inject: "true"
+
+
diff --git a/k8s/components/inject-linkerd/kustomization.yaml b/k8s/components/inject-linkerd/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: frontend-linkerd-annotation.yaml
+  - path: location-linkerd-annotation.yaml
+  - path: driver-linkerd-annotation.yaml
+  - path: route-linkerd-annotation.yaml
diff --git a/k8s/components/inject-linkerd/location-linkerd-annotation.yaml b/k8s/components/inject-linkerd/location-linkerd-annotation.yaml
@@ -7,4 +7,3 @@ spec:
     metadata:
       annotations:
         linkerd.io/inject: enabled
-        sidecar.signadot.com/inject: "true"
diff --git a/k8s/components/inject-linkerd/route-linkerd-annotation.yaml b/k8s/components/inject-linkerd/route-linkerd-annotation.yaml
@@ -7,4 +7,3 @@ spec:
     metadata:
       annotations:
         linkerd.io/inject: enabled
-        sidecar.signadot.com/inject: "true"
diff --git a/k8s/components/set-image-pull-never/driver-image-pull-config.yaml b/k8s/components/set-image-pull-never/driver-image-pull-config.yaml
@@ -8,3 +8,5 @@ spec:
       containers:
       - name: hotrod
         imagePullPolicy: Never
+
+
diff --git a/k8s/components/set-image-pull-never/frontend-image-pull-config.yaml b/k8s/components/set-image-pull-never/frontend-image-pull-config.yaml
@@ -8,3 +8,5 @@ spec:
       containers:
       - name: hotrod
         imagePullPolicy: Never
+
+
diff --git a/k8s/components/set-image-pull-never/kustomization.yaml b/k8s/components/set-image-pull-never/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: frontend-image-pull-config.yaml
+  - path: location-image-pull-config.yaml
+  - path: driver-image-pull-config.yaml
+  - path: route-image-pull-config.yaml
+
+
diff --git a/k8s/components/set-image-pull-never/location-image-pull-config.yaml b/k8s/components/set-image-pull-never/location-image-pull-config.yaml
@@ -8,3 +8,5 @@ spec:
       containers:
       - name: hotrod
         imagePullPolicy: Never
+
+
diff --git a/k8s/components/set-image-pull-never/route-image-pull-config.yaml b/k8s/components/set-image-pull-never/route-image-pull-config.yaml
@@ -8,3 +8,5 @@ spec:
       containers:
       - name: hotrod
         imagePullPolicy: Never
+
+
diff --git a/k8s/overlays/dev-minikube/devmesh/frontend-image-pull-config.yaml b/k8s/overlays/dev-minikube/devmesh/frontend-image-pull-config.yaml
diff --git a/k8s/overlays/dev-minikube/devmesh/kustomization.yaml b/k8s/overlays/dev-minikube/devmesh/kustomization.yaml
@@ -3,8 +3,5 @@ resources:
 - ../../prod/devmesh
 - ../../../base/jaeger
 
-patches:
-- path: frontend-image-pull-config.yaml
-- path: driver-image-pull-config.yaml
-- path: route-image-pull-config.yaml
-- path: location-image-pull-config.yaml
+components:
+  - ../../../components/set-image-pull-never
diff --git a/k8s/overlays/dev-minikube/devmesh/location-image-pull-config.yaml b/k8s/overlays/dev-minikube/devmesh/location-image-pull-config.yaml
diff --git a/k8s/overlays/dev-minikube/devmesh/route-image-pull-config.yaml b/k8s/overlays/dev-minikube/devmesh/route-image-pull-config.yaml
diff --git a/k8s/overlays/dev-minikube/istio-gatewayapi/kustomization.yaml b/k8s/overlays/dev-minikube/istio-gatewayapi/kustomization.yaml
@@ -0,0 +1,9 @@
+
+resources:
+  - ../../prod/istio-gatewayapi
+  - ../../../base/jaeger
+
+components:
+  - ../../../components/set-image-pull-never
+
+
diff --git a/k8s/overlays/dev-minikube/istio/driver-image-pull-config.yaml b/k8s/overlays/dev-minikube/istio/driver-image-pull-config.yaml
diff --git a/k8s/overlays/dev-minikube/istio/kustomization.yaml b/k8s/overlays/dev-minikube/istio/kustomization.yaml
@@ -3,8 +3,5 @@ resources:
 - ../../prod/istio
 - ../../../base/jaeger
 
-patches:
-- path: frontend-image-pull-config.yaml
-- path: location-image-pull-config.yaml
-- path: driver-image-pull-config.yaml
-- path: route-image-pull-config.yaml
+components:
+  - ../../../components/set-image-pull-never
diff --git a/k8s/overlays/dev-minikube/istio/route-image-pull-config.yaml b/k8s/overlays/dev-minikube/istio/route-image-pull-config.yaml
diff --git a/k8s/overlays/dev-minikube/linkerd-gatewayapi/kustomization.yaml b/k8s/overlays/dev-minikube/linkerd-gatewayapi/kustomization.yaml
@@ -0,0 +1,9 @@
+
+resources:
+  - ../../prod/linkerd-gatewayapi
+  - ../../../base/jaeger
+
+components:
+  - ../../../components/set-image-pull-never
+
+
diff --git a/k8s/overlays/dev-minikube/linkerd/driver-image-pull-config.yaml b/k8s/overlays/dev-minikube/linkerd/driver-image-pull-config.yaml
diff --git a/k8s/overlays/dev-minikube/linkerd/frontend-image-pull-config.yaml b/k8s/overlays/dev-minikube/linkerd/frontend-image-pull-config.yaml
diff --git a/k8s/overlays/dev-minikube/linkerd/kustomization.yaml b/k8s/overlays/dev-minikube/linkerd/kustomization.yaml
@@ -3,8 +3,5 @@ resources:
 - ../../prod/linkerd
 - ../../../base/jaeger
 
-patches:
-- path: frontend-image-pull-config.yaml
-- path: driver-image-pull-config.yaml
-- path: route-image-pull-config.yaml
-- path: location-image-pull-config.yaml
+components:
+  - ../../../components/set-image-pull-never
diff --git a/k8s/overlays/dev-minikube/linkerd/location-image-pull-config.yaml b/k8s/overlays/dev-minikube/linkerd/location-image-pull-config.yaml
diff --git a/k8s/overlays/prod/devmesh/kustomization.yaml b/k8s/overlays/prod/devmesh/kustomization.yaml
@@ -2,8 +2,5 @@
 resources:
 - ../../../base
 
-patches:
-- path: frontend-devmesh-annotation.yaml
-- path: location-devmesh-annotation.yaml
-- path: driver-devmesh-annotation.yaml
-- path: route-devmesh-annotation.yaml
+components:
+  - ../../../components/inject-devmesh
diff --git a/k8s/overlays/prod/istio-gatewayapi/kustomization.yaml b/k8s/overlays/prod/istio-gatewayapi/kustomization.yaml
@@ -0,0 +1,9 @@
+
+resources:
+- ../../../base
+
+components:
+  - ../../../components/inject-istio
+  - ../../../components/get-gatewayapi-routes
+
+
diff --git a/k8s/overlays/prod/istio/kustomization.yaml b/k8s/overlays/prod/istio/kustomization.yaml
@@ -3,8 +3,5 @@ resources:
 - ../../../base
 - virtual-service.yaml
 
-patches:
-- path: frontend-istio-label.yaml
-- path: location-istio-label.yaml
-- path: driver-istio-label.yaml
-- path: route-istio-label.yaml
+components:
+  - ../../../components/inject-istio
diff --git a/k8s/overlays/prod/linkerd-gatewayapi/kustomization.yaml b/k8s/overlays/prod/linkerd-gatewayapi/kustomization.yaml
@@ -0,0 +1,8 @@
+
+resources:
+- ../../../base
+components:
+  - ../../../components/inject-linkerd
+  - ../../../components/get-gatewayapi-routes
+
+
diff --git a/k8s/overlays/prod/linkerd/kustomization.yaml b/k8s/overlays/prod/linkerd/kustomization.yaml
@@ -3,9 +3,9 @@ resources:
 - ../../../base
 - http-route.yaml
 
+components:
+  - ../../../components/inject-linkerd
+  - ../../../components/inject-devmesh
+
 patches:
-- path: frontend-linkerd-annotation.yaml
-- path: location-linkerd-annotation.yaml
-- path: driver-linkerd-annotation.yaml
-- path: route-linkerd-annotation.yaml
-- path: location-service.yaml
+  - path: location-service.yaml
