Sync with Longhorn manager

commit ed3409b4c1bf53bbdda94d7a75399a73a617660e
Author: Sheng Yang <sheng.yang@rancher.com>
Date:   Tue Apr 28 15:50:17 2020 -0700

    Longhorn v0.8.1 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-04-28 17:35:27 -07:00 committed by Sheng Yang
parent dfd438a28c
commit c915b1c511
2 changed files with 10 additions and 14 deletions

View File

@ -45,10 +45,6 @@ rules:
- apiGroups: ["coordination.k8s.io"] - apiGroups: ["coordination.k8s.io"]
resources: ["leases"] resources: ["leases"]
verbs: ["*"] verbs: ["*"]
# to be removed after v0.7.0
- apiGroups: ["longhorn.rancher.io"]
resources: ["volumes", "engines", "replicas", "settings", "engineimages", "nodes", "instancemanagers"]
verbs: ["*"]
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
@ -241,7 +237,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-manager - name: longhorn-manager
image: longhornio/longhorn-manager:v0.8.1-rc3 image: longhornio/longhorn-manager:master
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
@ -250,11 +246,11 @@ spec:
- -d - -d
- daemon - daemon
- --engine-image - --engine-image
- longhornio/longhorn-engine:v0.8.1-rc3 - longhornio/longhorn-engine:master
- --instance-manager-image - --instance-manager-image
- longhornio/longhorn-instance-manager:v1_20200301 - longhornio/longhorn-instance-manager:v1_20200301
- --manager-image - --manager-image
- longhornio/longhorn-manager:v0.8.1-rc3 - longhornio/longhorn-manager:master
- --service-account - --service-account
- longhorn-service-account - longhorn-service-account
ports: ports:
@ -350,7 +346,8 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-ui - name: longhorn-ui
image: longhornio/longhorn-ui:v0.8.1-rc3 image: longhornio/longhorn-ui:master
imagePullPolicy: Always
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http
@ -359,7 +356,6 @@ spec:
value: "http://longhorn-backend:9500" value: "http://longhorn-backend:9500"
# imagePullSecrets: # imagePullSecrets:
# - name: # - name:
serviceAccountName: longhorn-service-account
--- ---
kind: Service kind: Service
apiVersion: v1 apiVersion: v1
@ -394,18 +390,18 @@ spec:
spec: spec:
initContainers: initContainers:
- name: wait-longhorn-manager - name: wait-longhorn-manager
image: longhornio/longhorn-manager:v0.8.1-rc3 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:v0.8.1-rc3 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:v0.8.1-rc3 - longhornio/longhorn-manager:master
- --manager-url - --manager-url
- http://longhorn-backend:9500/v1 - http://longhorn-backend:9500/v1
env: env:
@ -425,7 +421,7 @@ spec:
#- name: KUBELET_ROOT_DIR #- name: KUBELET_ROOT_DIR
# value: /var/lib/rancher/k3s/agent/kubelet # value: /var/lib/rancher/k3s/agent/kubelet
# For AirGap Installation # For AirGap Installation
# Replce PREFIX with your private registery # Replace PREFIX with your private registery
#- name: CSI_ATTACHER_IMAGE #- name: CSI_ATTACHER_IMAGE
# value: PREFIX/csi-attacher:v2.0.0 # value: PREFIX/csi-attacher:v2.0.0
#- name: CSI_PROVISIONER_IMAGE #- name: CSI_PROVISIONER_IMAGE

View File

@ -58,7 +58,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-uninstall - name: longhorn-uninstall
image: longhornio/longhorn-manager:v0.8.1-rc3 image: longhornio/longhorn-manager:master
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- longhorn-manager - longhorn-manager