Skip to content

Commit 3c738d1

Browse files
committed
Adding some more content 5
1 parent bf228ae commit 3c738d1

File tree

1 file changed

+27
-33
lines changed

1 file changed

+27
-33
lines changed

content/learn/getting-started-multi-cloud-gitops.adoc

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Other patterns build upon these concepts, making this an ideal starting point fo
4444
+
4545
[source,terminal]
4646
----
47-
oc get storageclass -o custom-columns=NAME:.metadata.name,PROVISIONER:.provisioner,DEFAULT:.metadata.annotations."storageclass\.kubernetes\.io/is-default-class"
47+
$ oc get storageclass -o custom-columns=NAME:.metadata.name,PROVISIONER:.provisioner,DEFAULT:.metadata.annotations."storageclass\.kubernetes\.io/is-default-class"
4848
----
4949
+
5050
* Optional: A second OpenShift cluster for multicloud demonstration.
@@ -58,59 +58,59 @@ public or private cloud by using https://console.redhat.com/openshift/create[Red
5858

5959
.Procedure
6060

61-
. Fork the https://github.com/validatedpatterns/multicloud-gitops[multicloud-gitops] repository on GitHub.
62-
. Clone the forked copy of this repository.
63-
+
64-
[source,terminal]
65-
----
66-
$ git clone [email protected]:your-username/multicloud-gitops.git
67-
----
61+
. From the https://github.com/validatedpatterns/multicloud-gitops[multicloud-gitops] repository on GitHub, click the Fork button.
6862

69-
. Create a local copy of the secret values file that can safely include credentials. Run the following commands:
63+
. Clone the forked copy of this repository by running the following command.
7064
+
7165
[source,terminal]
7266
----
73-
$ cp values-secret.yaml.template ~/values-secret-multicloud-gitops.yaml
67+
$ git clone [email protected]:<your-username>/multicloud-gitops.git
7468
----
69+
70+
. Run the following command to set the upstream repository:
7571
+
7672
[source,terminal]
7773
----
78-
$ vi ~/values-secret-multicloud-gitops.yaml
74+
$ git remote add -f upstream [email protected]/validatedpatterns/multicloud-gitops.git
7975
----
80-
+
81-
[WARNING]
82-
====
83-
Do not commit this file. You do not want to push personal credentials to GitHub. If you do not want to customize the secrets, these steps are not needed. The framework generates a random password for the `config-demo` application.
84-
====
8576

86-
. Customize the deployment for your cluster. Run the following command:
77+
. Verify the setup of your remote repositories by running the following command:
8778
+
8879
[source,terminal]
8980
----
90-
$ git checkout -b my-branch
81+
$ git remote -v
9182
----
9283
+
93-
[source,terminal]
94-
----
95-
$ vi values-global.yaml
96-
----
84+
.Example output
9785
+
9886
[source,terminal]
9987
----
100-
$ git add values-global.yaml
88+
origin [email protected]:<your-username>/multicloud-gitops.git (fetch)
89+
origin [email protected]:<your-username>/multicloud-gitops.git (push)
90+
upstream https://github.com/validatedpatterns/multicloud-gitops.git (fetch)
91+
upstream https://github.com/validatedpatterns/multicloud-gitops.git (push)
10192
----
93+
94+
. Create a local copy of the secret values file that can safely include credentials. Run the following commands:
10295
+
10396
[source,terminal]
10497
----
105-
$ git commit values-global.yaml
98+
$ cp values-secret.yaml.template ~/values-secret-multicloud-gitops.yaml
10699
----
100+
101+
. Push your local branch named `my-branch` to the remote repository specified by origin by running the following command:
107102
+
108103
[source,terminal]
109104
----
110105
$ git push origin my-branch
111106
----
107+
+
108+
[NOTE]
109+
====
110+
The idea of creating a local branch and pushing this to origin allows you scope to customize the base Multicloud GitOps.
111+
====
112112

113-
You can install the Multicloud GitOps pattern by using the web console or from command line.
113+
You can proceed to install the Multicloud GitOps pattern by using the web console or from command line.
114114

115115
To install the Multicloud GitOps pattern by using the the web console you must first install the Validated Patterns Operator. The Validated Patterns Operator installs and manages Validated Patterns.
116116

@@ -119,7 +119,7 @@ To install the Multicloud GitOps pattern by using the the web console you must f
119119
== Installing the {validated-patterns-op}
120120

121121
.Prerequisites
122-
* Access to an {ocp} cluster using an account with cluster-admin permissions.
122+
* Access to an {ocp} cluster using an account with `cluster-admin` permissions.
123123

124124
.Procedure
125125

@@ -184,7 +184,6 @@ To know the cluster group name for the patterns that you want to deploy, check t
184184
. Leave *In Cluster Git Server* unchanged.
185185
.. Change the *Target Repo* URL to your forked repository URL. For example, change `+https://github.com/validatedpatterns/<pattern_name>+` to `+https://github.com/<your-git-username>/<pattern-name>+`
186186
.. Optional: You might need to change the *Target Revision* field. The default value is `HEAD`. However, you can also provide a value for a branch, tag, or commit that you want to deploy. For example, `v2.1`, `main`, or a branch that you created, `my-branch`.
187-
. Ensure that you have made any required changes to your `values-*.yaml` files locally and pushed them to your forked repository on the correct branch or target that you chose in the previous step.
188187
. Click *Create*.
189188

190189
.Verification
@@ -199,7 +198,7 @@ Verify that the *hello-world* application deployed successfully as follows:
199198

200199
. Select the *hello-world* *Project*.
201200

202-
. Click on the *Location URL*. THis should reveal:
201+
. Click on the *Location URL*. This should reveal the following:
203202
+
204203
[source,terminal]
205204
----
@@ -250,8 +249,3 @@ image::multicloud-gitops/multicloud-gitops-argocd.png[Multicloud GitOps Hub]
250249

251250

252251
As part of this pattern, HashiCorp Vault has been installed. Refer to the section on https://validatedpatterns.io/secrets/vault/[Vault].
253-
254-
255-
You can use the {validated-patterns-op} to install and manage {solution-name-upstream}. Use the {hybrid-console-first} to install the {validated-patterns-op}. After installing the Operator, you can create an instance where you can specify the details for your pattern. The {validated-patterns-op} then installs and manages the required assets and artifacts that the pattern requires.
256-
257-

0 commit comments

Comments
 (0)