Merge pull request #118 from mattfenwick/kind-0.11.0

upgrade kind version to 0.11.0
mattfenwick · May 22, 2021 · 254fc7d · 254fc7d
2 parents 78c613f + 5038f40
commit 254fc7d
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/kind_cni_from_source.yml b/.github/workflows/kind_cni_from_source.yml
@@ -6,7 +6,7 @@ on:
         required: true
       cyclonus_args:
         required: false
-        default: "generate include --conflict"
+        default: "generate include --conflict --job-timeout-seconds 2"
 
 jobs:
   test-kind-calico:

diff --git a/cmd/worker/build.sh b/cmd/worker/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eou pipefail
+set -euo pipefail
 set -xv
 
 CLUSTER=${CLUSTER:-netpol-calico}

diff --git a/hack/kind/antrea/cyclonus-job.yaml b/hack/kind/antrea/cyclonus-job.yaml
@@ -11,6 +11,7 @@ spec:
             - ./cyclonus
             - generate
             - --server-protocol=tcp,udp
+            - --job-timeout-seconds=2
           name: cyclonus
           imagePullPolicy: IfNotPresent
           image: mfenwick100/cyclonus:latest

diff --git a/hack/kind/calico/cyclonus-job.yaml b/hack/kind/calico/cyclonus-job.yaml
@@ -10,6 +10,7 @@ spec:
         - command:
             - ./cyclonus
             - generate
+            - --job-timeout-seconds=2
           name: cyclonus
           imagePullPolicy: IfNotPresent
           image: mfenwick100/cyclonus:latest

diff --git a/hack/kind/cilium/cyclonus-job.yaml b/hack/kind/cilium/cyclonus-job.yaml
@@ -12,6 +12,7 @@ spec:
             - generate
             - --ignore-loopback=true
             - --server-protocol=tcp,udp
+            - --job-timeout-seconds=2
           name: cyclonus
           imagePullPolicy: IfNotPresent
           image: mfenwick100/cyclonus:latest

diff --git a/hack/kind/ovn-kubernetes/cyclonus-job.yaml b/hack/kind/ovn-kubernetes/cyclonus-job.yaml
@@ -12,6 +12,7 @@ spec:
             - generate
             - --ignore-loopback=true
             - --exclude=named-port,multi-peer,upstream-e2e,example
+            - --job-timeout-seconds=2
           name: cyclonus
           imagePullPolicy: IfNotPresent
           image: mfenwick100/cyclonus:latest

diff --git a/hack/kind/ovn-kubernetes/setup-kind.sh b/hack/kind/ovn-kubernetes/setup-kind.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 set -xv
-set -eou pipefail
+set -euo pipefail
 
 CLUSTER=${CLUSTER:-"ovn"}
 OVN_DIR="ovn-kubernetes-repo"

diff --git a/hack/kind/run-cyclonus.sh b/hack/kind/run-cyclonus.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 set -xv
-set -eou pipefail
+set -euo pipefail
 
-KIND_VERSION=${KIND_VERSION:-v0.10.0}
+KIND_VERSION=${KIND_VERSION:-v0.11.0}
 CNI=${CNI:-calico}
 CLUSTER_NAME="netpol-$CNI"
 RUN_FROM_SOURCE=${RUN_FROM_SOURCE:-true}
-FROM_SOURCE_ARGS=${FROM_SOURCE_ARGS:-"generate --include conflict"}
+FROM_SOURCE_ARGS=${FROM_SOURCE_ARGS:-"generate --include conflict --job-timeout-seconds 2"}
 
 # install kind if not found
 if ! command -v kind &> /dev/null

diff --git a/hack/sonobuoy/build.sh b/hack/sonobuoy/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 set -xv
-set -eou pipefail
+set -euo pipefail
 
 
 IMAGE=mfenwick100/sonobuoy-cyclonus:latest

diff --git a/hack/sonobuoy/run-sonobuoy-plugin.sh b/hack/sonobuoy/run-sonobuoy-plugin.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 set -xv
-set -eou pipefail
+set -euo pipefail
 
 CYCLONUS_ARGS=$@
 RESULTS_DIR="${RESULTS_DIR:-/tmp/results}"