Bump version to 2.1.8

fix: issue with keepalive (#7861 )
2026-03-16 21:38:48 +01:00 · 2021-12-13 23:10:19 +00:00 · 2021-12-13 23:10:03 +00:00 · 2021-12-11 11:18:48 -08:00 · 2021-12-10 21:24:31 -08:00 · 2021-11-24 18:19:19 -08:00
14 changed files with 32 additions and 33 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.1.7
+2.1.8
--- a/controller/appcontroller.go
+++ b/controller/appcontroller.go
@@ -1049,7 +1049,7 @@ func (ctrl *ApplicationController) processRequestedAppOperation(app *appv1.Appli
 	}

 	ctrl.setOperationState(app, state)
-	if state.Phase.Completed() && !app.Operation.Sync.DryRun {
+	if state.Phase.Completed() && (app.Operation.Sync != nil && !app.Operation.Sync.DryRun) {
 		// if we just completed an operation, force a refresh so that UI will report up-to-date
 		// sync/health information
 		if _, err := cache.MetaNamespaceKeyFunc(app); err == nil {
--- a/go.mod
+++ b/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d
 	github.com/alicebob/miniredis v2.5.0+incompatible
 	github.com/alicebob/miniredis/v2 v2.14.2
-	github.com/argoproj/gitops-engine v0.4.1
-	github.com/argoproj/pkg v0.9.1
+	github.com/argoproj/gitops-engine v0.4.2
+	github.com/argoproj/pkg v0.11.1-0.20211203175135-36c59d8fafe0
 	github.com/bombsimon/logrusr v1.0.0
 	github.com/bradleyfalzon/ghinstallation v1.1.1
 	github.com/casbin/casbin v1.9.1
--- a/go.sum
+++ b/go.sum
@@ -96,10 +96,10 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/argoproj/gitops-engine v0.4.1 h1:kBAAWVUBfnhD40sRIEr3XcUcPZHODOmwSXSpySmVWR0=
-github.com/argoproj/gitops-engine v0.4.1/go.mod h1:EdFe8qIOqsmbyxRhtIydU4BUeyZ4VTsY6R3XVQhU9LA=
-github.com/argoproj/pkg v0.9.1 h1:osfOS3QkzfRf+W43lbCZb0o0bzrBweQhL+U3rgEg+5M=
-github.com/argoproj/pkg v0.9.1/go.mod h1:ra+bQPmbVAoEL+gYSKesuigt4m49i3Qa3mE/xQcjCiA=
+github.com/argoproj/gitops-engine v0.4.2 h1:ylKdH5tSITjUSKUb3V1KTiY/kyckYaZY9U1UjED9ltA=
+github.com/argoproj/gitops-engine v0.4.2/go.mod h1:EdFe8qIOqsmbyxRhtIydU4BUeyZ4VTsY6R3XVQhU9LA=
+github.com/argoproj/pkg v0.11.1-0.20211203175135-36c59d8fafe0 h1:Cfp7rO/HpVxnwlRqJe0jHiBbZ77ZgXhB6HWlYD02Xdc=
+github.com/argoproj/pkg v0.11.1-0.20211203175135-36c59d8fafe0/go.mod h1:ra+bQPmbVAoEL+gYSKesuigt4m49i3Qa3mE/xQcjCiA=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -5,7 +5,7 @@ kind: Kustomization
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.1.7
+  newTag: v2.1.8
 resources:
 - ./application-controller
 - ./dex
--- a/manifests/core-install.yaml
+++ b/manifests/core-install.yaml
@@ -2990,7 +2990,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -3187,7 +3187,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/core-install/kustomization.yaml
+++ b/manifests/core-install/kustomization.yaml
@@ -11,4 +11,4 @@ resources:
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.1.7
+  newTag: v2.1.8
--- a/manifests/ha/base/kustomization.yaml
+++ b/manifests/ha/base/kustomization.yaml
@@ -11,7 +11,7 @@ patchesStrategicMerge:
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.1.7
+  newTag: v2.1.8
 resources:
 - ../../base/application-controller
 - ../../base/dex
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -3686,7 +3686,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -3903,7 +3903,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -4156,7 +4156,7 @@ spec:
              key: server.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -4352,7 +4352,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -1073,7 +1073,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -1290,7 +1290,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -1543,7 +1543,7 @@ spec:
              key: server.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -1739,7 +1739,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -3051,7 +3051,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -3232,7 +3232,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -3481,7 +3481,7 @@ spec:
              key: server.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -3671,7 +3671,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -438,7 +438,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -619,7 +619,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -868,7 +868,7 @@ spec:
              key: server.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -1058,7 +1058,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.1.7
+        image: quay.io/argoproj/argocd:v2.1.8
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/pkg/apis/application/v1alpha1/cluster_constants.go
+++ b/pkg/apis/application/v1alpha1/cluster_constants.go
@@ -36,12 +36,12 @@ var (

 func init() {
 	if envQPS := os.Getenv(EnvK8sClientQPS); envQPS != "" {
-		if qps, err := strconv.ParseFloat(envQPS, 32); err != nil {
+		if qps, err := strconv.ParseFloat(envQPS, 32); err == nil {
 			K8sClientConfigQPS = float32(qps)
 		}
 	}
 	if envBurst := os.Getenv(EnvK8sClientBurst); envBurst != "" {
-		if burst, err := strconv.Atoi(envBurst); err != nil {
+		if burst, err := strconv.Atoi(envBurst); err == nil {
 			K8sClientConfigBurst = burst
 		}
 	} else {
@@ -49,7 +49,7 @@ func init() {
 	}

 	if envMaxConn := os.Getenv(EnvK8sClientMaxIdleConnections); envMaxConn != "" {
-		if maxConn, err := strconv.Atoi(envMaxConn); err != nil {
+		if maxConn, err := strconv.Atoi(envMaxConn); err == nil {
 			K8sMaxIdleConnections = maxConn
 		}
 	}
--- a/server/application/application.go
+++ b/server/application/application.go
@@ -486,7 +486,6 @@ func (s *Server) ListResourceEvents(ctx context.Context, q *application.Applicat
 			"involvedObject.namespace": namespace,
 		}).String()
 	}
-
 	log.Infof("Querying for resource events with field selector: %s", fieldSelector)
 	opts := metav1.ListOptions{FieldSelector: fieldSelector}
 	return kubeClientset.CoreV1().Events(namespace).List(ctx, opts)
Author	SHA1	Message	Date
argo-bot	2fdaf7a9ad	Bump version to 2.1.8	2021-12-13 23:10:19 +00:00
argo-bot	5e64458c6b	Bump version to 2.1.8	2021-12-13 23:10:03 +00:00
pasha-codefresh	2475403af7	fix: issue with keepalive (#7861 ) * fix issue with keepalive Signed-off-by: pashavictorovich <pavel@codefresh.io> * empty commit Signed-off-by: pashavictorovich <pavel@codefresh.io>	2021-12-11 11:18:48 -08:00
jomenxiao	a1e14d48ab	fix nil point (#7905 ) Signed-off-by: jomenxiao <jomenxiao@gmail.com>	2021-12-10 21:24:31 -08:00
Jesse Suen	425d35c477	fix: env vars to tune cluster cache were broken (#7779 ) Signed-off-by: Jesse Suen <jesse@akuity.io>	2021-11-24 18:19:19 -08:00
Alexander Matyushentsev	0d7c4cbe83	fix: upgraded gitops engine to v0.4.2 (fixes #7561 ) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>	2021-11-19 13:07:41 -08:00
@@ -1 +1 @@
 .1.7
 .1.8