Rename to aks-engine

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2
 
 defaults: &defaults
-  working_directory: /go/src/github.com/Azure/acs-engine
+  working_directory: /go/src/github.com/Azure/aks-engine
   docker:
     - image: quay.io/deis/go-dev:v1.17.3
   environment:
@@ -59,7 +59,7 @@ jobs:
           command: make test-kubernetes
           no_output_timeout: "30m"
       - store_artifacts:
-          path: /go/src/github.com/Azure/acs-engine/_logs
+          path: /go/src/github.com/Azure/aks-engine/_logs
   k8s-1.10-release-e2e:
     <<: *defaults
     steps:
@@ -85,7 +85,7 @@ jobs:
           command: make test-kubernetes
           no_output_timeout: "30m"
       - store_artifacts:
-          path: /go/src/github.com/Azure/acs-engine/_logs
+          path: /go/src/github.com/Azure/aks-engine/_logs
   k8s-1.11-release-e2e:
     <<: *defaults
     steps:
@@ -111,7 +111,7 @@ jobs:
           command: make test-kubernetes
           no_output_timeout: "30m"
       - store_artifacts:
-          path: /go/src/github.com/Azure/acs-engine/_logs
+          path: /go/src/github.com/Azure/aks-engine/_logs
   k8s-1.12-release-e2e:
     <<: *defaults
     steps:
@@ -137,7 +137,7 @@ jobs:
           command: make test-kubernetes
           no_output_timeout: "30m"
       - store_artifacts:
-          path: /go/src/github.com/Azure/acs-engine/_logs
+          path: /go/src/github.com/Azure/aks-engine/_logs
   k8s-1.13-release-e2e:
     <<: *defaults
     steps:
@@ -163,7 +163,7 @@ jobs:
           command: make test-kubernetes
           no_output_timeout: "30m"
       - store_artifacts:
-          path: /go/src/github.com/Azure/acs-engine/_logs
+          path: /go/src/github.com/Azure/aks-engine/_logs
   k8s-windows-1.10-release-e2e:
     <<: *defaults
     steps:
@@ -186,7 +186,7 @@ jobs:
           command: make test-kubernetes
           no_output_timeout: "30m"
       - store_artifacts:
-          path: /go/src/github.com/Azure/acs-engine/_logs
+          path: /go/src/github.com/Azure/aks-engine/_logs
   k8s-windows-1.11-release-e2e:
     <<: *defaults
     steps:
@@ -209,7 +209,7 @@ jobs:
           command: make test-kubernetes
           no_output_timeout: "30m"
       - store_artifacts:
-          path: /go/src/github.com/Azure/acs-engine/_logs
+          path: /go/src/github.com/Azure/aks-engine/_logs
   k8s-windows-1.12-release-e2e:
     <<: *defaults
     steps:
@@ -232,7 +232,7 @@ jobs:
           command: make test-kubernetes
           no_output_timeout: "30m"
       - store_artifacts:
-          path: /go/src/github.com/Azure/acs-engine/_logs
+          path: /go/src/github.com/Azure/aks-engine/_logs
   k8s-windows-1.13-release-e2e:
     <<: *defaults
     steps:
@@ -255,7 +255,7 @@ jobs:
           command: make test-kubernetes
           no_output_timeout: "30m"
       - store_artifacts:
-          path: /go/src/github.com/Azure/acs-engine/_logs
+          path: /go/src/github.com/Azure/aks-engine/_logs
 workflows:
   version: 2
   build_and_test_pr:

.dockerignore

@@ -1,7 +1,7 @@
-./acs-engine
-./acs-engine.exe
+./aks-engine
+./aks-engine.exe
 ./_output
-./test/acs-engine-test/acs-engine-test
+./test/aks-engine-test/aks-engine-test
 ## autogenerated
 ./pkg/i18n/translations.go
-./pkg/acsengine/templates.go
+./pkg/engine/templates.go

.github/ISSUE_TEMPLATE.md

