Skip to content

Commit c0be080

Browse files
committed
gha/conformance-clustermesh: let service nodeport be selected randomly
Do not hardcode the nodeport assigned to the clustermesh-apiserver service, and instead let it be assigned randomly upon creation. This prevents the possibility of hitting a conflict with the port assigned to other services, which happens from time to time causing flakiness. The original reason for hardcoding the port no longer holds since cilium#24692 got fixed by [1]. [1]: 12acdb5 ("bpf/socklb: Don't resolve remote cluster NodePort services") Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
1 parent d039eaa commit c0be080

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

.github/workflows/conformance-clustermesh.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -566,13 +566,12 @@ jobs:
566566
env:
567567
KVSTORE_ID: 1
568568
run: |
569-
# Explicitly configure the NodePort to make sure that it is different in
570-
# each cluster, to workaround #24692
569+
# Let the NodePort to be selected randomly, to prevent the risk of conflicts.
571570
cilium --context ${{ env.contextName1 }} install \
572571
${{ steps.vars.outputs.cilium_install_defaults }} \
573572
--helm-set cluster.name=${{ env.ciliumClusterName1 }} \
574573
--helm-set cluster.id=1 \
575-
--helm-set clustermesh.apiserver.service.nodePort=32379 \
574+
--helm-set clustermesh.apiserver.service.nodePort=0 \
576575
--helm-set clustermesh.apiserver.tls.authMode=${{ matrix.cm-auth-mode-1 }} \
577576
${{ steps.vars.outputs.cilium_install_multipool_ipam_cluster1 }} \
578577
${{ steps.kvstore.outputs.cilium_install_kvstore }} \
@@ -589,13 +588,12 @@ jobs:
589588
env:
590589
KVSTORE_ID: 2
591590
run: |
592-
# Explicitly configure the NodePort to make sure that it is different in
593-
# each cluster, to workaround #24692
591+
# Let the NodePort to be selected randomly, to prevent the risk of conflicts.
594592
cilium --context ${{ env.contextName2 }} install \
595593
${{ steps.vars.outputs.cilium_install_defaults }} \
596594
--helm-set cluster.name=${{ env.ciliumClusterName2 }} \
597595
--helm-set cluster.id=${{ matrix.maxConnectedClusters }} \
598-
--helm-set clustermesh.apiserver.service.nodePort=32380 \
596+
--helm-set clustermesh.apiserver.service.nodePort=0 \
599597
--helm-set clustermesh.apiserver.tls.authMode=${{ matrix.cm-auth-mode-2 }} \
600598
${{ steps.vars.outputs.cilium_install_multipool_ipam_cluster2 }} \
601599
${{ steps.kvstore.outputs.cilium_install_kvstore }} \

0 commit comments

Comments
 (0)