From 77e207f98aaf4319bf79d45dd195668f1d32d01a Mon Sep 17 00:00:00 2001 From: Bryan Kribbs Date: Thu, 25 Jul 2024 11:20:06 -0500 Subject: [PATCH] Link Fixes --- docs/devops/argocd/index.md | 13 +- docs/devops/ibm-toolchain/index.md | 5 +- .../Tekton_Success.png | Bin docs/devops/tekton/index.md | 6 +- .../containers/container-registry/index.md | 17 +- docs/labs/devops/argocd/index.md | 4 +- docs/labs/devops/index.md | 6 - docs/labs/devops/tekton/index.md | 4 +- docs/labs/index.md | 16 +- docs/labs/kubernetes/index.md | 17 - docs/labs/kubernetes/solutions/index.md | 351 ------------------ docs/openshift/operators/operators.md | 2 +- docs/openshift/pods/jobs/index.md | 4 +- docs/prerequisites.md | 52 +-- mkdocs.yml | 16 +- 15 files changed, 60 insertions(+), 453 deletions(-) rename docs/devops/{ibm-toolchain => images}/Tekton_Success.png (100%) delete mode 100644 docs/labs/devops/index.md delete mode 100644 docs/labs/kubernetes/index.md delete mode 100644 docs/labs/kubernetes/solutions/index.md diff --git a/docs/devops/argocd/index.md b/docs/devops/argocd/index.md index 723fb6e..206d683 100644 --- a/docs/devops/argocd/index.md +++ b/docs/devops/argocd/index.md @@ -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. diff --git a/docs/devops/ibm-toolchain/index.md b/docs/devops/ibm-toolchain/index.md index 2b9d4d9..dd351bd 100644 --- a/docs/devops/ibm-toolchain/index.md +++ b/docs/devops/ibm-toolchain/index.md @@ -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. diff --git a/docs/devops/ibm-toolchain/Tekton_Success.png b/docs/devops/images/Tekton_Success.png similarity index 100% rename from docs/devops/ibm-toolchain/Tekton_Success.png rename to docs/devops/images/Tekton_Success.png diff --git a/docs/devops/tekton/index.md b/docs/devops/tekton/index.md index a57d434..1774714 100644 --- a/docs/devops/tekton/index.md +++ b/docs/devops/tekton/index.md @@ -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. diff --git a/docs/labs/containers/container-registry/index.md b/docs/labs/containers/container-registry/index.md index 5e21c8b..6e951e2 100644 --- a/docs/labs/containers/container-registry/index.md +++ b/docs/labs/containers/container-registry/index.md @@ -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 @@ -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** ``` @@ -35,8 +32,8 @@ In this lab we are going to create a Container Image and store it in the [IBM Cl export 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/ @@ -89,7 +86,7 @@ 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) @@ -97,7 +94,7 @@ In this lab we are going to create a Container Image and store it in the [IBM Cl ![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 diff --git a/docs/labs/devops/argocd/index.md b/docs/labs/devops/argocd/index.md index e9af3b6..3121440 100644 --- a/docs/labs/devops/argocd/index.md +++ b/docs/labs/devops/argocd/index.md @@ -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 @@ -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 diff --git a/docs/labs/devops/index.md b/docs/labs/devops/index.md deleted file mode 100644 index 19986f3..0000000 --- a/docs/labs/devops/index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: DevOps Labs -description: DevOps Labs ---- - -DevOps Labs diff --git a/docs/labs/devops/tekton/index.md b/docs/labs/devops/tekton/index.md index 597f48b..cd9c3c2 100644 --- a/docs/labs/devops/tekton/index.md +++ b/docs/labs/devops/tekton/index.md @@ -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 @@ -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 diff --git a/docs/labs/index.md b/docs/labs/index.md index 39f17a2..e33758c 100644 --- a/docs/labs/index.md +++ b/docs/labs/index.md @@ -3,7 +3,7 @@ | 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) | @@ -11,7 +11,7 @@ | 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) | @@ -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) | @@ -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) | diff --git a/docs/labs/kubernetes/index.md b/docs/labs/kubernetes/index.md deleted file mode 100644 index 1b73c26..0000000 --- a/docs/labs/kubernetes/index.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: Kubernetes/Openshift Labs -description: Kubernetes/Openshift Labs ---- - -[Lab 1 - Pod Creation](labs/kubernetes/lab1/index.md) \ -[Lab 2 - Pod Configuration](labs/kubernetes/lab2/index.md) \ -[Lab 3 - Multiple Containers](labs/kubernetes/lab3/index.md) \ -[Lab 4 - Probes](labs/kubernetes/lab4/index.md) \ -[Lab 5 - Debugging](labs/kubernetes/lab5/index.md) \ -[Lab 6 - Rolling Updates](labs/kubernetes/lab6/index.md) \ -[Lab 7 - Cron Jobs](labs/kubernetes/lab7/index.md) \ -[Lab 8 - Creating Services](labs/kubernetes/lab8/index.md) \ -[Lab 9 - Network Policies](labs/kubernetes/lab9/index.md) \ -[Lab 10 - Persistent Volumes](labs/kubernetes/lab10/index.md) \ -[Lab 11 - Ingress IKS](labs/kubernetes/ingress-iks/index.md) \ -[Solutions](labs/kubernetes/lab-solutions.md) \ \ No newline at end of file diff --git a/docs/labs/kubernetes/solutions/index.md b/docs/labs/kubernetes/solutions/index.md deleted file mode 100644 index cf6b5d8..0000000 --- a/docs/labs/kubernetes/solutions/index.md +++ /dev/null @@ -1,351 +0,0 @@ ---- -title: Kubernetes Lab Solutions -description: Solutions for Kubernetes Labs ---- -# Solutions - - - - - - apiVersion: v1 - kind: Pod - metadata: - name: nginx - namespace: web - spec: - containers: - - name: nginx - image: nginx - command: ["nginx"] - args: ["-g", "daemon off;", "-q"] - ports: - - containerPort: 80 - - - - - - kubectl create sa yoda-svc - ------------------------- - - apiVersion: v1 - kind: ConfigMap - metadata: - name: yoda-service-config - data: - yoda.cfg: |- - yoda.baby.power=100000000 - yoda.strength=10 - ------------------------- - - apiVersion: v1 - kind: Secret - metadata: - name: yoda-db-password - stringData: - password: 0penSh1ftRul3s! - ------------------------- - - apiVersion: v1 - kind: Pod - metadata: - name: yoda-service - spec: - serviceAccountName: yoda-svc - containers: - - name: yoda-service - image: bitnami/nginx - volumeMounts: - - name: config-volume - mountPath: /etc/yoda-service - env: - - name: DB_PASSWORD - valueFrom: - secretKeyRef: - name: yoda-db-password - key: password - resources: - requests: - memory: "64Mi" - cpu: "250m" - limits: - memory: "128Mi" - cpu: "500m" - volumes: - - name: config-volume - configMap: - name: yoda-service-config - - - - - - apiVersion: v1 - kind: ConfigMap - metadata: - name: vader-service-ambassador-config - data: - haproxy.cfg: |- - global - daemon - maxconn 256 - - defaults - mode http - timeout connect 5000ms - timeout client 50000ms - timeout server 50000ms - - listen http-in - bind *:80 - server server1 127.0.0.1:8989 maxconn 32 - ------------------------- - - apiVersion: v1 - kind: Pod - metadata: - name: vader-service - spec: - containers: - - name: millennium-falcon - image: ibmcase/millennium-falcon:1 - - name: haproxy-ambassador - image: haproxy:1.7 - ports: - - containerPort: 80 - volumeMounts: - - name: config-volume - mountPath: /usr/local/etc/haproxy - volumes: - - name: config-volume - configMap: - name: vader-service-ambassador-config - ------------------------- - - apiVersion: v1 - kind: Pod - metadata: - name: busybox - spec: - containers: - - name: myapp-container - image: radial/busyboxplus:curl - command: ['sh', '-c', 'while true; do sleep 3600; done'] - - Check it with - - kubectl exec busybox -- curl $(kubectl get pod vader-service -o=jsonpath='{.status.podIP}'):80 - - - - - - apiVersion: v1 - kind: Pod - metadata: - name: energy-shield-service - spec: - containers: - - name: energy-shield - image: ibmcase/energy-shield:1 - livenessProbe: - httpGet: - path: /healthz - port: 8080 - readinessProbe: - httpGet: - path: /ready - port: 8080 - initialDelaySeconds: 5 - - - - - - Check `STATUS` column for not Ready - - kubectl get pods --all-namespaces - - - Check the description of the deployment - - kubectl describe deployment hyper-drive - - Save logs for broken pod - - kubectl logs -n > /home/cloud_user/debug/broken-pod-logs.log - - In the deployment's description you will see the following is wrong: -
    -
  • Selector and Label names do not match.
  • -
  • The Probe is TCP instead of HTTP Get.
  • -
  • The Service Port is 80 instead of 8080.
  • -
- To fix probe, can't kubectl edit, need to delete and recreate the deployment - - kubectl get deployment -n -o yaml --export > hyper-drive.yml - - - Delete pod - - kubectl delete deployment -n - - Edit yaml, and apply - - kubectl apply -f hyper-drive.yml -n - - - Verify - - kubectl get deployment -n -
- - - - Update the deployment to the new version like so: - - kubectl set image deployment/jedi-deployment jedi-ws=bitnamy/nginx:1.18.1 --record - - Check the progress of the rolling update: - - kubectl rollout status deployment/jedi-deployment - - In another terminal window - - kubectl get pods -w - - Get a list of previous revisions. - - kubectl rollout history deployment/jedi-deployment - - Undo the last revision. - - kubectl rollout undo deployment/jedi-deployment - - Check the status of the rollout. - - kubectl rollout status deployment/jedi-deployment - - - - - - apiVersion: batch/v1beta1 - kind: CronJob - metadata: - name: xwing-cronjob - spec: - schedule: "*/1 * * * *" - jobTemplate: - spec: - template: - spec: - containers: - - name: xwing-status - image: ibmcase/xwing-status:1.0 - args: - - /usr/sbin/xwing-status.sh - restartPolicy: OnFailure - ------------------------- - - kubectl get cronjob xwing-cronjob - - - - - - apiVersion: v1 - kind: Service - metadata: - name: jedi-svc - spec: - type: NodePort - selector: - app: jedi - ports: - - protocol: TCP - port: 80 - targetPort: 8080 - ------------------------- - - apiVersion: v1 - kind: Service - metadata: - name: yoda-svc - spec: - type: ClusterIP - selector: - app: yoda - ports: - - protocol: TCP - port: 80 - targetPort: 8080 - - - - - - apiVersion: v1 - kind: PersistentVolume - metadata: - name: postgresql-pv - spec: - storageClassName: localdisk - capacity: - storage: 1Gi - accessModes: - - ReadWriteOnce - hostPath: - path: "/mnt/data" - ------------------------- - - apiVersion: v1 - kind: PersistentVolumeClaim - metadata: - name: postgresql-pv-claim - spec: - storageClassName: localdisk - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 500Mi - ------------------------- - - apiVersion: v1 - kind: Pod - metadata: - name: postgresql-pod - spec: - containers: - - name: postgresql - image: bitnami/postgresql - ports: - - containerPort: 5432 - env: - - name: MYSQL_ROOT_PASSWORD - value: password - volumeMounts: - - name: sql-storage - mountPath: /bitnami/postgresql/ - volumes: - - name: sql-storage - persistentVolumeClaim: - claimName: postgresql-pv-claim - ------------------------- - - - -
- diff --git a/docs/openshift/operators/operators.md b/docs/openshift/operators/operators.md index 8f93a8f..0cd6cee 100644 --- a/docs/openshift/operators/operators.md +++ b/docs/openshift/operators/operators.md @@ -1,3 +1,3 @@ # Operators -## Coming Soon \ No newline at end of file +Operators in Openshift are... \ No newline at end of file diff --git a/docs/openshift/pods/jobs/index.md b/docs/openshift/pods/jobs/index.md index b1a65d3..7aa36d9 100644 --- a/docs/openshift/pods/jobs/index.md +++ b/docs/openshift/pods/jobs/index.md @@ -154,5 +154,5 @@ spec: | Task | Description | Link | | --------------------------------| ------------------ |:----------- | | ***Try It Yourself*** | | | -| Rolling Updates Lab | Create a Rolling Update for your application. | [Rolling Updates](../kube-overview/activities/labs/lab6) | -| Cron Jobs Lab | Using Tekton to test new versions of applications. | [Crons Jobs](../kube-overview/activities/labs/lab7) | +| Rolling Updates Lab | Create a Rolling Update for your application. | [Rolling Updates](../../../labs/kubernetes/lab6/index.md) | +| Cron Jobs Lab | Using Tekton to test new versions of applications. | [Crons Jobs](../../../labs/kubernetes/lab7/index.md) | diff --git a/docs/prerequisites.md b/docs/prerequisites.md index 7b7933e..be08b3d 100644 --- a/docs/prerequisites.md +++ b/docs/prerequisites.md @@ -2,7 +2,7 @@ ## Required skills -This activites contained here require you to be proficient in working from the command line with a linux shell (Bash, Zsh, etc.) Below is a partial list of activites you should be able to perform. +This activities contained here require you to be proficient in working from the command line with a linux shell (Bash, Zsh, etc.) Below is a partial list of activities you should be able to perform. - Copy, move, and rename files - Understand linux file permissions @@ -56,14 +56,10 @@ Here is a course for learning (or brushing up) on working from the linux command curl -sL https://ibm.biz/idt-installer | bash ``` - + !!! Note + If you log in to the web UI using SSO, you'll need to [create an API key](https://cloud.ibm.com/docs/iam?topic=iam-federated_id) for logging into the CLI. - ** Note: ** If you log in to the web UI using SSO, you'll need to [create an API key](https://cloud.ibm.com/docs/iam?topic=iam-federated_id) for logging into the CLI. - You can also use this API key for [installing the Developer Tools environment](/admin/installation-ibm-cloud). - - - - - [Docker Desktop](https://www.docker.com/products/docker-desktop): Required for building and running docker images. + - [Podman Desktop](https://podman-desktop.io/): Required for building and running container images. - Installed and running on your local machine - [Tekton CLI](https://github.com/tektoncd/cli): Used to help control Tekton @@ -80,14 +76,6 @@ Here is a course for learning (or brushing up) on working from the linux command - [JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/jdk11-downloads-5066655.html): _Optional_ installed on your local machine - Used for SpringBoot content - - [OpenShift CodeReady Containers (CRC)](https://code-ready.github.io/crc/#installing-codeready-containers_gsg) - - - - **Warning:** Make sure you have Cisco VPN turned off when using CRC. - - - === "Openshift (Windows)" @@ -121,14 +109,10 @@ Here is a course for learning (or brushing up) on working from the linux command curl -sL https://ibm.biz/idt-installer | bash ``` - - - ** Note: ** If you log in to the web UI using SSO, you'll need to [create an API key](https://cloud.ibm.com/docs/iam?topic=iam-federated_id) for logging into the CLI. - You can also use this API key for [installing the Developer Tools environment](/admin/installation-ibm-cloud). + !!! Note + If you log in to the web UI using SSO, you'll need to [create an API key](https://cloud.ibm.com/docs/iam?topic=iam-federated_id) for logging into the CLI. - - - - [Docker Desktop](https://www.docker.com/products/docker-desktop): Required for building and running docker images. + - [Podman Desktop](https://podman-desktop.io/): Required for building and running container images. - Installed and running on your local machine - [Tekton CLI](https://github.com/tektoncd/cli): Used to help control Tekton pipelines from the command line. @@ -189,14 +173,11 @@ Here is a course for learning (or brushing up) on working from the linux command curl -sL https://ibm.biz/idt-installer | bash ``` - - - ** Note: ** If you log in to the web UI using SSO, you'll need to [create an API key](https://cloud.ibm.com/docs/iam?topic=iam-federated_id) for logging into the CLI. - You can also use this API key for [installing the Developer Tools environment](/admin/installation-ibm-cloud). + !!! Note + If you log in to the web UI using SSO, you'll need to [create an API key](https://cloud.ibm.com/docs/iam?topic=iam-federated_id) for logging into the CLI. + - - - - [Docker Desktop](https://www.docker.com/products/docker-desktop): Required for building and running docker images. + - [Podman Desktop](https://podman-desktop.io/): Required for building and running container images. - Installed and running on your local machine - [Tekton CLI](https://github.com/tektoncd/cli): Used to help control Tekton @@ -251,14 +232,11 @@ Here is a course for learning (or brushing up) on working from the linux command curl -sL https://ibm.biz/idt-installer | bash ``` - + !!! Note + If you log in to the web UI using SSO, you'll need to [create an API key](https://cloud.ibm.com/docs/iam?topic=iam-federated_id) for logging into the CLI. - ** Note: ** If you log in to the web UI using SSO, you'll need to [create an API key](https://cloud.ibm.com/docs/iam?topic=iam-federated_id) for logging into the CLI. - You can also use this API key for [installing the Developer Tools environment](/admin/installation-ibm-cloud). - - - - [Docker Desktop](https://www.docker.com/products/docker-desktop): Required for building and running docker images. + - [Podman Desktop](https://podman-desktop.io/): Required for building and running container images. - Installed and running on your local machine - [Tekton CLI](https://github.com/tektoncd/cli): Used to help control Tekton @@ -360,4 +338,4 @@ Here is a course for learning (or brushing up) on working from the linux command ## Next Steps -Once Setup is complete, you can now begin reading our about [Cloud Native](../concepts/cloud-native) by clicking the link, or the `Next` button below. +Once Setup is complete, you can now begin reading our about [Cloud Native](../cloud-native) by clicking the link, or the `Next` button below. diff --git a/mkdocs.yml b/mkdocs.yml index d4941b6..c467e0f 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -37,10 +37,12 @@ extra_css: markdown_extensions: - attr_list + - admonition + - pymdownx.details - footnotes - pymdownx.emoji: - emoji_index: !!python/name:materialx.emoji.twemoji - emoji_generator: !!python/name:materialx.emoji.to_svg + emoji_index: !!python/name:material.extensions.emoji.twemoji + emoji_generator: !!python/name:material.extensions.emoji.to_svg - md_in_html - pymdownx.superfences - pymdownx.tabbed: @@ -67,6 +69,10 @@ nav: - containers/index.md - References: containers/reference.md - Image Registries: containers/imageregistry.md + - Activities/Labs: + - labs/index.md + - Docker: labs/containers/index.md + - Container Registries: labs/containers/container-registry/index.md -
Kubernetes/OpenShift
: - openshift/index.md -
API Primatives
: openshift/core-concepts/index.md @@ -96,11 +102,15 @@ nav: - openshift/state-persistence/index.md -
Volumes
: openshift/state-persistence/volumes.md -
Persistent Volumes & Claims
: openshift/state-persistence/pv-pvc.md + -
Operators
: + - openshift/operators/operators.md + - DevOps/GitOps: - devops/index.md -
Continuous Integration
: - devops/tekton/index.md - - Tekton: devops/tekton/index.md + -
Tekton
: devops/tekton/index.md + -
IBM ToolChain
: devops/ibm-toolchain/index.md -
Continuous Deployment
: - devops/argocd/index.md - ArgoCD: devops/argocd/index.md