Skip to content

Commit c93edd3

Browse files
committed
Update side-by-side and helm install topics
1 parent 3f16cb9 commit c93edd3

File tree

2 files changed

+15
-21
lines changed

2 files changed

+15
-21
lines changed

_docs/installation/gitops/argo-with-gitops-side-by-side.md

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,19 @@ group: installation
55
toc: true
66
---
77

8-
If you have a cluster with Argo CD already installed, Codefresh provides an option to install a GitOps Runtime to co-exist with your Argo CD installation. This way you can extend your environments with Codefresh's GitOps capabilities without having to uninstall Argo CD, and with just a few configuration changes.
8+
If you have a cluster with Argo CD already installed, Codefresh provides an option to install the GitOps Runtime to co-exist with your Argo CD installation. Extend your environment with Codefresh's GitOps capabilities with a few simple configuration changes, and without the need to uninstall Argo CD.
99

10-
* **Explore Codefresh GitOps**
11-
Add Codefresh's unique GitOps capabilities and features without having to uninstall or reconfigure existing Argo CD installations. Explore Codefresh GitOps and its advantages in the context of your current setup. Read about our GitOps offering in [Codefresh for GitOps]({{site.baseurl}}/docs/getting-started/gitops-codefresh/).
10+
* **Enhance CI/CD with Codefresh GitOps**
11+
Dive into the world of Codefresh GitOps, exploring its capabilities and features without having to uninstall or reconfigure existing Argo CD installations. Read about our GitOps offering in [Codefresh for GitOps]({{site.baseurl}}/docs/getting-started/gitops-codefresh/).
1212

1313

14-
* **Gradual migration to GitOps applications**
15-
Once you have worked with Codefresh GitOps, assess migration impacts and make informed decisions on migrating your Argo CD Applications to Codefresh GitOps.
14+
* **Gradual migration to GitOps applications**
15+
After becoming familiar with Codefresh GitOps, make informed decisions when migrating your Argo CD Applications to Codefresh GitOps.
1616

17-
For a smooth shift from Argo CD Applications to Codefresh's GitOps applications, migrate them at your own pace and according to your requirements. Once migrated, view, track, and manage all aspects of the applications in Codefresh.
17+
For a smooth transition from Argo CD Applications to Codefresh's GitOps applications, migrate Applications at your preferred pace. On successful migration, view, track, and manage all aspects of the applications in Codefresh.
1818

19-
20-
How do you work with Argo CD and Codefresh GitOps side-by-side?
21-
22-
In three steps:
19+
20+
Follow these steps to install the GitOps Runtime on a cluster with Argo CD:
2321
* Prepare the Argo CD cluster for GitOps installation
2422
* Install the GitOps Runtime via Helm
2523
* Migrate Argo CD applications to GitOps
@@ -101,19 +99,15 @@ Verify that your native Argo CD instance uses `label` to track resources:
10199

102100
## Install Hybrid GitOps Runtime via Helm
103101

104-
After completing the prerequisites, follow our [step-by-step installation guide]({{site.baseurl}}/docs/installation/gitops/hybrid-gitops-helm-installation/#install-first-gitops-runtime-in-account) to install the GitOps Runtime.
102+
After completing the configuration changes, follow our [step-by-step installation guide]({{site.baseurl}}/docs/installation/gitops/hybrid-gitops-helm-installation/#install-first-gitops-runtime-in-account) to install the GitOps Runtime.
105103

106-
GitOps installation is Helm-based and installing GitOps on a cluster with Argo CD requires additional flags in the installation command and an additional step after installation.
104+
GitOps installation is Helm-based, and installing GitOps on a cluster with Argo CD requires additional flags in the installation command and an additional step after installation.
107105

108106

109107
## Migrate Argo CD Applications to Codefresh GitOps
110-
The final task depending on your requirements is to migrate your Argo CD Applications to Codefresh GitOps applications.
108+
The final step to fully leverage Codefresh GitOps is to migrate your Argo CD Applications to Codefresh GitOps applications.
109+
You can do this at any time after installation.
111110

112-
Why would you want to do this?
113-
Because this allows you to completely and seamlessly manage the applications in Codefresh as GitOps entities.
114-
115-
116-
The process to migrate an Argo CD Application is simple:
117111

118112
### Step 1: Add a Git Source to GitOps Runtime
119113

@@ -122,7 +116,6 @@ A Git Source is a Git repository with an opinionated folder structure managed by
122116
Read about [Git Sources]({{site.baseurl}}/docs/installation/gitops/git-sources/).
123117

124118

125-
126119
* Add a [Git Source]({{site.baseurl}}/docs/installation/gitops/git-sources/#create-a-git-source) to your GitOps Runtime.
127120

128121
### Step 2: Modify Argo CD Application
@@ -156,11 +149,12 @@ spec:
156149

157150
### Step 3: Commit the application to the Git Source
158151
As the final step in migrating your Argo CD Application to a Codefresh GitOps one, you'll manually commit the updated Application manifest to the Git Source you created in Step 1.
159-
Once you commit the manifest to the Git Source, it becomes a GitOps application. You can view it in the Codefresh UI, modify definitions, track it through our different dashboards - in short, manage it as would any GitOps resource in Codefresh.
152+
Once you commit the manifest to the Git Source, it becomes a GitOps application which you can view, modify, delete, and monitor, directly in Codefresh.
160153

161154
1. Go to the Git repo where you created the Git Source.
162155
1. Add and commit the Argo CD Application manifest.
163156

157+
ADD SCREENSHOT
164158

165159
## Related articles
166160
[Creating GitOps applications]({{site.baseurl}}/docs/deployments/gitops/create-application)

_docs/installation/gitops/hybrid-gitops-helm-installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ NAMESPACE=<runtime-namespace>
9898
kubectl label --overwrite crds $(kubectl get crd | grep argoproj.io | awk '{print $1}' | xargs) app.kubernetes.io/managed-by=Helm
9999
kubectl annotate --overwrite crds $(kubectl get crd | grep argoproj.io | awk '{print $1}' | xargs) meta.helm.sh/release-name=$RELEASE
100100
kubectl annotate --overwrite crds $(kubectl get crd | grep argoproj.io | awk '{print $1}' | xargs) meta.helm.sh/release-namespace=$NAMESPACE
101-
101+
```
102102

103103
#### Handle Argo project CRDs outside of the chart
104104
Disable CRD installation under the relevant section for each of the Argo projects in the Helm chart:<br>

0 commit comments

Comments
 (0)