From 1c87568c866c0078ac4a6e7c309f7e25527b6294 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng@yasker.org>
Date: Sat, 4 Aug 2018 00:10:50 -0700
Subject: [PATCH] Sync with Longhorn Manager

Manager commit:

commit 193dc5704ef033196300780fa5f956ba8c32b828
Author: Sheng Yang <sheng@yasker.org>
Date:   Fri Aug 3 23:02:16 2018 -0700

    Update images

    Manager to: rancher/longhorn-manager:298b65f
    Engine to: rancher/longhorn-engine:e58683a
    UI to: rancher/longhorn-ui:829ebc8
---
 deploy/longhorn.yaml                       | 14 ++++++------
 examples/flexvolume/example_baseimage.yaml | 26 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 examples/flexvolume/example_baseimage.yaml

diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml
index c95d3af..56a07a4 100644
--- a/deploy/longhorn.yaml
+++ b/deploy/longhorn.yaml
@@ -178,7 +178,7 @@ spec:
     spec:
       containers:
       - name: longhorn-manager
-        image: rancher/longhorn-manager:06a81b9
+        image: rancher/longhorn-manager:298b65f
         imagePullPolicy: Always
         securityContext:
           privileged: true
@@ -187,9 +187,9 @@ spec:
         - -d
         - daemon
         - --engine-image
-        - rancher/longhorn-engine:31c42f0
+        - rancher/longhorn-engine:e58683a
         - --manager-image
-        - rancher/longhorn-manager:06a81b9
+        - rancher/longhorn-manager:298b65f
         - --service-account
         - longhorn-service-account
         ports:
@@ -266,7 +266,7 @@ spec:
     spec:
       containers:
       - name: longhorn-ui
-        image: rancher/longhorn-ui:47e0b2a
+        image: rancher/longhorn-ui:829ebc8
         ports:
         - containerPort: 8000
         env:
@@ -305,18 +305,18 @@ spec:
     spec:
       initContainers:
         - name: wait-longhorn-manager
-          image: rancher/longhorn-manager:06a81b9
+          image: rancher/longhorn-manager:298b65f
           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:06a81b9
+          image: rancher/longhorn-manager:298b65f
           imagePullPolicy: Always
           command:
           - longhorn-manager
           - -d
           - deploy-driver
           - --manager-image
-          - rancher/longhorn-manager:06a81b9
+          - rancher/longhorn-manager:298b65f
           - --manager-url
           - http://longhorn-backend:9500/v1
           # manually choose "flexvolume" or "csi"
diff --git a/examples/flexvolume/example_baseimage.yaml b/examples/flexvolume/example_baseimage.yaml
new file mode 100644
index 0000000..2d25980
--- /dev/null
+++ b/examples/flexvolume/example_baseimage.yaml
@@ -0,0 +1,26 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: flexvol-baseimage
+  namespace: default
+spec:
+  containers:
+  - name: flexvol-baseimage
+    image: nginx:stable-alpine
+    imagePullPolicy: IfNotPresent
+    volumeMounts:
+    - name: flexvol
+      mountPath: /usr/share/nginx/html
+    ports:
+    - containerPort: 80
+  volumes:
+  - name: flexvol
+    flexVolume:
+      driver: "rancher.io/longhorn"
+      # fsType: "iso9660"
+      options:
+        size: "16Mi"
+        numberOfReplicas: "3"
+        staleReplicaTimeout: "20"
+        fromBackup: ""
+        baseImage: "rancher/longhorn-test-baseimage"