From 75481c6cec136b2d6916e92053c3e19ba70ea53e Mon Sep 17 00:00:00 2001
From: Arvind Iyengar <arvind.iyengar@rancher.com>
Date: Mon, 28 Jun 2021 14:46:16 -0700
Subject: [PATCH] Use rancher/shell

---
 .../templates/crd-template/templates/jobs.yaml            | 8 ++++----
 .../templates/crd-template/templates/rbac.yaml            | 2 +-
 .../rancher-monitoring/templates/crd-template/values.yaml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/rancher-monitoring/templates/crd-template/templates/jobs.yaml b/packages/rancher-monitoring/templates/crd-template/templates/jobs.yaml
index acdd1138f..6167ddbe2 100644
--- a/packages/rancher-monitoring/templates/crd-template/templates/jobs.yaml
+++ b/packages/rancher-monitoring/templates/crd-template/templates/jobs.yaml
@@ -17,8 +17,8 @@ spec:
     spec:
       serviceAccountName: {{ .Chart.Name }}-manager
       securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
+        runAsNonRoot: false
+        runAsUser: 0
       initContainers:
         - name: set-preserve-unknown-fields-false
           image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
@@ -93,8 +93,8 @@ spec:
     spec:
       serviceAccountName: {{ .Chart.Name }}-manager
       securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
+        runAsNonRoot: false
+        runAsUser: 0
       initContainers:
         - name: remove-finalizers
           image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
diff --git a/packages/rancher-monitoring/templates/crd-template/templates/rbac.yaml b/packages/rancher-monitoring/templates/crd-template/templates/rbac.yaml
index bdda1ddad..1c07c7dd0 100644
--- a/packages/rancher-monitoring/templates/crd-template/templates/rbac.yaml
+++ b/packages/rancher-monitoring/templates/crd-template/templates/rbac.yaml
@@ -53,7 +53,7 @@ spec:
   hostIPC: false
   hostPID: false
   runAsUser:
-    rule: 'MustRunAsNonRoot'
+    rule: 'RunAsAny'
   seLinux:
     rule: 'RunAsAny'
   supplementalGroups:
diff --git a/packages/rancher-monitoring/templates/crd-template/values.yaml b/packages/rancher-monitoring/templates/crd-template/values.yaml
index 8f3ebe37a..129d13914 100644
--- a/packages/rancher-monitoring/templates/crd-template/values.yaml
+++ b/packages/rancher-monitoring/templates/crd-template/values.yaml
@@ -7,5 +7,5 @@ global:
     systemDefaultRegistry: ""
 
 image:
-  repository: rancher/rancher-agent
-  tag: v2.5.7
+  repository: rancher/shell
+  tag: v0.1.8