Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install argocd #1421

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Install argocd #1421

merged 1 commit into from
Jun 19, 2024

Conversation

par97
Copy link
Member

@par97 par97 commented May 28, 2024

This PR installs argocd operator on hub cluster, and enables ability to create argocd application CR and applicationset CR on hub, and the application could be auto deployed to the target dr cluster by argocd controller, using push mode.

@par97 par97 force-pushed the install-argocd branch 2 times, most recently from 1f636a5 to ae586b9 Compare May 28, 2024 14:30
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/envs/regional-dr.yaml Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
Copy link
Member

@nirs nirs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hope you plan to squash all the tiny commits to smaller logical commits. I reviewed the entire changes since the commit looks like temporary commits.

test/addons/argocd/kustomization.yaml Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/test Outdated Show resolved Hide resolved
test/addons/argocd/test Outdated Show resolved Hide resolved
test/envs/regional-dr-argocd.yaml Outdated Show resolved Hide resolved
test/envs/regional-dr-argocd.yaml Outdated Show resolved Hide resolved
test/envs/regional-dr-argocd.yaml Outdated Show resolved Hide resolved
@par97 par97 force-pushed the install-argocd branch from 8cd63be to ca41788 Compare May 29, 2024 13:58
@par97 par97 marked this pull request as draft May 29, 2024 14:09
@par97 par97 force-pushed the install-argocd branch from 6727cfc to 4f5feea Compare May 31, 2024 12:16
@par97 par97 marked this pull request as ready for review June 6, 2024 12:27
@par97 par97 changed the title WIP: Install argocd Install argocd Jun 6, 2024
test/addons/argocd/kustomization.yaml Show resolved Hide resolved
test/addons/argocd/kustomization.yaml Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/test Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/test Outdated Show resolved Hide resolved
test/addons/argocd/test Outdated Show resolved Hide resolved
@nirs nirs force-pushed the install-argocd branch 2 times, most recently from 8c2bbce to 5bda9f0 Compare June 9, 2024 19:01
Copy link
Member

@nirs nirs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@par97 I rebased your PR on main for testing, and push it to ramen repo by mistake.

Re-basing on main when asking for review is a good idea in general, it makes it easier to review and test the PR.

test/addons/argocd/start Outdated Show resolved Hide resolved
@par97 par97 marked this pull request as draft June 12, 2024 08:45
@par97 par97 force-pushed the install-argocd branch 3 times, most recently from 9203b27 to 4ae91e1 Compare June 18, 2024 03:36
@par97 par97 marked this pull request as ready for review June 18, 2024 03:40
@nirs nirs self-requested a review June 18, 2024 11:06
Copy link
Member

@nirs nirs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The start hook looks good, added suggestions for minor improvements.

The test hook works but it install on the hub instead of the managed clusters, can be easily change to install on the managed clusters.

test/envs/argocd.yaml Outdated Show resolved Hide resolved
test/addons/argocd/test Outdated Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
test/addons/argocd/test Outdated Show resolved Hide resolved
test/addons/argocd/test Show resolved Hide resolved
test/addons/argocd/start Outdated Show resolved Hide resolved
@par97 par97 requested a review from nirs June 19, 2024 07:01
Copy link
Member

@nirs nirs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but waiting for the hub is not needed.

test/addons/argocd/start Outdated Show resolved Hide resolved
@par97 par97 requested a review from nirs June 19, 2024 10:53
Signed-off-by: jacklu <[email protected]>
@nirs
Copy link
Member

nirs commented Jun 19, 2024

Local test with argocd env

$ drenv start envs/argocd.yaml 
2024-06-19 20:51:33,383 INFO    [argocd] Starting environment
2024-06-19 20:51:33,437 INFO    [dr2] Starting minikube cluster
2024-06-19 20:51:33,438 INFO    [dr1] Starting minikube cluster
2024-06-19 20:51:33,440 INFO    [hub] Starting minikube cluster
2024-06-19 20:52:09,191 INFO    [hub] Cluster started in 35.75 seconds
2024-06-19 20:52:09,192 INFO    [hub/0] Running addons/argocd/start
2024-06-19 20:52:30,153 INFO    [dr1] Cluster started in 56.71 seconds
2024-06-19 20:52:50,812 INFO    [dr2] Cluster started in 77.37 seconds
2024-06-19 20:53:37,302 INFO    [hub/0] addons/argocd/start completed in 88.11 seconds
2024-06-19 20:53:37,302 INFO    [hub/0] Running addons/argocd/test
2024-06-19 20:54:11,212 INFO    [hub/0] addons/argocd/test completed in 33.91 seconds
2024-06-19 20:54:11,212 INFO    [argocd] Environment started in 157.83 seconds

@nirs
Copy link
Member

nirs commented Jun 19, 2024

Local test with regional-dr env