@@ -8,7 +8,7 @@
 
 ---
 
-**What version of acs-engine?**:
+**What version of aks-engine?**:
 
 ---
 

.gitignore

@@ -1,28 +1,28 @@
-acs-engine.exe
-acs-engine
+aks-engine.exe
+aks-engine
 debug
 _output/
 _input/
 .vscode
 .DS_Store
 test/user.env
 user.env
-test/acs-engine-test/acs-engine-test
+test/aks-engine-test/aks-engine-test
 .editorconfig
 _dist/
 bin/
 .env
 .coverprofile
 
 test/junit/
-test/acs-engine-test/acs-engine-test.exe
+test/aks-engine-test/aks-engine-test.exe
 pkg/operations/junit.xml
 pkg/operations/kubernetesupgrade/junit.xml
-pkg/acsengine/templates.go
+pkg/engine/templates.go
 pkg/i18n/translations.go
 
 _logs/
-test/acs-engine-test/report/TestReport.json
+test/aks-engine-test/report/TestReport.json
 *.swp
 
 # I have no idea why these get generated when I run the e2e test
@@ -41,4 +41,4 @@ packer/sp.json
 .vs
 
 # exclude vendor directory from gitignore
-!/vendor/**/*
+!/vendor/**/*

.prowci/README.md

@@ -4,7 +4,7 @@ Prow is a CI system that offers various features such as rich Github automation,
 and running tests in Jenkins or on a Kubernetes cluster. You can read more about
 Prow in [upstream docs][0].
 
