From 03baf77d605c2e893429b24882328562edab1287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Garc=C3=ADa?= <673420+palmerabollo@users.noreply.github.com> Date: Sat, 23 Feb 2019 09:16:52 +0000 Subject: [PATCH 1/3] docs: update acs-engine -> aks-engine acs-engine has been deprecated by Microsoft in favor of aks-engine --- content/en/docs/setup/turnkey/azure.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/content/en/docs/setup/turnkey/azure.md b/content/en/docs/setup/turnkey/azure.md index 028bab47b7342..033ffa6e58292 100644 --- a/content/en/docs/setup/turnkey/azure.md +++ b/content/en/docs/setup/turnkey/azure.md @@ -14,20 +14,19 @@ For an example of deploying a Kubernetes cluster onto Azure via the Azure Kubern **[Microsoft Azure Kubernetes Service](https://docs.microsoft.com/en-us/azure/aks/intro-kubernetes)** -## Custom Deployments: ACS-Engine +## Custom Deployments: AKS-Engine The core of the Azure Kubernetes Service is **open source** and available on GitHub for the community -to use and contribute to: **[ACS-Engine](https://github.com/Azure/acs-engine)**. +to use and contribute to: **[AKS-Engine](https://github.com/Azure/aks-engine)**. The legacy [ACS-Engine](https://github.com/Azure/acs-engine) codebase has been deprecated in favor of AKS-engine. -ACS-Engine is a good choice if you need to make customizations to the deployment beyond what the Azure Kubernetes +AKS-Engine is a good choice if you need to make customizations to the deployment beyond what the Azure Kubernetes Service officially supports. These customizations include deploying into existing virtual networks, utilizing multiple -agent pools, and more. Some community contributions to ACS-Engine may even become features of the Azure Kubernetes Service. +agent pools, and more. Some community contributions to AKS-Engine may even become features of the Azure Kubernetes Service. -The input to ACS-Engine is similar to the ARM template syntax used to deploy a cluster directly with the Azure Kubernetes Service. -The resulting output is an Azure Resource Manager Template that can then be checked into source control and can then be used -to deploy Kubernetes clusters into Azure. +The input to AKS-Engine is similar to the Azure Resource Manager (ARM) template syntax used to deploy a cluster directly with the Azure Kubernetes Service.The resulting output is an ARM template that can then be checked into source control +and can then be used to deploy Kubernetes clusters into Azure. -You can get started quickly by following the **[ACS-Engine Kubernetes Walkthrough](https://github.com/Azure/acs-engine/blob/master/docs/kubernetes.md)**. +You can get started quickly by following the **[ACS-Engine Kubernetes Tutorial](https://github.com/Azure/aks-engine/blob/master/docs/tutorials/README.md)**. ## CoreOS Tectonic for Azure From 32ed3e5554cd7dc2fec9e6035a594cbbea8af996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Garc=C3=ADa?= <673420+palmerabollo@users.noreply.github.com> Date: Sat, 23 Feb 2019 22:05:00 +0000 Subject: [PATCH 2/3] chore: PR feedback --- content/en/docs/setup/turnkey/azure.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/content/en/docs/setup/turnkey/azure.md b/content/en/docs/setup/turnkey/azure.md index 033ffa6e58292..e84f2893c0fb6 100644 --- a/content/en/docs/setup/turnkey/azure.md +++ b/content/en/docs/setup/turnkey/azure.md @@ -23,10 +23,9 @@ AKS-Engine is a good choice if you need to make customizations to the deployment Service officially supports. These customizations include deploying into existing virtual networks, utilizing multiple agent pools, and more. Some community contributions to AKS-Engine may even become features of the Azure Kubernetes Service. -The input to AKS-Engine is similar to the Azure Resource Manager (ARM) template syntax used to deploy a cluster directly with the Azure Kubernetes Service.The resulting output is an ARM template that can then be checked into source control -and can then be used to deploy Kubernetes clusters into Azure. +The input to AKS-Engine is an apimodel JSON file describing the Kubernetes cluster. It is similar to the Azure Resource Manager (ARM) template syntax used to deploy a cluster directly with the Azure Kubernetes Service. The resulting output is an ARM template that can be checked into source control and used to deploy Kubernetes clusters to Azure. -You can get started quickly by following the **[ACS-Engine Kubernetes Tutorial](https://github.com/Azure/aks-engine/blob/master/docs/tutorials/README.md)**. +You can get started by following the **[ACS-Engine Kubernetes Tutorial](https://github.com/Azure/aks-engine/blob/master/docs/tutorials/README.md)**. ## CoreOS Tectonic for Azure From adc6b2a99b4e7991be132b2088fc60973355eb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Garc=C3=ADa?= <673420+palmerabollo@users.noreply.github.com> Date: Mon, 25 Feb 2019 16:06:13 +0000 Subject: [PATCH 3/3] fix missing AKS --- content/en/docs/setup/turnkey/azure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/setup/turnkey/azure.md b/content/en/docs/setup/turnkey/azure.md index e84f2893c0fb6..eccbbca75bcb3 100644 --- a/content/en/docs/setup/turnkey/azure.md +++ b/content/en/docs/setup/turnkey/azure.md @@ -25,7 +25,7 @@ agent pools, and more. Some community contributions to AKS-Engine may even becom The input to AKS-Engine is an apimodel JSON file describing the Kubernetes cluster. It is similar to the Azure Resource Manager (ARM) template syntax used to deploy a cluster directly with the Azure Kubernetes Service. The resulting output is an ARM template that can be checked into source control and used to deploy Kubernetes clusters to Azure. -You can get started by following the **[ACS-Engine Kubernetes Tutorial](https://github.com/Azure/aks-engine/blob/master/docs/tutorials/README.md)**. +You can get started by following the **[AKS-Engine Kubernetes Tutorial](https://github.com/Azure/aks-engine/blob/master/docs/tutorials/README.md)**. ## CoreOS Tectonic for Azure