Merge pull request #38793 from euank/hyperkube-jq

Automatic merge from submit-queue (batch tested with PRs 37190, 38793) cluster/images/hyperkube: add jq for some volume plugins **What this PR does / why we need it**: Some flexvolume plugins use jq. See also https://github.com/coreos/bugs/issues/1706 It weighs in at about 400kb, so seems sane to include. **Release note**: ```release-note NONE ``` cc @luxas @pbx0

Merge pull request #38793 from euank/hyperkube-jq
d9aed2c5 · Kubernetes Submit Queue · GitHub · 275bed8b · c8115baa · d9aed2c5
Commit d9aed2c5 authored Dec 14, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Dockerfile cluster/images/hyperkube/Dockerfile +1 -0

No files found.
--- a/cluster/images/hyperkube/Dockerfile
+++ b/cluster/images/hyperkube/Dockerfile
@@ -28,6 +28,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \
    util-linux \
    socat \
    git \
+    jq \
    nfs-common \
    glusterfs-client \
    cifs-utils \