$ drenv start envs/regional-dr.yaml 
2024-06-19 20:55:44,960 INFO    [rdr] Starting environment
2024-06-19 20:55:45,012 INFO    [hub] Starting minikube cluster
2024-06-19 20:55:45,013 INFO    [dr1] Starting minikube cluster
2024-06-19 20:55:45,013 INFO    [dr2] Starting minikube cluster
2024-06-19 20:56:24,470 INFO    [dr1] Cluster started in 39.46 seconds
2024-06-19 20:56:24,471 INFO    [dr1/0] Running addons/rook-operator/start
2024-06-19 20:56:24,473 INFO    [dr1/2] Running addons/csi-addons/start
2024-06-19 20:56:24,473 INFO    [dr1/1] Running addons/ocm-cluster/start
2024-06-19 20:56:55,495 INFO    [dr2] Cluster started in 70.48 seconds
2024-06-19 20:56:55,497 INFO    [dr2/0] Running addons/rook-operator/start
2024-06-19 20:56:55,497 INFO    [dr2/1] Running addons/ocm-cluster/start
2024-06-19 20:56:55,498 INFO    [dr2/2] Running addons/csi-addons/start
2024-06-19 20:57:04,252 INFO    [dr1/2] addons/csi-addons/start completed in 39.78 seconds
2024-06-19 20:57:04,252 INFO    [dr1/2] Running addons/olm/start
2024-06-19 20:57:10,428 INFO    [dr1/0] addons/rook-operator/start completed in 45.96 seconds
2024-06-19 20:57:10,428 INFO    [dr1/0] Running addons/rook-cluster/start
2024-06-19 20:57:19,294 INFO    [hub] Cluster started in 94.28 seconds
2024-06-19 20:57:19,295 INFO    [hub/0] Running addons/ocm-hub/start
2024-06-19 20:57:19,297 INFO    [hub/1] Running addons/submariner/start
2024-06-19 20:57:23,914 INFO    [dr2/2] addons/csi-addons/start completed in 28.42 seconds
2024-06-19 20:57:23,914 INFO    [dr2/2] Running addons/olm/start
2024-06-19 20:57:36,927 INFO    [dr1/2] addons/olm/start completed in 32.68 seconds
2024-06-19 20:57:36,928 INFO    [dr1/2] Running addons/minio/start
2024-06-19 20:57:51,263 INFO    [dr2/2] addons/olm/start completed in 27.35 seconds
2024-06-19 20:57:51,263 INFO    [dr2/2] Running addons/minio/start
2024-06-19 20:57:55,136 INFO    [dr2/0] addons/rook-operator/start completed in 59.64 seconds
2024-06-19 20:57:55,137 INFO    [dr2/0] Running addons/rook-cluster/start
2024-06-19 20:57:57,381 INFO    [dr1/2] addons/minio/start completed in 20.45 seconds
2024-06-19 20:57:57,382 INFO    [dr1/2] Running addons/minio/test
2024-06-19 20:57:57,947 INFO    [dr1/2] addons/minio/test completed in 0.57 seconds
2024-06-19 20:57:57,947 INFO    [dr1/2] Running addons/velero/start
2024-06-19 20:58:13,405 INFO    [dr2/2] addons/minio/start completed in 22.14 seconds
2024-06-19 20:58:13,406 INFO    [dr2/2] Running addons/minio/test
2024-06-19 20:58:14,785 INFO    [dr2/2] addons/minio/test completed in 1.38 seconds
2024-06-19 20:58:14,786 INFO    [dr2/2] Running addons/velero/start
2024-06-19 20:58:44,564 INFO    [dr1/2] addons/velero/start completed in 46.62 seconds
2024-06-19 20:58:44,564 INFO    [dr1/2] Running addons/velero/test
2024-06-19 20:58:46,383 INFO    [hub/1] addons/submariner/start completed in 87.09 seconds
2024-06-19 20:58:46,383 INFO    [hub/1] Running addons/submariner/test
2024-06-19 20:58:53,441 INFO    [hub/0] addons/ocm-hub/start completed in 94.15 seconds
2024-06-19 20:58:53,442 INFO    [hub/0] Running addons/ocm-controller/start
2024-06-19 20:59:02,832 INFO    [dr2/2] addons/velero/start completed in 48.05 seconds
2024-06-19 20:59:02,832 INFO    [dr2/2] Running addons/velero/test
2024-06-19 20:59:16,030 INFO    [hub/0] addons/ocm-controller/start completed in 22.59 seconds
2024-06-19 20:59:16,030 INFO    [hub/0] Running addons/olm/start
2024-06-19 20:59:26,481 INFO    [dr1/2] addons/velero/test completed in 41.92 seconds
2024-06-19 20:59:34,330 INFO    [dr1/0] addons/rook-cluster/start completed in 143.90 seconds
2024-06-19 20:59:34,331 INFO    [dr1/0] Running addons/rook-toolbox/start
2024-06-19 20:59:39,382 INFO    [dr1/0] addons/rook-toolbox/start completed in 5.05 seconds
2024-06-19 20:59:39,383 INFO    [dr1/0] Running addons/rook-pool/start
2024-06-19 20:59:47,400 INFO    [dr2/2] addons/velero/test completed in 44.57 seconds
2024-06-19 20:59:54,812 INFO    [hub/1] addons/submariner/test completed in 68.43 seconds
2024-06-19 20:59:54,812 INFO    [hub/1] Running addons/argocd/start
2024-06-19 21:00:06,574 INFO    [hub/0] addons/olm/start completed in 50.54 seconds
2024-06-19 21:00:36,815 INFO    [dr2/0] addons/rook-cluster/start completed in 161.68 seconds
2024-06-19 21:00:36,815 INFO    [dr2/0] Running addons/rook-toolbox/start
2024-06-19 21:00:41,224 INFO    [dr2/0] addons/rook-toolbox/start completed in 4.41 seconds
2024-06-19 21:00:41,224 INFO    [dr2/0] Running addons/rook-pool/start
2024-06-19 21:00:41,510 INFO    [dr1/0] addons/rook-pool/start completed in 62.13 seconds
2024-06-19 21:00:41,510 INFO    [dr1/0] Running addons/rook-cephfs/start
2024-06-19 21:00:44,191 INFO    [dr1/1] addons/ocm-cluster/start completed in 259.72 seconds
2024-06-19 21:00:44,191 INFO    [dr1/1] Running addons/ocm-cluster/test
2024-06-19 21:00:52,563 INFO    [dr1/1] addons/ocm-cluster/test completed in 8.37 seconds
2024-06-19 21:00:52,563 INFO    [dr1/1] Running addons/recipe/start
2024-06-19 21:00:52,988 INFO    [dr1/1] addons/recipe/start completed in 0.43 seconds
2024-06-19 21:00:59,815 INFO    [dr2/1] addons/ocm-cluster/start completed in 244.32 seconds
2024-06-19 21:00:59,815 INFO    [dr2/1] Running addons/ocm-cluster/test
2024-06-19 21:01:04,567 INFO    [dr2/1] addons/ocm-cluster/test completed in 4.75 seconds
2024-06-19 21:01:04,567 INFO    [dr2/1] Running addons/recipe/start
2024-06-19 21:01:04,860 INFO    [dr2/1] addons/recipe/start completed in 0.29 seconds
2024-06-19 21:01:11,334 INFO    [dr2/0] addons/rook-pool/start completed in 30.11 seconds
2024-06-19 21:01:11,334 INFO    [dr2/0] Running addons/rook-cephfs/start
2024-06-19 21:01:13,515 INFO    [dr1/0] addons/rook-cephfs/start completed in 32.00 seconds
2024-06-19 21:01:13,515 INFO    [dr1/0] Running addons/rook-cephfs/test
2024-06-19 21:01:21,375 INFO    [dr1/0] addons/rook-cephfs/test completed in 7.86 seconds
2024-06-19 21:01:25,041 INFO    [hub/1] addons/argocd/start completed in 90.23 seconds
2024-06-19 21:01:25,042 INFO    [hub/1] Running addons/argocd/test
2024-06-19 21:01:35,978 INFO    [dr2/0] addons/rook-cephfs/start completed in 24.64 seconds
2024-06-19 21:01:35,978 INFO    [dr2/0] Running addons/rook-cephfs/test
2024-06-19 21:01:44,127 INFO    [dr2/0] addons/rook-cephfs/test completed in 8.15 seconds
2024-06-19 21:02:07,112 INFO    [hub/1] addons/argocd/test completed in 42.07 seconds
2024-06-19 21:02:07,114 INFO    [rdr/1] Running addons/volsync/start
2024-06-19 21:02:07,115 INFO    [rdr/0] Running addons/rbd-mirror/start
2024-06-19 21:02:51,169 INFO    [rdr/1] addons/volsync/start completed in 44.05 seconds
2024-06-19 21:02:51,169 INFO    [rdr/1] Running addons/volsync/test
2024-06-19 21:03:12,371 INFO    [rdr/0] addons/rbd-mirror/start completed in 65.26 seconds
2024-06-19 21:03:12,371 INFO    [rdr/0] Running addons/rbd-mirror/test
2024-06-19 21:03:28,525 INFO    [rdr/0] addons/rbd-mirror/test completed in 16.15 seconds
2024-06-19 21:03:35,468 INFO    [rdr/1] addons/volsync/test completed in 44.30 seconds
2024-06-19 21:03:35,469 INFO    [rdr] Dumping ramen e2e config to '/home/nsoffer/.config/drenv/rdr'
2024-06-19 21:03:35,648 INFO    [rdr] Environment started in 470.69 seconds

@nirs nirs merged commit cf8eb75 into RamenDR:main Jun 19, 2024
15 of 16 checks passed
nirs added a commit to nirs/ramen that referenced this pull request Jun 20, 2024
We change the cache API in RamenDR#1389 but it was merge after the argocd was
added.

- Use cache.get() instead of removed cache.fetch()
- Change current directory for start hook was missing in RamenDR#1421, not sure
  how the cache worked without it.

Signed-off-by: Nir Soffer <[email protected]>
ShyamsundarR pushed a commit that referenced this pull request Jun 20, 2024
We change the cache API in #1389 but it was merge after the argocd was
added.

- Use cache.get() instead of removed cache.fetch()
- Change current directory for start hook was missing in #1421, not sure
  how the cache worked without it.

Signed-off-by: Nir Soffer <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants