Cr 7472 sync argo v3.1.14 (#67)

* fix: do not delete expr tag tmpl values. Fixes argoproj#6909 (argoproj#6921) Signed-off-by: Alex Collins <[email protected]> * update image registry * result of `make pre-commit -B` * Retrigger CI pipeline * result of `make codegen -B STATIC_FILES=false` Co-authored-by: Alex Collins <[email protected]> Co-authored-by: Ilya Gorban <[email protected]>
codefresh-io · Nov 10, 2021 · 524d2e6 · 524d2e6
1 parent 97b0ec6
commit 524d2e6
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 29 deletions.
diff --git a/examples/k8s-orchestration.yaml b/examples/k8s-orchestration.yaml
@@ -66,7 +66,7 @@ spec:
       parameters:
       - name: job-uid
     container:
-      image: argoproj/argoexec:latest
+      image: quay.io/codefresh/argoexec:latest
       command: [sh, -c]
       args: ["
         for i in `kubectl get pods -l controller-uid={{inputs.parameters.job-uid}} -o name`; do 

diff --git a/manifests/base/argo-server/argo-server-deployment.yaml b/manifests/base/argo-server/argo-server-deployment.yaml
@@ -14,7 +14,7 @@ spec:
       serviceAccountName: argo-server
       containers:
         - name: argo-server
-          image: docker.io/argoproj/argocli:latest
+          image: quay.io/codefresh/argocli:latest
           securityContext:
             capabilities:
               drop:

diff --git a/manifests/base/workflow-controller/workflow-controller-deployment.yaml b/manifests/base/workflow-controller/workflow-controller-deployment.yaml
@@ -14,7 +14,7 @@ spec:
       serviceAccountName: argo
       containers:
         - name: workflow-controller
-          image: docker.io/argoproj/workflow-controller:latest
+          image: quay.io/codefresh/workflow-controller:latest
           securityContext:
             readOnlyRootFilesystem: true
             runAsNonRoot: true
@@ -28,7 +28,7 @@ spec:
             - --configmap
             - workflow-controller-configmap
             - --executor-image
-            - argoproj/argoexec:latest
+            - quay.io/codefresh/argoexec:latest
           env:
             - name: LEADER_ELECTION_IDENTITY
               valueFrom:

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -559,7 +559,7 @@ spec:
       containers:
       - args:
         - server
-        image: docker.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         name: argo-server
         ports:
         - containerPort: 2746
@@ -605,7 +605,7 @@ spec:
         - --configmap
         - workflow-controller-configmap
         - --executor-image
-        - argoproj/argoexec:latest
+        - quay.io/codefresh/argoexec:latest
         command:
         - workflow-controller
         env:
@@ -614,7 +614,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: docker.io/argoproj/workflow-controller:latest
+        image: quay.io/codefresh/workflow-controller:latest
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -453,7 +453,7 @@ spec:
       - args:
         - server
         - --namespaced
-        image: docker.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         name: argo-server
         ports:
         - containerPort: 2746
@@ -499,7 +499,7 @@ spec:
         - --configmap
         - workflow-controller-configmap
         - --executor-image
-        - argoproj/argoexec:latest
+        - quay.io/codefresh/argoexec:latest
         - --namespaced
         command:
         - workflow-controller
@@ -509,7 +509,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: docker.io/argoproj/workflow-controller:latest
+        image: quay.io/codefresh/workflow-controller:latest
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/manifests/quick-start-minimal.yaml b/manifests/quick-start-minimal.yaml
@@ -778,7 +778,7 @@ spec:
         - server
         - --auth-mode
         - client
-        image: docker.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         name: argo-server
         ports:
         - containerPort: 2746
@@ -873,7 +873,7 @@ spec:
         - --configmap
         - workflow-controller-configmap
         - --executor-image
-        - argoproj/argoexec:latest
+        - quay.io/codefresh/argoexec:latest
         - --namespaced
         command:
         - workflow-controller
@@ -883,7 +883,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: docker.io/argoproj/workflow-controller:latest
+        image: quay.io/codefresh/workflow-controller:latest
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/manifests/quick-start-mysql.yaml b/manifests/quick-start-mysql.yaml
@@ -822,7 +822,7 @@ spec:
         - server
         - --auth-mode
         - client
-        image: docker.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         name: argo-server
         ports:
         - containerPort: 2746
@@ -962,7 +962,7 @@ spec:
         - --configmap
         - workflow-controller-configmap
         - --executor-image
-        - argoproj/argoexec:latest
+        - quay.io/codefresh/argoexec:latest
         - --namespaced
         command:
         - workflow-controller
@@ -972,7 +972,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: docker.io/argoproj/workflow-controller:latest
+        image: quay.io/codefresh/workflow-controller:latest
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/manifests/quick-start-postgres.yaml b/manifests/quick-start-postgres.yaml
@@ -822,7 +822,7 @@ spec:
         - server
         - --auth-mode
         - client
-        image: docker.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         name: argo-server
         ports:
         - containerPort: 2746
@@ -954,7 +954,7 @@ spec:
         - --configmap
         - workflow-controller-configmap
         - --executor-image
-        - argoproj/argoexec:latest
+        - quay.io/codefresh/argoexec:latest
         - --namespaced
         command:
         - workflow-controller
@@ -964,7 +964,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.name
-        image: docker.io/argoproj/workflow-controller:latest
+        image: quay.io/codefresh/workflow-controller:latest
         livenessProbe:
           failureThreshold: 3
           httpGet:

diff --git a/test/e2e/functional/json-argument.yaml b/test/e2e/functional/json-argument.yaml
@@ -19,7 +19,7 @@ spec:
       - name: json1
       - name: json2
     container:
-      image: argoproj/argoexec:latest
+      image: quay.io/codefresh/argoexec:latest
       command: [sh, -c]
       args: ["echo '{{inputs.parameters.json1}}' | jq . ; echo '{{inputs.parameters.json2}}' | jq ."]
 
diff --git a/test/e2e/functional/output-jqfilter-parameters.yaml b/test/e2e/functional/output-jqfilter-parameters.yaml
@@ -52,7 +52,7 @@ spec:
       - name: key
       - name: value
     container:
-      image: argoproj/argoexec:latest
+      image: quay.io/codefresh/argoexec:latest
       command: [sh, -c]
       args: ["
         echo '<{{inputs.parameters.key}}>' > /tmp/input;

diff --git a/test/e2e/manifests/stress/workflow-controller-deployment.yaml b/test/e2e/manifests/stress/workflow-controller-deployment.yaml
@@ -10,7 +10,7 @@ spec:
           args:
             - --loglevel=warn
             - --configmap=workflow-controller-configmap
-            - --executor-image=argoproj/argoexec:latest
+            - --executor-image=quay.io/codefresh/argoexec:latest
             - --namespaced
             - --burst=2048
             - --qps=512

diff --git a/util/expand/expand.go b/util/expand/expand.go
@@ -26,7 +26,7 @@ func removeConflicts(m map[string]interface{}) map[string]interface{} {
 	for i := 0; i < len(keys)-1; i++ {
 		k := keys[i]
 		// remove any parent that has a child
-		if strings.HasPrefix(keys[i+1]+".", k) {
+		if strings.HasPrefix(keys[i+1], k+".") {
 			delete(n, k)
 		}
 	}

diff --git a/util/expand/expand_test.go b/util/expand/expand_test.go
@@ -8,20 +8,26 @@ import (
 )
 
 func TestExpand(t *testing.T) {
-	for i := 0; i < 100; i++ { // loop 100 times, because map ordering is not determisitic
+	for i := 0; i < 1; i++ { // loop 100 times, because map ordering is not determisitic
 		t.Run(fmt.Sprint(i), func(t *testing.T) {
 			before := map[string]interface{}{
-				"a.b": 1,
-				"a":   2,
-				"ab":  3,
+				"a.b":   1,
+				"a.c.d": 2,
+				"a":     3, // should be deleted
+				"ab":    4,
+				"abb":   5, // should be kept
 			}
 			after := Expand(before)
-			assert.Len(t, before, 3, "original map unchanged")
+			assert.Len(t, before, 5, "original map unchanged")
 			assert.Equal(t, map[string]interface{}{
 				"a": map[string]interface{}{
 					"b": 1,
+					"c": map[string]interface{}{
+						"d": 2,
+					},
 				},
-				"ab": 3,
+				"ab":  4,
+				"abb": 5,
 			}, after)
 		})
 	}