diff --git a/examples/kubernetes/etcd-controller-template.yaml b/examples/kubernetes/etcd-controller-template.yaml index c7f44653667..97a037cfca7 100644 --- 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 index 227d2343a00..966e67f04b5 100644 --- 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 index a2d3a9a07a2..e13561f69ad 100644 --- a/examples/kubernetes/guestbook-controller.yaml +++ b/examples/kubernetes/guestbook-controller.yaml @@ -2,14 +2,13 @@ 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 @@ -17,4 +16,7 @@ spec: 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 index 39d1881553f..341c3ee0314 100644 --- 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 new file mode 100644 index 00000000000..14b0f41a61a --- /dev/null +++ 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 index dcc566c41ae..9d76adfae84 100755 --- 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 deleted file mode 100644 index bf4774266b0..00000000000 --- a/examples/kubernetes/vtctld-pod.yaml +++ /dev/null @@ -1,37 +0,0 @@ -kind: Pod -apiVersion: v1 -metadata: - name: vtctld - labels: - name: vtctld -spec: - containers: - - name: vtctld - image: vitess/lite - volumeMounts: - - name: syslog - mountPath: /dev/log - - name: vtdataroot - mountPath: /vt/vtdataroot - 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-service.yaml b/examples/kubernetes/vtctld-service.yaml index 7cbfabe69e6..5c8ba5935cf 100644 --- 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 index 4f9a78b01c2..18474fc3a0e 100755 --- 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 index fb5454cca8b..09accdd53f6 100644 --- 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 index 67aff6ff376..5a9dead533b 100644 --- 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 index b3f787cfa97..37fe8f02bd7 100644 --- 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 index 8441adb8ee7..e3c814f4293 100755 --- 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 index 97fb8bd7038..1bcf3c03590 100644 --- 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 index 0f969ccbea9..152ea089fe1 100644 --- 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 index 45d895947d6..378cc2cb387 100755 --- 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 index 2bd486ef00d..e3fec623a75 100644 --- 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