Merge pull request #2 from AndrewChubatiuk/fix-scaler

Updated scaling

Author: AndrewChubatiuk

.circleci/config.yml

@@ -1,5 +1,8 @@
 version: 2.1
 
+orbs:
+  docker: circleci/[email protected]
+
 executors:
   go-linux:
     resource_class: medium
@@ -57,20 +60,33 @@ workflows:
     jobs:
       - check-deps-go:
           filters:
-              tags:
-                only: /^v\d+\.\d+\.\d+$/
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
       - lint-go:
           filters:
-              tags:
-                only: /^v\d+\.\d+\.\d+$/
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
       - linux-build-go:
           filters:
-              tags:
-                only: /^v\d+\.\d+\.\d+$/
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
       - linux-test-go:
           filters:
-              tags:
-                only: /^v\d+\.\d+\.\d+$/
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
+      - docker/publish:
+          attach-at: ./bin/
+          deploy: true
+          image: achubatiuk/nomad-autoscaler
+          tag: $CIRCLE_BRANCH
+          requires:
+            - check-deps-go
+            - lint-go
+            - linux-build-go
+            - linux-test-go
+          filters:
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
       - release:
           requires:
             - check-deps-go

.gitignore

@@ -1,2 +1,9 @@
 bin/*
-
+.terraform.lock.hcl
+*.tfstate
+*.tfstate.backup
+*.tfstate.*.backup
+*.tfplan
+**/.terraform/*
+creds.json
+.vscode

Dockerfile

@@ -0,0 +1,2 @@
+FROM hashicorp/nomad-autoscaler:0.3.6
+ADD bin/hcloud-server /plugins/

Makefile

@@ -32,7 +32,7 @@ build:
 	@CGO_ENABLED=0 GO111MODULE=on \
 	go build \
 	-ldflags $(GO_LDFLAGS) \
-	-o ./bin/nomad-hcloud-autoscaler
+	-o ./bin/hcloud-server
 	@echo "==> Done"
 
 .PHONY: lint
@@ -66,5 +66,5 @@ test: ## Test the source code
 .PHONY: clean
 clean:
 	@echo "==> Cleaning build artifacts..."
-	@rm -f ./bin/nomad-hcloud-autoscaler
+	@rm -f ./bin/*
 	@echo "==> Done"

README.md

@@ -1,6 +1,15 @@
 # nomad-hcloud-autoscaler
 
-Example configuration
+## Demo
+Run `terraform apply` in [demo](demo/setup) folder to create: 
+ - nomad server which runs services for:
+    - nomad-autoscaler
+    - prometheus
+    - redis
+Autoscaler scales hcloud nodes for redis. After successful run both Nomad and Consul are wide-world open and credentials for both you can find in terraform output
+
+
+## Configuration
 
 `config.hcl`
 ```
@@ -75,7 +84,7 @@ template {
             hcloud_user_data = ""
             hcloud_ssh_keys = "XXX"
             hcloud_server_type = "cx11"
-            hcloud_name_prefix = "XXX"
+            hcloud_group_id = "XXX"
             hcloud_labels = "XXX_node=true"
             hcloud_networks = "XXX"
         }

demo/modules/hcloud-server/output.tf

@@ -0,0 +1,7 @@
+output "ipv4_addresses" {
+  value = hcloud_server.server.*.ipv4_address
+}
+
+output "ids" {
+  value = hcloud_server.server.*.id
+}

demo/modules/hcloud-server/servers.tf

@@ -0,0 +1,18 @@
+data "hcloud_datacenters" "dc" {}
+
+resource "random_shuffle" "dc" {
+  count        = var.server_count
+  input        = local.locations
+  result_count = 1
+}
+
+resource "hcloud_server" "server" {
+  count       = var.server_count
+  name        = "${var.prefix}-${count.index}"
+  image       = var.image
+  datacenter  = random_shuffle.dc[count.index].result[0]
+  ssh_keys    = var.ssh_keys
+  server_type = var.server_type
+  user_data   = var.user_data
+  labels      = merge(var.labels, { "Name" = var.prefix })
+}

demo/modules/hcloud-server/variables.tf

@@ -0,0 +1,29 @@
+variable "location" {
+  type    = string
+  default = null
+}
+
+variable "labels" {
+  type    = map(string)
+  default = {}
+}
+
+variable "prefix" {}
+
+variable "server_count" {}
+
+variable "ssh_keys" {
+  type = list(string)
+}
+
+variable "server_type" {}
+
+variable "user_data" {}
+
+variable "image" {
+  default = "ubuntu-20.04"
+}
+
+locals {
+  locations = [for dc in data.hcloud_datacenters.dc.names : dc if var.location != null && can(regex("^${var.location}-dc\\d+$", dc))]
+}

demo/modules/hcloud-server/versions.tf

@@ -0,0 +1,11 @@
+terraform {
+  required_providers {
+    hcloud = {
+      source = "hetznercloud/hcloud"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
+  required_version = ">= 0.13"
+}

demo/modules/nomad-service/service.tf

@@ -0,0 +1,3 @@
+resource "nomad_job" "service" {
+  jobspec = file(var.path)
+}