Bump version to 2.1.5

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

VERSION

@@ -1 +1 @@
-2.1.4
+2.1.5

controller/appcontroller.go

@@ -675,7 +675,9 @@ func (ctrl *ApplicationController) processAppOperationQueueItem() (processNext b
 			return
 		}
 		app = freshApp
+	}
 
+	if app.Operation != nil {
 		ctrl.processRequestedAppOperation(app)
 	} else if app.DeletionTimestamp != nil && app.CascadedDeletion() {
 		_, err = ctrl.finalizeApplicationDeletion(app)

manifests/base/kustomization.yaml

@@ -5,7 +5,7 @@ kind: Kustomization
 images:
 - name: quay.io/argoproj/argocd
   newName: quay.io/argoproj/argocd
-  newTag: v2.1.4
+  newTag: v2.1.5
 resources:
 - ./application-controller
 - ./dex

manifests/core-install.yaml

@@ -2988,7 +2988,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -3185,7 +3185,7 @@ spec:
               key: controller.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

manifests/core-install/kustomization.yaml

@@ -11,4 +11,4 @@ resources:
 images:
 - name: quay.io/argoproj/argocd
   newName: quay.io/argoproj/argocd
-  newTag: v2.1.4
+  newTag: v2.1.5

manifests/ha/base/kustomization.yaml

@@ -11,7 +11,7 @@ patchesStrategicMerge:
 images:
 - name: quay.io/argoproj/argocd
   newName: quay.io/argoproj/argocd
-  newTag: v2.1.4
+  newTag: v2.1.5
 resources:
 - ../../base/application-controller
 - ../../base/dex

manifests/ha/install.yaml

@@ -3684,7 +3684,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -3901,7 +3901,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -4154,7 +4154,7 @@ spec:
               key: server.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -4350,7 +4350,7 @@ spec:
               key: controller.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

manifests/ha/namespace-install.yaml

@@ -1071,7 +1071,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -1288,7 +1288,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -1541,7 +1541,7 @@ spec:
               key: server.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -1737,7 +1737,7 @@ spec:
               key: controller.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

manifests/install.yaml

@@ -3049,7 +3049,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -3230,7 +3230,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -3479,7 +3479,7 @@ spec:
               key: server.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -3669,7 +3669,7 @@ spec:
               key: controller.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

manifests/namespace-install.yaml

@@ -436,7 +436,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -617,7 +617,7 @@ spec:
           value: /helm-working-dir
         - name: HELM_DATA_HOME
           value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -866,7 +866,7 @@ spec:
               key: server.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -1056,7 +1056,7 @@ spec:
               key: controller.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        image: quay.io/argoproj/argocd:v2.1.4
+        image: quay.io/argoproj/argocd:v2.1.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet: