Skip to content

Commit a9240a4

Browse files
authored
ci: detect existing minio operator installations correctly (#21908)
Signed-off-by: Nathan Klick <[email protected]>
1 parent b70e90b commit a9240a4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/support/citr/Taskfile.citr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ tasks:
413413
silent: true
414414
cmds:
415415
- |
416-
if ! kubectl get svc -l app.kubernetes.io/instance=minio-operator --all-namespaces --no-headers | grep -q . ; then
416+
if ! kubectl get pods -l app.kubernetes.io/instance=minio-operator -l app.kubernetes.io/name=operator --all-namespaces --no-headers | grep -q . ; then
417417
echo "No services found with label app.kubernetes.io/name=operator app.kubernetes.io/instance=minio-operator"
418418
echo "--minio" > {{ .minio_flag_file }}
419419
else
@@ -431,9 +431,9 @@ tasks:
431431
- |
432432
export MINIO_FLAG=$(cat {{ .minio_flag_file }})
433433
if [[ "{{ .solo_ge_0440 }}" == "true" ]]; then
434-
SOLO_HOME_DIR=${SOLO_HOME_DIR} solo cluster-ref config setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${MINIO_FLAG} ${SOLO_CHARTS_DIR_FLAG} ${CLUSTER_TLS_FLAGS} -q --dev
434+
SOLO_HOME_DIR=${SOLO_HOME_DIR} solo cluster-ref config setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${MINIO_FLAG} ${SOLO_CHARTS_DIR_FLAG} ${CLUSTER_TLS_FLAGS} --no-prometheus-stack -q --dev
435435
else
436-
SOLO_HOME_DIR=${SOLO_HOME_DIR} solo cluster-ref setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${MINIO_FLAG} ${SOLO_CHARTS_DIR_FLAG} ${CLUSTER_TLS_FLAGS} -q --dev
436+
SOLO_HOME_DIR=${SOLO_HOME_DIR} solo cluster-ref setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${MINIO_FLAG} ${SOLO_CHARTS_DIR_FLAG} ${CLUSTER_TLS_FLAGS} --no-prometheus-stack -q --dev
437437
fi
438438
439439
solo:node:addresses:

.github/workflows/support/citr/Taskfile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env:
2626
#EXPLORER_CLUSTER_CONTEXT: "kind-solo-cluster"
2727
SOLO_DEPLOYMENT: %SOLO_NAMESPACE%-test
2828
CLUSTER_REF: %SOLO_NAMESPACE%-ref
29-
SOLO_CLUSTER_RELEASE_NAME: cluster_name
29+
SOLO_CLUSTER_RELEASE_NAME: solo-cluster-setup
3030
CONTEXT: hashgraph.teleport.sh-k8s.pft.chi.lat.ope.eng.hashgraph.io
3131
SOLO_CLUSTER_SETUP_NAMESPACE: solo-setup
3232
SOLO_CLUSTER_NAME: solo-cluster-name

0 commit comments

Comments
 (0)