Merge pull request #756 from snyk/fix/deployment-recreate-strategy

fix: use Recreate strategy for snyk-monitor when using PVC as storage

Author: ivanstanev

.circleci/config.yml

@@ -535,12 +535,24 @@ jobs:
                       sleep $SLEEP_SECONDS_BETWEEN_ATTEMPTS
                     done
 
+                    SNYK_MONITOR_POD=$(kubectl get pods -n snyk-monitor --no-headers | \
+                      grep "snyk-monitor" | \
+                      awk 'END { if (NR==0) exit 1; else print $1 }')
+
                     # If we polled for 5 minutes and the snyk-monitor still hasn't upgraded, fail the current job.
                     if [[ "${VERSION}" != "${LATEST_TAG}" ]]; then
                       &>2 echo "versions (${VERSION}) does not match expected (${LATEST_TAG})!"
+
+                      kubectl describe pod ${SNYK_MONITOR_POD} -n snyk-monitor
+                      kubectl describe catalogsource snyk-operator -n openshift-marketplace
+                      kubectl get snykmonitors.charts.helm.k8s.io -n snyk-monitor -o yaml
+
                       exit 1
                     fi
 
+                    # We need to wait for the Pod to become Ready
+                    kubectl wait pod/${SNYK_MONITOR_POD} -n snyk-monitor --timeout 120s --for condition=Ready
+
                     echo "Update complete!"
                 name: Upgrade Operator and check that snyk-monitor also upgraded
             - run:

.circleci/config/jobs/operator_upgrade_tests.yml

@@ -190,12 +190,24 @@ steps:
           sleep $SLEEP_SECONDS_BETWEEN_ATTEMPTS
         done
 
+        SNYK_MONITOR_POD=$(kubectl get pods -n snyk-monitor --no-headers | \
+          grep "snyk-monitor" | \
+          awk 'END { if (NR==0) exit 1; else print $1 }')
+
         # If we polled for 5 minutes and the snyk-monitor still hasn't upgraded, fail the current job.
         if [[ "${VERSION}" != "${LATEST_TAG}" ]]; then
           &>2 echo "versions (${VERSION}) does not match expected (${LATEST_TAG})!"
+
+          kubectl describe pod ${SNYK_MONITOR_POD} -n snyk-monitor
+          kubectl describe catalogsource snyk-operator -n openshift-marketplace
+          kubectl get snykmonitors.charts.helm.k8s.io -n snyk-monitor -o yaml
+
           exit 1
         fi
 
+        # We need to wait for the Pod to become Ready
+        kubectl wait pod/${SNYK_MONITOR_POD} -n snyk-monitor --timeout 120s --for condition=Ready
+
         echo "Update complete!"
 
   - run:

snyk-monitor/templates/deployment.yaml

@@ -8,6 +8,10 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
+  {{- if .Values.pvc.enabled }}
+  strategy:
+    type: Recreate
+  {{- end }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "snyk-monitor.name" . }}