diff --git a/content/learn/getting-started-multi-cloud-gitops.adoc b/content/learn/getting-started-multi-cloud-gitops.adoc index fad99b432..1e166ba63 100644 --- a/content/learn/getting-started-multi-cloud-gitops.adoc +++ b/content/learn/getting-started-multi-cloud-gitops.adoc @@ -110,13 +110,13 @@ $ git push origin my-branch The idea of creating a local branch and pushing this to origin allows you scope to customize the base Multicloud GitOps. ==== -You can proceed to install the Multicloud GitOps pattern by using the web console or from command line. +You can proceed to install the Multicloud GitOps pattern by using the web console or from command line by using the script `./pattern.sh` script. 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. //Include Procedure module here [id="installing-validated-patterns-operator_{context}"] -== Installing the {validated-patterns-op} +== Installing the {validated-patterns-op} using the web console .Prerequisites * Access to an {ocp} cluster using an account with `cluster-admin` permissions. @@ -186,58 +186,55 @@ To know the cluster group name for the patterns that you want to deploy, check t .. 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`. . Click *Create*. -.Verification - 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*. -The deployment will not take long but it should deploy successfully. - -Verify that the *hello-world* application deployed successfully as follows: - -. Navigate to the *Networking* -> *Routes* menu options. +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. -. Select the *hello-world* *Project*. - -. Click on the *Location URL*. This should reveal the following: +* Run the following command to load the secrets into the vault: + [source,terminal] ---- -Hello World! +$ /pattern.sh make load-secrets +---- ++ +[NOTE] +==== +You must have created a local copy of the secret values file by running the following command: -Hub Cluster domain is 'apps.aws-hub-cluster.openshift.org' -Pod is running on Local Cluster Domain 'apps.aws-hub-cluster.openshift.org' +[source,terminal] +---- +./pattern.sh make load-secrets ---- -+ -For more information about post-installation instructions for a pattern, see its _Getting started_ page. +==== -Alternatively you can deploy the Multicloud GitOps pattern by using the command line script `pattern.sh` +The deployment will not take long but it should deploy successfully. -. Deploy the pattern by running `./pattern.sh make install` or by using the link:/infrastructure/using-validated-pattern-operator/[Validated Patterns Operator]. +Alternatively you can deploy the Multicloud GitOps pattern by using the command line script `pattern.sh` [id="deploying-cluster-using-patternsh-file"] == Deploying the cluster by using the pattern.sh file To deploy the cluster by using the `pattern.sh` file, complete the following steps: -. Login to your cluster by running the following command: +. Log in to your cluster by running the following command: + [source,terminal] ---- - oc login +$ oc login ---- + Optional: Set the `KUBECONFIG` variable for the `kubeconfig` file path: + [source,terminal] ---- - export KUBECONFIG=~/ +$ export KUBECONFIG=~/ ---- . Deploy the pattern to your cluster. Run the following command: + [source,terminal] ---- - ./pattern.sh make install +$ ./pattern.sh make install ---- . Verify that the Operators have been installed. @@ -247,5 +244,39 @@ Optional: Set the `KUBECONFIG` variable for the `kubeconfig` file path: + image::multicloud-gitops/multicloud-gitops-argocd.png[Multicloud GitOps Hub] +As part of installing by using the script `pattern.sh` pattern, HashiCorp Vault is installed. the load-secrets makefile target. Running `./pattern.sh make install` also calls the `load-secrets` makefile target. This `load-secrets` target looks for a yaml file describing the secrets to be loaded into vault and in case it cannot find one it will use the `values-secret.yaml.template` file in the git repo to try and generate random secrets. + +For more information, see section on https://validatedpatterns.io/secrets/vault/[Vault]. + +.Verification -As part of this pattern, HashiCorp Vault has been installed. Refer to the section on https://validatedpatterns.io/secrets/vault/[Vault]. +Verify that the *hello-world* application deployed successfully as follows: + +. Navigate to the *Networking* -> *Routes* menu options. + +. Select the *hello-world* *Project*. + +. Click on the *Location URL*. This should reveal the following: ++ +[source,terminal] +---- +Hello World! + +Hub Cluster domain is 'apps.aws-hub-cluster.openshift.org' +Pod is running on Local Cluster Domain 'apps.aws-hub-cluster.openshift.org' +---- + +Verify that the *config-demo* application deployed successfully as follows: + +. Navigate to the *Networking* -> *Routes* menu options. + +. Select the *config-demo* *Project*. + +. Click on the *Location URL*. This should reveal the following: ++ +[source,terminal] +---- +Hub Cluster domain is 'apps.ci-ln-b7ib8bt-76ef8.aws-2.ci.openshift.org' +Pod is running on Local Cluster Domain 'apps.ci-ln-b7ib8bt-76ef8.aws-2.ci.openshift.org' +The secret is secret +----