From f2032362aecdaf5b4f726617eec665a4d97a1e6f Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Sun, 23 Aug 2020 14:48:12 +0300
Subject: [PATCH 01/38] Add dockerfile and jenkinsfile for department service

---
 department-service/Dockerfile  | 10 +++++++
 department-service/Jenkinsfile | 48 ++++++++++++++++++++++++++++++++++
 department-service/Makefile    |  9 ++++---
 department-service/readme.md   |  5 ++--
 4 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 department-service/Dockerfile
 create mode 100644 department-service/Jenkinsfile

diff --git a/department-service/Dockerfile b/department-service/Dockerfile
new file mode 100644
index 0000000..f2dce0f
--- /dev/null
+++ b/department-service/Dockerfile
@@ -0,0 +1,10 @@
+from node as build
+copy index.js /src/
+copy package* /src/
+run cd /src && \
+    npm install
+from node
+copy --from=build /src/node_modules /dist/node_modules/
+copy index.js /dist/
+workdir /dist
+cmd ["node", "index.js"]
diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
new file mode 100644
index 0000000..964b8cb
--- /dev/null
+++ b/department-service/Jenkinsfile
@@ -0,0 +1,48 @@
+pipeline {
+  agent {
+    kubernetes {
+      yaml """
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    service_name: department-service
+    service_type: REST
+spec:
+  containers:
+  - name: dnd
+    image: bryandollery/alpine-docker 
+    command: 
+    - bash
+    tty: true
+"""
+    }
+  }
+  environment {
+    CREDS = credentials('bryan_docker_creds')
+    DOCKER_NAMESPACE = 'bryandollery'
+    SERVICE_NAME = 'department-service'
+  }
+  stages {
+      stage("Build") {
+          steps {
+              container('dnd') {
+                  sh '''
+                      cd $SERVICE_NAME
+                      docker build --tag $DOCKER_NAMESPACE/$SERVICE_NAME .
+                  '''
+              }
+          }
+      }
+      stage("Release") {
+          steps {
+              container('dnd') {
+                  sh '''
+                      docker login -p $CREDS_PSW -u $CREDS_USR
+                      docker push $DOCKER_NAMESPACE/$SERVICE_NAME
+                  '''
+              }
+          }
+      }
+  }
+}
diff --git a/department-service/Makefile b/department-service/Makefile
index fd7f50e..04b3a74 100644
--- a/department-service/Makefile
+++ b/department-service/Makefile
@@ -1,4 +1,7 @@
 build:
-    docker build --tag department-service .build
-run:
-    docker run -it --rm -p 8082:80 department-service
\ No newline at end of file
+	docker build --tag $$DOCKER_NAMESPACE/$$SERVICE_NAME .
+
+release:
+	docker login -p $$CREDS_PSW -u $$CREDS_USR
+	docker push $$DOCKER_NAMESPACE/SERVICE_NAME
+
diff --git a/department-service/readme.md b/department-service/readme.md
index bc06563..c8ed43e 100644
--- a/department-service/readme.md
+++ b/department-service/readme.md
@@ -1,9 +1,10 @@
 ## A nodejs REST service to return departments
+### Simple API to provide a service for the DevOps Bootcamp
 
-Designed to run in a node:lts-alpine3.10 container
+Designed to run in a node container
 
 Exposes an http service endpoint on port 80 with the /department/ context path
 
 eg
 
-http://{host}/department/
\ No newline at end of file
+http://{host}/department/

From c6b9abf1d22721172d26230e76c52c7783f59726 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Sun, 23 Aug 2020 15:36:11 +0300
Subject: [PATCH 02/38] add volume try 1

---
 department-service/Jenkinsfile | 2 ++
 readme.md                      | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 964b8cb..3dfb8da 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -15,6 +15,8 @@ spec:
     command: 
     - bash
     tty: true
