Skip to content

Commit d54aeab

Browse files
authored
Merge pull request #115410 from DCtheGeek/dmc-brokenlinks-20200515
OPS Broken Links - 20200515
2 parents 1869fc0 + 5a56cfe commit d54aeab

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

articles/aks/use-network-policies.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ The following example script:
7777
* Creates an Azure Active Directory (Azure AD) service principal for use with the AKS cluster.
7878
* Assigns *Contributor* permissions for the AKS cluster service principal on the virtual network.
7979
* Creates an AKS cluster in the defined virtual network and enables network policy.
80-
* The *azure* network policy option is used. To use Calico as the network policy option instead, use the `--network-policy calico` parameter. Note: Calico could be used with either `--network-plugin azure` or `--network-plugin kubenet`.
80+
* The _Azure Network_ policy option is used. To use Calico as the network policy option instead, use the `--network-policy calico` parameter. Note: Calico could be used with either `--network-plugin azure` or `--network-plugin kubenet`.
8181

8282
Note that instead of using a service principal, you can use a managed identity for permissions. For more information, see [Use managed identities](use-managed-identity.md).
8383

@@ -142,7 +142,7 @@ az aks get-credentials --resource-group $RESOURCE_GROUP_NAME --name $CLUSTER_NAM
142142

143143
## Deny all inbound traffic to a pod
144144

145-
Before you define rules to allow specific network traffic, first create a network policy to deny all traffic. This policy gives you a starting point to begin to whitelist only the desired traffic. You can also clearly see that traffic is dropped when the network policy is applied.
145+
Before you define rules to allow specific network traffic, first create a network policy to deny all traffic. This policy gives you a starting point to begin to create an allow list for only the desired traffic. You can also clearly see that traffic is dropped when the network policy is applied.
146146

147147
For the sample application environment and traffic rules, let's first create a namespace called *development* to run the example pods:
148148

@@ -470,9 +470,9 @@ To learn more about policies, see [Kubernetes network policies][kubernetes-netwo
470470
[policy-rules]: https://kubernetes.io/docs/concepts/services-networking/network-policies/#behavior-of-to-and-from-selectors
471471
[aks-github]: https://github.com/azure/aks/issues
472472
[tigera]: https://www.tigera.io/
473-
[calicoctl]: https://docs.projectcalico.org/v3.9/reference/calicoctl/
473+
[calicoctl]: https://docs.projectcalico.org/reference/calicoctl/
474474
[calico-support]: https://www.tigera.io/tigera-products/calico/
475-
[calico-logs]: https://docs.projectcalico.org/v3.9/maintenance/component-logs
475+
[calico-logs]: https://docs.projectcalico.org/maintenance/troubleshoot/component-logs
476476
[calico-aks-cleanup]: https://github.com/Azure/aks-engine/blob/master/docs/topics/calico-3.3.1-cleanup-after-upgrade.yaml
477477

478478
<!-- LINKS - internal -->

articles/virtual-machines/image-version-encryption.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ ms.author: cynthn
1111

1212
# Preview: Use customer-managed keys for encrypting images
1313

14-
Gallery images are stored as managed disks, so they are automatically encrypted using server-side encryption. Server-side encryption uses 256-bit [AES encryption](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard), one of the strongest block ciphers available, and is FIPS 140-2 compliant. For more information about the cryptographic modules underlying Azure managed disks, see [Cryptography API: Next Generation](https://docs.microsoft.com/windows/desktop/seccng/cng-portal)
14+
Gallery images are stored as managed disks, so they are automatically encrypted using server-side encryption. Server-side encryption uses 256-bit [AES encryption](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard), one of the strongest block ciphers available, and is FIPS 140-2 compliant. For more information about the cryptographic modules underlying Azure managed disks, see [Cryptography API: Next Generation](/windows/desktop/seccng/cng-portal)
1515

1616
You can rely on platform-managed keys for the encryption of your images, or you can manage encryption using your own keys. If you choose to manage encryption with your own keys, you can specify a *customer-managed key* to use for encrypting and decrypting all disks in your images.
1717

1818
Server-side encryption using customer-managed keys uses Azure Key Vault. You can either import [your RSA keys](../key-vault/keys/hsm-protected-keys.md) to your Key Vault or generate new RSA keys in Azure Key Vault.
1919

2020
To use customer managed keys for images, you first need an Azure Key Vault. You then create a disk encryption set. The disk encryption set is then used when creating you image versions.
2121

22-
For more information about creating and using disk encryption sets, see [Customer managed keys](https://docs.microsoft.com/azure/virtual-machines/windows/disk-encryption#customer-managed-keys).
22+
For more information about creating and using disk encryption sets, see [Customer managed keys](./windows/disk-encryption.md#customer-managed-keys).
2323

2424
## Limitations
2525

@@ -68,7 +68,7 @@ If it doesn't return `Registered`, use the following to register the providers:
6868
Register-AzResourceProvider -ProviderNamespace Microsoft.Compute
6969
```
7070

71-
To specify a disk encryption set to for an image version, use [New-AzGalleryImageDefinition](https://docs.microsoft.com/powershell/module/az.compute/new-azgalleryimageversion) with the `-TargetRegion` parameter.
71+
To specify a disk encryption set to for an image version, use [New-AzGalleryImageDefinition](/powershell/module/az.compute/new-azgalleryimageversion) with the `-TargetRegion` parameter.
7272

7373
```azurepowershell-interactive
7474

0 commit comments

Comments
 (0)