Merge pull request #4880 from andrewsykim/digitalocean-hostname-override

digitalocean: add kubelet hostname override

pkg/model/components/kubelet.go

@@ -162,6 +162,7 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
 
 	if cloudProvider == kops.CloudProviderDO {
 		clusterSpec.Kubelet.CloudProvider = "external"
+		clusterSpec.Kubelet.HostnameOverride = "@digitalocean"
 	}
 
 	if cloudProvider == kops.CloudProviderGCE {

upup/pkg/fi/nodeup/command.go

@@ -17,6 +17,7 @@ limitations under the License.
 package nodeup
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -337,29 +338,44 @@ func evaluateHostnameOverride(hostnameOverride string) (string, error) {
 	k := strings.TrimSpace(hostnameOverride)
 	k = strings.ToLower(k)
 
-	if k != "@aws" {
-		return hostnameOverride, nil
+	if k == "@aws" {
+		// We recognize @aws as meaning "the local-hostname from the aws metadata service"
+		vBytes, err := vfs.Context.ReadFile("metadata://aws/meta-data/local-hostname")
+		if err != nil {
+			return "", fmt.Errorf("error reading local hostname from AWS metadata: %v", err)
+		}
+
+		// The local-hostname gets it's hostname from the AWS DHCP Option Set, which
+		// may provide multiple hostnames separated by spaces. For now just choose
+		// the first one as the hostname.
+		domains := strings.Fields(string(vBytes))
+		if len(domains) == 0 {
+			glog.Warningf("Local hostname from AWS metadata service was empty")
+			return "", nil
+		} else {
+			domain := domains[0]
+			glog.Infof("Using hostname from AWS metadata service: %s", domain)
+
+			return domain, nil
+		}
 	}
 
-	// We recognize @aws as meaning "the local-hostname from the aws metadata service"
-	vBytes, err := vfs.Context.ReadFile("metadata://aws/meta-data/local-hostname")
-	if err != nil {
-		return "", fmt.Errorf("error reading local hostname from AWS metadata: %v", err)
+	if k == "@digitalocean" {
+		// @digitalocean means to use the private ipv4 address of a droplet as the hostname override
+		vBytes, err := vfs.Context.ReadFile("metadata://digitalocean/interfaces/private/0/ipv4/address")
+		if err != nil {
+			return "", fmt.Errorf("error reading droplet private IP from DigitalOcean metadata: %v", err)
+		}
+
+		hostname := string(vBytes)
+		if hostname == "" {
+			return "", errors.New("private IP for digitalocean droplet was empty")
+		}
+
+		return hostname, nil
 	}
 
-	// The local-hostname gets it's hostname from the AWS DHCP Option Set, which
-	// may provide multiple hostnames separated by spaces. For now just choose
-	// the first one as the hostname.
-	domains := strings.Fields(string(vBytes))
-	if len(domains) == 0 {
-		glog.Warningf("Local hostname from AWS metadata service was empty")
-		return "", nil
-	} else {
-		domain := domains[0]
-		glog.Infof("Using hostname from AWS metadata service: %s", domain)
-
-		return domain, nil
-	}
+	return hostnameOverride, nil
 }
 
 // evaluateDockerSpec selects the first supported storage mode, if it is a list

util/pkg/vfs/context.go

@@ -79,6 +79,9 @@ func (c *VFSContext) ReadFile(location string) ([]byte, error) {
 			case "aws":
 				httpURL := "http://169.254.169.254/latest/" + u.Path
 				return c.readHttpLocation(httpURL, nil)
+			case "digitalocean":
+				httpURL := "http://169.254.169.254/metadata/v1" + u.Path
+				return c.readHttpLocation(httpURL, nil)
 
 			default:
 				return nil, fmt.Errorf("unknown metadata type: %q in %q", u.Host, location)