Skip to content

Commit 5e5a5a7

Browse files
author
Vivek Reddy
committed
updated gke scripts
1 parent 81f43a4 commit 5e5a5a7

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.github/workflows/int-test-gcp-workflow.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,11 @@ jobs:
278278
make cleanup
279279
make clean
280280
make cluster-down
281-
- name: Delete GKE Cluster
282-
if: always()
281+
- name: Cleanup up EKS cluster
282+
if: ${{ always() }}
283283
run: |
284-
gcloud container clusters delete ${{ env.CLUSTER_NAME }} --zone ${{ env.GCP_ZONE }} --project ${{ env.GCP_PROJECT_ID }} --quiet
284+
make cluster-down
285+
#- name: Delete GKE Cluster
286+
# if: always()
287+
# run: |
288+
# gcloud container clusters delete ${{ env.CLUSTER_NAME }} --zone ${{ env.GCP_ZONE }} --project ${{ env.GCP_PROJECT_ID }} --quiet

test/deploy-gcp-cluster.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ if [[ -z "${GCR_REPOSITORY}" ]]; then
1616
fi
1717

1818
if [[ -z "${GKE_CLUSTER_K8_VERSION}" ]]; then
19-
echo "GKE_CLUSTER_K8_VERSION not set. Changing to 1.26"
20-
export GKE_CLUSTER_K8_VERSION="1.26"
19+
echo "GKE_CLUSTER_K8_VERSION not set. Changing to 1.29"
20+
export GKE_CLUSTER_K8_VERSION="1.29"
2121
fi
2222

2323
function deleteCluster() {
2424
echo "Cleanup remaining PVC on the GKE Cluster ${TEST_CLUSTER_NAME}"
2525
tools/cleanup.sh
26-
gcloud container clusters delete ${TEST_CLUSTER_NAME} --zone ${GCP_ZONE} --quiet
26+
gcloud container clusters delete ${TEST_CLUSTER_NAME} --zone ${GCP_ZONE} --project ${GCP_PROJECT_ID} --quiet
2727
if [ $? -ne 0 ]; then
2828
echo "Unable to delete cluster - ${TEST_CLUSTER_NAME}"
2929
return 1
@@ -44,9 +44,13 @@ function createCluster() {
4444
gcloud container clusters create ${TEST_CLUSTER_NAME} \
4545
--num-nodes=${CLUSTER_WORKERS} \
4646
--zone=${GCP_ZONE} \
47-
--subnetwork=${GCP_VPC_PUBLIC_SUBNET_STRING} \
47+
--disk-size 50 \
48+
#--network ${{ env.GCP_NETWORK }} \
49+
#--subnetwork=${GCP_VPC_PUBLIC_SUBNET_STRING} \
4850
--cluster-version=${GKE_CLUSTER_K8_VERSION} \
49-
--machine-type=n1-standard-4
51+
--machine-type n2-standard-8 \
52+
--scopes "https://www.googleapis.com/auth/cloud-platform" \
53+
--enable-ip-alias
5054
if [ $? -ne 0 ]; then
5155
echo "Unable to create cluster - ${TEST_CLUSTER_NAME}"
5256
return 1

0 commit comments

Comments
 (0)