Merge branch 'master' of github.com:nicolaka/netshoot

nicolaka · nicolaka · commit 7aab18d3b64c · 2020-05-06T02:59:10.000Z
diff --git a/Dockerfile b/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
     iptraf-ng \
     iputils \
     ipvsadm \
+    jq \
     libc6-compat \
     liboping \
     mtr \
diff --git a/README.md b/README.md
@@ -77,6 +77,7 @@ To troubleshoot these issues, `netshoot` includes a set of powerful tools as rec
     iptraf-ng
     iputils
     ipvsadm
+    jq
     libc6-compat
     liboping
     mtr
diff --git a/configs/netshoot-calico.yaml b/configs/netshoot-calico.yaml
@@ -1,4 +1,6 @@
-apiVersion: apps/v1beta2 # for versions before 1.9.0 use apps/v1beta2
+---
+# NOTE: use apps/v1beta1 before 1.9.x and apps/v1beta2 before v1.16.x
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   namespace: kube-system
