Tc

.github/workflows/ci.yaml

@@ -131,6 +131,9 @@ jobs:
           while [[ "$(minikube kubectl -- get pods | grep client | grep -v Running)" != "" ]]; do
             echo "Not ready, waiting..."
             minikube kubectl -- get pods -o wide
+            for POD in $(minikube kubectl -- get pods | grep client | awk '{print $1}'); do
+                minikube kubectl -- logs ${POD} --all-containers --previous || true
+            done
             sleep 1;
           done
 

example/k8s/client.yaml

@@ -74,7 +74,7 @@ spec:
           imagePullPolicy: IfNotPresent
           env:
             - name: SFUNNEL_RULESET
-              value: ip tcp sport 80 dport 540 actions unfunnel tcp
+              value: ip tcp sport 80 dport 540 actions unfunnel decap tcp
           securityContext:
             privileged: false #Set to true for some public clouds (e.g. GKE standard)
             capabilities:
@@ -89,7 +89,7 @@ spec:
             - name: DIRECTION
               value: egress
             - name: SFUNNEL_RULESET
-              value: ip tcp dport 8080 actions funnel tcp dport 80 sport 540
+              value: ip tcp dport 8080 actions funnel encap tcp dport 80 sport 540
           securityContext:
             privileged: false #Set to true for some public clouds (e.g. GKE standard)
             capabilities:

test/cni/example-client-patch.yaml

@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: my-web-client
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: sfunnel-init
+          image: sfunnel
+        - name: sfunnel-init-egress
+          image: sfunnel

test/cni/kustomization.yaml

@@ -5,7 +5,11 @@ resources:
   - ../../example/k8s/
 
 patches:
-  - path: example-patch.yaml
+  - path: example-svc-patch.yaml
     target:
       kind: Deployment
       name: my-nginx-deployment
+  - path: example-client-patch.yaml
+    target:
+      kind: Deployment
+      name: my-web-client