Auto-detect google-project if provider is Google and no project is su… (

#492) * Auto-detect google-project if provider is Google and no project is supplied. * Add changelog entry.
kubernetes-sigs · Mar 13, 2018 · f2a4efb · f2a4efb
1 parent 8989032
commit f2a4efb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+  - Google Provider: Add auto-detection of Google Project when running on GCP (#492) @drzero42
   - Add custom TTL support for DNSimple (#477) @jbowes
   - Fix docker build and delete vendor files which were not deleted (#473) @njuettner
   - DigitalOcean: DigitalOcean creates entries with host in them twice (#459) @njuettner

diff --git a/provider/google.go b/provider/google.go
@@ -21,6 +21,7 @@ import (
 	"sort"
 	"strings"
 
+	"cloud.google.com/go/compute/metadata"
 	"github.com/linki/instrumented_http"
 	log "github.com/sirupsen/logrus"
 
@@ -133,6 +134,14 @@ func NewGoogleProvider(project string, domainFilter DomainFilter, zoneIDFilter Z
 		return nil, err
 	}
 
+	if project == "" {
+		mProject, mErr := metadata.ProjectID()
+		if mErr == nil {
+			log.Infof("Google project auto-detected: %s", mProject)
+			project = mProject
+		}
+	}
+
 	provider := &GoogleProvider{
 		project:      project,
 		domainFilter: domainFilter,