From c915b1c511aecd4b4abaa229faedd6ccadff063d Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@rancher.com>
Date: Tue, 28 Apr 2020 17:35:27 -0700
Subject: [PATCH] Sync with Longhorn manager

commit ed3409b4c1bf53bbdda94d7a75399a73a617660e
Author: Sheng Yang <sheng.yang@rancher.com>
Date:   Tue Apr 28 15:50:17 2020 -0700

    Longhorn v0.8.1 release

    Signed-off-by: Sheng Yang <sheng.yang@rancher.com>

Signed-off-by: Sheng Yang <sheng.yang@rancher.com>
---
 deploy/longhorn.yaml     | 22 +++++++++-------------
 uninstall/uninstall.yaml |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml
index 3a731f7..5ffa66b 100644
--- a/deploy/longhorn.yaml
+++ b/deploy/longhorn.yaml
@@ -45,10 +45,6 @@ rules:
 - apiGroups: ["coordination.k8s.io"]
   resources: ["leases"]
   verbs: ["*"]
-# to be removed after v0.7.0
-- apiGroups: ["longhorn.rancher.io"]
-  resources: ["volumes", "engines", "replicas", "settings", "engineimages", "nodes", "instancemanagers"]
-  verbs: ["*"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -241,7 +237,7 @@ spec:
     spec:
       containers:
       - name: longhorn-manager
-        image: longhornio/longhorn-manager:v0.8.1-rc3
+        image: longhornio/longhorn-manager:master
         imagePullPolicy: Always
         securityContext:
           privileged: true
@@ -250,11 +246,11 @@ spec:
         - -d
         - daemon
         - --engine-image
-        - longhornio/longhorn-engine:v0.8.1-rc3
+        - longhornio/longhorn-engine:master
         - --instance-manager-image
         - longhornio/longhorn-instance-manager:v1_20200301
         - --manager-image
-        - longhornio/longhorn-manager:v0.8.1-rc3
+        - longhornio/longhorn-manager:master
         - --service-account
         - longhorn-service-account
         ports:
@@ -350,7 +346,8 @@ spec:
     spec:
       containers:
       - name: longhorn-ui
-        image: longhornio/longhorn-ui:v0.8.1-rc3
+        image: longhornio/longhorn-ui:master
+        imagePullPolicy: Always
         ports:
         - containerPort: 8000
           name: http
@@ -359,7 +356,6 @@ spec:
             value: "http://longhorn-backend:9500"
 #      imagePullSecrets:
 #      - name:
-      serviceAccountName: longhorn-service-account
 ---
 kind: Service
 apiVersion: v1
@@ -394,18 +390,18 @@ spec:
     spec:
       initContainers:
         - name: wait-longhorn-manager
-          image: longhornio/longhorn-manager:v0.8.1-rc3
+          image: longhornio/longhorn-manager:master
           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: longhornio/longhorn-manager:v0.8.1-rc3
+          image: longhornio/longhorn-manager:master
           imagePullPolicy: Always
           command:
           - longhorn-manager
           - -d
           - deploy-driver
           - --manager-image
-          - longhornio/longhorn-manager:v0.8.1-rc3
+          - longhornio/longhorn-manager:master
           - --manager-url
           - http://longhorn-backend:9500/v1
           env:
@@ -425,7 +421,7 @@ spec:
           #- name: KUBELET_ROOT_DIR
           #  value: /var/lib/rancher/k3s/agent/kubelet
           # For AirGap Installation
-          # Replce PREFIX with your private registery
+          # Replace PREFIX with your private registery
           #- name: CSI_ATTACHER_IMAGE
           #  value: PREFIX/csi-attacher:v2.0.0
           #- name: CSI_PROVISIONER_IMAGE
diff --git a/uninstall/uninstall.yaml b/uninstall/uninstall.yaml
index 0d1aade..028f23a 100644
--- a/uninstall/uninstall.yaml
+++ b/uninstall/uninstall.yaml
@@ -58,7 +58,7 @@ spec:
     spec:
       containers:
       - name: longhorn-uninstall
-        image: longhornio/longhorn-manager:v0.8.1-rc3
+        image: longhornio/longhorn-manager:master
         imagePullPolicy: Always
         command:
         - longhorn-manager