From cada6ce0c7da148e382b3b1d9776a6a6f3aed43a Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@tobru.ch>
Date: Thu, 17 Sep 2020 21:29:11 +0200
Subject: [PATCH] update argocd

---
 argocd/argocd.yaml | 43 +++++++++++--------------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/argocd/argocd.yaml b/argocd/argocd.yaml
index 8c4fb24..891eceb 100644
--- a/argocd/argocd.yaml
+++ b/argocd/argocd.yaml
@@ -922,8 +922,9 @@ spec:
                 type: object
               type: array
             observedAt:
-              description: ObservedAt indicates when the application state was updated
-                without querying latest git state
+              description: 'ObservedAt indicates when the application state was updated
+                without querying latest git state Deprecated: controller no longer
+                updates ObservedAt field'
               format: date-time
               type: string
             operationState:
@@ -2109,32 +2110,6 @@ spec:
                 type: object
               type: array
           type: object
-        status:
-          description: AppProjectStatus contains information about appproj
-          properties:
-            jwtTokensByRole:
-              additionalProperties:
-                properties:
-                  items:
-                    items:
-                      description: JWTToken holds the issuedAt and expiresAt values
-                        of a token
-                      properties:
-                        exp:
-                          format: int64
-                          type: integer
-                        iat:
-                          format: int64
-                          type: integer
-                        id:
-                          type: string
-                      required:
-                      - iat
-                      type: object
-                    type: array
-                type: object
-              type: object
-          type: object
       required:
       - metadata
       - spec
@@ -2608,7 +2583,7 @@ spec:
         - "20"
         - --operation-processors
         - "10"
-        image: argoproj/argocd:v1.7.0-rc1
+        image: argoproj/argocd:v1.7.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -2664,7 +2639,7 @@ spec:
         - -n
         - /usr/local/bin/argocd-util
         - /shared
-        image: argoproj/argocd:v1.7.0-rc1
+        image: argoproj/argocd:v1.7.5
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -2733,7 +2708,7 @@ spec:
         - argocd-repo-server
         - --redis
         - argocd-redis:6379
-        image: argoproj/argocd:v1.7.0-rc1
+        image: argoproj/argocd:v1.7.5
         imagePullPolicy: Always
         name: argocd-repo-server
         ports:
@@ -2751,6 +2726,8 @@ spec:
           name: tls-certs
         - mountPath: /app/config/gpg/source
           name: gpg-keys
+        - mountPath: /app/config/gpg/keys
+          name: gpg-keyring
       volumes:
       - configMap:
           name: argocd-ssh-known-hosts-cm
@@ -2761,6 +2738,8 @@ spec:
       - configMap:
           name: argocd-gpg-keys-cm
         name: gpg-keys
+      - emptyDir: {}
+        name: gpg-keyring
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -2784,7 +2763,7 @@ spec:
         - argocd-server
         - --staticassets
         - /shared/app
-        image: argoproj/argocd:v1.7.0-rc1
+        image: argoproj/argocd:v1.7.5
         imagePullPolicy: Always
         name: argocd-server
         ports: