From 8c782fc38cfad5f07786804e19a0c02811b2e1ee Mon Sep 17 00:00:00 2001
From: Alejandro Pedraza <alejandro@buoyant.io>
Date: Thu, 30 May 2024 09:52:42 -0500
Subject: [PATCH] debug

---
 .github/workflows/integration.yml                    |  1 -
 .../integration/manifests/flannel/linkerd-cni.yaml   |  2 +-
 cni-repair-controller/integration/run.sh             |  2 +-
 .../integration/iptables/iptablestest-lab.yaml       | 12 ++++++------
 proxy-init/integration/run.sh                        |  7 +++++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 3dea7004..e852f647 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -12,7 +12,6 @@ on:
 
 jobs:
   proxy-init-integration:
-    continue-on-error: true
     timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
diff --git a/cni-plugin/integration/manifests/flannel/linkerd-cni.yaml b/cni-plugin/integration/manifests/flannel/linkerd-cni.yaml
index 62e10680..54c80df7 100644
--- a/cni-plugin/integration/manifests/flannel/linkerd-cni.yaml
+++ b/cni-plugin/integration/manifests/flannel/linkerd-cni.yaml
@@ -87,7 +87,7 @@ data:
         "simulate": false,
         "use-wait-flag": false,
         "iptables-mode": "$IPTABLES_MODE",
-        "ipv6": true
+        "ipv6": false
       }
     }
 ---
diff --git a/cni-repair-controller/integration/run.sh b/cni-repair-controller/integration/run.sh
index ba6fc294..e7bf8102 100755
--- a/cni-repair-controller/integration/run.sh
+++ b/cni-repair-controller/integration/run.sh
@@ -42,7 +42,7 @@ linkerd install-cni \
   | kubectl apply -f -
 linkerd check --pre --linkerd-cni-enabled
 linkerd install --linkerd-cni-enabled | kubectl apply -f -
-linkerd check
+linkerd check || kubectl -n linkerd describe po
 
 step 'Installing pause DaemonSet'
 kubectl apply -f pause-ds.yml
diff --git a/proxy-init/integration/iptables/iptablestest-lab.yaml b/proxy-init/integration/iptables/iptablestest-lab.yaml
index 768b70e0..a10726d6 100644
--- a/proxy-init/integration/iptables/iptablestest-lab.yaml
+++ b/proxy-init/integration/iptables/iptablestest-lab.yaml
@@ -73,7 +73,7 @@ spec:
   - name: iptables-test
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "ipv6", "false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -90,7 +90,7 @@ spec:
   - name: linkerd-init
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "ipv6", "false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -144,7 +144,7 @@ spec:
   - name: linkerd-init
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "ipv6", "false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -201,7 +201,7 @@ spec:
   - name: linkerd-init
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "-r", "9090", "-r", "9099"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "-r", "9090", "-r", "9099", "ipv6", "false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -264,7 +264,7 @@ spec:
   - name: linkerd-init
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--inbound-ports-to-ignore", "6000-8000"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--inbound-ports-to-ignore", "6000-8000", "ipv6", "false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -318,7 +318,7 @@ spec:
   - name: linkerd-init
     image: test.l5d.io/linkerd/proxy-init:test
     imagePullPolicy: Never
-    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--subnets-to-ignore", "0.0.0.0/0"]
+    args: ["-p", "8080",  "-o", "8080", "-u", "2102", "-g", "2102", "--subnets-to-ignore", "0.0.0.0/0", "ipv6", "false"]
     securityContext:
       allowPrivilegeEscalation: false
       capabilities:
diff --git a/proxy-init/integration/run.sh b/proxy-init/integration/run.sh
index f4e1ad23..372a69ce 100755
--- a/proxy-init/integration/run.sh
+++ b/proxy-init/integration/run.sh
@@ -68,6 +68,9 @@ k run iptables-tester \
         --restart=Never \
         --rm \
         -- \
-        go test -integration-tests
+        go test -integration-tests || true
 
-k delete ns proxy-init-test
+#k delete ns proxy-init-test
+k get po -A
+k -n proxy-init-test describe po pod-with-existing-rules
+k -n proxy-init-test logs pod-with-existing-rules iptables-test