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
This commit is contained in:
Sheng Yang 2018-08-10 22:07:05 -07:00
parent f3ccbe7b28
commit 64562f16b1
3 changed files with 91 additions and 11 deletions

View File

@ -178,7 +178,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-manager - name: longhorn-manager
image: rancher/longhorn-manager:9838a5f image: rancher/longhorn-manager:v0.3-rc4
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
@ -187,9 +187,9 @@ spec:
- -d - -d
- daemon - daemon
- --engine-image - --engine-image
- rancher/longhorn-engine:e58683a - rancher/longhorn-engine:v0.3-rc4
- --manager-image - --manager-image
- rancher/longhorn-manager:9838a5f - rancher/longhorn-manager:v0.3-rc4
- --service-account - --service-account
- longhorn-service-account - longhorn-service-account
ports: ports:
@ -266,7 +266,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-ui - name: longhorn-ui
image: rancher/longhorn-ui:99252cc image: rancher/longhorn-ui:v0.3-rc4
ports: ports:
- containerPort: 8000 - containerPort: 8000
env: env:
@ -305,18 +305,18 @@ spec:
spec: spec:
initContainers: initContainers:
- name: wait-longhorn-manager - 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'] 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: containers:
- name: longhorn-driver-deployer - name: longhorn-driver-deployer
image: rancher/longhorn-manager:9838a5f image: rancher/longhorn-manager:v0.3-rc4
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- longhorn-manager - longhorn-manager
- -d - -d
- deploy-driver - deploy-driver
- --manager-image - --manager-image
- rancher/longhorn-manager:9838a5f - rancher/longhorn-manager:v0.3-rc4
- --manager-url - --manager-url
- http://longhorn-backend:9500/v1 - http://longhorn-backend:9500/v1
# manually choose "flexvolume" or "csi" # manually choose "flexvolume" or "csi"

View File

@ -1,6 +1,8 @@
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
labels:
app: flexvol-baseimage
name: flexvol-baseimage name: flexvol-baseimage
namespace: default namespace: default
spec: spec:
@ -16,11 +18,26 @@ spec:
volumes: volumes:
- name: flexvol - name: flexvol
flexVolume: flexVolume:
driver: "rancher.io/longhorn" driver: rancher.io/longhorn
# fsType: "iso9660"
options: options:
size: "16Mi" size: 32Mi
numberOfReplicas: "3" numberOfReplicas: "3"
staleReplicaTimeout: "20" staleReplicaTimeout: "20"
fromBackup: "" 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

View File

@ -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