Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

freshen go-dev image #2261

Merged
merged 2 commits into from
Feb 13, 2018
Merged

freshen go-dev image #2261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
011d244
freshen go-dev image
jackfrancis Feb 13, 2018
bcd6caa
lint
jackfrancis Feb 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 1 addition & 2 deletions pkg/acsengine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1676,7 +1676,6 @@ func makeWindowsExtensionScriptCommands(extension *api.Extension, extensionProfi

func getDCOSWindowsAgentPreprovisionParameters(cs *api.ContainerService, profile *api.AgentPoolProfile) string {
extension := profile.PreprovisionExtension
parms := ""

var extensionProfile *api.ExtensionProfile

Expand All @@ -1687,7 +1686,7 @@ func getDCOSWindowsAgentPreprovisionParameters(cs *api.ContainerService, profile
}
}

parms = extensionProfile.ExtensionParameters
parms := extensionProfile.ExtensionParameters
return parms
}

Expand Down
4 changes: 1 addition & 3 deletions pkg/acsengine/pki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/runner/cli_provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down