From 236f0666356fc2cb0a6f0e9ecb2cf29a42664bd2 Mon Sep 17 00:00:00 2001
From: Takashi Okamoto <toraneko@gmail.com>
Date: Tue, 28 Aug 2018 02:24:45 +0000
Subject: [PATCH] kubeadm cri-o support.
---
.../kubeadm/templates/kubeadm-client.conf.v1alpha2.j2 | 3 +++
.../master/templates/kubeadm-config.v1alpha2.yaml.j2 | 3 +++
2 files changed, 6 insertions(+)
diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
index 38ac215a2..1b0ab9c40 100644
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
@@ -15,3 +15,6 @@ discoveryTokenAPIServers:
discoveryTokenUnsafeSkipCAVerification: true
nodeRegistration:
name: {{ inventory_hostname }}
+{% if manage_crio %}
+ criSocket: /var/run/crio/crio.sock
+{% endif %}
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
index 31c499e0f..4ee15a181 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
@@ -138,3 +138,6 @@ nodeRegistration:
taints:
- effect: NoSchedule
key: node-role.kubernetes.io/master
+{% if manage_crio %}
+ criSocket: /var/run/crio/crio.sock
+{% endif %}
--
GitLab