chore(deps): bump express from 4.17.1 to 4.18.2 in /ui

.github/workflows/custom.yml

@@ -0,0 +1,33 @@
+name: Custom
+on:
+  push:
+    branches:
+      - custom
+jobs:
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.14
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v1
+
+    - name: Login Docker Hub
+      env:
+        DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
+        QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
+      run: |
+        echo ${DOCKERHUB_ACCESS_TOKEN} | docker login --username yujunz --password-stdin
+        echo ${QUAY_PASSWORD} | docker login quay.io --username yujunz --password-stdin
+
+    - name: Build
+      env:
+        IMAGE_NAMESPACE: quay.io/yujunz
+        DOCKER_PUSH: true
+      run: IMAGE_TAG=$(cat VERSION)-$(git describe --always --dirty) make image

Makefile

@@ -25,7 +25,7 @@ DOCKER_WORKDIR?=/go/src/github.com/argoproj/argo-cd
 
 ARGOCD_PROCFILE?=Procfile
 
-# Strict mode has been disabled in latest versions of mkdocs-material. 
+# Strict mode has been disabled in latest versions of mkdocs-material.
 # Thus pointing to the older image of mkdocs-material matching the version used by argo-cd.
 MKDOCS_DOCKER_IMAGE?=squidfunk/mkdocs-material:4.1.1
 MKDOCS_RUN_ARGS?=
@@ -117,7 +117,7 @@ define run-in-test-client
 		bash -c "$(1)"
 endef
 
-# 
+#
 define exec-in-test-server
 	docker exec -it -u $(shell id -u):$(shell id -g) -e ARGOCD_E2E_RECORD=$(ARGOCD_E2E_RECORD) -e ARGOCD_E2E_K3S=$(ARGOCD_E2E_K3S) argocd-test-server $(1)
 endef
@@ -299,7 +299,10 @@ else
 image:
 	DOCKER_BUILDKIT=1 docker build -t $(IMAGE_PREFIX)argocd:$(IMAGE_TAG) .
 endif
-	@if [ "$(DOCKER_PUSH)" = "true" ] ; then docker push $(IMAGE_PREFIX)argocd:$(IMAGE_TAG) ; fi
+	@if [ "$(DOCKER_PUSH)" = "true" ] ; then \
+		docker tag $(IMAGE_PREFIX)argocd:$(IMAGE_TAG) $(IMAGE_PREFIX)argocd:latest \
+		&& docker push --all-tags $(IMAGE_PREFIX)argocd ; \
+	fi
 
 .PHONY: armimage
 armimage:

controller/cache/cache.go

@@ -274,10 +274,11 @@ func ownerRefGV(ownerRef metav1.OwnerReference) schema.GroupVersion {
 }
 
 func getAppRecursive(r *clustercache.Resource, ns map[kube.ResourceKey]*clustercache.Resource, visited map[kube.ResourceKey]bool) string {
-	if !visited[r.ResourceKey()] {
-		visited[r.ResourceKey()] = true
+	k := r.ResourceKey()
+	if !visited[k] {
+		visited[k] = true
 	} else {
-		log.Warnf("Circular dependency detected: %v.", visited)
+		log.Warnf("Circular dependency detected: %v in %v.", k, visited)
 		return resInfo(r).AppName
 	}
 

controller/state.go

@@ -620,6 +620,13 @@ func (m *appStateManager) CompareAppState(app *v1alpha1.Application, project *ap
 	})
 	ts.AddCheckpoint("health_ms")
 	compRes.timings = ts.Timings()
+
+	for k, v := range ts.Timings() {
+		logCtx = logCtx.WithField(k, v.Milliseconds())
+	}
+	logCtx = logCtx.WithField("time_ms", time.Since(ts.StartTime).Milliseconds())
+	logCtx.Info("CompareAppState stats")
+
 	return &compRes
 }