Bump version to 2.2.7

fix: correct jsonnet paths resolution (#8721 )
2026-02-25 12:08:46 +01:00 · 2022-03-09 00:58:23 +00:00 · 2022-03-09 00:58:07 +00:00 · 2022-03-08 15:59:33 -08:00
11 changed files with 30 additions and 29 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.2.6
+2.2.7
--- 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.2.6
+  newTag: v2.2.7
 resources:
 - ./application-controller
 - ./dex
--- a/manifests/core-install.yaml
+++ b/manifests/core-install.yaml
@@ -3018,7 +3018,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -3067,7 +3067,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        name: copyutil
        volumeMounts:
        - mountPath: /var/run/argocd
@@ -3232,7 +3232,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        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.2.6
+  newTag: v2.2.7
--- 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.2.6
+  newTag: v2.2.7
 resources:
 - ../../base/application-controller
 - ../../base/dex
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -3709,7 +3709,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -3926,7 +3926,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -3975,7 +3975,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        name: copyutil
        volumeMounts:
        - mountPath: /var/run/argocd
@@ -4202,7 +4202,7 @@ spec:
              key: server.http.cookie.maxnumber
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -4398,7 +4398,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -1068,7 +1068,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -1285,7 +1285,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -1334,7 +1334,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        name: copyutil
        volumeMounts:
        - mountPath: /var/run/argocd
@@ -1561,7 +1561,7 @@ spec:
              key: server.http.cookie.maxnumber
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -1757,7 +1757,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -3079,7 +3079,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -3260,7 +3260,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -3309,7 +3309,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        name: copyutil
        volumeMounts:
        - mountPath: /var/run/argocd
@@ -3532,7 +3532,7 @@ spec:
              key: server.http.cookie.maxnumber
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -3722,7 +3722,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        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.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        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.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -668,7 +668,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        name: copyutil
        volumeMounts:
        - mountPath: /var/run/argocd
@@ -891,7 +891,7 @@ spec:
              key: server.http.cookie.maxnumber
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -1081,7 +1081,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.2.6
+        image: quay.io/argoproj/argocd:v2.2.7
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/reposerver/repository/repository.go
+++ b/reposerver/repository/repository.go
@@ -1071,7 +1071,8 @@ func makeJsonnetVm(appPath string, repoRoot string, sourceJsonnet v1alpha1.Appli
 	// Jsonnet Imports relative to the repository path
 	jpaths := []string{appPath}
 	for _, p := range sourceJsonnet.Libs {
-		jpath, _, err := pathutil.ResolveFilePath(appPath, repoRoot, p, nil)
+		// the jsonnet library path is relative to the repository root, not application path
+		jpath, _, err := pathutil.ResolveFilePath(repoRoot, repoRoot, p, nil)
 		if err != nil {
 			return nil, err
 		}
--- a/reposerver/repository/repository_test.go
+++ b/reposerver/repository/repository_test.go
@@ -250,7 +250,7 @@ func TestGenerateJsonnetManifestInDir(t *testing.T) {
 				Jsonnet: argoappv1.ApplicationSourceJsonnet{
 					ExtVars: []argoappv1.JsonnetVar{{Name: "extVarString", Value: "extVarString"}, {Name: "extVarCode", Value: "\"extVarCode\"", Code: true}},
 					TLAs:    []argoappv1.JsonnetVar{{Name: "tlaString", Value: "tlaString"}, {Name: "tlaCode", Value: "\"tlaCode\"", Code: true}},
-					Libs:    []string{"./vendor"},
+					Libs:    []string{"testdata/jsonnet/vendor"},
 				},
 			},
 		},
Author	SHA1	Message	Date
argo-bot	b8e154f767	Bump version to 2.2.7	2022-03-09 00:58:23 +00:00
argo-bot	c4ab0938f9	Bump version to 2.2.7	2022-03-09 00:58:07 +00:00
Alexander Matyushentsev	3fe5753f33	fix: correct jsonnet paths resolution (#8721 ) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>	2022-03-08 15:59:33 -08:00
@@ -1 +1 @@
 .2.6
 .2.7