Sync with Manager

commit 65d3426cae52a2da7d4af4ba6f32fd3868d9711d
Author: Sheng Yang <sheng@yasker.org>
Date:   Tue May 14 08:56:14 2019 -0700

    Longhorn v0.5.0-rc1 release
This commit is contained in:
Sheng Yang 2019-05-14 09:01:32 -07:00
parent e0775905bf
commit 0f6450e1a9
3 changed files with 64 additions and 14 deletions

View File

@ -181,7 +181,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-manager - name: longhorn-manager
image: rancher/longhorn-manager:v0.4.1 image: rancher/longhorn-manager:v0.5.0-rc1
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
@ -190,9 +190,9 @@ spec:
- -d - -d
- daemon - daemon
- --engine-image - --engine-image
- rancher/longhorn-engine:v0.4.1 - rancher/longhorn-engine:v0.5.0-rc1
- --manager-image - --manager-image
- rancher/longhorn-manager:v0.4.1 - rancher/longhorn-manager:v0.5.0-rc1
- --service-account - --service-account
- longhorn-service-account - longhorn-service-account
ports: ports:
@ -269,7 +269,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-ui - name: longhorn-ui
image: rancher/longhorn-ui:v0.4.1 image: rancher/longhorn-ui:v0.5.0-rc1
ports: ports:
- containerPort: 8000 - containerPort: 8000
env: env:
@ -308,26 +308,35 @@ spec:
spec: spec:
initContainers: initContainers:
- name: wait-longhorn-manager - name: wait-longhorn-manager
image: rancher/longhorn-manager:v0.4.1 image: rancher/longhorn-manager:v0.5.0-rc1
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:v0.4.1 image: rancher/longhorn-manager:v0.5.0-rc1
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- longhorn-manager - longhorn-manager
- -d - -d
- deploy-driver - deploy-driver
- --manager-image - --manager-image
- rancher/longhorn-manager:v0.4.1 - rancher/longhorn-manager:v0.5.0-rc1
- --manager-url - --manager-url
- http://longhorn-backend:9500/v1 - http://longhorn-backend:9500/v1
# manually choose "flexvolume" or "csi" # manually choose "flexvolume" or "csi"
#- --driver #- --driver
#- flexvolume #- flexvolume
# manually set root directory for flexvolume
#- --flexvolume-dir
#- /usr/libexec/kubernetes/kubelet-plugins/volume/exec/
# manually set root directory for csi # manually set root directory for csi
#- --kubelet-root-dir #- --kubelet-root-dir
#- /var/lib/rancher/k3s/agent/kubelet #- /var/lib/rancher/k3s/agent/kubelet
# manually specify number of CSI attacher replicas
#- --csi-attacher-replica-count
#- "3"
# manually specify number of CSI provisioner replicas
#- --csi-provisioner-replica-count
#- "3"
env: env:
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:

View File

@ -7,3 +7,5 @@ parameters:
numberOfReplicas: "3" numberOfReplicas: "3"
staleReplicaTimeout: "30" staleReplicaTimeout: "30"
fromBackup: "" fromBackup: ""
# recurringJobs: '[{"name":"snap", "task":"snapshot", "cron":"*/1 * * * *", "retain":1},
# {"name":"backup", "task":"backup", "cron":"*/2 * * * *", "retain":1}]'

View File

@ -1,8 +1,49 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: longhorn-uninstall-service-account
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
name: longhorn-uninstall-role
rules:
- apiGroups:
- apiextensions.k8s.io
resources:
- customresourcedefinitions
verbs:
- "*"
- apiGroups: [""]
resources: ["pods", "persistentvolumes", "persistentvolumeclaims"]
verbs: ["*"]
- apiGroups: ["apps"]
resources: ["daemonsets", "statefulsets", "deployments"]
verbs: ["*"]
- apiGroups: ["batch"]
resources: ["jobs", "cronjobs"]
verbs: ["*"]
- apiGroups: ["longhorn.rancher.io"]
resources: ["volumes", "engines", "replicas", "settings", "engineimages", "nodes"]
verbs: ["*"]
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: longhorn-uninstall-bind
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: longhorn-uninstall-role
subjects:
- kind: ServiceAccount
name: longhorn-uninstall-service-account
namespace: default
---
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: longhorn-uninstall name: longhorn-uninstall
namespace: longhorn-system
spec: spec:
activeDeadlineSeconds: 900 activeDeadlineSeconds: 900
backoffLimit: 1 backoffLimit: 1
@ -12,16 +53,14 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-uninstall - name: longhorn-uninstall
image: rancher/longhorn-manager:v0.4.1 image: rancher/longhorn-manager:v0.5.0-rc1
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- longhorn-manager - longhorn-manager
- uninstall - uninstall
- --force - --force
env: env:
- name: POD_NAMESPACE - name: LONGHORN_NAMESPACE
valueFrom: value: longhorn-system
fieldRef:
fieldPath: metadata.namespace
restartPolicy: OnFailure restartPolicy: OnFailure
serviceAccountName: longhorn-service-account serviceAccountName: longhorn-uninstall-service-account