summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-09-06 12:29:40 -0400
committerGitHub <noreply@github.com>2017-09-06 12:29:40 -0400
commit6fc8a058fb5f359f6c980dbdc9543b7a03a47ef9 (patch)
treeafe31b8601014dc24d01d2ba4e2a9b7621cab493
parentecfb118e3b9c34eb27e5d318586cfaa406d02cf5 (diff)
parent32bc9ea223477ac083dd723da5b76b45dffe3a9f (diff)
downloadopenshift-6fc8a058fb5f359f6c980dbdc9543b7a03a47ef9.tar.gz
openshift-6fc8a058fb5f359f6c980dbdc9543b7a03a47ef9.tar.bz2
openshift-6fc8a058fb5f359f6c980dbdc9543b7a03a47ef9.tar.xz
openshift-6fc8a058fb5f359f6c980dbdc9543b7a03a47ef9.zip
Merge pull request #5313 from sjenning/remove-experimental-cri-flag
remove experimental-cri flag from node config
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j22
1 files changed, 0 insertions, 2 deletions
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 711afcadb..f59aa6fb4 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -21,8 +21,6 @@ kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yam
- remote
container-runtime-endpoint:
- /var/run/crio.sock
- experimental-cri:
- - 'true'
image-service-endpoint:
- /var/run/crio.sock
node-labels: