Skip to content

Commit

Permalink
doc: update app cicd section and add image
Browse files Browse the repository at this point in the history
  • Loading branch information
evanshortiss committed May 17, 2023
1 parent 186567f commit 525685d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/modules/m5-ci-cd/pages/ci.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Making a Code Change and Triggering the Continuous Integration (CI) Process

Nice work on getting the application deployed on OpenShift! Now you'll make a change to the application's dev environment configuration, verify it passes CI, merge the change into the `main` branch and watch as Argo CD detects and applies the new change.
Nice work on getting the application deployed on OpenShift! Now you'll make a change to the application's development environment configuration, verify it passes CI, merge the change into the `main` branch and watch as Argo CD detects and applies the new change.

. Head over to your copy of the random-meme application repository: https://github.com/%USERID%/rht-summit-2023-sample-application[github.com/%USERID%/rht-summit-2023-sample-application].
. Use the period/dot key as a shortcut to open the GitHub IDE.
Expand Down
8 changes: 4 additions & 4 deletions docs/modules/m5-ci-cd/pages/deploy.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

👨‍💻 _Role: Developer_

The moment of truth! Time to stretch your developer legs as the `foo` user, and have Argo CD continuously deploy an application of yours into the development environment that was setup in prior sections.
In this section you're no longer acting as a cluster administrator, but are instead playing the role of a developer. Time to stretch your developer legs as the `foo` user, and have Argo CD continuously deploy an application of yours into the development environment that was setup in prior sections.

In this section you're no longer acting as a cluster administrator, but are instead acting playing the role of the `foo` developer that you've been configuring access for up to this point.
The application you'll be using can be found at https://github.com/evanshortiss/rht-summit-2023-sample-application[github.com/evanshortiss/rht-summit-2023-sample-application]. This repository contains a simple web application that renders a web page containing a randomly chosen meme. The repository also contains a set of resources in the _k8s/_ directory that will be used to deploy the application on OpenShift. You're going to deploy this application into the `project-memes-dev` namespace, then make an update to the application Git repository that runs a CI pipeline, and observe how Argo CD detects the new changes and automatically deploys them to complete the CI/CD flow.

For this section of the workshop you'll be using https://github.com/evanshortiss/rht-summit-2023-sample-application[this repository on GitHub]. The linked repository contains a simple web application that renders a web page containing a randomly chosen meme. The repository also contains a set of resources in the _k8s/_ directory that will be used to deploy the application on OpenShift. You're going to deploy this application into the `project-memes-dev` namespace, then make an update to the application Git repository that runs a CI pipeline, and observe how Argo CD detects the new changes and automatically deploys them to complete the CI/CD flow.
image:ex8.architecture.png[]

[NOTE]
====
Separating the OpenShift/Kubernetes resources and source code for an application into separate repositories is a common approach. To reduce the number of repositories you need to manage this workshop has placed both the source code and OpenShift/Kubernetes resources in this one repository.
Separating the OpenShift/Kubernetes resources and source code for an application into separate repositories is a common approach. To reduce the number of repositories you need to manage this workshop has placed both the source code and OpenShift/Kubernetes resources together in a single repository.
====

== Login to Argo CD as a Developer User
Expand Down

0 comments on commit 525685d

Please sign in to comment.