summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-07-15 21:45:13 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-08-03 17:20:51 +0200
commit55f6b3879d770d756963564a5894c09806a31003 (patch)
tree5c1c9f12ffb9251385f54eabd56ad8f7618c14f3
parent19b32d2a2ba68655afed6ba3c2cda3050b9070b4 (diff)
downloadopenshift-55f6b3879d770d756963564a5894c09806a31003.tar.gz
openshift-55f6b3879d770d756963564a5894c09806a31003.tar.bz2
openshift-55f6b3879d770d756963564a5894c09806a31003.tar.xz
openshift-55f6b3879d770d756963564a5894c09806a31003.zip
node.yaml: configure node to use cri-o when openshift.common.use_crio
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j215
1 files changed, 15 insertions, 0 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 351c8c9f6..a400dd8d9 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -16,6 +16,21 @@ imageConfig:
latest: false
kind: NodeConfig
kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yaml(level=1) }}
+{% if use_crio | default(False) %}
+ container-runtime:
+ - remote
+ container-runtime-endpoint:
+ - /var/run/crio.sock
+ enable-cri:
+ - 'true'
+ image-service-endpoint:
+ - /var/run/crio.sock
+ node-labels:
+ - router=true
+ - registry=true
+ runtime-request-timeout:
+ - 10m
+{% endif %}
{% if openshift.common.version_gte_3_3_or_1_3 | bool %}
masterClientConnectionOverrides:
acceptContentTypes: application/vnd.kubernetes.protobuf,application/json