Merge branch 'master' into 198-admin-cidr

Author: MattiasGees

docs/spelling_wordlist.txt

@@ -66,3 +66,12 @@ prepended
 username
 loopback
 CIDR
+addons
+autoscaler
+prometheus
+ubuntu
+offline
+admin
+plugin
+checklist
+localhost

docs/user-guide.rst

@@ -150,6 +150,32 @@ The configuration file can be found at ``$HOME/.tarmak/tarmak.yaml`` (default).
 The Pod Security Policy manifests can be found within the tarmak directory at
 ``puppet/modules/kubernetes/templates/pod-security-policy.yaml.erb``
 
+Cluster Autoscaler
+~~~~~~~~~~~~~~~~~~
+
+Tarmak supports deploying `Cluster Autoscaler
+<https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler>`_ when
+spinning up a Kubernetes cluster. The following `tarmak.yaml` snippet shows how
+you would enable Cluster Autoscaler. 
+
+.. code-block:: yaml
+
+    kubernetes:
+      clusterAutoscaler:
+        enabled: true
+    ...
+
+The above configuration would deploy Cluster Autoscaler with an image of
+`gcr.io/google_containers/cluster-autoscaler` using the recommend version based
+on the version of your Kubernetes cluster. The configuration block accepts two
+optional fields of `image` and `version` allowing you to change these defaults.
+Note that the final image tag used when deploying Cluster Autoscaler will be the
+configured version prepended with the letter `v`.
+
+The current implementation will configure the first instance pool of type worker
+in your cluster configuration to scale between `minCount` and `maxCount`. We
+plan to add support for an arbitrary number of worker instance pools.
+
 Logging
 ~~~~~~~
 
@@ -336,7 +362,6 @@ certificate is valid for ``jenkins.<environment>.<zone>``.
       type: ssd
   ...
 
-
 Tiller
 ~~~~~~
 
@@ -362,7 +387,6 @@ allows to override the deployed version:
    consider Helm's `security best practices
    <https://github.com/kubernetes/helm/blob/master/docs/securing_installation.md>`_.
 
-
 Prometheus
 ~~~~~~~~~~
 

pkg/puppet/puppet.go

@@ -306,11 +306,32 @@ func (p *Puppet) writeHieraData(puppetPath string, cluster interfaces.Cluster) e
 		return fmt.Errorf("error writing global hiera config: %s", err)
 	}
 
