Skip to content

Commit

Permalink
Link Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
bkribbs15 committed Jul 25, 2024
1 parent 6432619 commit 77e207f
Show file tree
Hide file tree
Showing 15 changed files with 60 additions and 453 deletions.
13 changes: 6 additions & 7 deletions docs/devops/argocd/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,20 @@ configuration so that teams can benefit from the same assurance as they do for t
## ArgoCD Overview
## Presentations

[GitOps Overview :fontawesome-regular-file-pdf:](./materials/05-Understanding-GitOps.pdf){ .md-button target=_blank}
[GitOps Overview :fontawesome-regular-file-pdf:](../materials/05-Understanding-GitOps.pdf){ .md-button target=_blank}

## Activities

These activites give you a chance to walkthrough building CD pipelines using ArgoCD.
These activities give you a chance to walkthrough building CD pipelines using ArgoCD.

These tasks assume that you have:
- Reviewed the Continuous Deployment concept page.

| Task | Description | Link | Time |
| --------------------------------| ------------------ |:----------- |---------|
| *** Walkthroughs *** | | | |
| GitOps | Introduction to GitOps with OpenShift | [Learn OpenShift](https://learn.openshift.com/introduction/gitops-introduction/){:target="_blank"} | 20 min |
| GitOps Multi-cluster | Multi-cluster GitOps with OpenShift | [Learn OpenShift](https://learn.openshift.com/introduction/gitops-multicluster/){:target="_blank"} | 20 min |
| *** Try It Yourself *** | | | |
| ArgoCD Lab | Learn how to setup ArgoCD and Deploy Application | [ArgoCD](../../labs/devops/argocd/) | 30 min |
| ***Walkthroughs*** | | | |
| GitOps | Introduction to GitOps with OpenShift | [Learn OpenShift GitOps](https://docs.openshift.com/gitops/1.13/understanding_openshift_gitops/about-redhat-openshift-gitops.html){:target="_blank"} | 20 min |
| ***Try It Yourself*** | | | |
| ArgoCD Lab | Learn how to setup ArgoCD and Deploy Application | [ArgoCD](../../labs/devops/argocd/index.md) | 30 min |

Once you have completed these tasks, you will have created an ArgoCD deployment and have an understanding of Continuous Deployment.
5 changes: 1 addition & 4 deletions docs/devops/ibm-toolchain/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
---
title: IBM Cloud DevOps with Tekton
description: Lab for continuous integration using Tekton on IBM Cloud DevOps
---
# IBM ToolChain

By following this tutorial, you create an open toolchain that includes a Tekton-based delivery pipeline. You then use the toolchain and DevOps practices to develop a simple "Hello World" web application (app) that you deploy to the IBM Cloud Kubernetes Service.

Expand Down
File renamed without changes
6 changes: 3 additions & 3 deletions docs/devops/tekton/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ These tasks assume that you have:
| ***Walkthroughs*** | | | |
| Deploying Applications From Source | Using OpenShift 4 | [S2I](https://learn.openshift.com/introduction/deploying-python/){:target="_blank"} | 30 min |
| ***Try It Yourself*** | | | |
| Tekton Lab | Using Tekton to build container images | [Tekton](labs/openshift.md) | 1 hour |
| IBM Cloud DevOps | Using IBM Cloud ToolChain with Tekton | [Tekton on IBM Cloud](../continuous-integration/activities/ibm-toolchain){:target="_blank"} | 1 hour |
| Jenkins Lab | Using Jenkins to build and deploy applications. | [Jenkins](../continuous-integration/activities/jenkins/openshift){:target="_blank"} | 1 hour |
| Tekton Lab | Using Tekton to build container images | [Tekton](../../labs/devops/tekton/index.md) | 1 hour |
| IBM Cloud DevOps | Using IBM Cloud ToolChain with Tekton | [Tekton on IBM Cloud](../../labs/devops/ibm-toolchain/index.md){:target="_blank"} | 1 hour |
| Jenkins Lab | Using Jenkins to build and deploy applications. | [Jenkins](../../labs/devops/jenkins/index.md){:target="_blank"} | 1 hour |

Once you have completed these tasks, you will have an understanding of continuous integration and how to use Tekton to build a pipeline.
17 changes: 7 additions & 10 deletions docs/labs/containers/container-registry/index.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
---
title: Lab - IBM Cloud Container Registry
description: Lab - IBM Cloud Container Registry
---
# IBM Container Registries

In this lab we are going to create a Container Image and store it in the [IBM Cloud Container Registry](https://cloud.ibm.com/docs/Registry?topic=Registry-registry_overview)

### Prerequisites
## Prerequisites
- IBM Cloud Account

### Login into IBM Cloud
Expand All @@ -20,7 +17,7 @@ In this lab we are going to create a Container Image and store it in the [IBM Cl
![ibm cloud shell prompt](../images/ibmcloud-shell-prompt.png)


### Create a new Container Registry namespace
## Create a new Container Registry namespace

1. Ensure that you're targeting the correct IBM Cloud Container Registry region. For example for Dallas region use **us-south**
```
Expand All @@ -35,8 +32,8 @@ In this lab we are going to create a Container Image and store it in the [IBM Cl
export NAMESPACE=<my_namespace>
```

### Building and Pusing a Container Image
1. Clone the folowwing git repository and change directory to `1-containers`
## Building and Pushing a Container Image
1. Clone the following git repository and change directory to `1-containers`
```
git clone --depth 1 https://github.com/csantanapr/think2020-nodejs.git my-app
cd my-app/1-containers/
Expand Down Expand Up @@ -89,15 +86,15 @@ In this lab we are going to create a Container Image and store it in the [IBM Cl
ibmcloud cr build --tag us.icr.io/$NAMESPACE/my-app:1.0 ./
```

### Explore the Container Registry on the IBM Cloud Console
## Explore the Container Registry on the IBM Cloud Console
1. Explore the container image details using the IBM Cloud Console. Go to the Main Menu->Kubernetes->Registry you can use the tabs `Namespaces`, `Repository`, `Images`
![cr namespace](../images/cr-namespaces.png)
![cr namespace](../images/cr-repositories.png)
![cr namespace](../images/cr-images.png)
![cr namespace](../images/cr-settings.png)


### Extra Credit (Run Imge on Kubernetes)
## Extra Credit (Run Imge on Kubernetes)

If you have a Kubernetes Cluster you can run your application image

Expand Down
4 changes: 2 additions & 2 deletions docs/labs/devops/argocd/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

Make sure your environment is setup properly for the lab.

Check the [Environment Setup](../prerequisites/#environment-setup) page for your setup.
Check the [Environment Setup](../../../prerequisites.md#environment-setup) page for your setup.

### ArgoCD Installation

Expand Down Expand Up @@ -199,7 +199,7 @@

Make sure your environment is setup properly for the lab.

Check the [Environment Setup](../prerequisites/#environment-setup) page for your setup.
Check the [Environment Setup](../../../prerequisites.md#environment-setup) page for your setup.

### ArgoCD Installation

Expand Down
6 changes: 0 additions & 6 deletions docs/labs/devops/index.md

This file was deleted.

4 changes: 2 additions & 2 deletions docs/labs/devops/tekton/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Make sure your environment is properly setup.

Follow the instructions [here](../../prerequisites#environment-setup)
Follow the instructions [here](../../../prerequisites.md#environment-setup)

## SetUp

Expand Down Expand Up @@ -445,7 +445,7 @@

Make sure your environment is properly setup.

Follow the instructions [here](../../prerequisites#environment-setup)
Follow the instructions [here](../../../prerequisites.md#environment-setup)

## SetUp

Expand Down
16 changes: 8 additions & 8 deletions docs/labs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

| Task | Description | Link |
| --------------------------------| ------------------ |:----------- |
| *** Try It Yourself *** | | |
| ***Try It Yourself*** | | |
| IBM Container Registry | Build and Deploy Run using IBM Container Registry | [IBM Container Registry](containers/container-registry/index.md) |
| Docker Lab | Running a Sample Application on Docker | [Docker Lab](containers/index.md) |

## Kubernetes

| Task | Description | Link |
| --------------------------------| ------------------ |:----------- |
| *** Try It Yourself *** | | |
| ***Try It Yourself*** | | |
| Pod Creation | Challenge yourself to create a Pod YAML file to meet certain parameters. | [Pod Creation](kubernetes/lab1/index.md) |
| Pod Configuration | Configure a pod to meet compute resource requirements. | [Pod Configuration](kubernetes/lab2/index.md) |
| Multiple Containers | Build a container using legacy container image.| [Multiple Containers](kubernetes/lab3/index.md) |
Expand All @@ -22,16 +22,16 @@
| Creating Services | Create two services with certain requirements. | [Setting up Services](kubernetes/lab8/index.md) |
| Setting up Persistent Volumes | Create a Persistent Volume that's accessible from a SQL Pod. | [Setting up Persistent Volumes](kubernetes/lab10/index.md) |
| IKS Ingress Controller | Configure Ingress on Free IKS Cluster | [Setting IKS Ingress](kubernetes/ingress-iks/index.md) |
| *** Solutions *** | | |
| ***Solutions*** | | |
| Lab Solutions | Solutions for the Kubernetes Labs | [Solutions](kubernetes/lab-solutions.md) |

## Continuous Integration

| Task | Description | Link |
| --------------------------------| ------------------ |:----------- |
| *** Walkthroughs *** | | |
| ***Walkthroughs*** | | |
| Deploying Applications From Source | Using OpenShift 4 | [S2I](https://learn.openshift.com/introduction/deploying-python/) |
| *** Try It Yourself *** | | |
| ***Try It Yourself*** | | |
| Tekton Lab | Using Tekton to test new versions of applications. | [Tekton](devops/tekton/index.md) |
| IBM Cloud DevOps | Using IBM Cloud ToolChain with Tekton | [Tekton on IBM Cloud](devops/ibm-toolchain/index.md) |
| Jenkins Lab | Using Jenkins to test new versions of applications. | [Jenkins](devops/jenkins/index.md) |
Expand All @@ -40,15 +40,15 @@

| Task | Description | Link |
| --------------------------------| ------------------ |:----------- |
| *** Walkthroughs *** | | | |
| ***Walkthroughs*** | | | |
| GitOps | Introduction to GitOps with OpenShift | [Learn OpenShift](https://learn.openshift.com/introduction/gitops-introduction/) |
| GitOps Multi-cluster | Multi-cluster GitOps with OpenShift | [Learn OpenShift](https://learn.openshift.com/introduction/gitops-multicluster/) |
| *** Try It Yourself *** | | |
| ***Try It Yourself*** | | |
| ArgoCD Lab | Learn how to setup ArgoCD and Deploy Application | [ArgoCD](devops/argocd/index.md) |

## Projects

| Task | Description | Link |
| --------------------------------| ------------------ |:----------- |
| *** Try It Yourself *** | | |
| ***Try It Yourself*** | | |
| Cloud Native Challenge | Deploy your own app using what we have learned | [CN Challenge](../cloudnative-challenge.md) |
17 changes: 0 additions & 17 deletions docs/labs/kubernetes/index.md

This file was deleted.

Loading

0 comments on commit 77e207f

Please sign in to comment.