Skip to content

Commit a158c25

Browse files
Merge pull request #49171 from kquinn1204/BZ-2116322
BZ-2116322 Creating initial submit correction to GitOps ZTP pipeline
2 parents d637fd8 + 6e32621 commit a158c25

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

modules/ztp-installing-the-new-gitops-ztp-applications.adoc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,16 @@ Using the extracted `argocd/deployment` directory, and after ensuring that the a
1010

1111
.Procedure
1212

13-
* Apply the contents of the `argocd/deployment` directory using the following command:
13+
. To patch the ArgoCD instance in the hub cluster by using the patch file previously extracted into the `out/argocd/deployment/` directory, enter the following command:
14+
+
15+
[source,terminal]
16+
----
17+
$ oc patch argocd openshift-gitops \
18+
-n openshift-gitops --type=merge \
19+
--patch-file out/argocd/deployment/argocd-openshift-gitops-patch.json
20+
----
21+
22+
. To apply the contents of the `argocd/deployment` directory, enter the following command:
1423
+
1524
[source,terminal]
1625
----

modules/ztp-preparing-the-hub-cluster-for-ztp.adoc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,16 @@ You can configure your hub cluster with a set of ArgoCD applications that genera
3636
3737
* The path should specify the path to the `SiteConfig` or `PolicyGenTemplate` CRs, respectively.
3838
39-
. Apply the pipeline configuration to your hub cluster using the following command:
39+
. To patch the ArgoCD instance in the hub cluster by using the patch file previously extracted into the `out/argocd/deployment/` directory, enter the following command:
40+
+
41+
[source,terminal]
42+
----
43+
$ oc patch argocd openshift-gitops \
44+
-n openshift-gitops --type=merge \
45+
--patch-file out/argocd/deployment/argocd-openshift-gitops-patch.json
46+
----
47+
48+
. Apply the pipeline configuration to your hub cluster by using the following command:
4049
+
4150
[source,terminal]
4251
----

0 commit comments

Comments
 (0)