From 33252c373a6103a41a170de791c79fd080ce5603 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Wed, 17 Sep 2025 22:39:59 +0300 Subject: [PATCH 1/6] fix cluster name pattern and add additional output --- Jenkinsfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 679a78697..061ccab79 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,9 +9,13 @@ void createCluster(String CLUSTER_SUFFIX) { gcloud auth activate-service-account --key-file $CLIENT_SECRET_FILE gcloud config set project $GCP_PROJECT ret_num=0 - while [ \${ret_num} -lt 15 ]; do + while [ \${ret_num} -lt 5 ]; do ret_val=0 - gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true + if [[ \${ret_num} -gt 1 ]]; then + kubectl cluster-info || true + kubectl config current-context || true + fi + gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true gcloud container clusters create $CLUSTER_NAME-${CLUSTER_SUFFIX} \ --zone $region \ --cluster-version=1.31 \ @@ -33,7 +37,7 @@ void createCluster(String CLUSTER_SUFFIX) { if [ \${ret_val} -eq 0 ]; then break; fi ret_num=\$((ret_num + 1)) done - if [ \${ret_num} -eq 15 ]; then + if [ \${ret_num} -eq 5 ]; then gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true exit 1 fi From 72ec025754b91d0957c3a1a108daf4b75cb82947 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Thu, 18 Sep 2025 13:10:11 +0300 Subject: [PATCH 2/6] Add ping --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 061ccab79..a199617dc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,7 @@ void createCluster(String CLUSTER_SUFFIX) { if [[ \${ret_num} -gt 1 ]]; then kubectl cluster-info || true kubectl config current-context || true + ping $(gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" '--format=csv[no-heading](MASTER_IP)') -t 10 || true fi gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true gcloud container clusters create $CLUSTER_NAME-${CLUSTER_SUFFIX} \ From 86d64db5bc41e0a6281d504884e728268973db65 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Thu, 18 Sep 2025 13:59:45 +0300 Subject: [PATCH 3/6] Fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a199617dc..b9db99c70 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ void createCluster(String CLUSTER_SUFFIX) { if [[ \${ret_num} -gt 1 ]]; then kubectl cluster-info || true kubectl config current-context || true - ping $(gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" '--format=csv[no-heading](MASTER_IP)') -t 10 || true + ping \$(gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" '--format=csv[no-heading](MASTER_IP)') -t 10 || true fi gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true gcloud container clusters create $CLUSTER_NAME-${CLUSTER_SUFFIX} \ From ff492a5bfc8e6a1dfe30f1ac4468a63dc6ea749d Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Fri, 19 Sep 2025 21:08:09 +0300 Subject: [PATCH 4/6] Check -v --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b9db99c70..4c190abf7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,8 @@ void createCluster(String CLUSTER_SUFFIX) { if [[ \${ret_num} -gt 1 ]]; then kubectl cluster-info || true kubectl config current-context || true - ping \$(gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" '--format=csv[no-heading](MASTER_IP)') -t 10 || true + kubectl get nodes -v=10 || true + ping -t10 \$(gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" '--format=csv[no-heading](MASTER_IP)') || true fi gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true gcloud container clusters create $CLUSTER_NAME-${CLUSTER_SUFFIX} \ From 9e37199788bd05265b41d86dea0b93da7e5e9f67 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Fri, 19 Sep 2025 21:23:14 +0300 Subject: [PATCH 5/6] Check -v --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4c190abf7..f94e5b451 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ void createCluster(String CLUSTER_SUFFIX) { if [[ \${ret_num} -gt 1 ]]; then kubectl cluster-info || true kubectl config current-context || true - kubectl get nodes -v=10 || true + kubectl --request-timeout 60 get nodes -v=9 || true ping -t10 \$(gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" '--format=csv[no-heading](MASTER_IP)') || true fi gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true @@ -35,11 +35,12 @@ void createCluster(String CLUSTER_SUFFIX) { --logging=NONE \ --no-enable-managed-prometheus \ --quiet && \ + if [[ \${ret_num} -gt 1 ]]; then gcloud container clusters get-credentials $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $region; fi && \ kubectl create clusterrolebinding cluster-admin-binding --clusterrole cluster-admin --user jenkins@"$GCP_PROJECT".iam.gserviceaccount.com || ret_val=\$? if [ \${ret_val} -eq 0 ]; then break; fi ret_num=\$((ret_num + 1)) done - if [ \${ret_num} -eq 5 ]; then + if [ \${ret_num} -eq 5 ]; then gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true exit 1 fi From 24c86c4b2036f9adfa44287f1498b45180c479d0 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Mon, 29 Sep 2025 11:19:33 +0300 Subject: [PATCH 6/6] Use ping -c --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f94e5b451..2c30f6259 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ void createCluster(String CLUSTER_SUFFIX) { kubectl cluster-info || true kubectl config current-context || true kubectl --request-timeout 60 get nodes -v=9 || true - ping -t10 \$(gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" '--format=csv[no-heading](MASTER_IP)') || true + ping -c 10 \$(gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" '--format=csv[no-heading](MASTER_IP)') || true fi gcloud container clusters list --filter="name=$CLUSTER_NAME-${CLUSTER_SUFFIX}" --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true gcloud container clusters create $CLUSTER_NAME-${CLUSTER_SUFFIX} \