$USER was not defined in the containers in Jenkins so I'm removing the usage of it. Its better without it anyway

Author: jmusselwhite

Makefile

@@ -18,24 +18,26 @@ SHELL := /usr/bin/env bash
 # All is the first target in the file so it will get picked up when you just run 'make' on its own
 linting: check_shell check_python check_golang check_terraform check_docker check_base_files check_headers check_trailing_whitespace
 
+SQLNAME := demo-postgres-3
+
 # The .PHONY directive tells make that this isn't a real target and so
 # the presence of a file named 'check_shell' won't cause this target to stop
 # working
 .PHONY: create
 create:
-	@source ./create.sh demo-postgres user user
+	@source ./create.sh $(SQLNAME) user user
 
 .PHONY: expose
 expose:
 	@source ./scripts/expose.sh
 
 .PHONY: validate
 validate:
-	@source ./validate.sh demo-postgres
+	@source ./validate.sh $(SQLNAME)
 
 .PHONY: teardown
 teardown:
-	@source ./teardown.sh demo-postgres
+	@source ./teardown.sh $(SQLNAME)
 
 .PHONY: check_shell
 check_shell:

scripts/cluster.sh

@@ -19,7 +19,7 @@
 
 set -o errexit
 
-CLUSTER_NAME=$USER-poc-cluster
+CLUSTER_NAME=postgres-demo-cluster
 PROJECT=$(gcloud config get-value core/project)
 
 # This line is just to eliminate a warning that GKE behavior will change in the
@@ -35,7 +35,7 @@ gcloud container clusters create "$CLUSTER_NAME" \
 --num-nodes 1 \
 --enable-autorepair \
 --zone "$CLUSTER_ZONE" \
---service-account="$USER"-poc-node-sa@"$PROJECT".iam.gserviceaccount.com \
+--service-account="postgres-demo-node-sa@$PROJECT".iam.gserviceaccount.com \
 
 # Setting up .kube/config. This happens normally if you don't use --async
 gcloud container clusters get-credentials "$CLUSTER_NAME" --zone "$CLUSTER_ZONE"

scripts/delete_resources.sh

@@ -18,16 +18,16 @@
 # Cloud SQL instance takes a long time so deleting it is a separate step
 # that includes a prompt in another script
 
-SA_NAME=$USER-poc-sa
-NODE_SA_NAME=$USER-poc-node-sa
+SA_NAME=postgres-demo-sa
+NODE_SA_NAME=postgres-demo-node-sa
 PROJECT=$(gcloud config get-value core/project)
 CLUSTER_ZONE=$(gcloud config get-value compute/zone)
 
 FULL_SA_NAME=$SA_NAME@$PROJECT.iam.gserviceaccount.com
 FULL_NODE_SA_NAME=$NODE_SA_NAME@$PROJECT.iam.gserviceaccount.com
 
 gcloud container clusters delete \
-"$USER"-poc-cluster --zone "$CLUSTER_ZONE" --quiet
+postgres-demo-cluster --zone "$CLUSTER_ZONE" --quiet
 
 gcloud projects remove-iam-policy-binding "$PROJECT" \
 --member serviceAccount:"$FULL_SA_NAME" \

scripts/service_account.sh

@@ -20,8 +20,8 @@
 # The second is for the GKE nodes and it gets the minimal permissions needed
 # for logging and monitoring as recommended by the GKE documentation
 
-SA_NAME=$USER-poc-sa
-NODE_SA_NAME=$USER-poc-node-sa
+SA_NAME=postgres-demo-sa
+NODE_SA_NAME=postgres-demo-node-sa
 PROJECT=$(gcloud config get-value core/project)
 
 if [ -z "$PROJECT" ]; then

validate.sh

@@ -19,7 +19,7 @@
 
 ROOT=$(dirname "${BASH_SOURCE[0]}")
 
-CLUSTER_NAME=$USER-poc-cluster
+CLUSTER_NAME=postgres-demo-cluster
 
 help() {
   echo "./validate.sh INSTANCE_NAME"