Merge pull request #88 from derekwaynecarr/fix-kubelet-stats

Fix kubelet stats summary endpoint with cri-o
openshift · Sep 21, 2018 · d948fb8 · d948fb8
2 parents d919bbc + 8504970
commit d948fb8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service b/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service
@@ -16,7 +16,7 @@ contents: |
         --rotate-certificates \
         --serialize-image-pulls=false \
         --container-runtime=remote \
-        --container-runtime-endpoint=unix:///var/run/crio/crio.sock \
+        --container-runtime-endpoint=/var/run/crio/crio.sock \
         --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
         --lock-file=/var/run/lock/kubelet.lock \
         --exit-on-lock-contention \

diff --git a/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service
@@ -16,7 +16,7 @@ contents: |
         --rotate-certificates \
         --serialize-image-pulls=false \
         --container-runtime=remote \
-        --container-runtime-endpoint=unix:///var/run/crio/crio.sock \
+        --container-runtime-endpoint=/var/run/crio/crio.sock \
         --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
         --lock-file=/var/run/lock/kubelet.lock \
         --exit-on-lock-contention \

diff --git a/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service b/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service
@@ -16,7 +16,7 @@ contents: |
         --rotate-certificates \
         --serialize-image-pulls=false \
         --container-runtime=remote \
-        --container-runtime-endpoint=unix:///var/run/crio/crio.sock \
+        --container-runtime-endpoint=/var/run/crio/crio.sock \
         --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
         --lock-file=/var/run/lock/kubelet.lock \
         --exit-on-lock-contention \

diff --git a/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service
@@ -16,7 +16,7 @@ contents: |
         --rotate-certificates \
         --serialize-image-pulls=false \
         --container-runtime=remote \
-        --container-runtime-endpoint=unix:///var/run/crio/crio.sock \
+        --container-runtime-endpoint=/var/run/crio/crio.sock \
         --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
         --lock-file=/var/run/lock/kubelet.lock \
         --exit-on-lock-contention \

diff --git a/templates/_base/master/units/kubelet.yaml b/templates/_base/master/units/kubelet.yaml
@@ -18,7 +18,7 @@ contents: |
         --rotate-certificates \
         --serialize-image-pulls=false \
         --container-runtime=remote \
-        --container-runtime-endpoint=unix:///var/run/crio/crio.sock \
+        --container-runtime-endpoint=/var/run/crio/crio.sock \
         --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
         --lock-file=/var/run/lock/kubelet.lock \
         --exit-on-lock-contention \

diff --git a/templates/_base/worker/units/kubelet.yaml b/templates/_base/worker/units/kubelet.yaml
@@ -18,7 +18,7 @@ contents: |
         --rotate-certificates \
         --serialize-image-pulls=false \
         --container-runtime=remote \
-        --container-runtime-endpoint=unix:///var/run/crio/crio.sock \
+        --container-runtime-endpoint=/var/run/crio/crio.sock \
         --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \
         --lock-file=/var/run/lock/kubelet.lock \
         --exit-on-lock-contention \