review changes, e2e fix

Signed-off-by: saumeya <[email protected]>
argoproj-labs · Oct 15, 2024 · a2c5f9d · a2c5f9d
1 parent 161d504
commit a2c5f9d
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 16 deletions.
diff --git a/controllers/argocd/deployment.go b/controllers/argocd/deployment.go
@@ -1587,7 +1587,6 @@ func getRolloutInitContainer() []corev1.Container {
 						"ALL",
 					},
 				},
-				RunAsNonRoot: boolPtr(true),
 				SeccompProfile: &corev1.SeccompProfile{
 					Type: "RuntimeDefault",
 				},

diff --git a/tests/k8s/1-044_validate_rollout_extension/01-assert.yaml b/tests/k8s/1-044_validate_rollout_extension/01-assert.yaml
@@ -22,10 +22,37 @@ spec:
           volumeMounts:
             - name: extensions
               mountPath: /tmp/extensions/
-          securityContext:
-            runAsNonRoot: true
       volumes:
-        - name: extensions
-          emptyDir: {}  
+      - configMap:
+          defaultMode: 420
+          name: argocd-ssh-known-hosts-cm
+        name: ssh-known-hosts
+      - configMap:
+          defaultMode: 420
+          name: argocd-tls-certs-cm
+        name: tls-certs
+      - name: argocd-repo-server-tls
+        secret:
+          defaultMode: 420
+          optional: true
+          secretName: argocd-repo-server-tls
+      - name: argocd-operator-redis-tls
+        secret:
+          defaultMode: 420
+          optional: true
+          secretName: argocd-operator-redis-tls
+      - emptyDir: {}
+        name: extensions
       containers:
-      - name: argocd-server
+      - name: argocd-server
+        volumeMounts:
+        - mountPath: /app/config/ssh
+          name: ssh-known-hosts
+        - mountPath: /app/config/tls
+          name: tls-certs
+        - mountPath: /app/config/server/tls
+          name: argocd-repo-server-tls
+        - mountPath: /app/config/server/tls/redis
+          name: argocd-operator-redis-tls
+        - mountPath: /tmp/extensions/
+          name: extensions
diff --git a/...alidate_rollout_extension/01-install.yaml → ...llout_extension/01-enable-rollout-ui.yaml b/...alidate_rollout_extension/01-install.yaml → ...llout_extension/01-enable-rollout-ui.yaml
diff --git a/...alidate_rollout_extension/02-install.yaml → ...lout_extension/02-disable-rollout-ui.yaml b/...alidate_rollout_extension/02-install.yaml → ...lout_extension/02-disable-rollout-ui.yaml
diff --git a/tests/k8s/1-044_validate_rollout_extension/02-errors.yaml b/tests/k8s/1-044_validate_rollout_extension/02-errors.yaml
@@ -1,8 +1,3 @@
-apiVersion: argoproj.io/v1beta1
-kind: ArgoCD
-metadata:
-  name: argocd
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -22,10 +17,37 @@ spec:
           volumeMounts:
             - name: extensions
               mountPath: /tmp/extensions/
-          securityContext:
-            runAsNonRoot: true
       volumes:
-        - name: extensions
-          emptyDir: {}  
+      - configMap:
+          defaultMode: 420
+          name: argocd-ssh-known-hosts-cm
+        name: ssh-known-hosts
+      - configMap:
+          defaultMode: 420
+          name: argocd-tls-certs-cm
+        name: tls-certs
+      - name: argocd-repo-server-tls
+        secret:
+          defaultMode: 420
+          optional: true
+          secretName: argocd-repo-server-tls
+      - name: argocd-operator-redis-tls
+        secret:
+          defaultMode: 420
+          optional: true
+          secretName: argocd-operator-redis-tls
+      - emptyDir: {}
+        name: extensions
       containers:
-      - name: argocd-server
+      - name: argocd-server
+        volumeMounts:
+        - mountPath: /app/config/ssh
+          name: ssh-known-hosts
+        - mountPath: /app/config/tls
+          name: tls-certs
+        - mountPath: /app/config/server/tls
+          name: argocd-repo-server-tls
+        - mountPath: /app/config/server/tls/redis
+          name: argocd-operator-redis-tls
+        - mountPath: /tmp/extensions/
+          name: extensions
-Original file line number
+Diff line change
@@ Expand Up / @@ -1587,7 +1587,6 @@ func getRolloutInitContainer() []corev1.Container { @@
     						"ALL",
     					},
     				},
-    				RunAsNonRoot: boolPtr(true),
     				SeccompProfile: &corev1.SeccompProfile{
     					Type: "RuntimeDefault",
     				},
@@ Expand Down @@