From 64562f16b19dd2fde9ba6d8dc5d1f6ca03ce06f0 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng@yasker.org>
Date: Fri, 10 Aug 2018 22:07:05 -0700
Subject: [PATCH] Sync with Longhorn Manager

Manager commit:

commit 807666ba7a13024a218361d963b6c4433b7b45fd
Author: Sheng Yang <sheng@yasker.org>
Date:   Fri Aug 10 21:57:07 2018 -0700

    Update image to rancher/longhorn-manager:v0.3-rc4

    Engine image: rancher/longhorn-engine:v0.3-rc4

    UI Image: rancher/longhorn-ui:v0.3-rc4
---
 deploy/longhorn.yaml                       | 14 ++---
 examples/flexvolume/example_baseimage.yaml | 25 +++++++--
 examples/provisioner_with_baseimage.yaml   | 63 ++++++++++++++++++++++
 3 files changed, 91 insertions(+), 11 deletions(-)
 create mode 100644 examples/provisioner_with_baseimage.yaml

diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml
index 54b82d2..d2b12ae 100644
--- a/deploy/longhorn.yaml
+++ b/deploy/longhorn.yaml
@@ -178,7 +178,7 @@ spec:
     spec:
       containers:
       - name: longhorn-manager
-        image: rancher/longhorn-manager:9838a5f
+        image: rancher/longhorn-manager:v0.3-rc4
         imagePullPolicy: Always
         securityContext:
           privileged: true
@@ -187,9 +187,9 @@ spec:
         - -d
         - daemon
         - --engine-image
-        - rancher/longhorn-engine:e58683a
+        - rancher/longhorn-engine:v0.3-rc4
         - --manager-image
-        - rancher/longhorn-manager:9838a5f
+        - rancher/longhorn-manager:v0.3-rc4
         - --service-account
         - longhorn-service-account
         ports:
@@ -266,7 +266,7 @@ spec:
     spec:
       containers:
       - name: longhorn-ui
-        image: rancher/longhorn-ui:99252cc
+        image: rancher/longhorn-ui:v0.3-rc4
         ports:
         - containerPort: 8000
         env:
@@ -305,18 +305,18 @@ spec:
     spec:
       initContainers:
         - name: wait-longhorn-manager
-          image: rancher/longhorn-manager:9838a5f
+          image: rancher/longhorn-manager:v0.3-rc4
           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:9838a5f
+          image: rancher/longhorn-manager:v0.3-rc4
           imagePullPolicy: Always
           command:
           - longhorn-manager
           - -d
           - deploy-driver
           - --manager-image
-          - rancher/longhorn-manager:9838a5f
+          - rancher/longhorn-manager:v0.3-rc4
           - --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
index 2d25980..640d561 100644
--- a/examples/flexvolume/example_baseimage.yaml
+++ b/examples/flexvolume/example_baseimage.yaml
@@ -1,6 +1,8 @@
 apiVersion: v1
 kind: Pod
 metadata:
+  labels:
+    app: flexvol-baseimage
   name: flexvol-baseimage
   namespace: default
 spec:
@@ -16,11 +18,26 @@ spec:
   volumes:
   - name: flexvol
     flexVolume:
-      driver: "rancher.io/longhorn"
-      # fsType: "iso9660"
+      driver: rancher.io/longhorn
       options:
-        size: "16Mi"
+        size: 32Mi
         numberOfReplicas: "3"
         staleReplicaTimeout: "20"
         fromBackup: ""
-        baseImage: "rancher/longhorn-test-baseimage"
+        baseImage: rancher/longhorn-test:baseimage-ext4
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: flexvol-baseimage
+  name: flexvol-baseimage
+  namespace: default
+spec:
+  ports:
+  - name: web
+    port: 80
+    targetPort: 80
+  selector:
+    app: flexvol-baseimage
+  type: LoadBalancer
diff --git a/examples/provisioner_with_baseimage.yaml b/examples/provisioner_with_baseimage.yaml
new file mode 100644
index 0000000..e3ab42b
--- /dev/null
+++ b/examples/provisioner_with_baseimage.yaml
@@ -0,0 +1,63 @@
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  labels:
+    app: provisioner-baseimage
+  name: baseimage-storageclass
+provisioner: rancher.io/longhorn
+parameters:
+  numberOfReplicas: '3'
+  staleReplicaTimeout: '30'
+  fromBackup: ''
+  baseImage: rancher/longhorn-test:baseimage-ext4
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: provisioner-baseimage
+  name: provisioner-baseimage-service
+spec:
+  ports:
+  - port: 80
+    name: web
+  selector:
+    app: provisioner-baseimage
+  type: LoadBalancer
+---
+apiVersion: apps/v1beta2
+kind: StatefulSet
+metadata:
+  labels:
+    app: provisioner-baseimage
+  name: provisioner-baseimage-statefulset
+spec:
+  selector:
+    matchLabels:
+      app: provisioner-baseimage
+  serviceName: provisioner-baseimage
+  replicas: 2
+  template:
+    metadata:
+      labels:
+        app: provisioner-baseimage
+    spec:
+      terminationGracePeriodSeconds: 10
+      containers:
+      - name: nginx
+        image: nginx:stable-alpine
+        imagePullPolicy: IfNotPresent
+        volumeMounts:
+        - name: baseimage-vol
+          mountPath: /usr/share/nginx/html
+        ports:
+        - containerPort: 80
+  volumeClaimTemplates:
+  - metadata:
+      name: baseimage-vol
+    spec:
+      accessModes: [ "ReadWriteOnce" ]
+      storageClassName: baseimage-storageclass
+      resources:
+        requests:
+          storage: 32Mi