From af331643dc0af5e3fb8bebfa9efb2682e46451b8 Mon Sep 17 00:00:00 2001 From: "Areli, Fuss (af732p)" Date: Thu, 24 May 2018 11:24:40 +0300 Subject: Alignment of VVP devkit Alignment of VVP devkit Change-Id: I7c6dae29faf0a14dce4d40114bd0bc4be8e23e42 Issue-ID: VVP-60 Signed-off-by: Areli, Fuss (af732p) --- .../templates/ignition/controller.yaml.j2 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ansible/roles/ansible-vvp-bootstrap/templates/ignition/controller.yaml.j2') diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/ignition/controller.yaml.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/ignition/controller.yaml.j2 index ff8e0b8..bf01435 100644 --- a/ansible/roles/ansible-vvp-bootstrap/templates/ignition/controller.yaml.j2 +++ b/ansible/roles/ansible-vvp-bootstrap/templates/ignition/controller.yaml.j2 @@ -182,7 +182,8 @@ systemd: --pod-manifest-path=/etc/kubernetes/manifests \ --hostname-override={{.domain_name}} \ --cluster_dns={{.k8s_dns_service_ip}} \ - --cluster_domain=cluster.local + --cluster_domain=cluster.local \ + --pod-infra-container-image="docker.io/kubernetes/pause" ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid Restart=always RestartSec=10 @@ -354,13 +355,14 @@ storage: - --service-account-key-file=/etc/kubernetes/ssl/apiserver-key.pem - --runtime-config=extensions/v1beta1/networkpolicies=true - --anonymous-auth=false + - --storage-backend=etcd2 livenessProbe: httpGet: host: 127.0.0.1 - port: 8080 + port: 10253 path: /healthz - initialDelaySeconds: 15 - timeoutSeconds: 15 + initialDelaySeconds: 15000 + timeoutSeconds: 1500 ports: - containerPort: {{.k8s_controller_port}} hostPort: {{.k8s_controller_port}} -- cgit 1.2.3-korg