-## acs-engine setup
+## aks-engine setup
 
 Deploy a new Kubernetes cluster (eg. `az aks create -g acse-test-prow-ci -n prow)
 
@@ -36,4 +36,4 @@ is also installed that takes care of merging pull requests that pass all tests
 and satisfy a set of label requirements.
 
 [0]: https://github.com/kubernetes/test-infra/tree/master/prow#prow
-[1]: https://docs.microsoft.com/en-us/azure/aks/ingress
+[1]: https://docs.microsoft.com/en-us/azure/aks/ingress

.prowci/config.yaml

@@ -3,10 +3,10 @@ log_level: debug
 tide:
   # target_url: http://prow-ci-bot-ingress.eastus.cloudapp.azure.com/tide.html
   merge_method:
-    Azure/acs-engine: squash
+    Azure/aks-engine: squash
   queries:
   - repos:
-    - Azure/acs-engine
+    - Azure/aks-engine
     labels:
     - lgtm
     - approved

.prowci/plugins.yaml

@@ -1,6 +1,6 @@
 approve:
 - repos:
-  - Azure/acs-engine
+  - Azure/aks-engine
   implicit_self_approve: true
   lgtm_acts_as_approve: true
 
@@ -21,7 +21,7 @@ label:
 
 
 plugins:
-  Azure/acs-engine:
+  Azure/aks-engine:
   - approve
   - assign
   - cat

.vsts-ci.yaml

@@ -1,21 +1,21 @@
 trigger: none
 
-# steps: 
+# steps:
 # - create an VHD in Packer to normal storage account
 # - copy from Packer storage account to classic storage account using AzCopy
 # - generate SAS link from azure CLI
 # - POST a new SKU to azure marketplace
 
 phases:
 - phase: build_vhd
-  queue: 
+  queue:
     name: Hosted Ubuntu 1604
     timeoutInMinutes: 120
   steps:
   - script: |
       docker run --rm \
-      -v ${PWD}:/go/src/github.com/Azure/acs-engine \
-      -w /go/src/github.com/Azure/acs-engine \
+      -v ${PWD}:/go/src/github.com/Azure/aks-engine \
+      -w /go/src/github.com/Azure/aks-engine \
       -e CLIENT_ID=${CLIENT_ID} \
       -e CLIENT_SECRET="$(CLIENT_SECRET)" \
       -e TENANT_ID=${TENANT_ID} \
@@ -33,8 +33,8 @@ phases:
       VHD_NAME="$(echo $OS_DISK_SAS | cut -d "/" -f 8 | cut -d "?" -f 1)" && \
       printf "COPY ME ----> ${CLASSIC_BLOB}/${VHD_NAME}?" | tee -a vhd-sas && \
       docker run --rm \
-      -v ${PWD}:/go/src/github.com/Azure/acs-engine \
-      -w /go/src/github.com/Azure/acs-engine \
+      -v ${PWD}:/go/src/github.com/Azure/aks-engine \
+      -w /go/src/github.com/Azure/aks-engine \
       -e CLIENT_ID=${CLIENT_ID} \
       -e CLIENT_SECRET="$(CLIENT_SECRET)" \
       -e TENANT_ID=${TENANT_ID} \
@@ -46,8 +46,8 @@ phases:
     displayName: Copying resource to Classic Storage Account
   - script: |
       docker run --rm \
-      -v ${PWD}:/go/src/github.com/Azure/acs-engine \
-      -w /go/src/github.com/Azure/acs-engine \
+      -v ${PWD}:/go/src/github.com/Azure/aks-engine \
+      -w /go/src/github.com/Azure/aks-engine \
       -e CLIENT_ID=${CLIENT_ID} \
       -e CLIENT_SECRET="$(CLIENT_SECRET)" \
       -e TENANT_ID=${TENANT_ID} \

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing Guidelines
 
-The Microsoft acs-engine project accepts contributions via GitHub pull requests. This document outlines the process to help get your contribution accepted.
+The Microsoft aks-engine project accepts contributions via GitHub pull requests. This document outlines the process to help get your contribution accepted.
 
 ## Contributor License Agreements
 
@@ -18,8 +18,8 @@ signed the CLA can be accepted into the repository.
 This is an open source project and as such no formal support is available. However, like all good open source projects we do offer "best effort" support through github issues.
 
 GitHub issues:
-- ACS-Engine: https://github.com/Azure/acs-engine/issues - file issues and PRs related to ACS-Engine
-- ACS: https://github.com/Azure/acs/issues - file issues and PRs related to Azure Container Service
+- AKS-Engine: https://github.com/Azure/aks-engine/issues - file issues and PRs related to AKS-Engine
+- AKS: https://github.com/Azure/AKS/issues - file issues and PRs related to Azure Kubernetes Service
 
 Before opening a new issue or submitting a new pull request, it's helpful to search the project - it's likely that another user has already reported the issue you're facing, or it's a known issue that we're already aware of.
 
@@ -33,11 +33,11 @@ specific upcoming bug or minor release, it would go into `2.2.1` or `2.3.0`.
 A milestone (and hence release) is considered done when all outstanding issues/PRs have been closed or moved to another milestone.
 
 ## Issues
-Issues are used as the primary method for tracking anything to do with the acs-engine project.
+Issues are used as the primary method for tracking anything to do with the aks-engine project.
 
 ### Issue Lifecycle
 The issue lifecycle is mainly driven by the core maintainers, but is good information for those
-contributing to acs-engine. All issue types follow the same general lifecycle. Differences are noted below.
+contributing to aks-engine. All issue types follow the same general lifecycle. Differences are noted below.
 1. Issue creation
 2. Triage
     - The maintainer in charge of triaging will apply the proper labels for the issue. This

Dockerfile

@@ -24,10 +24,10 @@ RUN git clone https://github.com/akesterson/cmdarg.git /tmp/cmdarg \
 RUN git clone https://github.com/akesterson/shunit.git /tmp/shunit \
     && cd /tmp/shunit && make install && rm -rf /tmp/shunit
 
-WORKDIR /gopath/src/github.com/Azure/acs-engine
+WORKDIR /gopath/src/github.com/Azure/aks-engine
 
 # Cache vendor layer
-ADD . /gopath/src/github.com/Azure/acs-engine/
+ADD . /gopath/src/github.com/Azure/aks-engine/
 RUN make bootstrap
 
 # https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.1.2-sdk-download.md
@@ -45,4 +45,3 @@ RUN apt-get update \
     && curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
     && apt-get update \
     && apt-get install azure-cli
-

Makefile

@@ -16,15 +16,15 @@ GO              ?= go
 TAGS            :=
 LDFLAGS         :=
 BINDIR          := $(CURDIR)/bin
-BINARIES        := acs-engine
+BINARIES        := aks-engine
 VERSION         ?= $(shell git rev-parse HEAD)
 VERSION_SHORT   ?= $(shell git rev-parse --short HEAD)
 GITTAG          := $(shell git describe --exact-match --tags $(shell git log -n1 --pretty='%h') 2> /dev/null)
 ifeq ($(GITTAG),)
 GITTAG := $(VERSION_SHORT)
 endif
 
-REPO_PATH := github.com/Azure/acs-engine
+REPO_PATH := github.com/Azure/aks-engine
 DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.17.3
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_OPTS := --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_VARS}
@@ -63,17 +63,17 @@ generate-azure-constants:
 .PHONY: build
 build: generate
 	GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -ldflags '$(LDFLAGS)'
-	cd test/acs-engine-test; go build $(GOFLAGS)
+	cd test/aks-engine-test; go build $(GOFLAGS)
 
 build-binary: generate
-	go build $(GOFLAGS) -v -ldflags "${LDFLAGS}" -o ${BINARY_DEST_DIR}/acs-engine .
+	go build $(GOFLAGS) -v -ldflags "${LDFLAGS}" -o ${BINARY_DEST_DIR}/aks-engine .
 
 # usage: make clean build-cross dist VERSION=v0.4.0
 .PHONY: build-cross
 build-cross: build
 build-cross: LDFLAGS += -extldflags "-static"
 build-cross:
-	CGO_ENABLED=0 gox -output="_dist/acs-engine-${GITTAG}-{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)'
+	CGO_ENABLED=0 gox -output="_dist/aks-engine-${GITTAG}-{{.OS}}-{{.Arch}}/{{.Dir}}" -osarch='$(TARGETS)' $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)'
 
 .PHONY: build-windows-k8s
 build-windows-k8s:
@@ -101,7 +101,7 @@ clean:
 
 GIT_BASEDIR    = $(shell git rev-parse --show-toplevel 2>/dev/null)
 ifneq ($(GIT_BASEDIR),)
-	LDFLAGS += -X github.com/Azure/acs-engine/pkg/test.JUnitOutDir=${GIT_BASEDIR}/test/junit
+	LDFLAGS += -X github.com/Azure/aks-engine/pkg/test.JUnitOutDir=${GIT_BASEDIR}/test/junit
 endif
 
 test: generate

README.md

@@ -1,12 +1,12 @@
 # Microsoft Azure Container Service Engine - Builds Docker Enabled Clusters
 
-[![Coverage Status](https://codecov.io/gh/Azure/acs-engine/branch/master/graph/badge.svg)](https://codecov.io/gh/Azure/acs-engine)
-[![CircleCI](https://circleci.com/gh/Azure/acs-engine/tree/master.svg?style=svg)](https://circleci.com/gh/Azure/acs-engine/tree/master)
-[![GoDoc](https://godoc.org/github.com/Azure/acs-engine?status.svg)](https://godoc.org/github.com/Azure/acs-engine)
+[![Coverage Status](https://codecov.io/gh/Azure/aks-engine/branch/master/graph/badge.svg)](https://codecov.io/gh/Azure/aks-engine)
+[![CircleCI](https://circleci.com/gh/Azure/aks-engine/tree/master.svg?style=svg)](https://circleci.com/gh/Azure/aks-engine/tree/master)
+[![GoDoc](https://godoc.org/github.com/Azure/aks-engine?status.svg)](https://godoc.org/github.com/Azure/aks-engine)
 
 ## Overview
 
-The Azure Container Service Engine (`acs-engine`) generates ARM (Azure Resource Manager) templates for Docker enabled clusters on Microsoft Azure with your choice of DC/OS, Kubernetes, OpenShift, Swarm Mode, or Swarm orchestrators. The input to the tool is a cluster definition. The cluster definition (or apimodel) is very similar to (in many cases the same as) the ARM template syntax used to deploy a Microsoft Azure Container Service cluster.
+The Azure Container Service Engine (`aks-engine`) generates ARM (Azure Resource Manager) templates for Docker enabled clusters on Microsoft Azure with your choice of DC/OS, Kubernetes, OpenShift, Swarm Mode, or Swarm orchestrators. The input to the tool is a cluster definition. The cluster definition (or apimodel) is very similar to (in many cases the same as) the ARM template syntax used to deploy a Microsoft Azure Container Service cluster.
 
 The cluster definition file enables you to customize your Docker enabled cluster in many ways including:
 
@@ -44,7 +44,7 @@ These guides cover more advanced features to try out after you have built your f
 
 Follow the [developers guide](docs/developers.md) to set up your environment.
 
-To build acs-engine, run `make build`. If you are developing with a working [Docker environment](https://docs.docker.com/engine), you can also run `make dev` (or `makedev.ps1` on Windows) first to start a Docker container and run `make build` inside the container.
+To build aks-engine, run `make build`. If you are developing with a working [Docker environment](https://docs.docker.com/engine), you can also run `make dev` (or `makedev.ps1` on Windows) first to start a Docker container and run `make build` inside the container.
 
 Please follow these instructions before submitting a PR:
 
@@ -65,7 +65,7 @@ $ vim examples/kubernetes.json
 # insert your preferred, unique DNS prefix
 # insert your SSH public key
 
-$ ./acs-engine generate examples/kubernetes.json
+$ ./aks-engine generate examples/kubernetes.json
 ```
 
 This produces a new directory inside `_output/` that contains an ARM template for deploying Kubernetes into Azure. (In the case of Kubernetes, some additional needed assets are generated and placed in the output directory.)

README_zh-CN.md

@@ -2,7 +2,7 @@
 
 ## 概览
 
-微软容器服务引擎（`acs-engine`）用于将一个容器集群描述文件转化成一组ARM（Azure Resource Manager）模板，通过在Azure上部署这些模板，用户可以很方便地在Azure上建立一套基于Docker的容器服务集群。用户可以自由地选择集群编排引擎DC/OS, Kubernetes或者是Swarm/Swarm Mode。集群描述文件使用和ARM模板相同的语法，它们都可以用来部署Azure容器服务。
+微软容器服务引擎（`aks-engine`）用于将一个容器集群描述文件转化成一组ARM（Azure Resource Manager）模板，通过在Azure上部署这些模板，用户可以很方便地在Azure上建立一套基于Docker的容器服务集群。用户可以自由地选择集群编排引擎DC/OS, Kubernetes或者是Swarm/Swarm Mode。集群描述文件使用和ARM模板相同的语法，它们都可以用来部署Azure容器服务。
 
 集群描述文件提供了一下几个功能：
 * 可以自由选择DC/OS, Kubernetes, Swarm Mode和Swarm等多种编排引擎
@@ -16,7 +16,7 @@
 
 ## 演示链接
 
-* [ACS Engine](docs/acsengine.md) - 演示如何使用ACS引擎来生成基于Docker的容器集群
+* [AKS Engine](docs/acsengine.md) - 演示如何使用ACS引擎来生成基于Docker的容器集群
 * [Cluster Definition](docs/clusterdefinition.md) - 详细介绍集群描述文件的格式
 * [DC/OS Walkthrough](docs/dcos.md) - 演示如何使用ACS引擎在Azure上创建DC/OS集群
 * [Kubernetes Walkthrough](docs/kubernetes.md) - 演示如何使用ACS引擎在Azure上创建Kubernetes集群