Merge pull request #8 from techgnosis/Jenkins

Fixing Jenkins related kubectl failures

Author: Erik

Makefile

@@ -18,7 +18,7 @@ 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-6
+SQLNAME := demo-postgres-7
 
 # 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

scripts/configs_and_secrets.sh

@@ -17,10 +17,10 @@
 # Here we are installing secrets into the Kubernetes cluster
 # Installing them into the cluster makes it very easy to access them from
 # the appliations in the cluster
-kubectl create secret generic cloudsql-sa-creds \
+kubectl --namespace default create secret generic cloudsql-sa-creds \
 --from-file=credentials.json=credentials.json
 
-kubectl create secret generic pgadmin-console \
+kubectl --namespace default create secret generic pgadmin-console \
 --from-literal=user="$PG_ADMIN_CONSOLE_EMAIL" \
 --from-literal=password="$PG_ADMIN_CONSOLE_PASSWORD"
 
@@ -30,5 +30,5 @@ CONNECTION_NAME=$(gcloud sql instances describe "$INSTANCE_NAME" \
 # You can also store non-sensitive information in the cluster
 # similar to a secret. In this case we are using a configMap, which
 # is also very easy to access from applications in the cluster
-kubectl create configmap connectionname \
+kubectl --namespace default create configmap connectionname \
 --from-literal=connectionname="$CONNECTION_NAME"

scripts/expose.sh

@@ -18,5 +18,5 @@
 # Cloud Load Balancer we are instead port-forwarding to the node and
 # exposing the pod port
 
-POD_ID=$(kubectl get pods -o name | cut -d '/' -f 2)
-kubectl port-forward "$POD_ID" 8080:80
+POD_ID=$(kubectl --namespace default get pods -o name | cut -d '/' -f 2)
+kubectl --namespace default port-forward "$POD_ID" 8080:80

scripts/pgadmin_deployment.sh

@@ -20,7 +20,7 @@
 
 ROOT=$(dirname "${BASH_SOURCE[0]}")
 
-kubectl create -f "$ROOT"/../manifests/pgadmin-deployment.yaml
+kubectl --namespace default create -f "$ROOT"/../manifests/pgadmin-deployment.yaml
 
 # Waiting for the pod to actually deploy correctly
-kubectl rollout status -f "$ROOT"/../manifests/pgadmin-deployment.yaml
+kubectl --namespace default rollout status -f "$ROOT"/../manifests/pgadmin-deployment.yaml

validate.sh

@@ -53,7 +53,7 @@ fi
 # This method involves giving the 'get' command the same manifest used to
 # create the object. It will find an object matching
 # the description in the manifest
-if ! kubectl get -f "$ROOT"/manifests/pgadmin-deployment.yaml > /dev/null; then
+if ! kubectl --namespace default get -f "$ROOT"/manifests/pgadmin-deployment.yaml > /dev/null; then
   echo "FAIL: pgAdmin4 Deployment object does not exist"
 else
   echo "pgAdmin4 Deployment object exists"