E2E: enable iis scaling test

.circleci/config.yml

@@ -1,9 +1,9 @@
 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.2
+    - image: quay.io/deis/go-dev:v1.17.3
   environment:
     GOPATH: /go
 
@@ -24,9 +24,6 @@ jobs:
       - run:
           name: Install dependencies
           command: make bootstrap
-      - run:
-          name: Run validation rules
-          command: make validate-generated
       - run:
           name: Run linting rules
           command: make test-style
@@ -62,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:
@@ -72,7 +69,7 @@ jobs:
           echo 'export ORCHESTRATOR_RELEASE=1.10' >> $BASH_ENV
           echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
           echo 'export CREATE_VNET=true' >> $BASH_ENV
-          echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
+          echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV
           echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
           echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV
           echo 'export RETAIN_SSH=false' >> $BASH_ENV
@@ -88,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:
@@ -98,7 +95,7 @@ jobs:
           echo 'export ORCHESTRATOR_RELEASE=1.11' >> $BASH_ENV
           echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
           echo 'export CREATE_VNET=true' >> $BASH_ENV
-          echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
+          echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV
           echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
           echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV
           echo 'export RETAIN_SSH=false' >> $BASH_ENV
@@ -114,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:
@@ -124,7 +121,7 @@ jobs:
           echo 'export ORCHESTRATOR_RELEASE=1.12' >> $BASH_ENV
           echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
           echo 'export CREATE_VNET=true' >> $BASH_ENV
-          echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
+          echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV
           echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
           echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV
           echo 'export RETAIN_SSH=false' >> $BASH_ENV
@@ -140,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:
@@ -150,7 +147,7 @@ jobs:
           echo 'export ORCHESTRATOR_RELEASE=1.13' >> $BASH_ENV
           echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
           echo 'export CREATE_VNET=true' >> $BASH_ENV
-          echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
+          echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV
           echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
           echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV
           echo 'export RETAIN_SSH=false' >> $BASH_ENV
@@ -166,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:
@@ -189,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:
@@ -212,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:
@@ -235,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:
@@ -258,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

.gitattributes

@@ -1 +1,2 @@
+parts/*.tmpl linguist-language=Go
 * -crlf

.github/ISSUE_TEMPLATE.md

@@ -8,7 +8,7 @@
 
 ---
 
-**What version of acs-engine?**:
+**What version of aks-engine?**:
 
 ---
 
@@ -27,7 +27,7 @@ might close your issue.  If we're wrong, PLEASE feel free to reopen it and
 explain why.
 -->
 
-**Orchestrator and version (e.g. Kubernetes, DC/OS, Swarm)**
+**Kubernetes version**
 
 
 **What happened**:

.gitignore

@@ -1,34 +1,32 @@
-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
 test/e2e/kubernetes/translations/
-test/e2e/openshift/translations/
-pkg/openshift/translations/
 
 # test outputs
 cmd/_test_output
@@ -41,4 +39,4 @@ packer/sp.json
 .vs
 
 # exclude vendor directory from gitignore
-!/vendor/**/*
+!/vendor/**/*

.prowci/Makefile

@@ -2,13 +2,13 @@ prow: prow-config prow-secrets prow-services
 .PHONY: prow
 
 prow-config:
-	kubectl create cm config --from-file=config=config.yaml
-	kubectl create cm plugins --from-file=plugins=plugins.yaml
+	kubectl create cm config --from-file=config.yaml=config.yaml
+	kubectl create cm plugins --from-file=plugins.yaml=plugins.yaml
 .PHONY: prow-config
 
 prow-config-update:
-	kubectl create cm config --from-file=config=config.yaml -o yaml --dry-run | kubectl replace -f -
-	kubectl create cm plugins --from-file=plugins=plugins.yaml -o yaml --dry-run | kubectl replace -f -
+	kubectl create cm config --from-file=config.yaml=config.yaml -o yaml --dry-run | kubectl replace -f -
+	kubectl create cm plugins --from-file=plugins.yaml=plugins.yaml -o yaml --dry-run | kubectl replace -f -
 .PHONY: prow-config-update
 
 prow-secrets:

.prowci/README.md

@@ -4,12 +4,12 @@ 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
 
-Prow is optimized to run as a Kubernetes application. There are some pre-installation
-steps that need to happen in a new Kubernetes cluster before deploying Prow. These
-involve setting up an Ingress controller and a mechanism to do TLS. The [Azure docs][1]
-explain how to setup Ingress with TLS on top of a Kubernetes cluster in Azure.
+Deploy a new Kubernetes cluster (eg. `az aks create -g acse-test-prow-ci -n prow)
+
+Set up an Ingress controller and a mechanism to do TLS. The [Azure docs][1]
+explain how to setup Ingress with TLS on top of a Kubernetes cluster in Azure. (make sure you specify `--set rbac.create=true` when creating the ingress controller)
 
 A Github webhook also needs to be setup in the repo that points to `dns-name/hook`.
 `dns-name` is the DNS name setup during the DNS configuration of the Ingress controller.
@@ -35,6 +35,5 @@ appropriately on Github. `deck` is installed as the Prow frontend. Last, `tide`
 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

.prowci/config.yaml

@@ -1,12 +1,12 @@
 log_level: debug
 
 tide:
-  # target_url: http://ci-bot-aks-ingress.eastus.cloudapp.azure.com/tide.html
+  # 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/hook.yaml

@@ -39,7 +39,7 @@ items:
       spec:
         containers:
         - name: hook
-          image: quay.io/kargakis/hook:workaround
+          image: registry.svc.ci.openshift.org/ci/hook:latest
           imagePullPolicy: IfNotPresent
           args:
           - --dry-run=false

.prowci/ingress.yaml

@@ -9,9 +9,9 @@ spec:
   tls:
   - secretName: prow-tls
     hosts:
-    - ci-bot-aks-ingress.eastus.cloudapp.azure.com
+    - prow-ci-bot-ingress.eastus.cloudapp.azure.com
   rules:
-  - host: ci-bot-aks-ingress.eastus.cloudapp.azure.com
+  - host: prow-ci-bot-ingress.eastus.cloudapp.azure.com
     http:
       paths:
       - path: /*

.prowci/plugins.yaml

@@ -1,6 +1,6 @@
 approve:
 - repos:
-  - Azure/acs-engine
+  - Azure/aks-engine
   implicit_self_approve: true
   lgtm_acts_as_approve: true
 
@@ -14,14 +14,11 @@ config_updater:
 label:
   additional_labels:
   - orchestrator/k8s
-  - orchestrator/openshift
-  - orchestrator/dcos
-  - orchestrator/swarm
   - DO-NOT-MERGE
 
 
 plugins:
-  Azure/acs-engine:
+  Azure/aks-engine:
   - approve
   - assign
   - cat

.prowci/tide.yaml

@@ -38,7 +38,7 @@ items:
         serviceAccountName: tide
         containers:
         - name: tide
-          image: quay.io/kargakis/tide:workaround
+          image: registry.svc.ci.openshift.org/ci/tide:latest
           imagePullPolicy: IfNotPresent
           args:
           - --dry-run=false

.vsts-ci.yaml

@@ -14,8 +14,8 @@ phases:
   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