From 2c63d2704a15a342616314f01ad52943b947d82f Mon Sep 17 00:00:00 2001 From: Paige Calvert Date: Wed, 15 May 2024 13:45:24 -0600 Subject: [PATCH] Other typos/minor edits --- .../02-create-a-customer/assignment.md | 8 ++++---- .../03-proxying-private-images/assignment.md | 4 ++-- .../04-helm-values-for-license-fields/assignment.md | 4 ++-- .../05-license-entitlements/assignment.md | 8 ++++---- .../06-validating-license-fields/assignment.md | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/instruqt/protecting-your-assets/02-create-a-customer/assignment.md b/instruqt/protecting-your-assets/02-create-a-customer/assignment.md index c5c7ba129..39539868b 100755 --- a/instruqt/protecting-your-assets/02-create-a-customer/assignment.md +++ b/instruqt/protecting-your-assets/02-create-a-customer/assignment.md @@ -51,7 +51,7 @@ For the purpose of the lab, click the "+ Create Customer" button to create ![Creating a Customer](../assets/create-customer-button.png) -Enter the name "NitFlex" and assign them to the `Stable` channel. They've +Enter the name "NitFlex" and assign them to the `Stable` channel. They've been trying your software for two months, so let's make sure we capture the expiration date. We also need an email for them to login and install your Helm chart. Note that we never use that email, it's your customer, not ours. @@ -73,14 +73,14 @@ The Vendor Portal generated a license for your Nitflex customer and also configured some credentials based on it. These credentials are for: * The Replicated registry for accessing the Slackernews Helm chart -* Our proxy registry that protects your private images +* The Replicated proxy registry that protects your private images Let's use the first set of credentials to look at how the license is embedded into your Helm chart. Click on "Helm install instructions" and you'll see a popup with a set of instructions for this customer to install Slackernews. The first command is the -login command for the Helm registry. +login command for the Replicated registry. ![Helm Login Command](../assets/helm-login-command.png) @@ -90,7 +90,7 @@ view the values for the Helm chart using `helm show values`: `helm show values oci://registry.replicated.com/[[ Instruqt-Var key="REPLICATED_APP" hostname="shell" ]]/slackernews | less` -this will show you the default vales from the Helm chart. As you scroll through +This will show you the default vales from the Helm chart. As you scroll through the values, you'll see license information injected in two places. The entire license file is injected as the `license` value for the `replicated` subchart, and a few details from it are injected under `.global.replicated`. diff --git a/instruqt/protecting-your-assets/03-proxying-private-images/assignment.md b/instruqt/protecting-your-assets/03-proxying-private-images/assignment.md index 115c30c28..4a9bc1ba4 100755 --- a/instruqt/protecting-your-assets/03-proxying-private-images/assignment.md +++ b/instruqt/protecting-your-assets/03-proxying-private-images/assignment.md @@ -58,10 +58,10 @@ Adding the Proxy to Your Chart The next step to securing your images with the Replicated Platform is to use the proxy to pull images. The Slackernews chart refers to its two images in -it's default values. We'll change those to refer to the Replicated proxy +its default values. We'll change those to refer to the Replicated proxy registry. -Images tags in the proxy registry follow the following pattern: +Image tags in the proxy registry follow the following pattern: ``` $PROXY_REGISTRY_HOST/proxy/$APP_SLUG/$ORIGINAL_IMAGE_TAG diff --git a/instruqt/protecting-your-assets/04-helm-values-for-license-fields/assignment.md b/instruqt/protecting-your-assets/04-helm-values-for-license-fields/assignment.md index 12035a1dd..5c65254d9 100755 --- a/instruqt/protecting-your-assets/04-helm-values-for-license-fields/assignment.md +++ b/instruqt/protecting-your-assets/04-helm-values-for-license-fields/assignment.md @@ -32,7 +32,7 @@ license into your Helm chart in two ways: your Helm templates. We're going to take advantage of the second option to update the Slackernews -chart to only install when the license has not expired. +chart to block installation if the license is expired. ### A Word of Caution @@ -62,7 +62,7 @@ will only include the values injected by the Registry. helm show values oci://[[ Instruqt-Var key="REGISTRY_HOST" hostname="shell"]]/[[ Instruqt-Var key="REPLICATED_APP" hostname="shell" ]]/slackernews | yq -P .global ``` -You'll see something like (the encoded fields and expiration will probably be +You'll see something like the following (the encoded fields and expiration will probably be different). ``` diff --git a/instruqt/protecting-your-assets/05-license-entitlements/assignment.md b/instruqt/protecting-your-assets/05-license-entitlements/assignment.md index e344989e0..9b0028593 100755 --- a/instruqt/protecting-your-assets/05-license-entitlements/assignment.md +++ b/instruqt/protecting-your-assets/05-license-entitlements/assignment.md @@ -30,7 +30,7 @@ or have different editions, or license different services it provides independently. To capture these in the Replicated Platform we add them as new fields on the license. In other words, license fields are the mechanism for implementing your entitlements on the Replicated platform. Since the field -represents the entitlement, you may see the terms use almost interchangeably. +represents the entitlement, you may see the terms used almost interchangeably. We learned a little bit about license fields in the previous sections of this lab. We know they can be one of a handful of types and that they are included @@ -121,7 +121,7 @@ The type field allows you to capture different types of entitlements: Text types also capture qualitative information, but in a longer form. These are great longer configuration values that you set specifically - for the customer. We'll look at an intersting example below. + for the customer. We'll look at an interesting example below. @@ -141,8 +141,8 @@ The type field allows you to capture different types of entitlements: One interesting topic that often comes up is what to do when you already have a licensing model in place. The Replicated Platform license is required for the -platform to function, but your existing license is required for you code to -work. This is another great use for Replicated License fields. You can use a +platform to function, but your existing license is required for your code to +work. This is another great use for Replicated license fields. You can use a text field to provide your existing license key and use the resulting field to provide the license to your code. diff --git a/instruqt/protecting-your-assets/06-validating-license-fields/assignment.md b/instruqt/protecting-your-assets/06-validating-license-fields/assignment.md index 641260c9f..d60fafe3c 100755 --- a/instruqt/protecting-your-assets/06-validating-license-fields/assignment.md +++ b/instruqt/protecting-your-assets/06-validating-license-fields/assignment.md @@ -16,7 +16,7 @@ difficulty: basic timelimit: 900 --- -The Replicated SDK provides an in-cluster API for the Replicated platform. One +The Replicated SDK provides an in-cluster API for the Replicated Platform. One of its core features is access to the complete customer license. We're going to run some simple shell commands against the SDK to show how your team can validate entitlements as part of your application.