Sync with manager:

commit fdd34f4f1986da6db3bac1b53c385c23203b0775
Author: Sheng Yang <sheng.yang@rancher.com>
Date:   Sat May 23 13:00:11 2020 -0700

    Longhorn v1.0.0-rc2 release

    Signed-off-by: Sheng Yang <sheng.yang@rancher.com>

Signed-off-by: Sheng Yang <sheng.yang@rancher.com>
This commit is contained in:
Sheng Yang 2020-05-23 13:12:26 -07:00 committed by Sheng Yang
parent e6e313d0a6
commit 385c7ea54d
2 changed files with 19 additions and 11 deletions

View File

@ -218,6 +218,11 @@ data:
backupstore-poll-interval: backupstore-poll-interval:
taint-toleration: taint-toleration:
registry-secret: registry-secret:
auto-salvage:
disable-scheduling-on-cordoned-node:
replica-zone-soft-anti-affinity:
volume-attachment-recovery-policy:
mkfs-ext4-parameters:
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
@ -237,7 +242,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-manager - name: longhorn-manager
image: longhornio/longhorn-manager:v1.0.0-rc1 image: longhornio/longhorn-manager:master
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
@ -246,11 +251,11 @@ spec:
- -d - -d
- daemon - daemon
- --engine-image - --engine-image
- longhornio/longhorn-engine:v1.0.0-rc1 - longhornio/longhorn-engine:master
- --instance-manager-image - --instance-manager-image
- longhornio/longhorn-instance-manager:v1_20200514 - longhornio/longhorn-instance-manager:v1_20200514
- --manager-image - --manager-image
- longhornio/longhorn-manager:v1.0.0-rc1 - longhornio/longhorn-manager:master
- --service-account - --service-account
- longhorn-service-account - longhorn-service-account
ports: ports:
@ -346,7 +351,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-ui - name: longhorn-ui
image: longhornio/longhorn-ui:v1.0.0-rc1 image: longhornio/longhorn-ui:master
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
runAsUser: 0 runAsUser: 0
@ -367,13 +372,14 @@ metadata:
name: longhorn-frontend name: longhorn-frontend
namespace: longhorn-system namespace: longhorn-system
spec: spec:
type: ClusterIP
selector: selector:
app: longhorn-ui app: longhorn-ui
ports: ports:
- port: 80 - name: http
targetPort: 8000 port: 80
targetPort: http
nodePort: null nodePort: null
type: ClusterIP
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
@ -392,18 +398,18 @@ spec:
spec: spec:
initContainers: initContainers:
- name: wait-longhorn-manager - name: wait-longhorn-manager
image: longhornio/longhorn-manager:v1.0.0-rc1 image: longhornio/longhorn-manager:master
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: longhornio/longhorn-manager:v1.0.0-rc1 image: longhornio/longhorn-manager:master
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- longhorn-manager - longhorn-manager
- -d - -d
- deploy-driver - deploy-driver
- --manager-image - --manager-image
- longhornio/longhorn-manager:v1.0.0-rc1 - longhornio/longhorn-manager:master
- --manager-url - --manager-url
- http://longhorn-backend:9500/v1 - http://longhorn-backend:9500/v1
env: env:
@ -438,6 +444,8 @@ spec:
# Manually specify number of CSI provisioner replicas # Manually specify number of CSI provisioner replicas
#- name: CSI_PROVISIONER_REPLICA_COUNT #- name: CSI_PROVISIONER_REPLICA_COUNT
# value: "3" # value: "3"
#- name: CSI_RESIZER_REPLICA_COUNT
# value: "3"
#imagePullSecrets: #imagePullSecrets:
#- name: #- name:
serviceAccountName: longhorn-service-account serviceAccountName: longhorn-service-account

View File

@ -58,7 +58,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-uninstall - name: longhorn-uninstall
image: longhornio/longhorn-manager:v1.0.0-rc1 image: longhornio/longhorn-manager:master
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- longhorn-manager - longhorn-manager