Skip to content

Commit cd11932

Browse files
committed
Adding secret example configuration 6
1 parent e2eeac4 commit cd11932

File tree

2 files changed

+31
-33
lines changed

2 files changed

+31
-33
lines changed

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ Other patterns build upon these concepts, making this an ideal starting point fo
4747
$ oc get storageclass -o custom-columns=NAME:.metadata.name,PROVISIONER:.provisioner,DEFAULT:.metadata.annotations."storageclass\.kubernetes\.io/is-default-class"
4848
----
4949
+
50+
.Example output
51+
+
52+
[source,terminal]
53+
----
54+
NAME PROVISIONER DEFAULT
55+
gp2-csi ebs.csi.aws.com <none>
56+
gp3-csi ebs.csi.aws.com true
57+
58+
----
59+
5060
* Optional: A second OpenShift cluster for multicloud demonstration.
5161
//Replaced git and podman prereqs with the tooling dependencies page
5262
* https://validatedpatterns.io/learn/quickstart/[Install the tooling dependencies].
@@ -104,12 +114,13 @@ upstream https://github.com/validatedpatterns/multicloud-gitops.git (push)
104114
----
105115
$ cp values-secret.yaml.template ~/values-secret-multicloud-gitops.yaml
106116
----
117+
+
107118
[NOTE]
108119
====
109120
The `values-secret.yaml` file is placed in your home directory so that it does not get pushed to your git repository. It is based on the `values-secrets.yaml.template` file provided by the pattern in the top level directory. When you create your own patterns you will add your secrets to this file and save. At the moment the focus is on getting started abd familiar with this base Multicloud GitOps pattern.
110121
====
111122

112-
. Create a new feature branch, for example `my-branch` from the main branch for your content:
123+
. Create a new feature branch, for example `my-branch` from the `main` branch for your content:
113124
+
114125
[source,terminal]
115126
----
@@ -211,9 +222,9 @@ A pop up may throw up an error `"Oh no! Something went wrong`. It is safe to ign
211222

212223
The {rh-gitops} Operator displays in list of *Installed Operators*. The {rh-gitops} Operator installs the remaining assets and artifacts for this pattern. To view the installation of these assets and artifacts, such as {rh-rhacm-first}, ensure that you switch to *Project:All Projects*.
213224

214-
The `config-demo` project when viewed through the *Hub ArgoCD* UI from the nines menu is stuck in a `Degraded` state. This is the expected behavior when installing using the OpenShift Container Platform console.
225+
The `config-demo` project when viewed through the *Hub ArgoCD* UI from the nines menu is stuck in a `Degraded` state. This is the expected behavior when installing using the OpenShift Container Platform console.
215226

216-
* Run the following command to load the secrets into the vault:
227+
* To resolve this you need to run the following to load the secrets into the vault:
217228
+
218229
[source,terminal]
219230
----
@@ -226,7 +237,7 @@ You must have created a local copy of the secret values file by running the foll
226237
227238
[source,terminal]
228239
----
229-
$ ./pattern.sh make load-secrets
240+
$ cp values-secret.yaml.template ~/values-secret-multicloud-gitops.yaml
230241
----
231242
====
232243

@@ -301,5 +312,5 @@ Verify that the *config-demo* application deployed successfully as follows:
301312
----
302313
Hub Cluster domain is 'apps.aws-hub-cluster.openshift.org'
303314
Pod is running on Local Cluster Domain 'apps.aws-hub-cluster.openshift.org'
304-
The secret is secret
315+
The secret is `secret`
305316
----

content/learn/getting-started-secret-management.adoc

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ secrets:
110110
+
111111
[source,terminal]
112112
----
113-
./pattern.sh make load-secrets
113+
$ ./pattern.sh make load-secrets
114114
----
115115

116116
. Verify the secret in the Vault UI.
@@ -123,29 +123,6 @@ secrets:
123123

124124
.. Verify that the `mysecret` entry exists and contains the `foo` and `bar` fields with auto-generated values.
125125

126-
. Push the changes to your Fork:
127-
128-
.. Add the modified file to your Git repository:
129-
+
130-
[source,terminal]
131-
----
132-
$ git add -u
133-
----
134-
135-
.. Commit your changes:
136-
+
137-
[source,terminal]
138-
----
139-
$ git commit -m "Adding a Secret to Multicloud GitOps Pattern in config-demo"
140-
----
141-
142-
.. Push your branch to the origin of your fork:
143-
+
144-
[source,terminal]
145-
----
146-
$ git push origin my-branch
147-
----
148-
149126
=== Creating a new external secret in OpenShift GitOps
150127

151128
Follow these steps to create and deploy a new external secret in your GitOps repository.
@@ -239,8 +216,10 @@ $ git push origin my-branch
239216
. Ensure that ArgoCD is monitoring the `charts/all/config-demo` directory.
240217

241218
. Wait for ArgoCD to synchronize and apply the new changes. You can observe the synchronization status in the ArgoCD web UI.
219+
+
220+
The new `config-demo-mysecret` should be created and visible in the `config-demo` project, populated with the relevant data extracted from the Vault.
242221

243-
. Verify the Secret in the Cluster
222+
. Verify the secret in the Cluster:
244223

245224
.. Once ArgoCD has applied the changes, verify that the `config-demo-mysecret` has been created in the `config-demo` namespace:
246225
+
@@ -255,10 +234,18 @@ $ oc get secret config-demo-mysecret -n config-demo
255234
----
256235
$ oc describe secret config-demo-mysecret -n config-demo
257236
----
237+
+
238+
.Expected output
239+
+
240+
[source,terminal]
241+
----
242+
NAME TYPE DATA AGE
243+
config-demo-mysecret Opaque 1 25s
244+
----
258245

259-
== Outcome
260-
After completing these steps, the new `config-demo-mysecret` should be created and visible in the `config-demo` namespace, populated with the relevant data extracted from the Vault.
246+
.. In the OpenShift Container Platform web console, select the *config-demo* *Project*.
261247

248+
.. Select the *config-demo-mysecret* to review the secret details.
262249

263250
== Next Steps
264251

@@ -269,5 +256,5 @@ After completing these steps, the new `config-demo-mysecret` should be created a
269256

270257
[IMPORTANT]
271258
====
272-
Remember to consult the official documentation at validatedpatterns.io for detailed information about specific features and advanced configurations.
259+
Remember to consult the official documentation at link:https://validatedpatterns.io/[Validated Patterns] for detailed information about specific features and advanced configurations.
273260
====

0 commit comments

Comments
 (0)