diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment.md b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment.md index fa788fb34..30ad410ae 100644 --- a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment.md +++ b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment.md @@ -169,14 +169,15 @@ Next you'll define the cluster reference. | Configuration name | `k8s-Workshop` | A reference to a configuration that lets CD/RO know where to use Helm | | Namespace | `my-username-qa` | The Kubernetes namespace where your application will be deployed. You should update this to be YOUR_USERNAME-qa. | | Kubeconfig context | | This allows you to target a specific cluster if your configuration is pointed at multiple. For this workshop you can leave this blank. | -| Utility resource name | `kubectl` | This is the name to identify the utility resource | -| Resource | `kubectl` | This is the agent which will communicate with the Kubernetes cluster | +| Utility resource name | `k8s-agent` | This is the name to identify the utility resource | +| Resource | `k8s-agent-0` | This is the agent which will communicate with the Kubernetes cluster | ![New cluster - part 3](new-environment-4.png) The last step in configuring our microservice application is to map the microservice (hello-app) to your environment (QA). To do that click on the ![Add mapping](AddMapping.png) button and map your application -| ![mapping](mappingTile.ppng) | ![mapped](mapedApplication.png) | +|--------|--------| +| ![mapping](mappingTile.png) | ![mapped](mapedApplication.png) | ## Running the deployment @@ -203,7 +204,7 @@ You can click the top list item to see more detail on the overall run and you ca ### Visiting our application -Now we can visit the application we just deployed by visiting the URL from the values definition of our application. This will be in the form of `https://my-username.cdro-workshop.cb-demos.io`. +Now we can visit the application we just deployed by visiting the URL from the values definition of our application. This will be in the form of [https://my-username.cdro-workshop.cb-demos.io](https://my-username.cdro-workshop.cb-demos.io). You should see the name of your username and the environment QA listed. diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/environment-created.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/environment-created.png index d299adf50..5d699a1f3 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/environment-created.png and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/environment-created.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments.md b/labs/cloudbees-cdro-v2/content/labs/05_environments.md index ac23b3b4b..4462f7cf6 100644 --- a/labs/cloudbees-cdro-v2/content/labs/05_environments.md +++ b/labs/cloudbees-cdro-v2/content/labs/05_environments.md @@ -14,7 +14,11 @@ In the previous lab we took a look at the application modeling process and setup ## Reviewing the environment we've created -Let's take a look at the environment we created in the previous lab in more detail. On the *Hierarchy Menu* on the left side of the screen, you can click on the "Environment: QA" link at the bottom. This will bring you to the environment page. +Let's take a look at the environment we created in the previous lab in more detail. To look at the environments click on the hamburger menu an then click on *Environments*. + +|---|---| +| ![environmentSelectionMenu](environmentSelectionMenu.png) | ![environmentList](environmentList.png) | + ![Click on environment](click-environment.png) @@ -59,15 +63,15 @@ You can also navigate there via the main menu (aka the *burger menu*) by going t ![App menu](app-burger-menu.png) -To add a new environment, click the large plus button on the right side of the QA environment. +To add a new environment, click the large plus button bellow the QA environment. ![New environment button](prod-1.png) -You'll now see a familiar "New environment" block with a "New cluster" block inside of it. We are essentially going to repeat our steps from the previous lab. +You'll now see a familiar "Add environment". We are essentially going to repeat our steps from the previous lab. ![New environment block](prod-2.png) -First, click on the "New Cluster" button in the inner block. This will pop up the New environment modal. Like before, you'll just click "Next", leaving the default option of "New environment". +Fill out the environment parameters to define our production environment. ![New environment modal](prod-3.png) @@ -78,28 +82,30 @@ This will look remarkably similar to before. We'll just replace the values of QA | Environment name | `Production` | The name to identify your environment | | Project | Select your project | The project inside which this environment will be stored | | Environment description | *Optional* | A field to give textual details about this environment | +| Utility resource name | `k8s-agent` | This is the name to identify the utility resource | +| Resource | `k8s-agent` | This is the agent which will communicate with the Kubernetes cluster | +2 + +Once the environment is created you can create cluster references by clicking on the `Add cluster reference` button. + +![New environment modal](prod-3a.png) + +| Field | Value | Description | +|-------------------------|-------------------------|----------------------------------------------------------------------------------------------------------------------------------------| | Cluster name | `default` | A name to identify this cluster | | Cluster description | *Optional* | A field to give textual details about this cluster | | Configuration provider | `Kubernetes (via Helm)` | The type of environment you're defining | -| Configuration name | `helm` | A reference to a configuration that lets CD/RO know where to use Helm | +| Configuration name | `k8s-worshop` | A reference to a configuration that lets CD/RO know where to use Helm | | Namespace | `my-username-prod` | The Kubernetes namespace where your application will be deployed. You should update this to be YOUR_USERNAME-prod. | | Kubeconfig context | | This allows you to target a specific cluster if your configuration is pointed at multiple. For this workshop you can leave this blank. | -| Utility resource name | `k8s-agent` | This is the name to identify the utility resource | -| Resource | `k8s-agent` | This is the agent which will communicate with the Kubernetes cluster | ![New environment form](prod-4.png) -Next we need to map this new environment to the application. - - -![Map new environment](prod-5.png) - -Drag the arrow into the Kubernetes cluster within the Production environment. -![Map environment](prod-6.png) +The last step in configuring our microservice application is to map the microservice (hello-app) to your environment (Production). To do that click on the ![Add mapping](AddMapping.png) button and map your application -You'll have a popup asking you to confirm the mapping. Go ahead and click "OK". +|--------|--------| +| ![mapping](prod-5.png) | ![mapped](prod-6.png) | -![Map environment - confirm](prod-7.png) Now you're ready to deploy into the production environment. Like before, you can click the "Deploy" button, but this time select the Production environment. diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/AddMapping.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/AddMapping.png new file mode 100644 index 000000000..14c473d8a Binary files /dev/null and b/labs/cloudbees-cdro-v2/content/labs/05_environments/AddMapping.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/click-environment.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/click-environment.png index d98f7e54b..050a69403 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/click-environment.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/click-environment.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/env-1.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/env-1.png index 0e9d4f12c..1c720816e 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/env-1.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/env-1.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/env-2.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/env-2.png index 4fbd9a075..34276eb58 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/env-2.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/env-2.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/environmentList.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/environmentList.png new file mode 100644 index 000000000..c563e04a8 Binary files /dev/null and b/labs/cloudbees-cdro-v2/content/labs/05_environments/environmentList.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/environmentSelectionMenu.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/environmentSelectionMenu.png new file mode 100644 index 000000000..667acef14 Binary files /dev/null and b/labs/cloudbees-cdro-v2/content/labs/05_environments/environmentSelectionMenu.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-1.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-1.png index f3e5b3343..364b04266 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-1.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-1.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-7.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-7.png index de7f20f8b..56e982dea 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-7.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/envvars-7.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-1.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-1.png index a049ccfca..5c317826f 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-1.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-1.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-2.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-2.png index 07d3fda8f..52fc706cc 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-2.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-2.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-3.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-3.png index 8a33a1a1f..447799623 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-3.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-3.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-3a.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-3a.png new file mode 100644 index 000000000..45c3a361a Binary files /dev/null and b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-3a.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-4.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-4.png index be1292a7b..96be50f63 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-4.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-4.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-5.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-5.png index caf16dabc..8d8975892 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-5.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-5.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-6.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-6.png index a4275b642..14560d1a8 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-6.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-6.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-7.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-7.png deleted file mode 100644 index 60bd0a730..000000000 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/prod-7.png and /dev/null differ diff --git a/labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-3.png b/labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-3.png index 90c28a763..7f2fdcca9 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-3.png and b/labs/cloudbees-cdro-v2/content/labs/05_environments/rerun-3.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release.md b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release.md index f54e90f89..257b2b17c 100644 --- a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release.md +++ b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release.md @@ -31,17 +31,17 @@ _Alternatively, you can delete tasks by clicking on the "more" menu on the task Which ever way you deleted it, you should now see 0 Tasks in that stage. ![Empty stage](7.png) -Now it is time to create a new task. Go ahead and click the **Add** button in the bottom of the stage. Go ahead and call it `Deploy to QA`. +Now it is time to create a new task. Go ahead and click the **Add task** button in the bottom of the stage. Go ahead and call it `Deploy to QA`. ![New task](8.png) -Next, click on **Select Task Type** and choose the **Deployer** option from under the **Native** section. +Next, click on **Define** and choose the **Deployer** option from under the **Native** section. ![New task](9.png) Then, click on **Define** to configure this task. ![Configure new task](10.png) -Since we're only working with a single application, we can ignore these settings and just click **OK**. This is where you can change the behavior of how it chooses to deploy multiple applications. +Since we're only working with a single application, we can ignore these settings and just click **Save changes**. This is where you can change the behavior of how it chooses to deploy multiple applications. Now we're done with the QA stage. diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/10.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/10.png index d4ed25ed6..077a7e500 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/10.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/10.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/11.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/11.png index a591d97f1..31ad2f9e9 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/11.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/11.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/12.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/12.png index 035f0036d..d89d016ed 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/12.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/12.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/13.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/13.png index 794459c99..754767bd6 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/13.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/13.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/16.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/16.png index 6c797b0b3..d1e8d305d 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/16.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/16.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/24.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/24.png index 0e1ab6a9f..085619ec4 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/24.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/24.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/25.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/25.png index 08b58baa1..ce4e60c5c 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/25.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/25.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/26.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/26.png index 9d11c387e..fa80e6d5d 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/26.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/26.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/3.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/3.png index 303d6e329..40c4f8b3e 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/3.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/3.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/7.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/7.png index a2bcdcb47..404b3dbba 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/7.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/7.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/8.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/8.png index 5e342fc9a..62930ded7 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/8.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/8.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/9.png b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/9.png index e652fe8bf..0a94ff4b5 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/9.png and b/labs/cloudbees-cdro-v2/content/labs/06_deployment-in-release/9.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline.md b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline.md index fad95916c..2b909c2b2 100644 --- a/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline.md +++ b/labs/cloudbees-cdro-v2/content/labs/07_template-release-as-a-pipeline.md @@ -42,7 +42,7 @@ pipeline 'pipeline_Base', { actualParameter = [ 'branch': 'main', 'commit': '', - 'config': '/projects/CloudBees/pluginConfigurations/cb-bot', + 'config': '/projects/Workshop/pluginConfigurations/cb-bot', 'depth': '', 'gitRepoFolder': '/tmp/demo-app', 'mirror': 'false', @@ -63,7 +63,7 @@ pipeline 'pipeline_Base', { task 'Get latest SonarQube scan results', { actualParameter = [ - 'config': '/projects/Default/pluginConfigurations/SonarQube', + 'config': '/projects/Workshop/pluginConfigurations/cb-demos-sonar', 'resultFormat': 'propertysheet', 'resultSonarProperty': '/myJob/getLastSonarMetrics', 'sonarMetricsComplexity': 'all', @@ -76,9 +76,9 @@ pipeline 'pipeline_Base', { 'sonarMetricsReliability': 'all', 'sonarMetricsSecurity': 'all', 'sonarMetricsTests': 'all', - 'sonarProjectKey': 'demo-app', - 'sonarProjectName': 'demo-app', - 'sonarProjectVersion': '', + 'sonarProjectKey': 'petclinic', + 'sonarProjectName': 'petclinic', + 'sonarProjectVersion': '2.2.0.BUILD-SNAPSHOT', 'sonarTaskId': '', 'sonarTimeout': '', ]