Skip to content

Commit 254fc7d

Browse files
authored
Merge pull request #118 from mattfenwick/kind-0.11.0
upgrade kind version to 0.11.0
2 parents 78c613f + 5038f40 commit 254fc7d

File tree

10 files changed

+12
-8
lines changed

10 files changed

+12
-8
lines changed

.github/workflows/kind_cni_from_source.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
required: true
77
cyclonus_args:
88
required: false
9-
default: "generate include --conflict"
9+
default: "generate include --conflict --job-timeout-seconds 2"
1010

1111
jobs:
1212
test-kind-calico:

cmd/worker/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
set -eou pipefail
3+
set -euo pipefail
44
set -xv
55

66
CLUSTER=${CLUSTER:-netpol-calico}

hack/kind/antrea/cyclonus-job.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ spec:
1111
- ./cyclonus
1212
- generate
1313
- --server-protocol=tcp,udp
14+
- --job-timeout-seconds=2
1415
name: cyclonus
1516
imagePullPolicy: IfNotPresent
1617
image: mfenwick100/cyclonus:latest

hack/kind/calico/cyclonus-job.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ spec:
1010
- command:
1111
- ./cyclonus
1212
- generate
13+
- --job-timeout-seconds=2
1314
name: cyclonus
1415
imagePullPolicy: IfNotPresent
1516
image: mfenwick100/cyclonus:latest

hack/kind/cilium/cyclonus-job.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ spec:
1212
- generate
1313
- --ignore-loopback=true
1414
- --server-protocol=tcp,udp
15+
- --job-timeout-seconds=2
1516
name: cyclonus
1617
imagePullPolicy: IfNotPresent
1718
image: mfenwick100/cyclonus:latest

hack/kind/ovn-kubernetes/cyclonus-job.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ spec:
1212
- generate
1313
- --ignore-loopback=true
1414
- --exclude=named-port,multi-peer,upstream-e2e,example
15+
- --job-timeout-seconds=2
1516
name: cyclonus
1617
imagePullPolicy: IfNotPresent
1718
image: mfenwick100/cyclonus:latest

hack/kind/ovn-kubernetes/setup-kind.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
set -xv
4-
set -eou pipefail
4+
set -euo pipefail
55

66
CLUSTER=${CLUSTER:-"ovn"}
77
OVN_DIR="ovn-kubernetes-repo"

hack/kind/run-cyclonus.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/usr/bin/env bash
22

33
set -xv
4-
set -eou pipefail
4+
set -euo pipefail
55

6-
KIND_VERSION=${KIND_VERSION:-v0.10.0}
6+
KIND_VERSION=${KIND_VERSION:-v0.11.0}
77
CNI=${CNI:-calico}
88
CLUSTER_NAME="netpol-$CNI"
99
RUN_FROM_SOURCE=${RUN_FROM_SOURCE:-true}
10-
FROM_SOURCE_ARGS=${FROM_SOURCE_ARGS:-"generate --include conflict"}
10+
FROM_SOURCE_ARGS=${FROM_SOURCE_ARGS:-"generate --include conflict --job-timeout-seconds 2"}
1111

1212
# install kind if not found
1313
if ! command -v kind &> /dev/null

hack/sonobuoy/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
set -xv
4-
set -eou pipefail
4+
set -euo pipefail
55

66

77
IMAGE=mfenwick100/sonobuoy-cyclonus:latest

hack/sonobuoy/run-sonobuoy-plugin.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env sh
22

33
set -xv
4-
set -eou pipefail
4+
set -euo pipefail
55

66
CYCLONUS_ARGS=$@
77
RESULTS_DIR="${RESULTS_DIR:-/tmp/results}"

0 commit comments

Comments
 (0)