From 45261f4462a2324e764e1065c5efaa07f2d27e32 Mon Sep 17 00:00:00 2001
From: Adam Zell <zellster@gmail.com>
Date: Tue, 17 May 2016 00:14:58 -0700
Subject: [PATCH] The Mac version of base64 does not support the wrap option. 
 Use tr to delete the trailing newline for Mac and Linux runs.

Move the security context tag under containers.

Run hack/update-generated-docs.sh
---
 examples/newrelic/README.md               | 4 ++--
 examples/newrelic/config-to-secret.sh     | 2 +-
 examples/newrelic/newrelic-daemonset.yaml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/newrelic/README.md b/examples/newrelic/README.md
index 591c81c5260..710a31eeaa9 100644
--- a/examples/newrelic/README.md
+++ b/examples/newrelic/README.md
@@ -121,8 +121,6 @@ spec:
       # Filter to specific nodes:
       # nodeSelector:
       #  app: newrelic
-      securityContext:
-        privileged: true
       hostPID: true
       hostIPC: true
       hostNetwork: true
@@ -130,6 +128,8 @@ spec:
         - resources:
             requests:
               cpu: 0.15
+          securityContext:
+            privileged: true
           env:
             - name: NRSYSMOND_logfile
               value: "/var/log/nrsysmond.log"
diff --git a/examples/newrelic/config-to-secret.sh b/examples/newrelic/config-to-secret.sh
index 823aa4fde3c..70e02a35cdd 100755
--- a/examples/newrelic/config-to-secret.sh
+++ b/examples/newrelic/config-to-secret.sh
@@ -16,5 +16,5 @@
 
 # Encodes the environment variables into a Kubernetes secret.
 
-BASE64_ENC=$(cat nrconfig.env | base64 --wrap=0)
+BASE64_ENC=$(cat nrconfig.env | base64 | tr -d '\n')
 sed -e "s#{{config_data}}#${BASE64_ENC}#g" ./newrelic-config-template.yaml > newrelic-config.yaml
diff --git a/examples/newrelic/newrelic-daemonset.yaml b/examples/newrelic/newrelic-daemonset.yaml
index b4cc29f51fa..24adb382378 100644
--- a/examples/newrelic/newrelic-daemonset.yaml
+++ b/examples/newrelic/newrelic-daemonset.yaml
@@ -15,8 +15,6 @@ spec:
       # Filter to specific nodes:
       # nodeSelector:
       #  app: newrelic
-      securityContext:
-        privileged: true
       hostPID: true
       hostIPC: true
       hostNetwork: true
@@ -24,6 +22,8 @@ spec:
         - resources:
             requests:
               cpu: 0.15
+          securityContext:
+            privileged: true
           env:
             - name: NRSYSMOND_logfile
               value: "/var/log/nrsysmond.log"