Update for etcd 3.4.16

Signed-off-by: Daichi Sakaue <daichi-sakaue@cybozu.co.jp>

Author: yokaze

.github/workflows/main.yaml

@@ -21,7 +21,7 @@ jobs:
             cp ./static/resources.go /tmp/resources.go
             make static
             cmp /tmp/resources.go ./static/resources.go
-      - run: docker run -d --network host quay.io/coreos/etcd:v3.3
+      - run: docker run -d --network host quay.io/coreos/etcd:v3.4.16
       - run: make test
       - run: make install GOBIN=$(pwd)/docker
       - run: docker build -t quay.io/cybozu/cke:latest ./docker

Makefile

@@ -1,6 +1,6 @@
 # Makefile for cke
 
-ETCD_VERSION = 3.3.25
+ETCD_VERSION = 3.4.16
 
 .PHONY: all
 all: test

agent.go

@@ -93,7 +93,7 @@ func SSHAgent(node *Node, privkey string) (Agent, error) {
 		return nil, err
 	}
 
-	a := sshAgent{
+	a := &sshAgent{
 		node:   node,
 		client: ssh.NewClient(clientConn, channelCh, reqCh),
 		conn:   conn,
@@ -107,22 +107,22 @@ func SSHAgent(node *Node, privkey string) (Agent, error) {
 	return a, nil
 }
 
-func (a sshAgent) Close() error {
+func (a *sshAgent) Close() error {
 	err := a.client.Close()
 	a.client = nil
 	return err
 }
 
-func (a sshAgent) Run(command string) ([]byte, []byte, error) {
+func (a *sshAgent) Run(command string) ([]byte, []byte, error) {
 	return a.RunWithTimeout(command, "", DefaultRunTimeout)
 }
 
-func (a sshAgent) RunWithInput(command, input string) error {
+func (a *sshAgent) RunWithInput(command, input string) error {
 	_, _, err := a.RunWithTimeout(command, input, DefaultRunTimeout)
 	return err
 }
 
-func (a sshAgent) RunWithTimeout(command, input string, timeout time.Duration) ([]byte, []byte, error) {
+func (a *sshAgent) RunWithTimeout(command, input string, timeout time.Duration) ([]byte, []byte, error) {
 	if timeout > 0 {
 		err := a.conn.SetDeadline(time.Now().Add(timeout))
 		if err != nil {

docs/etcd.md

@@ -20,7 +20,6 @@ $ CERT=$(ckecli etcd root-issue)
 $ echo "$CERT" | jq -r .ca_certificate > /tmp/etcd-ca.crt
 $ echo "$CERT" | jq -r .certificate > /tmp/etcd-root.crt
 $ echo "$CERT" | jq -r .private_key > /tmp/etcd-root.key
-$ export ETCDCTL_API=3
 $ export ETCDCTL_CACERT=/tmp/etcd-ca.crt
 $ export ETCDCTL_CERT=/tmp/etcd-root.crt
 $ export ETCDCTL_KEY=/tmp/etcd-root.key

etcd_util.go

@@ -5,8 +5,8 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 
-	"github.com/coreos/etcd/clientv3"
 	"github.com/cybozu-go/etcdutil"
+	"go.etcd.io/etcd/clientv3"
 )
 
 const (

example/README.md

@@ -39,7 +39,7 @@ $ docker ps
 CONTAINER ID        IMAGE                      COMMAND                  CREATED             STATUS              PORTS                                  NAMES
 844ea90ab7b5        quay.io/cybozu/cke:1.15    "/entrypoint.sh"         12 seconds ago      Up 10 seconds                                              cke
 9617f2dc36c5        quay.io/cybozu/vault:1.1   "/entrypoint.sh"         14 seconds ago      Up 12 seconds       0.0.0.0:8200-8201->8200-8201/tcp       vault
-7140fa308dc3        quay.io/cybozu/etcd:3.3    "/entrypoint.sh"         16 seconds ago      Up 14 seconds       0.0.0.0:2379-2380->2379-2380/tcp       etcd
+7140fa308dc3        quay.io/cybozu/etcd:3.4    "/entrypoint.sh"         16 seconds ago      Up 14 seconds       0.0.0.0:2379-2380->2379-2380/tcp       etcd
 ```
 
 ## Setup node VMs

example/docker-compose.yml

@@ -56,7 +56,7 @@ services:
       - /entrypoint.sh
   etcd:
     container_name: etcd
-    image: quay.io/cybozu/etcd:3.3
+    image: quay.io/cybozu/etcd:3.4
     networks:
       app_net:
         ipv4_address: 172.30.0.14

example/etcd.conf.yml

@@ -30,11 +30,8 @@ initial-cluster-token: 'etcd-cluster-1'
 # Initial cluster state ('new' or 'existing').
 initial-cluster-state: 'new'
 
-# Accept etcd V2 client requests
-enable-v2: false
-
 # Enable runtime profiling data via HTTP server
 enable-pprof: true
 
 # Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd.
-log-outputs: stderr
+log-outputs: [stderr]

example/setup/setup.sh

@@ -14,7 +14,6 @@ function retry() {
 
 export VAULT_ADDR=http://172.30.0.13:8200
 export VAULT_TOKEN=cybozu
-export ETCDCTL_API=3
 
 # wait for preparation of vault
 retry curl ${VAULT_ADDR}/v1/sys/health

example/setup/test.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
 
-ETCDCTL_API=3 etcdctl --endpoints=http://172.30.0.14:2379 member list
+etcdctl --endpoints=http://172.30.0.14:2379 member list
 VAULT_ADDR=http://172.30.0.13:8200 VAULT_TOKEN=cybozu vault status
 ckecli leader