cron pod is now always deleted gracefully

UPGRADE.md

@@ -12,6 +12,7 @@
 
 ## Upgrade from v5.0.0 to v5.1.0
 
+- cron pod is now always deleted gracefully ([#72](https://github.com/shopsys/deployment/pull/72))
 - health check for webserver now uses PHP-FPM `ping` endpoint instead of nginx `stub_status` ([#71](https://github.com/shopsys/deployment/pull/71))
 - update the `/health` location block in `project-nginx.conf` in your project's `app/orchestration/kubernetes/configmap/nginx.yaml` file to pass the request to PHP-FPM:
     ```diff

deploy/parts/deploy.sh

@@ -77,14 +77,10 @@ else
     fi
 fi
 
-DEPLOYED_CRON_POD=$(kubectl get pods --namespace=${PROJECT_NAME} --field-selector=status.phase=Running -l app=cron -o=jsonpath='{.items[?(@.status.containerStatuses[0].state.running)].metadata.name}') || true
-
-if [[ -n ${DEPLOYED_CRON_POD} ]]; then
-    echo -n "Lock crons to prevent run next iteration "
-    runCommand "ERROR" "kubectl exec -t --namespace=${PROJECT_NAME} ${DEPLOYED_CRON_POD} -- bash -c \"./phing -S cron-lock > /dev/null 2>&1 & disown\""
-
-    echo -n "Waiting until all cron instances are done "
-    runCommand "ERROR" "kubectl exec --namespace=${PROJECT_NAME} ${DEPLOYED_CRON_POD} -- ./phing -S cron-watch"
+if kubectl get deployment/cron --namespace="${PROJECT_NAME}" >/dev/null 2>&1; then
+  echo -n "Waiting until all cron instances are done and stop cron"
+  runCommand "ERROR" "kubectl scale deployment/cron --namespace=${PROJECT_NAME} --replicas=0"
+  runCommand "ERROR" "kubectl rollout status deployment/cron --namespace=${PROJECT_NAME} --timeout=60m"
 fi
 
 echo "Migrate Application (database migrations, elasticsearch migrations, ...):"
@@ -130,7 +126,7 @@ if [ ${MIGRATION_COMPLETE_EXIT_CODE} -eq 1 ]; then
     echo -e "[${RED}ERROR${NO_COLOR}]"
 
     echo -n "Restore previous cron container "
-    runCommand "SKIP" "kubectl delete pod --namespace=${PROJECT_NAME} ${DEPLOYED_CRON_POD}"
+    runCommand "SKIP" "kubectl scale deployment/cron --namespace=${PROJECT_NAME} --replicas=1"
 
     RUNNING_WEBSERVER_PHP_FPM_POD=$(kubectl get pods --namespace=${PROJECT_NAME} --field-selector=status.phase=Running -l app=webserver-php-fpm -o=jsonpath='{.items[0].metadata.name}')
 
@@ -151,9 +147,6 @@ else
     kubectl logs job/migrate-application --namespace=${PROJECT_NAME}
     echo -e "section_end:`date +%s`:migrate_application_logs_section\r\e[0K"
     echo ""
-
-    echo -n "Deploy new cron container "
-    runCommand "ERROR" "kustomize build --load-restrictor LoadRestrictionsNone \"${CONFIGURATION_TARGET_PATH}/kustomize/cron\" | kubectl apply -f -"
 fi
 
 echo "Deploy new Webserver and PHP-FPM container:"

kubernetes/deployments/cron.yaml

@@ -8,10 +8,7 @@ spec:
     progressDeadlineSeconds: 1500
     replicas: 1
     strategy:
-        rollingUpdate:
-            maxSurge: 1
-            maxUnavailable: 0
-        type: RollingUpdate
+        type: Recreate
     selector:
         matchLabels:
             app: cron
@@ -25,6 +22,7 @@ spec:
             labels:
                 app: cron
         spec:
+            terminationGracePeriodSeconds: 3000
             tolerations:
                 -   key: "workload"
                     operator: "Equal"
@@ -38,8 +36,7 @@ spec:
                                 matchExpressions:
                                     -   key: workload
                                         operator: In
-                                        values:
-                                            - background
+                                        values: ["background"]
             volumes:
                 -   name: domains-urls
                     configMap:
@@ -61,14 +58,30 @@ spec:
                         runAsUser: 0
                     imagePullPolicy: IfNotPresent
                     workingDir: /var/www/html
-                    command: ["/bin/sh","-c"]
-                    args: ["cd /var/www/html && ./phing warmup > /dev/null && rm -rf /tmp/log-pipe && mkfifo /tmp/log-pipe && chmod 666 /tmp/log-pipe && crontab -u root /var/spool/cron/template && { crond || cron; } && stdbuf -o0 tail -n +1 -f /tmp/log-pipe"]
+                    command: ["/bin/sh","-lc"]
+                    args:
+                        - >
+                            ./phing warmup > /dev/null
+
+                            # FIFO for logs
+                            rm -f /tmp/log-pipe && mkfifo /tmp/log-pipe && chmod 666 /tmp/log-pipe
+
+                            # crontab
+                            crontab -u root /var/spool/cron/template
+
+                            # run on backround
+                            stdbuf -o0 tail -n +1 -f /tmp/log-pipe &
+
+                            exec crond -f || exec cron -f
                     lifecycle:
                         preStop:
                             exec:
                                 command:
-                                    - sleep
-                                    - '5'
+                                    - /bin/sh
+                                    - -lc
+                                    - |
+                                        ( ./bin/console deploy:cron:lock > /tmp/cron-lock.log 2>&1 || true ) &
+                                        ./bin/console deploy:cron:watch || true
                     volumeMounts:
                         -   name: domains-urls
                             mountPath: /var/www/html/{{DOMAINS_URLS_FILEPATH}}

kubernetes/kustomize/webserver/kustomization.yaml

@@ -2,11 +2,14 @@ resources:
     - ../../deployments/webserver-php-fpm.yaml
     - ../../services/webserver-php-fpm.yaml
     - ../../deployments/storefront.yaml
+    - ../../deployments/cron.yaml
     - ../../services/storefront.yaml
     - ../../namespace.yaml
     - ../../configmap/nginx.yaml
     - ../../configmap/production-php-fpm.yaml
     - ../../configmap/production-php-opcache.yaml
+    - ../../configmap/cron-env.yaml
+    - ../../configmap/cron-list.yaml
     - ../../ingress/ingress-rabbitmq.yaml
 namespace: "{{PROJECT_NAME}}"
 configMapGenerator: