k8s: Make vtctld a replication controller, and other fixes.

vtctld should be a replication controller rather than a single pod, so it gets restarted if the node fails. Also made other fixes as suggested in a review by some Kubernetes folks.
vitessio · Sep 26, 2015 · b8aa8fc · b8aa8fc
1 parent 5be1349
commit b8aa8fc
Show file tree

Hide file tree

Showing 17 changed files with 109 additions and 74 deletions.
diff --git a/examples/kubernetes/etcd-controller-template.yaml b/examples/kubernetes/etcd-controller-template.yaml
@@ -2,19 +2,14 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: etcd-{{cell}}
-  labels:
-    name: etcd
-    cell: {{cell}}
 spec:
   replicas: {{replicas}}
-  selector:
-    name: etcd
-    cell: {{cell}}
   template:
     metadata:
       labels:
-        name: etcd
+        component: etcd
         cell: {{cell}}
+        app: vitess
     spec:
       volumes:
         - name: certs
@@ -34,6 +29,10 @@ spec:
               # Mount root certs from the host OS into the location
               # expected for our container OS (Debian):
               mountPath: /etc/ssl/certs/ca-certificates.crt
+          resources:
+            limits:
+              memory: "128Mi"
+              cpu: "100m"
           command:
             - bash
             - "-c"

diff --git a/examples/kubernetes/etcd-service-template.yaml b/examples/kubernetes/etcd-service-template.yaml
@@ -3,12 +3,13 @@ apiVersion: v1
 metadata:
   name: etcd-{{cell}}
   labels:
-    name: etcd
+    component: etcd
     cell: {{cell}}
+    app: vitess
 spec:
   ports:
     - port: 4001
   selector:
-    name: etcd
+    component: etcd
     cell: {{cell}}
-
+    app: vitess
diff --git a/examples/kubernetes/guestbook-controller.yaml b/examples/kubernetes/guestbook-controller.yaml
@@ -2,19 +2,21 @@ kind: ReplicationController
 apiVersion: v1
 metadata:
   name: guestbook
-  labels:
-    name: guestbook
 spec:
   replicas: 3
-  selector: {name: guestbook}
   template:
     metadata:
-      labels: {name: guestbook}
+      labels:
+        component: frontend
+        app: guestbook
     spec:
       containers:
         - name: guestbook
           image: vitess/guestbook
           ports:
             - name: http-server
               containerPort: 8080
-
+          resources:
+            limits:
+              memory: "128Mi"
+              cpu: "100m"
diff --git a/examples/kubernetes/guestbook-service.yaml b/examples/kubernetes/guestbook-service.yaml
@@ -2,10 +2,15 @@ kind: Service
 apiVersion: v1
 metadata:
   name: guestbook
+  labels:
+    component: frontend
+    app: guestbook
 spec:
   ports:
     - port: 80
       targetPort: http-server
-  selector: {name: guestbook}
+  selector:
+    component: frontend
+    app: guestbook
   type: LoadBalancer
 
diff --git a/examples/kubernetes/vtctld-controller.yaml b/examples/kubernetes/vtctld-controller.yaml
@@ -0,0 +1,45 @@
+kind: ReplicationController
+apiVersion: v1
+metadata:
+  name: vtctld
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        component: vtctld
+        app: vitess
+    spec:
+      containers:
+        - name: vtctld
+          image: vitess/lite
+          volumeMounts:
+            - name: syslog
+              mountPath: /dev/log
+            - name: vtdataroot
+              mountPath: /vt/vtdataroot
+          resources:
+            limits:
+              memory: "128Mi"
+              cpu: "100m"
+          command:
+            - sh
+            - "-c"
+            - >-
+              mkdir -p $VTDATAROOT/tmp &&
+              chown -R vitess /vt &&
+              su -p -c "/vt/bin/vtctld
+              -debug
+              -templates $VTTOP/go/cmd/vtctld/templates
+              -web_dir $VTTOP/web/vtctld
+              -log_dir $VTDATAROOT/tmp
+              -alsologtostderr
+              -port 15000
+              -topo_implementation etcd
+              -tablet_protocol grpc
+              -etcd_global_addrs http://$ETCD_GLOBAL_SERVICE_HOST:$ETCD_GLOBAL_SERVICE_PORT" vitess
+      volumes:
+        - name: syslog
+          hostPath: {path: /dev/log}
+        - name: vtdataroot
+          emptyDir: {}
diff --git a/examples/kubernetes/vtctld-down.sh b/examples/kubernetes/vtctld-down.sh
@@ -7,8 +7,8 @@ set -e
 script_root=`dirname "${BASH_SOURCE}"`
 source $script_root/env.sh
 
-echo "Deleting vtctld pod..."
-$KUBECTL delete pod vtctld
+echo "Stopping vtctld replicationcontroller..."
+$KUBECTL stop replicationcontroller vtctld
 
 echo "Deleting vtctld service..."
 $KUBECTL delete service vtctld
diff --git a/examples/kubernetes/vtctld-pod.yaml b/examples/kubernetes/vtctld-pod.yaml
diff --git a/examples/kubernetes/vtctld-service.yaml b/examples/kubernetes/vtctld-service.yaml
@@ -3,12 +3,15 @@ apiVersion: v1
 metadata:
   name: vtctld
   labels:
-    name: vtctld
+    component: vtctld
+    app: vitess
 spec:
   ports:
     - port: 15000
       targetPort: 15000
       nodePort: 30000
-  selector: {name: vtctld}
+  selector:
+    component: vtctld
+    app: vitess
   type: NodePort
 
diff --git a/examples/kubernetes/vtctld-up.sh b/examples/kubernetes/vtctld-up.sh
@@ -10,8 +10,8 @@ source $script_root/env.sh
 echo "Creating vtctld service..."
 $KUBECTL create -f vtctld-service.yaml
 
-echo "Creating vtctld pod..."
-$KUBECTL create -f vtctld-pod.yaml
+echo "Creating vtctld replicationcontroller..."
+$KUBECTL create -f vtctld-controller.yaml
 
 server=$(get_vtctld_addr)
 echo

diff --git a/examples/kubernetes/vtgate-controller-benchmarking-template.yaml b/examples/kubernetes/vtgate-controller-benchmarking-template.yaml
@@ -2,13 +2,13 @@ kind: ReplicationController
 apiVersion: v1
 metadata:
   name: vtgate
-  labels: {name: vtgate}
 spec:
   replicas: {{replicas}}
-  selector: {name: vtgate}
   template:
     metadata:
-      labels: {name: vtgate}
+      labels:
+        component: vtgate
+        app: vitess
     spec:
       containers:
         - name: vtgate
@@ -44,4 +44,3 @@ spec:
           hostPath: {path: /dev/log}
         - name: vtdataroot
           {{vtdataroot_volume}}
-
diff --git a/examples/kubernetes/vtgate-controller-template.yaml b/examples/kubernetes/vtgate-controller-template.yaml
@@ -2,13 +2,13 @@ kind: ReplicationController
 apiVersion: v1
 metadata:
   name: vtgate
-  labels: {name: vtgate}
 spec:
   replicas: {{replicas}}
-  selector: {name: vtgate}
   template:
     metadata:
-      labels: {name: vtgate}
+      labels:
+        component: vtgate
+        app: vitess
     spec:
       containers:
         - name: vtgate
@@ -18,6 +18,10 @@ spec:
               mountPath: /dev/log
             - name: vtdataroot
               mountPath: /vt/vtdataroot
+          resources:
+            limits:
+              memory: "512Mi"
+              cpu: "500m"
           command:
             - sh
             - "-c"

diff --git a/examples/kubernetes/vtgate-service.yaml b/examples/kubernetes/vtgate-service.yaml
@@ -2,10 +2,13 @@ kind: Service
 apiVersion: v1
 metadata:
   name: vtgate
-  labels: {name: vtgate}
+  labels:
+    component: vtgate
+    app: vitess
 spec:
   ports:
     - port: 15001
-  selector: {name: vtgate}
+  selector:
+    component: vtgate
+    app: vitess
   type: LoadBalancer
-
diff --git a/examples/kubernetes/vtgate-up.sh b/examples/kubernetes/vtgate-up.sh
@@ -13,7 +13,7 @@ VTGATE_TEMPLATE=${VTGATE_TEMPLATE:-'vtgate-controller-template.yaml'}
 
 vtdataroot_volume='emptyDir: {}'
 if [ -n "$VTDATAROOT_VOLUME" ]; then
-  vtdataroot_volume="hostDir: {path: ${VTDATAROOT_VOLUME}}"
+  vtdataroot_volume="hostPath: {path: ${VTDATAROOT_VOLUME}}"
 fi
 
 replicas=$VTGATE_REPLICAS

diff --git a/examples/kubernetes/vttablet-pod-benchmarking-template.yaml b/examples/kubernetes/vttablet-pod-benchmarking-template.yaml
@@ -3,10 +3,11 @@ apiVersion: v1
 metadata:
   name: vttablet-{{uid}}
   labels:
-    name: vttablet
+    component: vttablet
     keyspace: "{{keyspace}}"
     shard: "{{shard_label}}"
     tablet: "{{alias}}"
+    app: vitess
 spec:
   containers:
     - name: vttablet

diff --git a/examples/kubernetes/vttablet-pod-template.yaml b/examples/kubernetes/vttablet-pod-template.yaml
@@ -3,10 +3,11 @@ apiVersion: v1
 metadata:
   name: vttablet-{{uid}}
   labels:
-    name: vttablet
+    component: vttablet
     keyspace: "{{keyspace}}"
     shard: "{{shard_label}}"
     tablet: "{{alias}}"
+    app: vitess
 spec:
   containers:
     - name: vttablet
@@ -16,6 +17,10 @@ spec:
           mountPath: /dev/log
         - name: vtdataroot
           mountPath: /vt/vtdataroot
+      resources:
+        limits:
+          memory: "1Gi"
+          cpu: "500m"
       command:
         - bash
         - "-c"
@@ -72,6 +77,10 @@ spec:
           mountPath: /dev/log
         - name: vtdataroot
           mountPath: /vt/vtdataroot
+      resources:
+        limits:
+          memory: "1Gi"
+          cpu: "500m"
       command:
         - sh
         - "-c"

diff --git a/examples/kubernetes/vttablet-up.sh b/examples/kubernetes/vttablet-up.sh
@@ -21,7 +21,7 @@ RDONLY_COUNT=${RDONLY_COUNT:-2}
 
 vtdataroot_volume='emptyDir: {}'
 if [ -n "$VTDATAROOT_VOLUME" ]; then
-  vtdataroot_volume="hostDir: {path: ${VTDATAROOT_VOLUME}}"
+  vtdataroot_volume="hostPath: {path: ${VTDATAROOT_VOLUME}}"
 fi
 
 uid_base=$UID_BASE

diff --git a/examples/kubernetes/vtworker-pod-template.yaml b/examples/kubernetes/vtworker-pod-template.yaml
@@ -3,7 +3,8 @@ apiVersion: v1
 metadata:
   name: vtworker
   labels:
-    name: vtworker
+    component: vtworker
+    app: vitess
 spec:
   containers:
     - name: vtworker