feat: move to two level cache, reconfigure cache interface to provide…

… consistent behavior Signed-off-by: nromriell <nateromriell@gmail.com>
argoproj · Nov 19, 2023 · e833653 · e833653
1 parent aafad63
commit e833653
Show file tree

Hide file tree

Showing 26 changed files with 1,033 additions and 722 deletions.
diff --git a/cmd/argocd/commands/headless/headless.go b/cmd/argocd/commands/headless/headless.go
@@ -78,12 +78,16 @@ func (c *forwardCacheClient) Set(item *cache.Item) error {
 	})
 }
 
-func (c *forwardCacheClient) Get(key string, obj interface{}) error {
+func (c *forwardCacheClient) Get(item *cache.Item) error {
 	return c.doLazy(func(client cache.CacheClient) error {
-		return client.Get(key, obj)
+		return client.Get(item)
 	})
 }
 
+func (c *forwardCacheClient) GetClientType() cache.CacheType {
+	return c.client.GetClientType()
+}
+
 func (c *forwardCacheClient) Delete(key string) error {
 	return c.doLazy(func(client cache.CacheClient) error {
 		return client.Delete(key)

diff --git a/manifests/base/repo-server/argocd-repo-server-deployment.yaml b/manifests/base/repo-server/argocd-repo-server-deployment.yaml
@@ -90,24 +90,6 @@ spec:
                   name: argocd-cmd-params-cm
                   key: reposerver.repo.cache.expiration
                   optional: true
-          - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
-            valueFrom:
-              configMapKeyRef:
-                key: reposerver.repo.cache.lock.enabled
-                name: argocd-cmd-params-cm
-                optional: true
-          - name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
-            valueFrom:
-              configMapKeyRef:
-                key: reposerver.repo.cache.lock.timeout
-                name: argocd-cmd-params-cm
-                optional: true
-          - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
-            valueFrom:
-              configMapKeyRef:
-                key: reposerver.repo.cache.lock.interval
-                name: argocd-cmd-params-cm
-                optional: true
           - name: REDIS_SERVER
             valueFrom:
                 configMapKeyRef:

diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml
@@ -21232,24 +21232,6 @@ spec:
               key: reposerver.repo.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.enabled
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.timeout
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.interval
-              name: argocd-cmd-params-cm
-              optional: true
         - name: REDIS_SERVER
           valueFrom:
             configMapKeyRef:

diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -22719,24 +22719,6 @@ spec:
               key: reposerver.repo.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.enabled
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.timeout
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.interval
-              name: argocd-cmd-params-cm
-              optional: true
         - name: REDIS_SERVER
           valueFrom:
             configMapKeyRef:

diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
@@ -2106,24 +2106,6 @@ spec:
               key: reposerver.repo.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.enabled
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.timeout
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.interval
-              name: argocd-cmd-params-cm
-              optional: true
         - name: REDIS_SERVER
           valueFrom:
             configMapKeyRef:

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -21765,24 +21765,6 @@ spec:
               key: reposerver.repo.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.enabled
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.timeout
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.interval
-              name: argocd-cmd-params-cm
-              optional: true
         - name: REDIS_SERVER
           valueFrom:
             configMapKeyRef:

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -1152,24 +1152,6 @@ spec:
               key: reposerver.repo.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_ENABLED
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.enabled
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.timeout
-              name: argocd-cmd-params-cm
-              optional: true
-        - name: ARGOCD_REVISION_CACHE_LOCK_WAIT_INTERVAL
-          valueFrom:
-            configMapKeyRef:
-              key: reposerver.repo.cache.lock.interval
-              name: argocd-cmd-params-cm
-              optional: true
         - name: REDIS_SERVER
           valueFrom:
             configMapKeyRef: