Update to 1.20.5 (#12)

* Minor typos (#11) (#1) Signed-off-by: Chad Kittel <[email protected]> * Minor typos Signed-off-by: Chad Kittel <[email protected]> * Update to 1.20.5 Signed-off-by: Chad Kittel <[email protected]>
mspnp · Apr 26, 2021 · 295962f · 295962f
1 parent 305b60f
commit 295962f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cluster-stamp.json b/cluster-stamp.json
@@ -103,7 +103,7 @@
         }
     },
     "variables": {
-        "kubernetesVersion": "1.20.2",
+        "kubernetesVersion": "1.20.5",
 
         "networkContributorRole": "[concat(subscription().Id, '/providers/Microsoft.Authorization/roleDefinitions/4d97b98b-1d4f-4787-a291-c67834d212e7')]",
         "monitoringMetricsPublisherRole": "[concat(subscription().Id, '/providers/Microsoft.Authorization/roleDefinitions/3913510d-42f4-4e42-8a64-420c390055eb')]",

diff --git a/cluster-stamp.v2.json b/cluster-stamp.v2.json
@@ -103,7 +103,7 @@
         }
     },
     "variables": {
-        "kubernetesVersion": "1.20.2",
+        "kubernetesVersion": "1.20.5",
 
         "networkContributorRole": "[concat(subscription().Id, '/providers/Microsoft.Authorization/roleDefinitions/4d97b98b-1d4f-4787-a291-c67834d212e7')]",
         "monitoringMetricsPublisherRole": "[concat(subscription().Id, '/providers/Microsoft.Authorization/roleDefinitions/3913510d-42f4-4e42-8a64-420c390055eb')]",

diff --git a/docs/deploy/06-aks-jumpboximage.md b/docs/deploy/06-aks-jumpboximage.md
@@ -70,7 +70,7 @@ Now that we have our image building network created, egressing through our hub,
 
 1. Create the AKS jump box image template. (🛑 _if not using the custom roles created above._)
 
-   Next you are going to deploy the image template and Azure Image Builders's managed identity. This is being done directly into our workload resource group for simplicity. You can choose to deploy this to a separate resource group if you wish. This "golden image" generation process would typically happen out-of-band to the workload management.
+   Next you are going to deploy the image template and Azure Image Builders's managed identity. This is being done directly into our workload resource group for simplicity. You can choose to deploy this to a separate resource group if you wish. This "golden image" generation process would typically happen out-of-band to the cluster management.
 
    ```bash
    #ROLEID_NETWORKING=4d97b98b-1d4f-4787-a291-c67834d212e7 # Network Contributor -- Only use this if you did not, or could not, create custom roles. This is more permission than necessary.)

diff --git a/docs/deploy/10-pre-bootstrap.md b/docs/deploy/10-pre-bootstrap.md
@@ -95,7 +95,7 @@ Using a security agent that is container-aware and can operate from within the c
 
 1. Trigger quarantine violation. _Optional._
 
-   You've deployed an alert called **Image Imported into ACR from source other than approved Quarantine** that will fire if you import an image directly to `live/` without coming from `quarantine/`. If you'd like to see that trigger, go ahead and import some other image directly to `live/`. On the validation page later in this walkthrough, you'll see that alert.
+   You've deployed an alert called **Image Imported into ACR from source other than approved Quarantine** that will fire if you import an image directly to `live/` without coming from `quarantine/`. If you'd like to see that trigger, go ahead and import an image directly to `live/`. On the validation page later in this walkthrough, you'll see that alert.
 
    ```bash
    az acr import --source docker.io/library/busybox:1.33.0 -t live/library/busybox:SkippedQuarantine -n $ACR_NAME