Merge pull request #66 from cybozu-go/kubernetes-1.15

fix deployment apiversion and update components version

CHANGELOG.md

@@ -5,6 +5,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.1.5] - 2019-08-23
+
+### Added
+- "--version" flags to some commands (#66).
+
+### Changed
+- Update k8s.io/client-go to v12.0.0 (#65).
+- Update etcd/clientv3 to 3.3.15 (#66).
+
 ## [1.1.4] - 2019-07-11
 
 Just bump version because v1.1.3 is accidentally unreleased.
@@ -94,7 +103,8 @@ This is the first release
 
 - Implement CNI plugin, coild, coilctl and coil-controller
 
-[Unreleased]: https://github.com/cybozu-go/coil/compare/v1.1.4...HEAD
+[Unreleased]: https://github.com/cybozu-go/coil/compare/v1.1.5...HEAD
+[1.1.5]: https://github.com/cybozu-go/coil/compare/v1.1.4...v1.1.5
 [1.1.4]: https://github.com/cybozu-go/coil/compare/v1.1.3...v1.1.4
 [1.1.3]: https://github.com/cybozu-go/coil/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/cybozu-go/coil/compare/v1.1.1...v1.1.2

RELEASE.md

@@ -37,15 +37,16 @@ Bump version
 2. Checkout `master` branch.
 3. Make a branch to release, for example by `git neco dev "$VERSION"`
 4. Edit `CHANGELOG.md` for the new version ([example][]).
-5. Commit the change and push it.
+5. Edit `version.go` for the new version.
+6. Commit the changes and push it.
 
     ```console
     $ git commit -a -m "Bump version to $VERSION"
     $ git neco review
     ```
-6. Merge this branch.
-7. Checkout `master` branch.
-8. Add a git tag, then push it.
+7. Merge this branch.
+8. Checkout `master` branch.
+9. Add a git tag, then push it.
 
     ```console
     $ git tag "v$VERSION"

go.mod

@@ -3,14 +3,15 @@ module github.com/cybozu-go/coil
 require (
 	github.com/containernetworking/cni v0.6.0
 	github.com/containernetworking/plugins v0.7.4
-	github.com/coreos/etcd v0.0.0-20190816232144-5cf5d88a18ae
+	github.com/coreos/etcd v3.3.15+incompatible
 	github.com/coreos/go-iptables v0.4.0 // indirect
-	github.com/cybozu-go/etcdutil v1.3.2
+	github.com/cybozu-go/etcdutil v1.3.3
 	github.com/cybozu-go/log v1.5.0
 	github.com/cybozu-go/netutil v1.2.0
 	github.com/cybozu-go/well v1.8.1
 	github.com/google/go-cmp v0.3.0
 	github.com/googleapis/gnostic v0.2.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/mitchellh/go-homedir v1.0.0
 	github.com/mitchellh/mapstructure v1.0.0
 	github.com/onsi/ginkgo v1.8.0

mtest/Makefile

@@ -14,13 +14,13 @@ endif
 PLACEMAT = /usr/bin/placemat
 GINKGO = env GOFLAGS=-mod=vendor $(GOPATH)/bin/ginkgo
 CURL = curl -fsL
-MANAGEMENT_ETCD_VERSION = 3.3.14
-VAULT_VERSION = 1.0.2
-K8S_VERSION = 1.14.1
+MANAGEMENT_ETCD_VERSION = 3.3.15
+VAULT_VERSION = 1.2.2
+K8S_VERSION = 1.15.3
 PLACEMAT_DATADIR = /var/scratch/placemat
 VM_SHARED_DIR = /mnt/placemat
 CONTAINERD_VERSION = 1.2.7
-CRITOOLS_VERSION = 1.14.0
+CRITOOLS_VERSION = 1.15.0
 CT_VERSION = 0.9.0
 CT = /usr/local/bin/ct
 SUDO = sudo

mtest/pod.go

@@ -220,7 +220,7 @@ func TestPod() {
 		coilctlSafe("pool", "show", "--json", "default", addressPool)
 
 		By("creating 4 pods to node1")
-		overrides := fmt.Sprintf(`{ "apiVersion": "apps/v1beta1", "spec": { "template": { "spec": { "nodeSelector": { "kubernetes.io/hostname": "%s" } } } } }`, node1)
+		overrides := fmt.Sprintf(`{ "apiVersion": "apps/v1", "spec": { "template": { "spec": { "nodeSelector": { "kubernetes.io/hostname": "%s" } } } } }`, node1)
 		overrideFile := remoteTempFile(overrides)
 		_, stderr, err := kubectl("run", "nginx", "--image=nginx", "--replicas=4", "--overrides=\"$(cat "+overrideFile+")\"")
 		Expect(err).NotTo(HaveOccurred(), "stderr: %s", stderr)

mtest/setup-cke.sh

@@ -2,7 +2,7 @@
 
 VAULT=/data/vault
 CKECLI=/opt/bin/ckecli
-CKE_VERSION=1.14.0-rc1
+CKE_VERSION=1.15.0-rc.1
 
 if [ ! -f /usr/bin/jq ]; then
     echo "please wait; cloud-init will install jq."

pkg/coil-controller/cmd/root.go

@@ -29,8 +29,9 @@ var etcdConfig *etcdutil.Config
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:   "coil-controller",
-	Short: "A kubernetes controller for coil",
+	Use:     "coil-controller",
+	Version: coil.Version,
+	Short:   "A kubernetes controller for coil",
 	Long: `coil-controller is a Kubernetes controller to maintain coil resources.
 
 It should be deployed as a Deployment pod in Kunernetes.

pkg/coilctl/cmd/root.go

@@ -40,8 +40,9 @@ var etcdConfig *etcdutil.Config
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:   "coilctl",
-	Short: "control and show coil settings",
+	Use:     "coilctl",
+	Version: coil.Version,
+	Short:   "control and show coil settings",
 	Long: `coilctl is a command-line tool to control and show coil settings.
 
 It directly communicates with etcd.  You need to prepare a

pkg/coild/cmd/root.go

@@ -54,8 +54,9 @@ var etcdConfig *etcdutil.Config
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:   "coild",
-	Short: "Backend service to allocate IP address",
+	Use:     "coild",
+	Version: coil.Version,
+	Short:   "Backend service to allocate IP address",
 	Long: `coild is a backend service to allocate IP address.
 
 It normally run as a DaemonSet container in Kubernetes.

vendor/modules.txt

@@ -11,7 +11,7 @@ github.com/containernetworking/plugins/pkg/ipam
 github.com/containernetworking/plugins/pkg/ns
 github.com/containernetworking/plugins/pkg/utils/hwaddr
 github.com/containernetworking/plugins/pkg/utils/sysctl
-# github.com/coreos/etcd v0.0.0-20190816232144-5cf5d88a18ae
+# github.com/coreos/etcd v3.3.15+incompatible
 github.com/coreos/etcd/clientv3
 github.com/coreos/etcd/clientv3/clientv3util
 github.com/coreos/etcd/clientv3/namespace
@@ -35,7 +35,7 @@ github.com/coreos/go-iptables/iptables
 github.com/coreos/go-systemd/journal
 # github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
 github.com/coreos/pkg/capnslog
-# github.com/cybozu-go/etcdutil v1.3.2
+# github.com/cybozu-go/etcdutil v1.3.3
 github.com/cybozu-go/etcdutil
 # github.com/cybozu-go/log v1.5.0
 github.com/cybozu-go/log

version.go

@@ -0,0 +1,4 @@
+package coil
+
+// Version represents the version of coil
+const Version = "1.1.5"