Skip to content

Commit 04994dd

Browse files
committed
Merge remote-tracking branch 'upstream/master' into gitops-3394-integrate-sscsid-with-gitops
2 parents 0da92e9 + 9b0f3e8 commit 04994dd

File tree

413 files changed

+9096
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

413 files changed

+9096
-0
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Check that our console link is installed correctly
2+
apiVersion: console.openshift.io/v1
3+
kind: ConsoleLink
4+
metadata:
5+
name: argocd
6+
spec:
7+
location: ApplicationMenu
8+
text: Cluster Argo CD

test/openshift/e2e/ignore-tests/parallel/1-003_validate_console_link/01-check-console-link.yaml

Whitespace-only changes.
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
apiVersion: argoproj.io/v1alpha1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
status:
6+
phase: Available
7+
---
8+
apiVersion: v1
9+
kind: Secret
10+
metadata:
11+
name: argocd-ca
12+
---
13+
apiVersion: v1
14+
kind: Secret
15+
metadata:
16+
name: argocd-cluster
17+
---
18+
apiVersion: v1
19+
kind: Secret
20+
metadata:
21+
name: argocd-default-cluster-config
22+
---
23+
apiVersion: v1
24+
kind: Secret
25+
metadata:
26+
name: argocd-secret
27+
---
28+
apiVersion: v1
29+
kind: Secret
30+
metadata:
31+
name: argocd-tls
32+
---
33+
apiVersion: apps/v1
34+
kind: Deployment
35+
metadata:
36+
name: argocd-redis
37+
status:
38+
replicas: 1
39+
readyReplicas: 1
40+
---
41+
apiVersion: apps/v1
42+
kind: Deployment
43+
metadata:
44+
name: argocd-server
45+
status:
46+
replicas: 1
47+
readyReplicas: 1
48+
---
49+
apiVersion: apps/v1
50+
kind: Deployment
51+
metadata:
52+
name: argocd-repo-server
53+
status:
54+
replicas: 1
55+
readyReplicas: 1
56+
---
57+
apiVersion: apps/v1
58+
kind: StatefulSet
59+
metadata:
60+
name: argocd-application-controller
61+
status:
62+
replicas: 1
63+
readyReplicas: 1
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: argoproj.io/v1alpha1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
spec:
6+
server:
7+
route:
8+
enabled: true
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This test step ensures that the cluster secret only contains the installation
2+
# namespace after managed-by label has been removed from other-managed-namespace
3+
apiVersion: kuttl.dev/v1beta1
4+
kind: TestStep
5+
commands:
6+
- script: |
7+
namespaces=$(oc get secret -n $NAMESPACE argocd-default-cluster-config -o jsonpath='{.data.namespaces}' | base64 -d)
8+
if test "$namespaces" != "$NAMESPACE"; then
9+
echo "Assertion for cluster secret failed!"
10+
exit 1
11+
fi
12+
exit 0
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: argoproj.io/v1alpha1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
namespace: test-1-8-custom
6+
status:
7+
phase: Available
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: test-1-8-custom
5+
---
6+
apiVersion: argoproj.io/v1alpha1
7+
kind: ArgoCD
8+
metadata:
9+
name: argocd
10+
namespace: test-1-8-custom
11+
spec:
12+
server:
13+
route:
14+
enabled: true
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Wait for the Operator to reconcile
2+
apiVersion: kuttl.dev/v1beta1
3+
kind: TestStep
4+
commands:
5+
- script: |
6+
function wait_until_pods_running() {
7+
echo -n "Waiting until all pods in namespace $1 are up"
8+
for i in {1..150}; do # timeout after 5 minutes
9+
local pods="$(oc get pods --no-headers -n $1 2>/dev/null)"
10+
# write it to tempfile
11+
TempFile=$(mktemp)
12+
oc get pods --no-headers -n $1 2>/dev/null >$TempFile
13+
14+
# All pods must be running
15+
local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l)
16+
if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then
17+
local all_ready=1
18+
while read pod; do
19+
local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' '))
20+
# All containers must be ready
21+
[[ -z ${status[0]} ]] && all_ready=0 && break
22+
[[ -z ${status[1]} ]] && all_ready=0 && break
23+
[[ ${status[0]} -lt 1 ]] && all_ready=0 && break
24+
[[ ${status[1]} -lt 1 ]] && all_ready=0 && break
25+
[[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break
26+
done <${TempFile}
27+
if ((all_ready)); then
28+
echo -e "\nAll pods are up:\n${pods}"
29+
return 0
30+
fi
31+
fi
32+
echo -n "."
33+
sleep 2
34+
done
35+
echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}"
36+
return 1
37+
}
38+
39+
wait_until_pods_running "test-1-8-custom"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: argoproj.io/v1alpha1
2+
kind: Application
3+
metadata:
4+
name: validate-custom-argocd
5+
namespace: test-1-8-custom
6+
status:
7+
health:
8+
status: Healthy
9+
sync:
10+
status: Synced
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: argoproj.io/v1alpha1
2+
kind: Application
3+
metadata:
4+
name: validate-custom-argocd
5+
namespace: test-1-8-custom
6+
spec:
7+
project: default
8+
source:
9+
repoURL: https://github.com/redhat-developer/gitops-operator
10+
path: test/examples/nginx
11+
targetRevision: HEAD
12+
destination:
13+
server: https://kubernetes.default.svc
14+
namespace: test-1-8-custom
15+
syncPolicy:
16+
automated: {}

0 commit comments

Comments
 (0)