Merge pull request #11 from pydevops/dev

upgrade jenkins-k8s-node to 1.1.0

Author: chrislovecnm

.gitignore

@@ -1,6 +1,6 @@
 # Files for Demo
 credentials.json
-instanceName
+.instance
 
 # OSX leaves these everywhere on SMB shares
 ._*

Jenkinsfile

@@ -33,7 +33,7 @@ metadata:
 spec:
   containers:
   - name: k8s-node
-    image: gcr.io/pso-helmsman-cicd/jenkins-k8s-node:1.0.1
+    image: gcr.io/pso-helmsman-cicd/jenkins-k8s-node:1.2.0
     imagePullPolicy: Always
     command:
     - cat

Makefile

@@ -18,26 +18,24 @@ 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-8
-
 # 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 $(SQLNAME) user user
+	@source ./create.sh user user
 
 .PHONY: expose
 expose:
 	@source ./scripts/expose.sh
 
 .PHONY: validate
 validate:
-	@source ./validate.sh $(SQLNAME)
+	@source ./validate.sh
 
 .PHONY: teardown
 teardown:
-	@source ./teardown.sh $(SQLNAME)
+	@source ./teardown.sh
 
 .PHONY: check_shell
 check_shell:

create.sh

@@ -19,23 +19,28 @@
 # some accompanying service accounts
 
 help() {
-  echo "./create.sh INSTANCE_NAME POSTGRES_USERNAME PGADMIN_USERNAME"
+  echo "./create.sh POSTGRES_USERNAME PGADMIN_USERNAME"
   echo "Passwords will be entered via prompts"
 }
 
-export INSTANCE_NAME=$1
+ROOT=$(dirname "${BASH_SOURCE[0]}")
+
+RANDOM_SUFFIX=$(tr -dc 'a-z0-9' </dev/urandom | fold -w 6 | head -n 1)
+export INSTANCE_NAME=demo-postgres-${RANDOM_SUFFIX}
+echo "$INSTANCE_NAME" > "${ROOT}"/.instance
+
 if [ -z "$INSTANCE_NAME" ] ; then
   help
   exit 1
 fi
 
-export USER_NAME=$2
+export USER_NAME=$1
 if [ -z "$USER_NAME" ] ; then
   help
   exit 1
 fi
 
-export PG_ADMIN_CONSOLE_EMAIL=$3
+export PG_ADMIN_CONSOLE_EMAIL=$2
 if [ -z "$PG_ADMIN_CONSOLE_EMAIL" ]; then
   help
   exit 1

teardown.sh

@@ -25,7 +25,8 @@ help() {
   echo "./teardown.sh INSTANCE_NAME"
 }
 
-export INSTANCE_NAME=$1
+INSTANCE_NAME=$(cat "${ROOT}"/.instance)
+export INSTANCE_NAME
 if [ -z "$INSTANCE_NAME" ] ; then
   help
   exit 1

validate.sh

@@ -30,7 +30,8 @@ if [ -z "$CLUSTER_ZONE" ]; then
   exit 1
 fi
 
-export INSTANCE_NAME=$1
+INSTANCE_NAME=$(cat "${ROOT}"/.instance)
+export INSTANCE_NAME
 if [ -z "$INSTANCE_NAME" ] ; then
   help
   exit 1