VOL-666 : Disabled swap on kubernetes hosts
- Also added specific versions for kafka and zookeeper
Change-Id: Id5d31fc2ac8dbfd0921a3fff103c8f3dc95bf96a
diff --git a/Makefile b/Makefile
index 92dcd86..984d397 100644
--- a/Makefile
+++ b/Makefile
@@ -140,8 +140,8 @@
quay.io/coreos/hyperkube:v1.9.2_coreos.0 \
quay.io/coreos/etcd-operator:v0.7.2 \
quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2 \
- wurstmeister/kafka:latest \
- zookeeper:latest
+ wurstmeister/kafka:1.0.0 \
+ zookeeper:3.4.11
FETCH_IMAGE_LIST = $(shell echo $(FETCH_BUILD_IMAGE_LIST) $(FETCH_COMPOSE_IMAGE_LIST) $(FETCH_K8S_IMAGE_LIST) | tr ' ' '\n' | sort -u)
diff --git a/install/ansible/roles/voltha-k8s/tasks/config.yml b/install/ansible/roles/voltha-k8s/tasks/config.yml
index c3bfe22..d7a4d43 100644
--- a/install/ansible/roles/voltha-k8s/tasks/config.yml
+++ b/install/ansible/roles/voltha-k8s/tasks/config.yml
@@ -74,3 +74,8 @@
with_items: "{{ voltha_containers }}"
when: target == "cluster"
tags: [voltha]
+
+- name: VOLT-HA Config | Disable all swaps
+ command: swapoff -a
+ when: target == "cluster"
+ tags: [voltha]
diff --git a/install/containers.cfg.k8s b/install/containers.cfg.k8s
index 5a7eeb8..71a39c0 100644
--- a/install/containers.cfg.k8s
+++ b/install/containers.cfg.k8s
@@ -26,5 +26,5 @@
- voltha-shovel:latest
- voltha-tools:latest
- voltha-voltha:latest
- - wurstmeister/kafka:latest
- - zookeeper:latest
+ - wurstmeister/kafka:1.0.0
+ - zookeeper:3.4.11
diff --git a/install/installer.sh b/install/installer.sh
index 4a8453c..4ace5a0 100755
--- a/install/installer.sh
+++ b/install/installer.sh
@@ -169,10 +169,6 @@
sed -i -e "s/or is_atomic)/& and skip_downloads == \"false\" /" \
kubespray/roles/kubernetes/preinstall/tasks/main.yml
- # Disable swapon check
- sed -i -e "s/kubelet_fail_swap_on|default(true)/kubelet_fail_swap_on|default(false)/" \
- kubespray/roles/kubernetes/preinstall/tasks/verify-settings.yml
-
# Construct node inventory
CONFIG_FILE=kubespray/inventory/voltha/hosts.ini python3 \
kubespray/contrib/inventory_builder/inventory.py $hosts