Fixes to demo marshaller and cleanup

tombatchelor · Nov 5, 2019 · 339c2d2 · 339c2d2
1 parent 27f6cae
commit 339c2d2
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 250 deletions.
diff --git a/cron_cleanup/clean_up.py b/cron_cleanup/clean_up.py
@@ -1,6 +1,7 @@
 import mysql.connector
 import random
 import boto3
+import os
 
 def get_array_of_randoms(length, limit):
     randoms = []
@@ -35,7 +36,7 @@ def trim_table(selectQuery, deleteQuery, max, toDelete, cnx):
     return IDsDeleted
 
 def delete_s3_objects(IDsDeleted):
-    s3_bucket_name = os.envion['BUCKET_NAME']
+    s3_bucket_name = os.environ['BUCKET_NAME']
     s3_client = boto3.client('s3', region_name='us-west-2')
     for id in IDsDeleted:
         s3_client.delete_object(Bucket=s3_bucket_name, Key='IMG_' + str(id) + '.jpeg')

diff --git a/demo_marshaller/2_leak.yaml b/demo_marshaller/2_leak.yaml
diff --git a/demo_marshaller/2_no_leak.yaml b/demo_marshaller/2_no_leak.yaml
diff --git a/demo_marshaller/4_leak.yaml b/demo_marshaller/4_leak.yaml
diff --git a/demo_marshaller/4_no_leak.yaml b/demo_marshaller/4_no_leak.yaml
diff --git a/demo_marshaller/Dockerfile b/demo_marshaller/Dockerfile
@@ -3,6 +3,7 @@ FROM bash:4.4
 COPY --from=lachlanevenson/k8s-kubectl:v1.15.5 /usr/local/bin/kubectl /usr/local/bin/kubectl
 
 COPY script.sh /
-COPY *.yaml /
+
+ENV VERSION=2.1
 
 CMD ["bash", "/script.sh"]
diff --git a/demo_marshaller/script.sh b/demo_marshaller/script.sh
@@ -1,4 +1,30 @@
 #!/bin/bash
 
-kubectl apply -f /"$NEW_YAML" -n $NAMESPACE
+if [ "$NEW_YAML" == "2_leak" ]
+then
+    LEAK="-leak"
+    SIZE=2
+fi
 
+if [ "$NEW_YAML" == "4_leak" ]
+then
+    LEAK="-leak"
+    SIZE=4
+fi
+
+if [ "$NEW_YAML" == "4_no_leak" ]
+then
+    LEAK=
+    SIZE=4
+fi
+
+if [ "$NEW_YAML" == "2_no_leak" ]
+then
+    LEAK=""
+    SIZE=2
+fi
+
+echo kubectl set image deployment/cars-deployment app-server=tombatchelor/cars:$VERSION$LEAK
+kubectl set image deployment/cars-deployment app-server=tombatchelor/cars:$VERSION$LEAK
+echo kubectl scale --replicas=$SIZE deployment/cars-deployment
+kubectl scale --replicas=$SIZE deployment/cars-deployment
diff --git a/kubernetes/cars_app-staging.yaml b/kubernetes/cars_app-staging.yaml
@@ -226,7 +226,7 @@ spec:
         spec:
           containers:
           - name: cleanup
-            image: tombatchelor/carscleanup:2.1
+            image: tombatchelor/carscleanup:2.3
             env:
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
@@ -258,14 +258,10 @@ spec:
           serviceAccountName: marshaller
           containers:
           - name: 2leak
-            image: tombatchelor/demo_marshaller:2.1
+            image: tombatchelor/demo_marshaller:2.3
             env:
             - name: NEW_YAML
-              value: 2_leak.yaml
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+              value: 2_leak
           restartPolicy: OnFailure
 ---
 apiVersion: batch/v1beta1
@@ -282,14 +278,10 @@ spec:
           containers:
           - name: 4leak
             imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.1
+            image: tombatchelor/demo_marshaller:2.3
             env:
             - name: NEW_YAML
-              value: 4_leak.yaml
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+              value: 4_leak
           restartPolicy: OnFailure
 ---
 apiVersion: batch/v1beta1
@@ -306,14 +298,11 @@ spec:
           containers:
           - name: 4noleak
             imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.1
+            image: tombatchelor/demo_marshaller:2.3
             env:
             - name: NEW_YAML
-              value: 4_no_leak.yaml
+              value: 4_no_leak
             - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
           restartPolicy: OnFailure
 ---
 apiVersion: batch/v1beta1
@@ -330,14 +319,10 @@ spec:
           containers:
           - name: 2noleak
             imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.1
+            image: tombatchelor/demo_marshaller:2.3
             env:
             - name: NEW_YAML
-              value: 2_no_leak.yaml
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+              value: 2_no_leak
           restartPolicy: OnFailure
 ---
 apiVersion: v1
@@ -421,9 +406,10 @@ kind: ClusterRole
 metadata:
   name: marshaller
 rules:
-- apiGroups: ["apps"]
+- apiGroups: ["apps", "extensions"]
   resources:
   - deployments
+  - deployments/scale
   verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
 ---
 apiVersion: v1