Merge pull request #100 from cybozu-go/change-etcd-tls-config

change etcd TLS config

.circleci/config.yml

@@ -7,6 +7,9 @@ jobs:
     working_directory: /go/src/github.com/cybozu-go/sabakan
     steps:
       - checkout
+      # TODO use go mod
+      - run: go get -v -t -d ./...
+      - run: (cd /go/src/github.com/coreos/etcd; git checkout v3.3.9)
       - run: go get -v -t -d ./...
       - run: test -z "$(goimports -d . | tee /dev/stderr)"
       - run: golint -set_exit_status ./...

cmd/sabakan/main.go

@@ -64,9 +64,9 @@ func main() {
 		cfg.Etcd.Timeout = *flagEtcdTimeout
 		cfg.Etcd.Username = *flagEtcdUsername
 		cfg.Etcd.Password = *flagEtcdPassword
-		cfg.Etcd.TLSCA = *flagEtcdTLSCA
-		cfg.Etcd.TLSCert = *flagEtcdTLSCert
-		cfg.Etcd.TLSKey = *flagEtcdTLSKey
+		cfg.Etcd.TLSCAFile = *flagEtcdTLSCA
+		cfg.Etcd.TLSCertFile = *flagEtcdTLSCert
+		cfg.Etcd.TLSKeyFile = *flagEtcdTLSKey
 	} else {
 		f, err := os.Open(*flagConfigFile)
 		if err != nil {

mtest/Makefile

@@ -67,7 +67,14 @@ $(OUTPUT)/etcd $(OUTPUT)/etcdctl: $(ETCD_ARCHIVE)
 
 $(OUTPUT)/sabakan $(OUTPUT)/sabactl:
 	mkdir -p $(OUTPUT)
-	cd ..; go get ./... && GOBIN=$(realpath $(OUTPUT)) go install ./cmd/$(notdir $@)
+	cd ..; \
+		go get -d ./... && \
+		cd $$GOPATH/src/github.com/coreos/etcd && \
+		git fetch origin && \
+		git checkout v3.3.9
+	cd ..; \
+		go get -d ./... && \
+		GOBIN=$(realpath $(OUTPUT)) go install ./cmd/$(notdir $@)
 
 $(OUTPUT)/cluster.yml: cluster.yml
 	mkdir -p $(OUTPUT)