Merge branch 'malowe/main/159' into 'main'

Iss #159 - Update Jenkinsfile + staging k8s for new latest-staging tag

Closes #159

See merge request !178

Jenkinsfile

@@ -105,6 +105,16 @@
         """,
         returnStdout: true
       )
+    LATEST_TAG_NAME = sh(
+      script: """
+        if [ "${env.ENVIRONMENT}" = "staging" ]; then
+          printf latest-staging
+        else
+          printf latest
+        fi
+      """,
+      returnStdout: true
+    )
     }
 
     options {
@@ -166,7 +176,7 @@
 
           unstash 'target'
 
-          sh 'docker build -f src/main/docker/Dockerfile.jvm --no-cache -t ${IMAGE_NAME}:${TAG_NAME} -t ${IMAGE_NAME}:latest .'
+          sh 'docker build -f src/main/docker/Dockerfile.jvm --no-cache -t ${IMAGE_NAME}:${TAG_NAME} -t ${IMAGE_NAME}:${LATEST_TAG_NAME} .'
         }
       }
 
@@ -184,7 +194,7 @@
           withDockerRegistry([credentialsId: '04264967-fea0-40c2-bf60-09af5aeba60f', url: 'https://index.docker.io/v1/']) {
             sh '''
               docker push ${IMAGE_NAME}:${TAG_NAME}
-              docker push ${IMAGE_NAME}:latest
+              docker push ${IMAGE_NAME}:${LATEST_TAG_NAME}
             '''
           }
         }

src/main/k8s/production.yml

@@ -39,7 +39,7 @@ spec:
             cpu: '1'
             memory: 512Mi
           requests:
-            cpu: 200m
+            cpu: 300m
             memory: 512Mi
         env: 
         - name: CONFIG_SECRET_PATH