diff --git a/Dockerfile b/Dockerfile index 35d70f6..3831f0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,9 @@ LABEL org.opencontainers.image.revision="$GITHUB_SHA" LABEL org.opencontainers.image.title="Summit 2023 GitOps Workshop Guide" LABEL org.opencontainers.image.description="A httpd container that serve the workshop guide." LABEL org.opencontainers.image.url="https://demo.redhat.com" -LABEL org.opencontainers.image.source="git@github.com:evanshortiss/rht-summit-2023-lab-guide" -LABEL org.opencontainers.image.documentation="https://github.com/evanshortiss/rht-summit-2023-lab-guide" -LABEL org.opencontainers.image.authors="evanshortiss" +LABEL org.opencontainers.image.source="git@github.com:redhat-scholars/summit-2023-gitops-lab-guide" +LABEL org.opencontainers.image.documentation="https://github.com/redhat-scholars/summit-2023-gitops-lab-guide" +LABEL org.opencontainers.image.authors="redhat-scholars" LABEL org.opencontainers.image.vendor="redhat" LABEL org.opencontainers.image.licenses="MIT" LABEL org.opencontainers.image.version="1.0.0" diff --git a/README.adoc b/README.adoc index d69d84c..1190d99 100644 --- a/README.adoc +++ b/README.adoc @@ -1,21 +1,23 @@ # Summit 2023 - GitOps Workshop Guide -## Local development +## Local Development + +Build and view the guide locally using Docker/Podman: [source,bash] ---- -podman build -t localhost/summit-2023-lab-guide . -podman run --rm --name guides -d -p 4000:8080 localhost/summit-2023-lab-guide +podman build -t localhost/summit-2023-gitops-lab-guide . +podman run --rm --name guides -d -p 4000:8080 localhost/summit-2023-gitops-lab-guide ---- ## Deploy to OpenShift [source,bash] ---- -oc new-app https://github.com/evanshortiss/rht-summit-2023-lab-guide --strategy=docker -oc create route edge rht-summit-2023-lab-guide --service=rht-summit-2023-lab-guide +oc new-app https://github.com/redhat-scholars/summit-2023-gitops-lab-guide --strategy=docker +oc create route edge summit-2023-gitops-lab-guide --service=summit-2023-gitops-lab-guide # To rebuild after changes pushed to git -oc start-build rht-summit-2023-lab-guide --follow +oc start-build summit-2023-gitops-lab-guide --follow ---- ## Lab Environment Setup diff --git a/chart/values.yaml b/chart/values.yaml index 312a5f0..2cc9650 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -4,7 +4,7 @@ namespace: guides -image: quay.io/evanshortiss/summit-2023-lab-guide:latest +image: quay.io/redhat-scholars/summit-2023-gitops-lab-guide:latest replicaCount: 1 diff --git a/docs/modules/m1-overview/pages/setup.adoc b/docs/modules/m1-overview/pages/setup.adoc index 06d3ce3..55f9e72 100644 --- a/docs/modules/m1-overview/pages/setup.adoc +++ b/docs/modules/m1-overview/pages/setup.adoc @@ -14,7 +14,7 @@ The next two sections will walk you through getting access to these resources. You'll need a GitHub account to complete this step. If you don't have one, go ahead and sign-up at https://github.com[github.com], then complete these steps: . Login to https://github.com[github.com]. -. Visit the workshop repository at: https://github.com/evanshortiss/rht-summit-2023-gitops-cluster-mgmt[github.com/evanshortiss/rht-summit-2023-gitops-cluster-mgmt] +. Visit the workshop repository at: https://github.com/redhat-scholars/summit-2023-gitops-cluster-mgmt[github.com/redhat-scholars/summit-2023-gitops-cluster-mgmt] . Click the **Use this template** button in the upper-right corner of the Git repository. A list of options will be displayed. . Select the *Create a new repository* option. . Use the following value for the the *Repository name* field: @@ -28,7 +28,7 @@ rht-summit-2023-gitops-cluster-mgmt [IMPORTANT] ==== -You'll be asked to use this repository throughout the workshop. Make sure to always use *your copy*, and *not* the original one owned by _evanshortiss_ on GitHub! +You'll be asked to use this repository throughout the workshop. Make sure to always use *your copy*, and *not* the original one owned by _redhat-scholars_ on GitHub! ==== Ensure your copy of the repository is linked to in subsequent sections of this guide: diff --git a/docs/modules/m5-ci-cd/pages/deploy.adoc b/docs/modules/m5-ci-cd/pages/deploy.adoc index dc057fe..d0f4390 100644 --- a/docs/modules/m5-ci-cd/pages/deploy.adoc +++ b/docs/modules/m5-ci-cd/pages/deploy.adoc @@ -6,7 +6,7 @@ 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. -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. +The application you'll be using can be found at https://github.com/redhat-scholars/summit-2023-gitops-lab-sample-application[github.com/redhat-scholars/summit-2023-gitops-lab-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. image:ex8.architecture.png[] @@ -40,7 +40,7 @@ image:ex8.argocd-project-settings.png[] Create an Argo CD Application to manage your containerised random meme web application: -. Visit the https://github.com/evanshortiss/rht-summit-2023-sample-application[random-meme application repository]. +. Visit the https://github.com/redhat-scholars/summit-2023-gitops-lab-sample-application[random-meme application repository]. . Click the *Use this template* button, and select *Create a new repository* from the list of options that are displayed. + image:ex8.gh-use-template.png[]