+    volumes:
+    - hostPathVolume: /var/run/docker.sock  
 """
     }
   }
diff --git a/readme.md b/readme.md
index 3eb39f8..010e79d 100644
--- a/readme.md
+++ b/readme.md
@@ -54,7 +54,8 @@ Once the builds are successful, the same pipeline can deploy the app to kubernet
 Each of the 5 services needs a separate deployment and service object definition. 
 Your services should expose NodePorts so that they can be accessed from your browser.
 The complexity here is that you need to have known port for each service otherwise you will not be able to access it from the UI.
-Remember, the calls to the separate REST services are made from the browser, not from the UI service.
+Remember, the calls to the separate REST services are made from the browser, not from the UI service. 
+There is no inter-service chatter.
 
 
 

From fed40b3352e9af0649e6fb530d481abd23248635 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Sun, 23 Aug 2020 15:44:48 +0300
Subject: [PATCH 03/38] trying again

---
 department-service/Jenkinsfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 3dfb8da..effa758 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -15,8 +15,14 @@ spec:
     command: 
     - bash
     tty: true
-    volumes:
-    - hostPathVolume: /var/run/docker.sock  
+    volumeMounts: 
+    - mountPath: /var/run/docker.sock
+      name: docker_socket
+  volumes:
+  - name: docker_socket
+    hostPath:
+      path: /var/run/docker.sock  
+      type: Socket
 """
     }
   }

From 1f23ed271cca3ac675d6e247a90cb6a2950cae04 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Sun, 23 Aug 2020 21:46:28 +0300
Subject: [PATCH 04/38] change name of docker socket volume

---
 department-service/Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index effa758..8bcc35b 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -11,15 +11,15 @@ metadata:
 spec:
   containers:
   - name: dnd
-    image: bryandollery/alpine-docker 
+    image: docker:latest
     command: 
-    - bash
+    - cat
     tty: true
     volumeMounts: 
     - mountPath: /var/run/docker.sock
-      name: docker_socket
+      name: docker-sock
   volumes:
-  - name: docker_socket
+  - name: docker-sock
     hostPath:
       path: /var/run/docker.sock  
       type: Socket

From 59a17c3b9c9e5c3d73bb2a29081cadc180604887 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Sun, 23 Aug 2020 22:14:29 +0300
Subject: [PATCH 05/38] first attempt at deployment

---
 department-service/Jenkinsfile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 8bcc35b..ddfb520 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -52,5 +52,14 @@ spec:
               }
           }
       }
+      stage("Deploy") {
+          steps {
+              container('kubectl') {
+                  sh '''
+                      kubectl get pods -n jenkins
+                  '''
+              }
+          }
+      }
   }
 }

From e2ae2c0b7467c1535f76248ab0db32e5dda7716a Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Sun, 23 Aug 2020 22:17:48 +0300
Subject: [PATCH 06/38] 2nd attempt at deployment

---
 department-service/Jenkinsfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index ddfb520..3995f09 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -18,6 +18,11 @@ spec:
     volumeMounts: 
     - mountPath: /var/run/docker.sock
       name: docker-sock
+  - name: kubectl
+    image: wernight/kubectl
+    command:
+    - cat
+    tty: true
   volumes:
   - name: docker-sock
     hostPath:

From 22100c41196dbfcd915efe67b5c9a1290ff43e50 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Sun, 23 Aug 2020 22:32:27 +0300
Subject: [PATCH 07/38] added service account

---
 department-service/Jenkinsfile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 3995f09..f56dc3e 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -23,11 +23,18 @@ spec:
     command:
     - cat
     tty: true
+    volumeMounts:
+    - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
+      name: serviceaccount
   volumes:
   - name: docker-sock
     hostPath:
       path: /var/run/docker.sock  
       type: Socket
