Merge pull request #259 from orangedeng/windows-fix

Bug fix for agent in windows environment

Author: Craig Jellick

core/compute/compute_windows.go

@@ -2,6 +2,9 @@ package compute
 
 import (
 	"context"
+	"strings"
+
+	"github.com/Sirupsen/logrus"
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
@@ -12,9 +15,36 @@ import (
 	dutils "github.com/rancher/agent/utilities/docker"
 )
 
+const (
+	RancherDNSPriority = "io.rancher.container.dns.priority"
+	RancherDomain      = "rancher.internal"
+)
+
 func setupPublishPorts(hostConfig *container.HostConfig, instance model.Instance) {}
 
 func setupDNSSearch(hostConfig *container.HostConfig, instance model.Instance) error {
+	var defaultDomains []string
+	var svcNameSpace string
+	var stackNameSpace string
+
+	if instance.Data.Fields.Labels != nil {
+		setRancherSearchDomains := true
+		if strings.EqualFold(strings.TrimSpace(instance.Data.Fields.Labels[RancherDNSPriority]), "None") {
+			setRancherSearchDomains = false
+		}
+		if setRancherSearchDomains {
+			if value, ok := instance.Data.Fields.Labels["io.rancher.stack_service.name"]; ok {
+				splitted := strings.Split(value, "/")
+				svc := strings.ToLower(splitted[1])
+				stack := strings.ToLower(splitted[0])
+				svcNameSpace = svc + "." + stack + "." + RancherDomain
+				stackNameSpace = stack + "." + RancherDomain
+				defaultDomains = append(defaultDomains, svcNameSpace)
+				defaultDomains = append(defaultDomains, stackNameSpace)
+			}
+		}
+	}
+	hostConfig.DNSSearch = defaultDomains
 	return nil
 }
 
@@ -70,14 +100,26 @@ var cmdDNS = []string{
 func configureDNS(dockerClient *client.Client, containerID string) error {
 	var err error
 	var execObj types.ContainerExecCreateResponse
+	var currentCMD []string
+	currentCMD = append(currentCMD, cmdDNS...)
+	//Setup dns search list
+	info, err := dockerClient.ContainerInspect(context.Background(), containerID)
+	if err == nil && len(info.HostConfig.DNSSearch) != 0 {
+		dnsSearch := []string{}
+		for i := 0; i < len(info.HostConfig.DNSSearch); i++ {
+			dnsSearch = append(dnsSearch, `"`+info.HostConfig.DNSSearch[i]+`"`)
+		}
+		currentCMD[1] = currentCMD[1] + "; Set-DnsClientGlobalSetting -SuffixSearchList " + strings.Join(dnsSearch, ",")
+	}
+	logrus.Info(currentCMD)
 	execConfig := types.ExecConfig{
 		AttachStdout: true,
 		AttachStdin:  true,
 		AttachStderr: true,
 		Privileged:   true,
 		Tty:          false,
 		Detach:       false,
-		Cmd:          cmdDNS,
+		Cmd:          currentCMD,
 	}
 
 	if execObj, err = dockerClient.ContainerExecCreate(context.Background(), containerID, execConfig); err == nil {

register/register.go

@@ -6,15 +6,16 @@ import (
 	"bufio"
 	"crypto/rand"
 	"fmt"
-	"github.com/Sirupsen/logrus"
-	"github.com/pkg/errors"
-	"github.com/rancher/go-rancher/v2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"strings"
 	"time"
+
+	"github.com/Sirupsen/logrus"
+	"github.com/pkg/errors"
+	"github.com/rancher/go-rancher/v2"
 )
 
 const (
@@ -56,8 +57,12 @@ func loadEnv(url string) (string, string, string, string) {
 			str := strings.Split(line, "=")[1]
 			cattleURL = str[1 : len(str)-1]
 		} else if strings.Contains(line, "DETECTED_CATTLE_AGENT_IP") {
-			str := strings.Split(line, "=")[1]
-			agentIP = str[1 : len(str)-1]
+			if envAgentIP := os.Getenv("CATTLE_AGENT_IP"); envAgentIP != "" {
+				agentIP = envAgentIP
+			} else {
+				str := strings.Split(line, "=")[1]
+				agentIP = str[1 : len(str)-1]
+			}
 		}
 	}
 	return accessKey, secretKey, cattleURL, agentIP