From da9d0cac327a787d85812f091bfa7b7774d1d3dc Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng@yasker.org>
Date: Thu, 21 Mar 2019 18:50:30 -0700
Subject: [PATCH] Sync with manager

commit 62a6ff4a9dfbfc2081917184815a8f71e549492b
Author: Sheng Yang <sheng@yasker.org>
Date:   Thu Mar 21 18:41:45 2019 -0700

    Longhorn v0.4.1-rc1 release
---
 deploy/longhorn.yaml     | 17 ++++++++++-------
 uninstall/uninstall.yaml |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml
index 9f47f30..2474e61 100644
--- a/deploy/longhorn.yaml
+++ b/deploy/longhorn.yaml
@@ -181,7 +181,7 @@ spec:
     spec:
       containers:
       - name: longhorn-manager
-        image: rancher/longhorn-manager:v0.4.0
+        image: rancher/longhorn-manager:v0.4.1-rc1
         imagePullPolicy: Always
         securityContext:
           privileged: true
@@ -190,9 +190,9 @@ spec:
         - -d
         - daemon
         - --engine-image
-        - rancher/longhorn-engine:v0.4.0
+        - rancher/longhorn-engine:v0.4.1-rc1
         - --manager-image
-        - rancher/longhorn-manager:v0.4.0
+        - rancher/longhorn-manager:v0.4.1-rc1
         - --service-account
         - longhorn-service-account
         ports:
@@ -269,7 +269,7 @@ spec:
     spec:
       containers:
       - name: longhorn-ui
-        image: rancher/longhorn-ui:v0.4.0
+        image: rancher/longhorn-ui:v0.4.1-rc1
         ports:
         - containerPort: 8000
         env:
@@ -308,23 +308,26 @@ spec:
     spec:
       initContainers:
         - name: wait-longhorn-manager
-          image: rancher/longhorn-manager:v0.4.0
+          image: rancher/longhorn-manager:v0.4.1-rc1
           command: ['sh', '-c', 'while [ $(curl -m 1 -s -o /dev/null -w "%{http_code}" http://longhorn-backend:9500/v1) != "200" ]; do echo waiting; sleep 2; done']
       containers:
         - name: longhorn-driver-deployer
-          image: rancher/longhorn-manager:v0.4.0
+          image: rancher/longhorn-manager:v0.4.1-rc1
           imagePullPolicy: Always
           command:
           - longhorn-manager
           - -d
           - deploy-driver
           - --manager-image
-          - rancher/longhorn-manager:v0.4.0
+          - rancher/longhorn-manager:v0.4.1-rc1
           - --manager-url
           - http://longhorn-backend:9500/v1
           # manually choose "flexvolume" or "csi"
           #- --driver
           #- flexvolume
+          # manually set root directory for csi
+          #- --kubelet-root-dir
+          #- /var/lib/rancher/k3s/agent/kubelet
           env:
           - name: POD_NAMESPACE
             valueFrom:
diff --git a/uninstall/uninstall.yaml b/uninstall/uninstall.yaml
index e13d1a2..2d15334 100644
--- a/uninstall/uninstall.yaml
+++ b/uninstall/uninstall.yaml
@@ -12,7 +12,7 @@ spec:
     spec:
       containers:
       - name: longhorn-uninstall
-        image: rancher/longhorn-manager:v0.4.0
+        image: rancher/longhorn-manager:v0.4.1-rc1
         imagePullPolicy: Always
         command:
         - longhorn-manager