Add providerID for autoscale 1.0.3

Author: 0lvin

.gitmodules

@@ -101,7 +101,7 @@
 [submodule "src/k8s.io/autoscaler"]
 	path = src/k8s.io/autoscaler
 	url = [email protected]:cloudify-incubator/kubernetes-autoscaler.git
-	branch = master
+	branch = cluster-autoscaler-stable
 [submodule "src/github.com/tools/godep"]
 	path = src/github.com/tools/godep
 	url = [email protected]:tools/godep.git

examples/cluster_blueprint/monitoring.yaml

@@ -280,3 +280,16 @@ node_templates:
       target: kube
     - type: cloudify.relationships.depends_on
       target: heapster_deployment
+
+  heapster_rbac:
+    type: cloudify.nodes.ApplicationServer
+    interfaces:
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        create:
+          implementation: scripts/cfy_autoscale/heapster_rbac.sh
+    relationships:
+    - target: kubemanager
+      type: cloudify.relationships.contained_in
+    - type: cloudify.relationships.depends_on
+      target: heapster_service

examples/cluster_blueprint/scripts/cfy_autoscale/heapster_rbac.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+ctx logger info "Start rbac/heapster-rbac"
+for retry_count in {1..10}
+do
+	kubectl create -f https://raw.githubusercontent.com/kubernetes/heapster/release-1.4/deploy/kube-config/rbac/heapster-rbac.yaml && break
+	ctx logger info "Issues with start heapster-rbac"
+	sleep 10
+done

examples/cluster_blueprint/scripts/kubernetes/install.sh

@@ -30,14 +30,14 @@ elif [[ "$VM_VERSION" == 'NAME="Ubuntu"' ]]; then
 	EOF
 
 	sudo apt-get update
-	sudo apt-get install -y kubelet=1.8.3-00 kubeadm=1.8.3-00
+	sudo apt-get install -y kubelet=1.8.4-00 kubeadm=1.8.4-00
 else
 	ctx logger info "Unknow OS"
 fi
 
 # we need to disable swaps before use
 swapon -s | awk '{print "sudo swapoff " $1}' | grep -v "Filename" | sh -
-sudo sed -i 's|cgroup-driver=systemd|cgroup-driver=cgroupfs|g' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+sudo sed -i 's|cgroup-driver=systemd|cgroup-driver=cgroupfs --provider-id='`hostname`'|g' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
 
 ctx logger info "Reload kubernetes"
 

src/cloudifyprovider/instances.go

@@ -219,8 +219,6 @@ func (r *Instances) ExternalID(nodeName types.NodeName) (string, error) {
 	return r.InstanceID(nodeName)
 }
 
-const fakeuuid = "fakeuuid:"
-
 // InstanceID returns the cloud provider ID of the specified instance.
 func (r *Instances) InstanceID(nodeName types.NodeName) (string, error) {
 	name := string(nodeName)
@@ -247,8 +245,8 @@ func (r *Instances) InstanceID(nodeName types.NodeName) (string, error) {
 				continue
 			}
 
-			glog.Infof("Node is alive %+v", nodeInstance)
-			return fakeuuid + name, nil
+			glog.Infof("Node is alive: %+v", name)
+			return name, nil
 		}
 	}