+  - name: serviceaccount
+    hostPath:
+      path: /var/run/secrets/kubernetes.io/serviceaccount
+      type: Secret
 """
     }
   }
@@ -61,7 +68,10 @@ spec:
           steps {
               container('kubectl') {
                   sh '''
-                      kubectl get pods -n jenkins
+                      kubectl --token="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" \
+                              --certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
+                              --namespace jenkins \
+                              get pods
                   '''
               }
           }

From 4dbe49ffe0ce9f6d343ee4a73f4f97a9dd390acf Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Sun, 23 Aug 2020 22:34:38 +0300
Subject: [PATCH 08/38] debugging

---
 department-service/Jenkinsfile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index f56dc3e..4825876 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -44,6 +44,18 @@ spec:
     SERVICE_NAME = 'department-service'
   }
   stages {
+      stage("debug") {
+          steps {
+              container('kubectl') {
+                  sh '''
+                      kubectl --token="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" \
+                              --certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
+                              --namespace jenkins \
+                              get pods
+                  '''
+              }
+          }
+      }
       stage("Build") {
           steps {
               container('dnd') {

From 1e17420e4419443de12491c3703eb1203d624025 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Sun, 23 Aug 2020 22:39:45 +0300
Subject: [PATCH 09/38] try without a type

---
 department-service/Jenkinsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 4825876..7f31d5a 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -34,7 +34,6 @@ spec:
   - name: serviceaccount
     hostPath:
       path: /var/run/secrets/kubernetes.io/serviceaccount
-      type: Secret
 """
     }
   }

From 4dbea48a6aa936f0134534e5069becb938713bec Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 07:27:23 +0300
Subject: [PATCH 10/38] experimental debugging

---
 department-service/Jenkinsfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 7f31d5a..1db5f21 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -41,16 +41,17 @@ spec:
     CREDS = credentials('bryan_docker_creds')
     DOCKER_NAMESPACE = 'bryandollery'
     SERVICE_NAME = 'department-service'
