Merge pull request #56 from acornies/bug/datacenters

Change datacenter behaviour:
hashicorp · Oct 27, 2018 · 1937e19 · 1937e19
2 parents 114f923 + 3c8b8f4
commit 1937e19
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,6 @@
       "request": "launch",
       "mode": "auto",
       "remotePath": "",
-      "port": 8080,
       "host": "0.0.0.0",
       "program": "${workspaceFolder}",
       "env": {},
@@ -21,7 +20,8 @@
         "-statsd_addr", "192.168.50.2:9125",
         "-basic_auth_secret_path", "provisioning/secrets",
         "-enable_basic_auth=false",
-        "-vault_default_policy", "openfaas"
+        "-vault_default_policy", "openfaas",
+        "-port=8081"
       ],
       "showLog": true
     }

diff --git a/handlers/deploy.go b/handlers/deploy.go
@@ -78,7 +78,7 @@ func createJob(r requests.CreateFunctionRequest, providerConfig types.ProviderCo
 	job := api.NewServiceJob(jobname, jobname, "global", 1)
 
 	job.Meta = createAnnotations(r)
-	job.Datacenters = createDataCenters(r)
+	job.Datacenters = createDataCenters(r, providerConfig.Datacenter)
 	job.Update = createUpdateStrategy()
 
 	// add constraints
@@ -222,20 +222,21 @@ func createLimits(r requests.CreateFunctionRequest) (taskMemory, taskCPU int) {
 	return taskMemory, taskCPU
 }
 
-func createDataCenters(r requests.CreateFunctionRequest) []string {
-	if r.Labels != nil && (*r.Labels)["datacenters"] != "" {
-		lbls := (*r.Labels)["datacenters"]
+func createDataCenters(r requests.CreateFunctionRequest, defaultDC string) []string {
+	if r.Constraints != nil && len(r.Constraints) > 0 {
 		dcs := []string{}
 
-		for _, dc := range strings.Split(lbls, ",") {
-			dcs = append(dcs, strings.Trim(dc, " "))
+		for _, constr := range r.Constraints {
+			if strings.Contains(constr, "datacenter") {
+				dcs = append(dcs, strings.Trim(strings.Split(constr, "==")[1], " "))
+			}
 		}
 
 		return dcs
 	}
 
 	// default datacenter
-	return []string{"dc1"}
+	return []string{defaultDC}
 }
 
 func createEnvVars(r requests.CreateFunctionRequest) map[string]string {

diff --git a/handlers/deploy_test.go b/handlers/deploy_test.go
@@ -26,7 +26,7 @@ func setupDeploy(body string) (http.HandlerFunc, *httptest.ResponseRecorder, *ht
 
 	logger := hclog.Default()
 
-	return MakeDeploy(mockJob, fntypes.ProviderConfig{VaultDefaultPolicy: "openfaas", VaultSecretPathPrefix: "secret/openfaas"}, logger, mockStats),
+	return MakeDeploy(mockJob, fntypes.ProviderConfig{VaultDefaultPolicy: "openfaas", VaultSecretPathPrefix: "secret/openfaas", Datacenter: "dc1"}, logger, mockStats),
 		httptest.NewRecorder(),
 		httptest.NewRequest("GET", "/system/functions", bytes.NewReader([]byte(body)))
 }
@@ -80,7 +80,7 @@ func TestHandlerRegistersWithFunctionProcess(t *testing.T) {
 
 func TestHandlesDataCentreLabelWithSingleDC(t *testing.T) {
 	fr := createRequest()
-	(*fr.Labels)["datacenters"] = "test"
+	fr.Constraints = []string{"datacenter == test"}
 
 	h, rw, r := setupDeploy(fr.String())
 
@@ -95,7 +95,7 @@ func TestHandlesDataCentreLabelWithSingleDC(t *testing.T) {
 
 func TestHandlesDataCentreLabelWithMultipleDC(t *testing.T) {
 	fr := createRequest()
-	(*fr.Labels)["datacenters"] = "test1,test2"
+	fr.Constraints = []string{"datacenter == test1", "datacenter == test2"}
 
 	h, rw, r := setupDeploy(fr.String())
 

diff --git a/main.go b/main.go
@@ -30,7 +30,7 @@ var (
 	nodeURI               = flag.String("node_addr", "localhost", "URI of the current Nomad node, this address is used for reporting and logging")
 	nomadAddr             = flag.String("nomad_addr", "localhost:4646", "Address for Nomad API endpoint")
 	consulAddr            = flag.String("consul_addr", "http://localhost:8500", "Address for Consul API endpoint")
-  consulACL           = flag.String("consul_acl", "", "ACL token for Consul API, only required if ACL are enabled in Consul")
+	consulACL             = flag.String("consul_acl", "", "ACL token for Consul API, only required if ACL are enabled in Consul")
 	nomadRegion           = flag.String("nomad_region", "global", "Default region to schedule functions in")
 	enableBasicAuth       = flag.Bool("enable_basic_auth", false, "Flag for enabling basic authentication on gateway endpoints")
 	basicAuthSecretPath   = flag.String("basic_auth_secret_path", "/secrets", "The directory path to the basic auth secret file")
@@ -149,9 +149,16 @@ func main() {
 
 func createFaaSHandlers(nomadClient *api.Client, consulResolver *consul.Resolver, stats *statsd.Client, logger hclog.Logger) *types.FaaSHandlers {
 
+	datacenter, err := nomadClient.Agent().Datacenter()
+	if err != nil {
+		datacenter = "dc1"
+	}
+	logger.Info("Datacenter from agent:" + datacenter)
+
 	providerConfig := &fntypes.ProviderConfig{
 		VaultDefaultPolicy:    *vaultDefaultPolicy,
 		VaultSecretPathPrefix: *vaultSecretPathPrefix,
+		Datacenter:            datacenter,
 	}
 
 	return &types.FaaSHandlers{

diff --git a/nomad_job_files/faas.hcl b/nomad_job_files/faas.hcl
@@ -93,7 +93,7 @@ EOH
       }
 
       config {
-        image = "openfaas/gateway:0.8.12"
+        image = "openfaas/gateway:0.9.3"
 
         port_map {
           http = 8080

diff --git a/provisioning/saltstack/salt/nomad/files/faas.hcl b/provisioning/saltstack/salt/nomad/files/faas.hcl
@@ -28,7 +28,7 @@ job "faas-nomadd" {
         destination   = "secrets/gateway.env"
         // point the functions_provider_url to the host running vagrant (assuming a go process listening on 0.0.0.0), always .1 on last octet
         data = <<EOH
-functions_provider_url="http://{{ host_address }}:8080/"
+functions_provider_url="http://{{ host_address }}:8081/"
 {% raw -%}
 {{ range service "prometheus" }}
 faas_prometheus_host="{{ .Address }}"

diff --git a/types/provider_config.go b/types/provider_config.go
@@ -3,5 +3,5 @@ package types
 type ProviderConfig struct {
 	VaultDefaultPolicy    string
 	VaultSecretPathPrefix string
-	ConsulACLToken        string
+	Datacenter            string
 }