From 385c7ea54d996c8e51a212b75cf6ae7bb9372a43 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@rancher.com>
Date: Sat, 23 May 2020 13:12:26 -0700
Subject: [PATCH] Sync with manager:

commit fdd34f4f1986da6db3bac1b53c385c23203b0775
Author: Sheng Yang <sheng.yang@rancher.com>
Date:   Sat May 23 13:00:11 2020 -0700

    Longhorn v1.0.0-rc2 release

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

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

diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml
index 28d6676..f10bc23 100644
--- a/deploy/longhorn.yaml
+++ b/deploy/longhorn.yaml
@@ -218,6 +218,11 @@ data:
     backupstore-poll-interval:
     taint-toleration:
     registry-secret:
+    auto-salvage:
+    disable-scheduling-on-cordoned-node:
+    replica-zone-soft-anti-affinity:
+    volume-attachment-recovery-policy:
+    mkfs-ext4-parameters:
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -237,7 +242,7 @@ spec:
     spec:
       containers:
       - name: longhorn-manager
-        image: longhornio/longhorn-manager:v1.0.0-rc1
+        image: longhornio/longhorn-manager:master
         imagePullPolicy: Always
         securityContext:
           privileged: true
@@ -246,11 +251,11 @@ spec:
         - -d
         - daemon
         - --engine-image
-        - longhornio/longhorn-engine:v1.0.0-rc1
+        - longhornio/longhorn-engine:master
         - --instance-manager-image
         - longhornio/longhorn-instance-manager:v1_20200514
         - --manager-image
-        - longhornio/longhorn-manager:v1.0.0-rc1
+        - longhornio/longhorn-manager:master
         - --service-account
         - longhorn-service-account
         ports:
@@ -346,7 +351,7 @@ spec:
     spec:
       containers:
       - name: longhorn-ui
-        image: longhornio/longhorn-ui:v1.0.0-rc1
+        image: longhornio/longhorn-ui:master
         imagePullPolicy: Always
         securityContext:
           runAsUser: 0
@@ -367,13 +372,14 @@ metadata:
   name: longhorn-frontend
   namespace: longhorn-system
 spec:
+  type: ClusterIP
   selector:
     app: longhorn-ui
   ports:
-  - port: 80
-    targetPort: 8000
+  - name: http
+    port: 80
+    targetPort: http
     nodePort: null
-  type: ClusterIP
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -392,18 +398,18 @@ spec:
     spec:
       initContainers:
         - name: wait-longhorn-manager
-          image: longhornio/longhorn-manager:v1.0.0-rc1
+          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:v1.0.0-rc1
+          image: longhornio/longhorn-manager:master
           imagePullPolicy: Always
           command:
           - longhorn-manager
           - -d
           - deploy-driver
           - --manager-image
-          - longhornio/longhorn-manager:v1.0.0-rc1
+          - longhornio/longhorn-manager:master
           - --manager-url
           - http://longhorn-backend:9500/v1
           env:
@@ -438,6 +444,8 @@ spec:
           # Manually specify number of CSI provisioner replicas
           #- name: CSI_PROVISIONER_REPLICA_COUNT
           #  value: "3"
+          #- name: CSI_RESIZER_REPLICA_COUNT
+          #  value: "3"
       #imagePullSecrets:
       #- name:
       serviceAccountName: longhorn-service-account
diff --git a/uninstall/uninstall.yaml b/uninstall/uninstall.yaml
index 3e445e0..028f23a 100644
--- a/uninstall/uninstall.yaml
+++ b/uninstall/uninstall.yaml
@@ -58,7 +58,7 @@ spec:
     spec:
       containers:
       - name: longhorn-uninstall
-        image: longhornio/longhorn-manager:v1.0.0-rc1
+        image: longhornio/longhorn-manager:master
         imagePullPolicy: Always
         command:
         - longhorn-manager