+	// retrieve details for first worker instance pool
+	workerMinCount := 0
+	workerMaxCount := 0
+	workerInstancePoolName := ""
+	if cluster.Config().Kubernetes.ClusterAutoscaler != nil && cluster.Config().Kubernetes.ClusterAutoscaler.Enabled {
+		for _, instancePool := range cluster.InstancePools() {
+			if instancePool.Role().Name() == clusterv1alpha1.KubernetesWorkerRoleName {
+				workerMinCount = instancePool.MinCount()
+				workerMaxCount = instancePool.MaxCount()
+				workerInstancePoolName = instancePool.Name()
+				break
+			}
+		}
+	}
+
 	// loop through instance pools
 	for _, instancePool := range cluster.InstancePools() {
 
 		classes, variables := contentInstancePoolConfig(cluster.Config(), instancePool.Config(), instancePool.Role().Name())
 
+		if instancePool.Role().Name() == clusterv1alpha1.KubernetesMasterRoleName && cluster.Config().Kubernetes.ClusterAutoscaler != nil && cluster.Config().Kubernetes.ClusterAutoscaler.Enabled {
+			variables = append(variables, fmt.Sprintf(`kubernetes_addons::cluster_autoscaler::min_instances: %d`, workerMinCount))
+			variables = append(variables, fmt.Sprintf(`kubernetes_addons::cluster_autoscaler::max_instances: %d`, workerMaxCount))
+			variables = append(variables, fmt.Sprintf(`kubernetes_addons::cluster_autoscaler::instance_pool_name: "%s"`, workerInstancePoolName))
+		}
+
 		//  classes
 		err = p.writeLines(
 			filepath.Join(hieraPath, "instance_pools", fmt.Sprintf("%s_classes.yaml", instancePool.Name())), classes,

pkg/tarmak/cluster/cluster.go

@@ -418,12 +418,13 @@ func (c *Cluster) Variables() map[string]interface{} {
 		if ok {
 			output[fmt.Sprintf("%s_ami", instancePool.TFName())] = ids
 		}
-		output[fmt.Sprintf("%s_instance_count", instancePool.TFName())] = instancePool.Config().MinCount
 		if instancePool.Config().AllowCIDRs != nil {
 			output[fmt.Sprintf("%s_admin_cidrs", instancePool.TFName())] = instancePool.Config().AllowCIDRs
 		} else {
 			output[fmt.Sprintf("%s_admin_cidrs", instancePool.TFName())] = c.environment.Config().AdminCIDRs
 		}
+		output[fmt.Sprintf("%s_min_instance_count", instancePool.TFName())] = instancePool.Config().MinCount
+		output[fmt.Sprintf("%s_max_instance_count", instancePool.TFName())] = instancePool.Config().MaxCount
 	}
 
 	// set network cidr

pkg/tarmak/instance_pool/instance_pool.go

@@ -149,8 +149,11 @@ func (n *InstancePool) RootVolume() interfaces.Volume {
 	return n.rootVolume
 }
 
-func (n *InstancePool) Count() int {
-	// TODO: this needs to be replaced by Max/Min
+func (n *InstancePool) MinCount() int {
+	return n.conf.MinCount
+}
+
+func (n *InstancePool) MaxCount() int {
 	return n.conf.MaxCount
 }
 

pkg/tarmak/interfaces/interfaces.go

@@ -249,6 +249,8 @@ type InstancePool interface {
 	Volumes() []Volume
 	Zones() []string
 	Validate() error
+	MinCount() int
+	MaxCount() int
 }
 
 type Volume interface {

puppet/hieradata/common.yaml

@@ -15,10 +15,6 @@ tarmak::kubernetes_api_url: "https://api.%{::tarmak_cluster}.%{::tarmak_dns_root
 # TODO: This should come from terraform
 tarmak::etcd_instances: 3
 
-# cluster scaler config
-kubernetes_addons::cluster_autoscaler::min_instances: 3
-kubernetes_addons::cluster_autoscaler::max_instances: 10
-
 # point heapster to influxdb
 kubernetes_addons::heapster::sink: influxdb:http://monitoring-influxdb.kube-system:8086
 

puppet/modules/aws_es_proxy/spec/acceptance/nodesets/default.yml

@@ -7,7 +7,7 @@ HOSTS:
       - k8s-worker
     platform: el-7-x86_64
     box: centos/7
-    box_version: 1710.01
+    box_version: 1804.02
     hypervisor: vagrant_libvirt
 CONFIG:
   type: foss

puppet/modules/calico/spec/acceptance/nodesets/default.yml

@@ -5,7 +5,7 @@ HOSTS:
       - master
     platform: el-7-x86_64
     box: centos/7
-    box_version: 1710.01
+    box_version: 1804.02
     hypervisor: vagrant_libvirt
 CONFIG:
   type: foss

puppet/modules/etcd/spec/acceptance/nodesets/3n-cluster.yml

@@ -6,23 +6,23 @@ HOSTS:
       - master
     platform: el-7-x86_64
     box: centos/7
-    box_version: 1710.01
+    box_version: 1804.02
     hypervisor: vagrant_libvirt
     ip: 10.123.0.11
   etcd2:
     roles:
       - etcd
     platform: el-7-x86_64
     box: centos/7
-    box_version: 1710.01
+    box_version: 1804.02
     hypervisor: vagrant_libvirt
     ip: 10.123.0.12
   etcd3:
     roles:
       - etcd
     platform: el-7-x86_64
     box: centos/7
-    box_version: 1710.01
+    box_version: 1804.02
     hypervisor: vagrant_libvirt
     ip: 10.123.0.13
 CONFIG: