From 83c2b7078219a7c7d8aaaa3fc44ad5fc033292d1 Mon Sep 17 00:00:00 2001
From: Adam Gardner <adam@agardner.net>
Date: Mon, 14 Mar 2022 18:55:52 +1000
Subject: [PATCH 1/2] Update job-executor.yaml

---
 quickstart/demo/job/job-executor.yaml | 31 ++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/quickstart/demo/job/job-executor.yaml b/quickstart/demo/job/job-executor.yaml
index 676a574..3e50394 100644
--- a/quickstart/demo/job/job-executor.yaml
+++ b/quickstart/demo/job/job-executor.yaml
@@ -8,18 +8,21 @@ metadata:
 spec:
   selector:
     matchLabels:
-      run: job-executor-service
+      app.kubernetes.io/name: distributor
+      app.kubernetes.io/instance: keptn
   replicas: 1
   template:
     metadata:
       labels:
-        run: job-executor-service
-        app.kubernetes.io/name: job-executor-service
-        app.kubernetes.io/version: 0.1.4
+        app.kubernetes.io/name: distributor
+        app.kubernetes.io/instance: keptn
+        app.kubernetes.io/part-of: keptn-keptn
+        app.kubernetes.io/component: control-plane
+        app.kubernetes.io/version: develop
     spec:
       containers:
         - name: job-executor-service
-          image: jbraeuer/job-executor-service:0.1.4.1
+          image: keptncontrib/job-executor-service:0.1.7
           ports:
             - containerPort: 8080
           resources:
@@ -37,7 +40,7 @@ spec:
             - name: JOB_NAMESPACE
               value: 'keptn'
             - name: INIT_CONTAINER_IMAGE
-              value: 'keptnsandbox/job-executor-service-initcontainer:0.1.4'
+              value: 'keptncontrib/job-executor-service-initcontainer:0.1.7'
             - name: DEFAULT_RESOURCE_LIMITS_CPU
               value: "1"
             - name: DEFAULT_RESOURCE_LIMITS_MEMORY
@@ -49,7 +52,7 @@ spec:
             - name: ALWAYS_SEND_FINISHED_EVENT
               value: "false"
         - name: distributor
-          image: keptn/distributor:0.9.2
+          image: keptn/distributor:0.13.2
           livenessProbe:
             httpGet:
               path: /health
@@ -61,11 +64,11 @@ spec:
             - containerPort: 8080
           resources:
             requests:
-              memory: "32Mi"
-              cpu: "50m"
+              memory: "16Mi"
+              cpu: "25m"
             limits:
-              memory: "128Mi"
-              cpu: "500m"
+              memory: "32Mi"
+              cpu: "100m"
           env:
             - name: PUBSUB_URL
               value: 'nats://keptn-nats-cluster'
@@ -78,6 +81,10 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: 'metadata.labels[''app.kubernetes.io/version'']'
+            - name: LOCATION
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.labels['app.kubernetes.io/component']
             - name: K8S_DEPLOYMENT_NAME
               valueFrom:
                 fieldRef:
@@ -198,4 +205,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: default
-    namespace: keptn
\ No newline at end of file
+    namespace: keptn

From 78e3bff053cda90b429298a552dce85069151a27 Mon Sep 17 00:00:00 2001
From: Adam Gardner <adam@agardner.net>
Date: Mon, 14 Mar 2022 20:04:44 +1000
Subject: [PATCH 2/2] Add check for existing JES deployment

Add check for existing JES deployment

Signed-off-by: Adam Gardner <adam@agardner.net>
---
 quickstart/automated-operations.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/quickstart/automated-operations.sh b/quickstart/automated-operations.sh
index c2d7e81..3d6b53c 100755
--- a/quickstart/automated-operations.sh
+++ b/quickstart/automated-operations.sh
@@ -58,9 +58,14 @@ keptn add-resource --project=$PROJECT --stage=production --service=$SERVICE --re
 echo "Adding Remediation Configuration"
 keptn add-resource --project=$PROJECT --stage=production --service=$SERVICE --resource=./demo/remediation.yaml --resourceUri=remediation.yaml
 
-print_headline "Deploy Job Executor"
+jes_is_installed=$(kubectl -n keptn get deployment job-executor-service --ignore-not-found)
+if [[ $jes_is_installed == "" ]]; then
+  print_headline "Deploy Job Executor"
+  kubectl apply -f ./demo/job/job-executor.yaml
+else
+  print_headline "Job Executor Already Deployed. Skipping Deployment. Will Add Config."
+fi
 
-kubectl apply -f ./demo/job/job-executor.yaml
 keptn add-resource --project=$PROJECT --service=$SERVICE --stage=production --resource=./demo/job/config.yaml --resourceUri=job/config.yaml
 
 wait_for_deployment_in_namespace "job-executor-service" "keptn"