Merge pull request #47 from janeczku/parameterize-state

Parameterize FQDN / Keep state on managed records
rancher · Oct 23, 2016 · c6cc79e · c6cc79e
2 parents 55ed9c4 + 07b8416
commit c6cc79e
Show file tree

Hide file tree

Showing 11 changed files with 462 additions and 24 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/valyala/fasttemplate/LICENSE b/Godeps/_workspace/src/github.com/valyala/fasttemplate/LICENSE
diff --git a/Godeps/_workspace/src/github.com/valyala/fasttemplate/README.md b/Godeps/_workspace/src/github.com/valyala/fasttemplate/README.md
diff --git a/Godeps/_workspace/src/github.com/valyala/fasttemplate/template.go b/Godeps/_workspace/src/github.com/valyala/fasttemplate/template.go
diff --git a/config/config.go b/config/config.go
@@ -8,19 +8,29 @@ import (
 	"github.com/rancher/external-dns/utils"
 )
 
+const (
+	defaultNameTemplate = "%{{service_name}}.%{{stack_name}}.%{{environment_name}}"
+)
+
 var (
 	RootDomainName  string
 	TTL             int
 	CattleURL       string
 	CattleAccessKey string
 	CattleSecretKey string
+	NameTemplate    string
 )
 
 func SetFromEnvironment() {
 	CattleURL = getEnv("CATTLE_URL")
 	CattleAccessKey = getEnv("CATTLE_ACCESS_KEY")
 	CattleSecretKey = getEnv("CATTLE_SECRET_KEY")
 	RootDomainName = utils.Fqdn(getEnv("ROOT_DOMAIN"))
+	NameTemplate = os.Getenv("NAME_TEMPLATE")
+	if len(NameTemplate) == 0 {
+		NameTemplate = defaultNameTemplate
+	}
+
 	TTLEnv := os.Getenv("TTL")
 	i, err := strconv.Atoi(TTLEnv)
 	if err != nil {