From 1cba33eb0ec2f968c38c90b33abdc98c177d258d Mon Sep 17 00:00:00 2001
From: Rita Zhang <rita.z.zhang@gmail.com>
Date: Mon, 21 May 2018 10:49:34 -0700
Subject: [PATCH] Update prometheus extension with new cse naming convention
 (#3018)

---
 .../prometheus-grafana-k8s/v1/prometheus-grafana-k8s.sh  | 3 +++
 extensions/prometheus-grafana-k8s/v1/template-link.json  | 5 ++++-
 extensions/prometheus-grafana-k8s/v1/template.json       | 9 ++++++++-
 pkg/acsengine/engine.go                                  | 6 +++---
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/extensions/prometheus-grafana-k8s/v1/prometheus-grafana-k8s.sh b/extensions/prometheus-grafana-k8s/v1/prometheus-grafana-k8s.sh
index 000301ea95..bde3b0c4a5 100644
--- a/extensions/prometheus-grafana-k8s/v1/prometheus-grafana-k8s.sh
+++ b/extensions/prometheus-grafana-k8s/v1/prometheus-grafana-k8s.sh
@@ -341,6 +341,9 @@ DS_NAME=prometheus1
 
 PROM_URL=http://monitoring-prometheus-server
 
+# When RBAC is enabled, need to grant permission to tiller
+kubectl create clusterrolebinding tiller-cluster-admin --clusterrole=cluster-admin --serviceaccount=kube-system:default
+
 install_helm "$RAW_PROMETHEUS_CHART_VALS"
 wait_for_tiller
 if [[ $? -ne 0 ]]; then
diff --git a/extensions/prometheus-grafana-k8s/v1/template-link.json b/extensions/prometheus-grafana-k8s/v1/template-link.json
index ee89795b63..64474cc151 100644
--- a/extensions/prometheus-grafana-k8s/v1/template-link.json
+++ b/extensions/prometheus-grafana-k8s/v1/template-link.json
@@ -3,7 +3,7 @@
     "type": "Microsoft.Resources/deployments",
     "apiVersion": "[variables('apiVersionLinkDefault')]",
     "dependsOn": [
-        "[concat('Microsoft.Compute/virtualMachines/', EXTENSION_TARGET_VM_NAME_PREFIX, copyIndex(EXTENSION_LOOP_OFFSET), '/extensions/cse', copyIndex(EXTENSION_LOOP_OFFSET))]"
+        "[concat('Microsoft.Compute/virtualMachines/', EXTENSION_TARGET_VM_NAME_PREFIX, copyIndex(EXTENSION_LOOP_OFFSET), '/extensions/cse', '-EXTENSION_TARGET_VM_TYPE-', copyIndex(EXTENSION_LOOP_OFFSET))]"
     ],
     "copy": {
         "count": "EXTENSION_LOOP_COUNT",
@@ -25,6 +25,9 @@
             "targetVMName": {
                 "value": "[concat(EXTENSION_TARGET_VM_NAME_PREFIX, copyIndex(EXTENSION_LOOP_OFFSET))]"
             },
+            "targetVMType": {
+                "value": "EXTENSION_TARGET_VM_TYPE"
+            },
             "extensionParameters": {
                 "value": "EXTENSION_PARAMETERS_REPLACE"
             },
diff --git a/extensions/prometheus-grafana-k8s/v1/template.json b/extensions/prometheus-grafana-k8s/v1/template.json
index a15413c65a..2ea2934c1e 100644
--- a/extensions/prometheus-grafana-k8s/v1/template.json
+++ b/extensions/prometheus-grafana-k8s/v1/template.json
@@ -23,6 +23,13 @@
 				"description": "Name of the vm to run the "
 			}
 		},
+		"targetVMType":{
+			"type": "string",
+			"minLength": 1,
+			"metadata": {
+				"description": "Type of the vm to run the extension: master or agent "
+			}
+		},
 		"extensionParameters": {
 			"type": "securestring",
 			"minLength": 0,
@@ -47,7 +54,7 @@
       "dependsOn": [],
       "location": "[resourceGroup().location]",
       "type": "Microsoft.Compute/virtualMachines/extensions",
-	  "name": "[concat(parameters('targetVMName'),'/cse', parameters('vmIndex'))]",
+	  "name": "[concat(parameters('targetVMName'),'/cse', '-', parameters('targetVMType'), '-', parameters('vmIndex'))]",
       "properties": {
         "publisher": "Microsoft.Azure.Extensions",
         "type": "CustomScript",
diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
index 393f0e7585..1594fc31db 100644
--- a/pkg/acsengine/engine.go
+++ b/pkg/acsengine/engine.go
@@ -2866,10 +2866,10 @@ func internalGetPoolLinkedTemplateText(extTargetVMNamePrefix, orchestratorType,
 	if e != nil {
 		return "", e
 	}
-	if strings.Contains(extTargetVMNamePrefix, "master") {
-		dta = strings.Replace(dta, "EXTENSION_TARGET_VM_TYPE", "master", -1)
-	} else {
+	if strings.Contains(extTargetVMNamePrefix, "agent") {
 		dta = strings.Replace(dta, "EXTENSION_TARGET_VM_TYPE", "agent", -1)
+	} else {
+		dta = strings.Replace(dta, "EXTENSION_TARGET_VM_TYPE", "master", -1)
 	}
 	extensionsParameterReference := fmt.Sprintf("[parameters('%sParameters')]", extensionProfile.Name)
 	dta = strings.Replace(dta, "EXTENSION_PARAMETERS_REPLACE", extensionsParameterReference, -1)