Merge pull request #19 from harness/CI-9848

fix: [CI-9848]: network driver flag
harness · Oct 10, 2023 · dd02097 · dd02097
2 parents c6b8475 + d41d79d
commit dd02097
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/config/config.go b/config/config.go
@@ -15,7 +15,8 @@ type Config struct {
 	ServerName string `envconfig:"SERVER_NAME" default:"drone"`
 
 	Runner struct {
-		Volumes []string `envconfig:"CI_MOUNT_VOLUMES"`
+		Volumes       []string `envconfig:"CI_MOUNT_VOLUMES"`
+		NetworkDriver string   `envconfig:"NETWORK_DRIVER"`
 	}
 
 	Server struct {

diff --git a/engine/docker/docker.go b/engine/docker/docker.go
@@ -106,6 +106,11 @@ func (e *Docker) Setup(ctx context.Context, pipelineConfig *spec.PipelineConfig)
 	if pipelineConfig.Platform.OS == "windows" {
 		driver = "nat"
 	}
+
+	if pipelineConfig.NetworkDriver != "" {
+		driver = pipelineConfig.NetworkDriver
+	}
+
 	_, err := e.client.NetworkCreate(ctx, pipelineConfig.Network.ID, types.NetworkCreate{
 		Driver:  driver,
 		Options: pipelineConfig.Network.Options,

diff --git a/engine/engine.go b/engine/engine.go
@@ -184,7 +184,7 @@ func toWindowsDrive(s string) string {
 	if len(s) >= 2 && (s[0] >= 'a' && s[0] <= 'z' || s[0] >= 'A' && s[0] <= 'Z') && s[1] == ':' {
 		return toWindowsPath(s)
 	}
-	return "c:" + toWindowsPath(s)
+	return "C:" + toWindowsPath(s)
 }
 
 // helper function converts the path to a valid windows

diff --git a/engine/spec/spec.go b/engine/spec/spec.go
@@ -16,6 +16,7 @@ type (
 		Platform          Platform          `json:"platform,omitempty"`
 		Volumes           []*Volume         `json:"volumes,omitempty"`
 		Network           Network           `json:"network"`
+		NetworkDriver     string            `json:"network_driver"`
 		Envs              map[string]string `json:"envs,omitempty"`
 		Files             []*File           `json:"files,omitempty"`
 		EnableDockerSetup *bool             `json:"mount_docker_socket"`

diff --git a/handler/setup.go b/handler/setup.go
@@ -99,8 +99,9 @@ func HandleSetup(config *config.Config) http.HandlerFunc {
 		s.Volumes = append(s.Volumes, getGlobalVolumes(config)...)
 
 		cfg := &spec.PipelineConfig{
-			Envs:    s.Envs,
-			Network: s.Network,
+			Envs:          s.Envs,
+			Network:       s.Network,
+			NetworkDriver: config.Runner.NetworkDriver,
 			Platform: spec.Platform{
 				OS:   runtime.GOOS,
 				Arch: runtime.GOARCH,

diff --git a/handler/step.go b/handler/step.go
@@ -67,7 +67,9 @@ func HandleStartStep(config *config.Config) http.HandlerFunc {
 				v.Path = hv.HostPath.Path
 			}
 		}
-		updateDelegateCapacity(&s.StartStepRequestConfig)
+		if config.DelegateCapacity.Secret != "" {
+			updateDelegateCapacity(&s.StartStepRequestConfig)
+		}
 		updateGitCloneConfig(&s.StartStepRequestConfig)
 
 		// fmt.Printf("start step request config: %+v\n", s.StartStepRequestConfig)