Bump version to 2.1.6

fix: don't use revision caching during app creation (#7508 )
2026-03-22 08:18:47 +01:00 · 2021-10-28 19:51:48 +00:00 · 2021-10-28 19:51:34 +00:00 · 2021-10-20 20:40:18 -07:00 · 2021-10-20 18:43:03 -07:00 · 2021-10-20 15:09:22 +00:00
14 changed files with 29 additions and 45 deletions
--- a/USERS.md
+++ b/USERS.md
@@ -154,3 +154,4 @@ Currently, the following organizations are **officially** using Argo CD:
 1. [Beleza Na Web](https://www.belezanaweb.com.br/)
 1. [MariaDB](https://mariadb.com)
 1. [Lightricks](https://www.lightricks.com/)
+1. [Snapp](https://snapp.ir/)
--- a/2
+++ b/2
@@ -1 +1 @@
-2.1.4
+2.1.6
--- a/controller/appcontroller.go
+++ b/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)
--- 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.4
+  newTag: v2.1.6
 resources:
 - ./application-controller
 - ./dex
--- a/manifests/core-install.yaml
+++ b/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.6
        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.6
        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.4
+  newTag: v2.1.6
--- 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.4
+  newTag: v2.1.6
 resources:
 - ../../base/application-controller
 - ../../base/dex
--- a/manifests/ha/install.yaml
+++ b/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.6
        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.6
        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.6
        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.6
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/ha/namespace-install.yaml
+++ b/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.6
        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.6
        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.6
        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.6
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/install.yaml
+++ b/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.6
        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.6
        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.6
        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.6
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/namespace-install.yaml
+++ b/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.6
        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.6
        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.6
        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.6
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/reposerver/repository/repository.go
+++ b/reposerver/repository/repository.go
@@ -489,8 +489,9 @@ func getHelmDependencyRepos(appPath string) ([]*v1alpha1.Repository, error) {
 	for _, r := range d.Dependencies {
 		if u, err := url.Parse(r.Repository); err == nil && (u.Scheme == "https" || u.Scheme == "oci") {
 			repo := &v1alpha1.Repository{
-				Repo: r.Repository,
-				Name: r.Repository,
+				Repo:      r.Repository,
+				Name:      r.Repository,
+				EnableOCI: u.Scheme == "oci",
 			}
 			repos = append(repos, repo)
 		}
--- a/test/e2e/helm_test.go
+++ b/test/e2e/helm_test.go
@@ -549,24 +549,3 @@ func TestTemplatesHelmOCIWithDependencies(t *testing.T) {
 		Expect(HealthIs(health.HealthStatusHealthy)).
 		Expect(SyncStatusIs(SyncStatusCodeSynced))
 }
-
-// This is for the scenario of application source is from Git repo which has a helm chart with helm OCI registry dependency.
-// When the application project only allows git repository, this app creation should fail.
-func TestRepoPermission(t *testing.T) {
-	Given(t).
-		And(func() {
-			repoURL := fixture.RepoURL("")
-			output := FailOnErr(RunCli("proj", "remove-source", "default", "*")).(string)
-			assert.Empty(t, output)
-			output = FailOnErr(RunCli("proj", "add-source", "default", repoURL)).(string)
-			assert.Empty(t, output)
-		}).
-		PushChartToOCIRegistry("helm-values", "helm-values", "1.0.0").
-		HelmOCIRepoAdded("myrepo").
-		Path("helm-oci-with-dependencies").
-		When().
-		IgnoreErrors().
-		Create().
-		Then().
-		Expect(Error("", "Unable to generate manifests"))
-}
--- a/util/argo/argo.go
+++ b/util/argo/argo.go
@@ -429,6 +429,7 @@ func verifyGenerateManifests(
 		KubeVersion:       kubeVersion,
 		ApiVersions:       apiVersions,
 		HelmRepoCreds:     repositoryCredentials,
+		NoRevisionCache:   true,
 	}
 	req.Repo.CopyCredentialsFromRepo(repoRes)
 	req.Repo.CopySettingsFrom(repoRes)
Author	SHA1	Message	Date
argo-bot	a346cf933e	Bump version to 2.1.6	2021-10-28 19:51:48 +00:00
argo-bot	f249d530b5	Bump version to 2.1.6	2021-10-28 19:51:34 +00:00
Alexander Matyushentsev	46c1ef7a16	fix: don't use revision caching during app creation (#7508 ) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>	2021-10-20 20:40:18 -07:00
Mohammad Yosefpor	b4565fd7b2	fix: supporting OCI dependencies. Fixes #6062 (#6994 ) * fix: supporting OCI dependencies Signed-off-by: Mohammad Yosefpor <myusefpur@gmail.com> * chore: add org to USERS.md Signed-off-by: Mohammad Yosefpor <myusefpur@gmail.com> * fix(tests): remove invalid TestRepoPermission e2e test Signed-off-by: Mohammad Yosefpor <myusefpur@gmail.com>	2021-10-20 18:43:03 -07:00
argo-bot	a8a6fc8dda	Bump version to 2.1.5	2021-10-20 15:09:22 +00:00
argo-bot	81024f8a89	Bump version to 2.1.5	2021-10-20 15:09:12 +00:00
Alexander Matyushentsev	f0201c3a99	fix: Invalid memory address or nil pointer dereference in processRequestedAppOperation (#7501 ) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>	2021-10-20 08:04:38 -07:00
@@ -1 +1 @@
 .1.4
 .1.6