Skip to content

Commit 42c7c72

Browse files
DO NOT MERGE debugging
Signed-off-by: Michi Mutsuzaki <[email protected]>
1 parent c0f9529 commit 42c7c72

File tree

5 files changed

+15
-38
lines changed

5 files changed

+15
-38
lines changed

Diff for: .github/workflows/eks-tunnel.yaml

+3-7
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ on:
1414
# will disappear from the PR checks: please provide a direct link to the
1515
# successful workflow run (can be found from Actions tab) in a comment.
1616
#
17-
# pull_request: {}
17+
pull_request: {}
1818
###
19-
pull_request_target: {}
19+
#pull_request_target: {}
2020
# Run every 6 hours
2121
schedule:
2222
- cron: '30 1/6 * * *'
@@ -158,11 +158,7 @@ jobs:
158158
# Port forward Relay
159159
cilium hubble port-forward&
160160
sleep 10s
161-
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
162-
# support for native port-forwarding
163-
# TODO: remove kubectl version after 0.16.20 release
164-
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
165-
fi
161+
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
166162
167163
# Run connectivity test
168164
cilium connectivity test --test-concurrency=3 --all-flows --collect-sysdump-on-failure --external-target amazon.com. \

Diff for: .github/workflows/eks.yaml

+3-7
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ on:
1414
# will disappear from the PR checks: please provide a direct link to the
1515
# successful workflow run (can be found from Actions tab) in a comment.
1616
#
17-
# pull_request: {}
17+
pull_request: {}
1818
###
19-
pull_request_target: {}
19+
#pull_request_target: {}
2020
# Run every 6 hours
2121
schedule:
2222
- cron: '0 1/6 * * *'
@@ -157,11 +157,7 @@ jobs:
157157
# Port forward Relay
158158
cilium hubble port-forward&
159159
sleep 10s
160-
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
161-
# support for native port-forwarding
162-
# TODO: remove kubectl version after 0.16.20 release
163-
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
164-
fi
160+
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
165161
166162
# Run connectivity test
167163
cilium connectivity test --test-concurrency=3 --all-flows --collect-sysdump-on-failure --external-target amazon.com.

Diff for: .github/workflows/gke.yaml

+4-7
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ on:
1414
# will disappear from the PR checks: please provide a direct link to the
1515
# successful workflow run (can be found from Actions tab) in a comment.
1616
#
17-
# pull_request: {}
17+
pull_request: {}
1818
###
19-
pull_request_target: {}
19+
# pull_request_target: {}
2020
# Run every 6 hours
2121
schedule:
2222
- cron: '0 2/6 * * *'
@@ -153,11 +153,8 @@ jobs:
153153
# Port forward Relay
154154
cilium hubble port-forward&
155155
sleep 10s
156-
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
157-
# support for native port-forwarding
158-
# TODO: remove kubectl version after 0.16.20 release
159-
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
160-
fi
156+
157+
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
161158
162159
# Run connectivity test
163160
cilium connectivity test --test-concurrency=5 --all-flows --collect-sysdump-on-failure --external-target google.com.

Diff for: .github/workflows/kind.yaml

+2-10
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ jobs:
8282
run: |
8383
cilium hubble port-forward&
8484
sleep 10s
85-
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
86-
# support for native port-forwarding
87-
# TODO: remove kubectl version after 0.16.20 release
88-
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
89-
fi
85+
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
9086
9187
- name: Set up external targets
9288
id: external_targets
@@ -164,11 +160,7 @@ jobs:
164160
run: |
165161
cilium hubble port-forward&
166162
sleep 10s
167-
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
168-
# support for native port-forwarding
169-
# TODO: remove kubectl version after 0.16.20 release
170-
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
171-
fi
163+
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
172164
173165
- name: Connectivity test
174166
run: |

Diff for: .github/workflows/multicluster.yaml

+3-7
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ on:
1414
# will disappear from the PR checks: please provide a direct link to the
1515
# successful workflow run (can be found from Actions tab) in a comment.
1616
#
17-
# pull_request: {}
17+
pull_request: {}
1818
###
19-
pull_request_target: {}
19+
# pull_request_target: {}
2020
# Run every 6 hours
2121
schedule:
2222
- cron: '0 3/6 * * *'
@@ -250,11 +250,7 @@ jobs:
250250
# Port forward Relay
251251
cilium --context "${{ steps.contexts.outputs.cluster1 }}" hubble port-forward&
252252
sleep 10s
253-
if ! [[ $(pgrep -f "kubectl.*port-forward.*hubble-relay" | wc -l) == 1 ]]; then
254-
# support for native port-forwarding
255-
# TODO: remove kubectl version after 0.16.20 release
256-
[[ $(pgrep -f "cilium.*hubble.*port-forward" | wc -l) == 1 ]]
257-
fi
253+
[[ $(pgrep -f "^cilium.*hubble.*port-forward$" | wc -l) == 1 ]]
258254
259255
# Run connectivity test
260256
cilium --context "${{ steps.contexts.outputs.cluster1 }}" connectivity test --test-concurrency=5 \

0 commit comments

Comments
 (0)