[ci skip] 2019.01.22-1464

cybozu-go · Jan 22, 2019 · 0c025be · 0c025be
2 parents 6e7a02b + e4dbf9f
commit 0c025be
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 7 deletions.
diff --git a/dctest/auto-config b/dctest/auto-config
@@ -2,14 +2,18 @@
 
 set -e
 
+http_proxy=http://10.0.49.3:3128/
+https_proxy=http://10.0.49.3:3128/
+
 cat > /etc/apt/sources.list <<EOF
 deb http://mirror.math.princeton.edu/pub/ubuntu bionic main restricted universe multiverse
 deb http://mirror.math.princeton.edu/pub/ubuntu bionic-updates main restricted universe multiverse
 deb http://mirror.math.princeton.edu/pub/ubuntu bionic-security main restricted universe multiverse
 EOF
 
-apt-get update
-apt-get install -y --no-install-recommends jq ca-certificates freeipmi-tools
+env http_proxy=$http_proxy apt-get update
+env http_proxy=$http_proxy apt-get install -y --no-install-recommends jq ca-certificates freeipmi-tools
+apt-get clean
 
 dpkg -i /mnt/neco_0.0.1_amd64.deb
 

diff --git a/dctest/highcpu-menu.yml b/dctest/highcpu-menu.yml
@@ -7,6 +7,7 @@ spec:
   core-spine: 10.0.2.0/31
   core-external: 10.0.3.0/24
   core-operation: 10.0.4.0/24
+  proxy: 10.0.49.3
   exposed:
     loadbalancer: 10.72.32.0/20
     bastion: 10.72.48.0/26

diff --git a/dctest/menu.yml b/dctest/menu.yml
@@ -7,6 +7,7 @@ spec:
   core-spine: 10.0.2.0/31
   core-external: 10.0.3.0/24
   core-operation: 10.0.4.0/24
+  proxy: 10.0.49.3
   exposed:
     loadbalancer: 10.72.32.0/20
     bastion: 10.72.48.0/26

diff --git a/dctest/run.go b/dctest/run.go
@@ -22,6 +22,8 @@ const (
 
 	// DefaultRunTimeout is the timeout value for Agent.Run().
 	DefaultRunTimeout = 10 * time.Minute
+
+	proxy = "http://10.0.49.3:3128"
 )
 
 var (

diff --git a/dctest/setup.go b/dctest/setup.go
@@ -16,7 +16,7 @@ func TestSetup() {
 		env := well.NewEnvironment(context.Background())
 		env.Go(func(ctx context.Context) error {
 			stdout, stderr, err := execAt(
-				boot0, "sudo", "neco", "setup", "--no-revoke", "0", "1", "2")
+				boot0, "sudo", "neco", "setup", "--no-revoke", "--proxy="+proxy, "0", "1", "2")
 			if err != nil {
 				log.Error("neco setup failed", map[string]interface{}{
 					"host":   "boot-0",
@@ -29,7 +29,7 @@ func TestSetup() {
 		})
 		env.Go(func(ctx context.Context) error {
 			stdout, stderr, err := execAt(
-				boot1, "sudo", "neco", "setup", "--no-revoke", "0", "1", "2")
+				boot1, "sudo", "neco", "setup", "--no-revoke", "--proxy="+proxy, "0", "1", "2")
 			if err != nil {
 				log.Error("neco setup failed", map[string]interface{}{
 					"host":   "boot-1",
@@ -42,7 +42,7 @@ func TestSetup() {
 		})
 		env.Go(func(ctx context.Context) error {
 			stdout, stderr, err := execAt(
-				boot2, "sudo", "neco", "setup", "--no-revoke", "0", "1", "2")
+				boot2, "sudo", "neco", "setup", "--no-revoke", "--proxy="+proxy, "0", "1", "2")
 			if err != nil {
 				log.Error("neco setup failed", map[string]interface{}{
 					"host":   "boot-2",

diff --git a/ext/http.go b/ext/http.go
@@ -46,7 +46,7 @@ func ProxyHTTPClient(ctx context.Context, st storage.Storage) (*http.Client, err
 // LocalHTTPClient returns a *http.Client to access intranet services.
 func LocalHTTPClient() *http.Client {
 	transport := &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
+		Proxy: nil,
 		DialContext: (&net.Dialer{
 			Timeout:   30 * time.Second,
 			KeepAlive: 30 * time.Second,

diff --git a/pkg/neco-worker/main.go b/pkg/neco-worker/main.go
@@ -39,7 +39,7 @@ func main() {
 	}
 
 	well.Go(func(ctx context.Context) error {
-		// NOTE: hack to set http proxy to container/image
+		// NOTE: hack for github.com/containers/image to set HTTP proxy
 		st := storage.NewStorage(ec)
 		proxy, err := st.GetProxyConfig(ctx)
 		if err != nil && err != storage.ErrNotFound {

diff --git a/pkg/neco/cmd/sabakan_upload.go b/pkg/neco/cmd/sabakan_upload.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"os"
 
 	"github.com/cybozu-go/log"
 	"github.com/cybozu-go/neco"
@@ -27,6 +28,16 @@ func sabakanUpload(ctx context.Context, st storage.Storage) error {
 	}
 	localClient := ext.LocalHTTPClient()
 
+	// NOTE: hack for github.com/containers/image to set HTTP proxy
+	proxy, err := st.GetProxyConfig(ctx)
+	if err != nil && err != storage.ErrNotFound {
+		return err
+	}
+	if len(proxy) != 0 {
+		os.Setenv("http_proxy", proxy)
+		os.Setenv("https_proxy", proxy)
+	}
+
 	username, err := st.GetQuayUsername(ctx)
 	if err != nil && err != storage.ErrNotFound {
 		return err