Merge pull request #125 from cybozu-go/update-k8s-1.13

Support for k8s-1.13

go.mod

@@ -159,8 +159,10 @@ require (
 	gopkg.in/vmihailenco/msgpack.v2 v2.9.1 // indirect
 	gopkg.in/yaml.v2 v2.2.1
 	gotest.tools v2.1.0+incompatible // indirect
-	k8s.io/api v0.0.0-20181013020047-475331a8afff
-	k8s.io/apimachinery v0.0.0-20181022183627-f71dbbc36e12
-	k8s.io/client-go v9.0.0+incompatible
+	k8s.io/api v0.0.0-20181121191454-a61488babbd6
+	k8s.io/apimachinery v0.0.0-20190117220443-572dfc7bdfcb
+	k8s.io/client-go v10.0.0+incompatible
+	k8s.io/klog v0.1.0 // indirect
 	layeh.com/radius v0.0.0-20190109000448-e6d9fd7a048a // indirect
+	sigs.k8s.io/yaml v1.1.0 // indirect
 )

images.go

@@ -10,12 +10,12 @@ func (i Image) Name() string {
 
 // Container image definitions
 const (
-	EtcdImage      = Image("quay.io/cybozu/etcd:3.3.9-4")
+	EtcdImage      = Image("quay.io/cybozu/etcd:3.3.11-1")
 	ToolsImage     = Image("quay.io/cybozu/cke-tools:1.3.0-1")
-	HyperkubeImage = Image("quay.io/cybozu/hyperkube:1.12.3-2")
+	HyperkubeImage = Image("quay.io/cybozu/hyperkube:1.13.2-1")
 	PauseImage     = Image("quay.io/cybozu/pause:3.1-2")
-	CoreDNSImage   = Image("quay.io/cybozu/coredns:1.2.5-1")
-	UnboundImage   = Image("quay.io/cybozu/unbound:1.8.1-2")
+	CoreDNSImage   = Image("quay.io/cybozu/coredns:1.3.1-1")
+	UnboundImage   = Image("quay.io/cybozu/unbound:1.8.3-1")
 )
 
 // AllImages return container images list used by CKE

mtest/Makefile

@@ -14,9 +14,9 @@ NODE5 = 10.0.0.105
 NODE6 = 10.0.0.106
 PLACEMAT = /usr/bin/placemat
 GINKGO = env GOFLAGS=-mod=vendor $(GOPATH)/bin/ginkgo
-MANAGEMENT_ETCD_VERSION = 3.3.9
-VAULT_VERSION = 0.11.0
-K8S_VERSION = 1.12.3
+MANAGEMENT_ETCD_VERSION = 3.3.11
+VAULT_VERSION = 1.0.2
+K8S_VERSION = 1.13.2
 PLACEMAT_DATADIR = /var/scratch/placemat
 
 export HOST1 HOST2 NODE1 NODE2 NODE3 NODE4 NODE5 NODE6 PLACEMAT GINKGO

mtest/README.md

@@ -7,7 +7,7 @@ How to manually run CKE using placemat
 
     ```console
     $ chmod 600 mtest_key
-    $ ssh -i mtest_key [email protected]
+    $ ./mssh host-1 
     ```
 
 4. Run `/data/setup-cke.sh` on `host1`.
@@ -20,3 +20,11 @@ How to manually run CKE using placemat
     ```
 
 7. To stop placemat, run `sudo pkill placemat`.
+
+
+If you want to use kubectl, run the following commands on host-vm.
+
+    ```console
+    $ ./mssh host-1 /opt/bin/ckecli kubernetes issue > ~/.kube/config
+    $ ./output/kubectl get nodes
+    ```

op/k8s/scheduler_boot.go

@@ -97,6 +97,10 @@ func SchedulerParams() cke.ServiceParams {
 		"--kubeconfig=/etc/kubernetes/scheduler/kubeconfig",
 		"--log-dir=/var/log/kubernetes/scheduler",
 		"--logtostderr=false",
+		// for healthz service
+		"--tls-cert-file=" + op.K8sPKIPath("apiserver.crt"),
+		"--tls-private-key-file=" + op.K8sPKIPath("apiserver.key"),
+		"--port=0",
 	}
 	return cke.ServiceParams{
 		ExtraArguments: args,

op/status.go

@@ -83,7 +83,7 @@ func GetNodeStatus(ctx context.Context, inf cke.Infrastructure, node *cke.Node,
 		IsHealthy:     false,
 	}
 	if status.Scheduler.Running {
-		status.Scheduler.IsHealthy, err = checkHealthz(ctx, inf, node.Address, 10251)
+		status.Scheduler.IsHealthy, err = checkSecureHealthz(ctx, inf, node.Address, 10259)
 		if err != nil {
 			log.Warn("failed to check scheduler health", map[string]interface{}{
 				log.FnError: err,