diff --git a/labs/cloudbees-cdro-v2/content/labs/03_basic-release/3-old.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/3-old.png deleted file mode 100644 index dd330ec99..000000000 Binary files a/labs/cloudbees-cdro-v2/content/labs/03_basic-release/3-old.png and /dev/null differ diff --git a/labs/cloudbees-cdro-v2/content/labs/03_basic-release/3.png b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/3.png index 129b99be3..f7766a3ae 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/03_basic-release/3.png and b/labs/cloudbees-cdro-v2/content/labs/03_basic-release/3.png differ 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 d1f227792..fa788fb34 100644 --- a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment.md +++ b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment.md @@ -89,7 +89,7 @@ As you can see, there are two big components standing out here. There is the mic First we'll start with the microservice definition on the left. This is where you'll specify the Helm chart you want to deploy as well as any values you need to pass in. -To begin, click the inner, pink "New microservice" button which will bring up the necessary form. +To begin, click on the blue "Add microservice" button which will bring up the necessary form. ![New microservice button](new-microservice-button.png) @@ -104,7 +104,7 @@ Next you need to fill out the definition form. | Description | *optional* | A field to help understand the context of this application | | Definition type | `Helm` | The type of microservice deployment you want to run | | Definition source | `Git repository` | The source for where to look for the target Helm chart. It could be a Helm registry, but for this workshop we're using a Git repo. | -| Configuration Name | `Git Bot` | The credentials to use for the Git connection when pulling the repository. In this case, we'll be using a shared GitHub service account since the repository is public. | +| Configuration Name | `cb-bot-Workshop` | The credentials to use for the Git connection when pulling the repository. In this case, we'll be using a shared GitHub service account since the repository is public. | | Git repository | https://github.com/cloudbees-days/cdro-workshop-demo-app | The target repository where it will look for the Helm chart | | Remote branch | `main` | The branch in GitHub it will checkout | | Release name | `hello-app` | The name Helm will use to track your app release | @@ -140,7 +140,7 @@ Now hit "OK" and the microservice component will be created. Now, before we're able to deploy our newly-defined application, we need to define an environment to deploy it into. -Get started by clicking the "New cluster" button on the right side. +Get started by clicking the blue "+" button on the right side. ![New cluster](new-environment-1.png) *It should be noted that we aren't creating a new Kubernetes cluster, but rather a new environment definition based on a cluster.* @@ -155,16 +155,28 @@ Now you'll define the cluster environment. | Environment name | `QA` | 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 | + +![New cluster - part 3](new-environment-3.png) + +Next you'll define the cluster reference. + +| 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-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 | `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 | +| 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 | -![New cluster - part 3](new-environment-3.png) +![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) | ## Running the deployment diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/AddMapping.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/AddMapping.png new file mode 100644 index 000000000..14c473d8a Binary files /dev/null and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/AddMapping.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/fresh-app-model.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/fresh-app-model.png index 00924856a..3b530e8cb 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/fresh-app-model.png and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/fresh-app-model.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/mapedApplication.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/mapedApplication.png new file mode 100644 index 000000000..0b4f9c280 Binary files /dev/null and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/mapedApplication.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/mapppingTile.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/mapppingTile.png new file mode 100644 index 000000000..cf707f643 Binary files /dev/null and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/mapppingTile.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-application-button.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-application-button.png index e57f0969b..de0bdadc0 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-application-button.png and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-application-button.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-1.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-1.png index d966d2c03..6b4945c5c 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-1.png and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-1.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-2.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-2.png index 697f13b95..28fa35f1d 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-2.png and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-2.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-3.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-3.png index 557cbbbe0..b387c0f82 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-3.png and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-3.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-4.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-4.png new file mode 100644 index 000000000..3fe62f8a9 Binary files /dev/null and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-environment-4.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-button.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-button.png index f8ebf2cd8..a6aaadbf5 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-button.png and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-button.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-done.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-done.png index 0b2b38536..37a3ea217 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-done.png and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-done.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-1.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-1.png index bb23fb030..499d5fc60 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-1.png and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-1.png differ diff --git a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-2.png b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-2.png index 46d59c598..d074d712a 100644 Binary files a/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-2.png and b/labs/cloudbees-cdro-v2/content/labs/04_microservice-deployment/new-microservice-form-2.png differ diff --git a/labs/cloudbees-cdro-v2/support/dsl/Workshop_Service_Catalog.groovy b/labs/cloudbees-cdro-v2/support/dsl/Workshop_Service_Catalog.groovy index a7631ad2d..f00ee2848 100644 --- a/labs/cloudbees-cdro-v2/support/dsl/Workshop_Service_Catalog.groovy +++ b/labs/cloudbees-cdro-v2/support/dsl/Workshop_Service_Catalog.groovy @@ -44,14 +44,14 @@ release args.releaseName, { iconUrl = 'icon-pipeline.svg' useFormalParameter = '1' - formalParameter 'releaseName', { + formalParameter 'releaseName', defaultValue: '$[/myUser/userName] Release', { label = 'Release Name' orderIndex = '1' required = '1' type = 'entry' } - formalParameter 'releaseTag', { + formalParameter 'releaseTag', defaultValue: 'PROD', { label = 'Release Tags' orderIndex = '2' required = '1' diff --git a/labs/cloudbees-cdro-v2/support/dsl/pipeline_Base.groovy b/labs/cloudbees-cdro-v2/support/dsl/pipeline_Base.groovy index a2664cab5..e7b16da8e 100644 --- a/labs/cloudbees-cdro-v2/support/dsl/pipeline_Base.groovy +++ b/labs/cloudbees-cdro-v2/support/dsl/pipeline_Base.groovy @@ -71,7 +71,7 @@ pipeline 'pipeline_Base', { colorCode = '#ff7f0e' pipelineName = 'pipeline_Base' task 'Deploy to QA', { - command = 'echo "Deploy to QA"' + command = 'echo "replace me"' taskType = 'COMMAND' } } @@ -79,21 +79,9 @@ pipeline 'pipeline_Base', { stage 'Production', { colorCode = '#2ca02c' pipelineName = 'pipeline_Base' - gate 'PRE', { - task 'Manual approval', { - gateType = 'PRE' - notificationEnabled = '1' - notificationTemplate = 'ec_default_gate_task_notification_template' - subproject = 'Workshop' - taskType = 'APPROVAL' - approver = [ - 'rbroker', - ] - } - } task 'Deploy to Production', { - command = 'echo "Deploy to Production"' + command = 'echo "replace me"' taskType = 'COMMAND' } }