+    SA=credentials('f355ebb8-b7cb-4848-8c83-c0d56b88959e')
   }
   stages {
       stage("debug") {
           steps {
-              container('kubectl') {
+              container('dnd') {
                   sh '''
-                      kubectl --token="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" \
-                              --certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
-                              --namespace jenkins \
-                              get pods
+                      env
+                      echo $SA
+                      # cat /var/run/secrets/kubernetes.io/serviceaccount/token
+                      # cat /var/run/secrets/kubernetes.io/serviceaccount/ca.crt 
                   '''
               }
           }

From a89b52e446d518b7fef47f4bfff31908dc934b8a Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 07:31:41 +0300
Subject: [PATCH 11/38] trying the token

---
 department-service/Jenkinsfile | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 1db5f21..fd2cc19 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -23,17 +23,11 @@ spec:
     command:
     - cat
     tty: true
-    volumeMounts:
-    - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
-      name: serviceaccount
   volumes:
   - name: docker-sock
     hostPath:
       path: /var/run/docker.sock  
       type: Socket
-  - name: serviceaccount
-    hostPath:
-      path: /var/run/secrets/kubernetes.io/serviceaccount
 """
     }
   }
@@ -46,12 +40,9 @@ spec:
   stages {
       stage("debug") {
           steps {
-              container('dnd') {
+              container('kubectl') {
                   sh '''
-                      env
-                      echo $SA
-                      # cat /var/run/secrets/kubernetes.io/serviceaccount/token
-                      # cat /var/run/secrets/kubernetes.io/serviceaccount/ca.crt 
+                      kubectl --token=$SA get pods -n kenkins
                   '''
               }
           }

From 5004b298ab17f573488ea696a8257a19379a1dd9 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 07:37:37 +0300
Subject: [PATCH 12/38] debugging

---
 department-service/Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index fd2cc19..e1b0aad 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -42,6 +42,7 @@ spec:
           steps {
               container('kubectl') {
                   sh '''
+                      cat ~/.kube/config
                       kubectl --token=$SA get pods -n kenkins
                   '''
               }

From 0d1fbbcaa089e7bbfd11681dbdf8eb1319024b93 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 07:45:14 +0300
Subject: [PATCH 13/38] debugging more

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index e1b0aad..c353497 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -19,7 +19,7 @@ spec:
     - mountPath: /var/run/docker.sock
       name: docker-sock
   - name: kubectl
-    image: wernight/kubectl
+    image: bryandollery/terraform-packer-aws-alpine
     command:
     - cat
     tty: true

From 60ee44930b8ef783bb656266da8888f78c40634e Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 07:47:05 +0300
Subject: [PATCH 14/38] trying token again

---
 department-service/Jenkinsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index c353497..07e4ec9 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -42,7 +42,6 @@ spec:
           steps {
               container('kubectl') {
                   sh '''
-                      cat ~/.kube/config
                       kubectl --token=$SA get pods -n kenkins
                   '''
               }

From 7ae21d6b69dd2646b40e6a4e745f5dc051f68463 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 07:48:49 +0300
Subject: [PATCH 15/38] fix typo

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 07e4ec9..bde6b78 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -42,7 +42,7 @@ spec:
           steps {
               container('kubectl') {
                   sh '''
-                      kubectl --token=$SA get pods -n kenkins
+                      kubectl --token=$SA get pods -n jenkins
                   '''
               }
           }

From 28a59755840808aebf490c9cd8de9a64fd550d68 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 07:52:35 +0300
Subject: [PATCH 16/38] working

---
 department-service/Jenkinsfile  | 14 +-------------
 department-service/deploy.yaml  |  0
 department-service/service.yaml |  0
 3 files changed, 1 insertion(+), 13 deletions(-)
 create mode 100644 department-service/deploy.yaml
 create mode 100644 department-service/service.yaml

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index bde6b78..60a9da9 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -38,15 +38,6 @@ spec:
     SA=credentials('f355ebb8-b7cb-4848-8c83-c0d56b88959e')
   }
   stages {
-      stage("debug") {
-          steps {
-              container('kubectl') {
-                  sh '''
-                      kubectl --token=$SA get pods -n jenkins
-                  '''
-              }
-          }
-      }
       stage("Build") {
           steps {
               container('dnd') {
@@ -71,10 +62,7 @@ spec:
           steps {
               container('kubectl') {
                   sh '''
-                      kubectl --token="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" \
-                              --certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt \
-                              --namespace jenkins \
-                              get pods
+                      kubectl --token=$SA -n test apply -f deploy.yaml -f service.yaml
                   '''
               }
           }
diff --git a/department-service/deploy.yaml b/department-service/deploy.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/department-service/service.yaml b/department-service/service.yaml
new file mode 100644
index 0000000..e69de29

From 7a8eafbb65c7cecd1c9e64c7dbe906a57d309ae8 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 08:12:16 +0300
Subject: [PATCH 17/38] adding deployment and service

---
 department-service/deploy.yaml  | 22 ++++++++++++++++++++++
 department-service/service.yaml | 11 +++++++++++
 2 files changed, 33 insertions(+)

diff --git a/department-service/deploy.yaml b/department-service/deploy.yaml
index e69de29..8b3272a 100644
--- a/department-service/deploy.yaml
+++ b/department-service/deploy.yaml
@@ -0,0 +1,22 @@
+piVersion: apps/v1
+kind: Deployment
+metadata:
+  name: department-service
+  labels:
+    app: department-service
+    type: api
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: deployment-service
+  template:
+    metadata:
+      labels:
+        app: deployment-service
+    spec:
+      containers:
+      - name: department-service
+        image: bryandollery/department-service
+        ports:
+        - containerPort: 80
diff --git a/department-service/service.yaml b/department-service/service.yaml
index e69de29..d293a89 100644
--- a/department-service/service.yaml
+++ b/department-service/service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: department-service
+spec:
+  type: NodePort
+  selector:
+    app: departement-service
+  ports:
+    - port: 80
+      targetPort: 80

From 888374104cf97571e6818f03558bce03701031d1 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 08:32:37 +0300
Subject: [PATCH 18/38] changed var to token

---
 department-service/Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 60a9da9..e97fbcf 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -35,7 +35,7 @@ spec:
     CREDS = credentials('bryan_docker_creds')
     DOCKER_NAMESPACE = 'bryandollery'
     SERVICE_NAME = 'department-service'
-    SA=credentials('f355ebb8-b7cb-4848-8c83-c0d56b88959e')
+    TOKEN=credentials('f355ebb8-b7cb-4848-8c83-c0d56b88959e')
   }
   stages {
       stage("Build") {
@@ -62,7 +62,7 @@ spec:
           steps {
               container('kubectl') {
                   sh '''
-                      kubectl --token=$SA -n test apply -f deploy.yaml -f service.yaml
+                      kubectl --token=$TOKEN -n test apply -f deploy.yaml -f service.yaml
                   '''
               }
           }

From b5919369c3668d539cfa60f0fb92bd72a9ae611e Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 08:35:36 +0300
Subject: [PATCH 19/38] changed dir

---
 department-service/Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index e97fbcf..e4afe0b 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -62,6 +62,7 @@ spec:
           steps {
               container('kubectl') {
                   sh '''
+                      cd $SERVICE_NAME
                       kubectl --token=$TOKEN -n test apply -f deploy.yaml -f service.yaml
                   '''
               }

From a7f20ebc0ee62aa0476a5e7db010719a561ab9b9 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 08:38:15 +0300
Subject: [PATCH 20/38] fixed typo in deploy.yaml

---
 department-service/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/deploy.yaml b/department-service/deploy.yaml
index 8b3272a..2e7d7b4 100644
--- a/department-service/deploy.yaml
+++ b/department-service/deploy.yaml
@@ -1,4 +1,4 @@
-piVersion: apps/v1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: department-service

From 4df88ea3ed09bf46eb2e1dffbe131f2a73634efb Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 08:40:13 +0300
Subject: [PATCH 21/38] moving to jenkins namespace

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index e4afe0b..20d413d 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -63,7 +63,7 @@ spec:
               container('kubectl') {
                   sh '''
                       cd $SERVICE_NAME
-                      kubectl --token=$TOKEN -n test apply -f deploy.yaml -f service.yaml
+                      kubectl --token=$TOKEN -n jenkins apply -f deploy.yaml -f service.yaml
                   '''
               }
           }

From ba7c56a924b8480086a2718cb1b9e08d91145669 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 08:43:56 +0300
Subject: [PATCH 22/38] debugging

---
 department-service/Jenkinsfile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 20d413d..12a92bb 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -38,6 +38,17 @@ spec:
     TOKEN=credentials('f355ebb8-b7cb-4848-8c83-c0d56b88959e')
   }
   stages {
+      stage("debug") {
+          steps {
+              container('kubectl') {
+                  sh '''
+                      cd $SERVICE_NAME
+                      kubectl --token=$TOKEN -n jenkins get all
+                      # kubectl --token=$TOKEN -n jenkins apply -f deploy.yaml -f service.yaml
+                  '''
+              }
+          }
+      }
       stage("Build") {
           steps {
               container('dnd') {
@@ -63,7 +74,8 @@ spec:
               container('kubectl') {
                   sh '''
                       cd $SERVICE_NAME
-                      kubectl --token=$TOKEN -n jenkins apply -f deploy.yaml -f service.yaml
+                      kubectl --token=$TOKEN -n jenkins get all
+                      # kubectl --token=$TOKEN -n jenkins apply -f deploy.yaml -f service.yaml
                   '''
               }
           }

From e43c89bc952b6c4e51a0d8c4af5ea38b466feced Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 09:20:50 +0300
Subject: [PATCH 23/38] trying a new token

---
 department-service/Jenkinsfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 12a92bb..ed465c2 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -35,7 +35,7 @@ spec:
     CREDS = credentials('bryan_docker_creds')
     DOCKER_NAMESPACE = 'bryandollery'
     SERVICE_NAME = 'department-service'
-    TOKEN=credentials('f355ebb8-b7cb-4848-8c83-c0d56b88959e')
+    TOKEN=credentials('tester_token')
   }
   stages {
       stage("debug") {
@@ -74,8 +74,9 @@ spec:
               container('kubectl') {
                   sh '''
                       cd $SERVICE_NAME
-                      kubectl --token=$TOKEN -n jenkins get all
-                      # kubectl --token=$TOKEN -n jenkins apply -f deploy.yaml -f service.yaml
+                      kubectl --token=$TOKEN -n tester get all
+                      kubectl --token=$TOKEN -n jenkins apply -f deploy.yaml -f service.yaml
+                      kubectl --token=$TOKEN -n tester get all
                   '''
               }
           }

From dc5d99e4062a05dcefaebdd300e761c064a76342 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 09:21:24 +0300
Subject: [PATCH 24/38] update debugger

---
 department-service/Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index ed465c2..88062aa 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -43,8 +43,7 @@ spec:
               container('kubectl') {
                   sh '''
                       cd $SERVICE_NAME
-                      kubectl --token=$TOKEN -n jenkins get all
-                      # kubectl --token=$TOKEN -n jenkins apply -f deploy.yaml -f service.yaml
+                      kubectl --token=$TOKEN -n tester get all
                   '''
               }
           }

From 17c3e333196a8e268d266260f31a22507b24b3eb Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 11:48:19 +0300
Subject: [PATCH 25/38] debugging

---
 department-service/Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 88062aa..90f9a3e 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -43,7 +43,8 @@ spec:
               container('kubectl') {
                   sh '''
                       cd $SERVICE_NAME
-                      kubectl --token=$TOKEN -n tester get all
+                      env
+                      kubectl --server=10.43.0.1:443 --insecure-skip-tls-verify=true --token=$TOKEN -n tester get all
                   '''
               }
           }

From 8a48e7bb2c348a949a507babb550f7e23f4872e8 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 11:56:02 +0300
Subject: [PATCH 26/38] experimenting

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 90f9a3e..922dc93 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -44,7 +44,7 @@ spec:
                   sh '''
                       cd $SERVICE_NAME
                       env
-                      kubectl --server=10.43.0.1:443 --insecure-skip-tls-verify=true --token=$TOKEN -n tester get all
+                      kubectl --server="https://kubernetes" --insecure-skip-tls-verify=true --token=$TOKEN -n tester get all
                   '''
               }
           }

From a16a5c9dc2ebfc3ad68649f98caf7520901f2f86 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 11:59:40 +0300
Subject: [PATCH 27/38] trying a different url

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 922dc93..d6698b3 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -44,7 +44,7 @@ spec:
                   sh '''
                       cd $SERVICE_NAME
                       env
-                      kubectl --server="https://kubernetes" --insecure-skip-tls-verify=true --token=$TOKEN -n tester get all
+                      kubectl --server="https://kubernetes.default" --insecure-skip-tls-verify=true --token=$TOKEN -n tester get all
                   '''
               }
           }

From 9762f51b7fc530ad092181c8921e6c6a84f6258c Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 12:08:13 +0300
Subject: [PATCH 28/38] fix typo in namespace

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index d6698b3..d465839 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -44,7 +44,7 @@ spec:
                   sh '''
                       cd $SERVICE_NAME
                       env
-                      kubectl --server="https://kubernetes.default" --insecure-skip-tls-verify=true --token=$TOKEN -n tester get all
+                      kubectl --server="https://kubernetes.default" --insecure-skip-tls-verify=true --token=$TOKEN -n test get all
                   '''
               }
           }

From 0d16ca72c90627b0747901b44a38fefc7df1a139 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 12:11:19 +0300
Subject: [PATCH 29/38] simplifying

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index d465839..725860f 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -44,7 +44,7 @@ spec:
                   sh '''
                       cd $SERVICE_NAME
                       env
-                      kubectl --server="https://kubernetes.default" --insecure-skip-tls-verify=true --token=$TOKEN -n test get all
+                      kubectl --token=$TOKEN -n test get all
                   '''
               }
           }

From 383c7772820656f2359b3ebec531c97d3f128929 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 13:13:08 +0300
Subject: [PATCH 30/38] testing

---
 department-service/Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 725860f..0fef0f8 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -35,7 +35,7 @@ spec:
     CREDS = credentials('bryan_docker_creds')
     DOCKER_NAMESPACE = 'bryandollery'
     SERVICE_NAME = 'department-service'
-    TOKEN=credentials('tester_token')
+    TOKEN=credentials('deployer_token')
   }
   stages {
       stage("debug") {
@@ -43,7 +43,6 @@ spec:
               container('kubectl') {
                   sh '''
                       cd $SERVICE_NAME
-                      env
                       kubectl --token=$TOKEN -n test get all
                   '''
               }

From 6de6a8e760add13f5c9938dc8cbee162a0ac29b1 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 13:28:14 +0300
Subject: [PATCH 31/38] trying jenkins namespace and a new token

---
 department-service/Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 0fef0f8..92ea0a5 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -15,7 +15,7 @@ spec:
     command: 
     - cat
     tty: true
-    volumeMounts: 
+    volumeMounts:
     - mountPath: /var/run/docker.sock
       name: docker-sock
   - name: kubectl
@@ -35,7 +35,7 @@ spec:
     CREDS = credentials('bryan_docker_creds')
     DOCKER_NAMESPACE = 'bryandollery'
     SERVICE_NAME = 'department-service'
-    TOKEN=credentials('deployer_token')
+    TOKEN=credentials('jenkins_token_due')
   }
   stages {
       stage("debug") {
@@ -43,7 +43,7 @@ spec:
               container('kubectl') {
                   sh '''
                       cd $SERVICE_NAME
-                      kubectl --token=$TOKEN -n test get all
+                      kubectl --token=$TOKEN -n jenkins get all
                   '''
               }
           }

From f0c1b926eadb816a8bf9011c6a8fac7424cda6ba Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 13:28:35 +0300
Subject: [PATCH 32/38] fix typo

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 92ea0a5..46ce020 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -35,7 +35,7 @@ spec:
     CREDS = credentials('bryan_docker_creds')
     DOCKER_NAMESPACE = 'bryandollery'
     SERVICE_NAME = 'department-service'
-    TOKEN=credentials('jenkins_token_due')
+    TOKEN=credentials('jenkins_token_dude')
   }
   stages {
       stage("debug") {

From 530a1a207c45bcee07a7d7f59ea344e81fe2e217 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 13:36:42 +0300
Subject: [PATCH 33/38] trying k8s token

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 46ce020..cedf97a 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -35,7 +35,7 @@ spec:
     CREDS = credentials('bryan_docker_creds')
     DOCKER_NAMESPACE = 'bryandollery'
     SERVICE_NAME = 'department-service'
-    TOKEN=credentials('jenkins_token_dude')
+    TOKEN=credentials('f355ebb8-b7cb-4848-8c83-c0d56b88959e')
   }
   stages {
       stage("debug") {

From 041a048f3424ae44a6aad630a38b89cd53be4696 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 13:58:50 +0300
Subject: [PATCH 34/38] fix typos

---
 department-service/Jenkinsfile  | 2 +-
 department-service/deploy.yaml  | 4 ++--
 department-service/service.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index cedf97a..3a58012 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -74,7 +74,7 @@ spec:
                   sh '''
                       cd $SERVICE_NAME
                       kubectl --token=$TOKEN -n tester get all
-                      kubectl --token=$TOKEN -n jenkins apply -f deploy.yaml -f service.yaml
+                      kubectl --token=$TOKEN -n tester apply -f deploy.yaml -f service.yaml
                       kubectl --token=$TOKEN -n tester get all
                   '''
               }
diff --git a/department-service/deploy.yaml b/department-service/deploy.yaml
index 2e7d7b4..07cdd01 100644
--- a/department-service/deploy.yaml
+++ b/department-service/deploy.yaml
@@ -9,11 +9,11 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: deployment-service
+      app: department-service
   template:
     metadata:
       labels:
-        app: deployment-service
+        app: department-service
     spec:
       containers:
       - name: department-service
diff --git a/department-service/service.yaml b/department-service/service.yaml
index d293a89..bd27473 100644
--- a/department-service/service.yaml
+++ b/department-service/service.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   type: NodePort
   selector:
-    app: departement-service
+    app: department-service
   ports:
     - port: 80
       targetPort: 80

From 7104d4290d6306e7bb75f7fb210618a74b8a4700 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 14:00:53 +0300
Subject: [PATCH 35/38] simplified

---
 department-service/Jenkinsfile | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 3a58012..e1a5bd5 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -38,16 +38,6 @@ spec:
     TOKEN=credentials('f355ebb8-b7cb-4848-8c83-c0d56b88959e')
   }
   stages {
-      stage("debug") {
-          steps {
-              container('kubectl') {
-                  sh '''
-                      cd $SERVICE_NAME
-                      kubectl --token=$TOKEN -n jenkins get all
-                  '''
-              }
-          }
-      }
       stage("Build") {
           steps {
               container('dnd') {
@@ -73,9 +63,7 @@ spec:
               container('kubectl') {
                   sh '''
                       cd $SERVICE_NAME
-                      kubectl --token=$TOKEN -n tester get all
-                      kubectl --token=$TOKEN -n tester apply -f deploy.yaml -f service.yaml
-                      kubectl --token=$TOKEN -n tester get all
+                      kubectl --token=$TOKEN -n test apply -f deploy.yaml -f service.yaml
                   '''
               }
           }

From e9509ddefc751cba321c8fd7b394c6ef3836e079 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 14:15:50 +0300
Subject: [PATCH 36/38] trying tester token again

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index e1a5bd5..46df9fe 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -35,7 +35,7 @@ spec:
     CREDS = credentials('bryan_docker_creds')
     DOCKER_NAMESPACE = 'bryandollery'
     SERVICE_NAME = 'department-service'
-    TOKEN=credentials('f355ebb8-b7cb-4848-8c83-c0d56b88959e')
+    TOKEN=credentials('tester-token')
   }
   stages {
       stage("Build") {

From f0d6355df05c021244cdf0096ecbeee56ff28849 Mon Sep 17 00:00:00 2001
From: Bryan Dollery <bryan.dollery@gmail.com>
Date: Mon, 24 Aug 2020 14:22:16 +0300
Subject: [PATCH 37/38] fix typo

---
 department-service/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index 46df9fe..fa01509 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -35,7 +35,7 @@ spec:
     CREDS = credentials('bryan_docker_creds')
     DOCKER_NAMESPACE = 'bryandollery'
     SERVICE_NAME = 'department-service'
-    TOKEN=credentials('tester-token')
+    TOKEN=credentials('tester_token')
   }
   stages {
       stage("Build") {

From f4728e0f3837d76b204b2d9af41832b3a1dc475d Mon Sep 17 00:00:00 2001
From: Walaa Altowairiki <48950818+walaafahad1994@users.noreply.github.com>
Date: Tue, 25 Aug 2020 13:54:24 +0300
Subject: [PATCH 38/38] Update Jenkinsfile

---
 department-service/Jenkinsfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/department-service/Jenkinsfile b/department-service/Jenkinsfile
index fa01509..9111366 100644
--- a/department-service/Jenkinsfile
+++ b/department-service/Jenkinsfile
@@ -63,7 +63,10 @@ spec:
               container('kubectl') {
                   sh '''
                       cd $SERVICE_NAME
+                      kubectl --token=$TOKEN -n test get all
                       kubectl --token=$TOKEN -n test apply -f deploy.yaml -f service.yaml
+                      kubectl --token=$TOKEN -n test get all
+
                   '''
               }
           }