freshen go-dev image (#2261)

* freshen go-dev image * lint
Azure · Feb 13, 2018 · 455deb2 · 455deb2
1 parent 01246dd
commit 455deb2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,7 +8,7 @@ jobs:
   test:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.2.0
+      - image: quay.io/deis/go-dev:v1.8.1
         environment:
           GOPATH: /go
     steps:
@@ -34,7 +34,7 @@ jobs:
   swarm-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.2.0
+      - image: quay.io/deis/go-dev:v1.8.1
         environment:
           GOPATH: /go
     steps:
@@ -61,7 +61,7 @@ jobs:
   dcos-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.2.0
+      - image: quay.io/deis/go-dev:v1.8.1
         environment:
           GOPATH: /go
     steps:
@@ -84,7 +84,7 @@ jobs:
   swarmmode-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.2.0
+      - image: quay.io/deis/go-dev:v1.8.1
         environment:
           GOPATH: /go
     steps:
@@ -111,7 +111,7 @@ jobs:
   k8s-1.7-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.2.0
+      - image: quay.io/deis/go-dev:v1.8.1
         environment:
           GOPATH: /go
     steps:
@@ -137,7 +137,7 @@ jobs:
   k8s-windows-1.7-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.2.0
+      - image: quay.io/deis/go-dev:v1.8.1
         environment:
           GOPATH: /go
     steps:
@@ -162,7 +162,7 @@ jobs:
   k8s-1.9-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.2.0
+      - image: quay.io/deis/go-dev:v1.8.1
         environment:
           GOPATH: /go
     steps:
@@ -188,7 +188,7 @@ jobs:
   k8s-1.8-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.2.0
+      - image: quay.io/deis/go-dev:v1.8.1
         environment:
           GOPATH: /go
     steps:
@@ -214,7 +214,7 @@ jobs:
   k8s-windows-1.8-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.2.0
+      - image: quay.io/deis/go-dev:v1.8.1
         environment:
           GOPATH: /go
     steps:
@@ -239,7 +239,7 @@ jobs:
   k8s-windows-1.9-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.2.0
+      - image: quay.io/deis/go-dev:v1.8.1
         environment:
           GOPATH: /go
     steps:

diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ GITTAG := $(VERSION_SHORT)
 endif
 
 REPO_PATH := github.com/Azure/acs-engine
-DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.2.0
+DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.8.1
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_OPTS := --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_VARS}
 DEV_ENV_CMD := docker run ${DEV_ENV_OPTS} ${DEV_ENV_IMAGE}

diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -1687,7 +1687,6 @@ func makeWindowsExtensionScriptCommands(extension *api.Extension, extensionProfi
 
 func getDCOSWindowsAgentPreprovisionParameters(cs *api.ContainerService, profile *api.AgentPoolProfile) string {
 	extension := profile.PreprovisionExtension
-	parms := ""
 
 	var extensionProfile *api.ExtensionProfile
 
@@ -1698,7 +1697,7 @@ func getDCOSWindowsAgentPreprovisionParameters(cs *api.ContainerService, profile
 		}
 	}
 
-	parms = extensionProfile.ExtensionParameters
+	parms := extensionProfile.ExtensionParameters
 	return parms
 }
 

diff --git a/pkg/acsengine/pki.go b/pkg/acsengine/pki.go
@@ -114,9 +114,7 @@ func CreatePki(extraFQDNs []string, extraIPs []net.IP, clusterDomain string, caP
 			var err error
 			ip := net.ParseIP("127.0.0.1").To4()
 			peerIPs := append(extraIPs, ip)
-			etcdPeerCertificate := new(x509.Certificate)
-			etcdPeerPrivateKey := new(rsa.PrivateKey)
-			etcdPeerCertificate, etcdPeerPrivateKey, err = createCertificate("etcdpeer", caCertificate, caPrivateKey, true, false, nil, peerIPs, nil)
+			etcdPeerCertificate, etcdPeerPrivateKey, err := createCertificate("etcdpeer", caCertificate, caPrivateKey, true, false, nil, peerIPs, nil)
 			etcdPeerCertPairs[i] = &PkiKeyCertPair{CertificatePem: string(certificateToPem(etcdPeerCertificate.Raw)), PrivateKeyPem: string(privateKeyToPem(etcdPeerPrivateKey))}
 			errors <- err
 		}(i)

diff --git a/test/e2e/runner/cli_provisioner.go b/test/e2e/runner/cli_provisioner.go
@@ -136,6 +136,9 @@ func (cli *CLIProvisioner) provision() error {
 	}
 
 	c, err := config.ParseConfig()
+	if err != nil {
+		return fmt.Errorf("unable to parse base config")
+	}
 	engCfg, err := engine.ParseConfig(cli.Config.CurrentWorkingDir, c.ClusterDefinition, c.Name)
 	if err != nil {
 		return fmt.Errorf("unable to parse config")