Minor improvements to etcd app

Fixes small issues that caused warnings to be printed (including
"deployment failed" result, which is incorrect)

Author: Stan Lagun

examples/etcd/dependencies/etcd-recover.yaml

@@ -8,6 +8,7 @@ parent: flow/etcd-recover
 child: job/delete-node-$NAME-job
 args:
   NAME: $nodeSuffix
+  SELF_DELETE: "true"
 ---
 apiVersion: appcontroller.k8s/v1alpha1
 kind: Dependency

examples/etcd/dependencies/etcd-scale.yaml

@@ -35,4 +35,5 @@ parent: flow/etcd-scale
 child: job/delete-node-$NAME-job
 args:
   NAME: $AC_NAME
+  SELF_DELETE: "false"
 

examples/etcd/resources/delete-node-job.yaml

@@ -25,6 +25,8 @@ job:
               value: $clusterName
             - name: REPLICA_NAME
               value: $NAME
+            - name: SELF_DELETE
+              value: $SELF_DELETE
           command:
             - "/bin/sh"
             - "-c"
@@ -38,5 +40,8 @@ job:
               kubectl delete replica "replica-$REPLICA_NAME"
               kubectl delete service "etcd-$REPLICA_NAME"
               kubectl delete replica -l"replicaspace=etcd-recover-$CLUSTERNAME"
-              kubectl delete job "delete-node-$REPLICA_NAME-job"
+              if [ $SELF_DELETE = "true" ]
+              then
+                kubectl delete job "delete-node-$REPLICA_NAME-job"
+              fi
         restartPolicy: Never

examples/etcd/resources/monitor-job.yaml

@@ -4,6 +4,7 @@ metadata:
   name: monitor-clustername-job
 meta:
   timeout: 0
+  on-error: ignore
 job:
   apiVersion: batch/v1
   kind: Job