Port changes from Baseline (#40)

mspnp · Sep 21, 2021 · 381c986 · 381c986
1 parent 14c5e38
commit 381c986
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/cluster-stamp.json b/cluster-stamp.json
@@ -1289,7 +1289,7 @@
                             "Data classification": "Confidential",
                             "Business unit": "BU0001",
                             "Business criticality": "Business unit-critical"
-                        }/* Currently not supported by Azure Policy Add-On ,
+                        }/* This can be used to prevent unexpected workloads from landing on system node pool. All add-ons support this taint.,
                         "nodeTaints": [
                             "CriticalAddonsOnly=true:NoSchedule"
                         ]*/
@@ -1460,6 +1460,10 @@
                     "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('clusterControlPlaneIdentityName'))]": {}
                 }
             },
+            "sku": {
+                "name": "Basic",
+                "tier": "Paid"
+            },
             "resources": [
                 {
                     "type": "providers/roleAssignments",

diff --git a/cluster-stamp.v2.json b/cluster-stamp.v2.json
@@ -1289,7 +1289,7 @@
                             "Data classification": "Confidential",
                             "Business unit": "BU0001",
                             "Business criticality": "Business unit-critical"
-                        }/* Currently not supported by Azure Policy Add-On ,
+                        }/* This can be used to prevent unexpected workloads from landing on system node pool. All add-ons support this taint.,
                         "nodeTaints": [
                             "CriticalAddonsOnly=true:NoSchedule"
                         ]*/
@@ -1471,6 +1471,10 @@
                     "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('clusterControlPlaneIdentityName'))]": {}
                 }
             },
+            "sku": {
+                "name": "Basic",
+                "tier": "Paid"
+            },
             "resources": [
                 {
                     "type": "providers/roleAssignments",

diff --git a/docs/deploy/01-prerequisites.md b/docs/deploy/01-prerequisites.md
@@ -29,11 +29,25 @@ Throughout this walkthrough, take note of the following symbol.
 
    Ensure you're logged into the subscription in which you plan on deploying this reference to.
 
-1. Enable three preview features.
+1. While the following feature(s) are still in _preview_, please enable them in your target subscription.
 
-   * Follow the instructions to [enable Azure AD Pod Identity](https://docs.microsoft.com/azure/aks/use-azure-ad-pod-identity#before-you-begin) on your target subscription. You do not need to install the preview CLI extension or follow other instructions on this page.
-   * Follow the instructions to [enable Open Service Mesh](https://docs.microsoft.com/azure/aks/servicemesh-osm-about?pivots=client-operating-system-linux#register-the-aks-openservicemesh-preview-feature) on your target subscription. You do not need to install the open service mesh CLI or follow other instructions on this page.
+   * Follow the instructions to [enable Azure AD Pod Identity](https://docs.microsoft.com/azure/aks/use-azure-ad-pod-identity#before-you-begin). You do not need to install the preview CLI extension or follow other instructions on this page.
+   * Follow the instructions to [enable Open Service Mesh](https://docs.microsoft.com/azure/aks/open-service-mesh-deploy-add-on#register-the-aks-openservicemesh-preview-feature). You do not need to install the open service mesh CLI or follow other instructions on this page.
    * Register the [Azure Key Vault Secrets Provider for AKS preview feature - `AKS-AzureKeyVaultSecretsProvider`](https://docs.microsoft.com/azure/aks/csi-secrets-store-driver#register-the-aks-azurekeyvaultsecretsprovider-preview-feature).
+   * Register the [Disable local accounts feature - `DisableLocalAccountsPreview`](https://docs.microsoft.com/azure/aks/managed-aad#disable-local-accounts-preview).
+
+   ```bash
+   az feature register --namespace "Microsoft.ContainerService" -n "EnablePodIdentityPreview"
+   az feature register --namespace "Microsoft.ContainerService" -n "AKS-OpenServiceMesh"
+   az feature register --namespace "Microsoft.ContainerService" -n "AKS-AzureKeyVaultSecretsProvider"
+   az feature register --namespace "Microsoft.ContainerService" -n "DisableLocalAccountsPreview"
+
+   # Keep running until all four say "Registered." (This may take up to 20 minutes.)
+   az feature list -o table --query "[?name=='Microsoft.ContainerService/EnablePodIdentityPreview' || name=='Microsoft.ContainerService/AKS-OpenServiceMesh' || name=='Microsoft.ContainerService/AKS-AzureKeyVaultSecretsProvider' || name=='Microsoft.ContainerService/DisableLocalAccountsPreview'].{Name:name,State:properties.state}"
+
+   # When all say "Registered" then re-register the AKS resource provider
+   az provider register --namespace Microsoft.ContainerService
+   ```
 
 1. Fork this repository and clone it locally. 🛑
 

diff --git a/docs/deploy/02-ca-certificates.md b/docs/deploy/02-ca-certificates.md
@@ -20,7 +20,7 @@ To support end-to-end TLS encryption, the following TLS certificates are procure
 1. Create the certificate for Azure Application Gateway with a common name of `bicycle.contoso.com`.
 
    ```bash
-   openssl req -x509 -nodes -days 365 -newkey rsa:2048 -out appgw.crt -keyout appgw.key -subj "/CN=bicycle.contoso.com/O=Contoso Bicycle"
+   openssl req -x509 -nodes -days 365 -newkey rsa:2048 -out appgw.crt -keyout appgw.key -subj "/CN=bicycle.contoso.com/O=Contoso Bicycle" -addext "subjectAltName = DNS:bicycle.contoso.com" -addext "keyUsage = digitalSignature" -addext "extendedKeyUsage = serverAuth"
    openssl pkcs12 -export -out appgw.pfx -in appgw.crt -inkey appgw.key -passout pass:
    ```