Sync with Longhorn Manager

commit ccdccee7b3ac8d254fc36fefa9acd6a091df624e
Author: Sheng Yang <sheng@yasker.org>
Date:   Wed Feb 20 13:59:32 2019 -0800

    Longhorn v0.4.0-rc1 release
This commit is contained in:
Sheng Yang 2019-02-20 14:09:38 -08:00
parent 631ddeb2ac
commit 6e4c7f8efb
2 changed files with 14 additions and 11 deletions

View File

@ -21,13 +21,13 @@ rules:
verbs: verbs:
- "*" - "*"
- apiGroups: [""] - apiGroups: [""]
resources: ["pods", "events", "persistentvolumes", "persistentvolumeclaims", "nodes", "proxy/nodes", "pods/log", "secrets", "services", "endpoints"] resources: ["pods", "events", "persistentvolumes", "persistentvolumeclaims", "nodes", "proxy/nodes", "pods/log", "secrets", "services", "endpoints", "configmaps"]
verbs: ["*"] verbs: ["*"]
- apiGroups: [""] - apiGroups: [""]
resources: ["namespaces"] resources: ["namespaces"]
verbs: ["get", "list"] verbs: ["get", "list"]
- apiGroups: ["apps"] - apiGroups: ["apps"]
resources: ["daemonsets", "statefulsets"] resources: ["daemonsets", "statefulsets", "deployments"]
verbs: ["*"] verbs: ["*"]
- apiGroups: ["batch"] - apiGroups: ["batch"]
resources: ["jobs", "cronjobs"] resources: ["jobs", "cronjobs"]
@ -35,6 +35,9 @@ rules:
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["storageclasses", "volumeattachments"] resources: ["storageclasses", "volumeattachments"]
verbs: ["*"] verbs: ["*"]
- apiGroups: ["csi.storage.k8s.io"]
resources: ["csinodeinfos"]
verbs: ["get", "list", "watch"]
- apiGroups: ["longhorn.rancher.io"] - apiGroups: ["longhorn.rancher.io"]
resources: ["volumes", "engines", "replicas", "settings", "engineimages", "nodes"] resources: ["volumes", "engines", "replicas", "settings", "engineimages", "nodes"]
verbs: ["*"] verbs: ["*"]
@ -178,7 +181,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-manager - name: longhorn-manager
image: rancher/longhorn-manager:v0.3.3 image: rancher/longhorn-manager:v0.4.0-rc1
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
@ -187,9 +190,9 @@ spec:
- -d - -d
- daemon - daemon
- --engine-image - --engine-image
- rancher/longhorn-engine:v0.3.3 - rancher/longhorn-engine:v0.4.0-rc1
- --manager-image - --manager-image
- rancher/longhorn-manager:v0.3.3 - rancher/longhorn-manager:v0.4.0-rc1
- --service-account - --service-account
- longhorn-service-account - longhorn-service-account
ports: ports:
@ -255,7 +258,7 @@ metadata:
name: longhorn-ui name: longhorn-ui
namespace: longhorn-system namespace: longhorn-system
spec: spec:
replicas: 1 replicas: 3
selector: selector:
matchLabels: matchLabels:
app: longhorn-ui app: longhorn-ui
@ -266,7 +269,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-ui - name: longhorn-ui
image: rancher/longhorn-ui:v0.3.3 image: rancher/longhorn-ui:v0.4.0-rc1
ports: ports:
- containerPort: 8000 - containerPort: 8000
env: env:
@ -305,18 +308,18 @@ spec:
spec: spec:
initContainers: initContainers:
- name: wait-longhorn-manager - name: wait-longhorn-manager
image: rancher/longhorn-manager:v0.3.3 image: rancher/longhorn-manager:v0.4.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.3.3 image: rancher/longhorn-manager:v0.4.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.3.3 - rancher/longhorn-manager:v0.4.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"

View File

@ -12,7 +12,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-uninstall - name: longhorn-uninstall
image: rancher/longhorn-manager:v0.3.3 image: rancher/longhorn-manager:v0.4.0-rc1
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- longhorn-manager - longhorn-manager