From fc04775b45cbd337b130214a0563f15314c39e25 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Sat, 29 Feb 2020 18:33:09 -0800 Subject: [PATCH] Sync with Longhorn manager Author: Sheng Yang Date: Sat Feb 29 18:29:21 2020 -0800 example: Explain the magic number of staleReplicaTimeout Signed-off-by: Sheng Yang Signed-off-by: Sheng Yang --- deploy/longhorn.yaml | 34 +++++++++++++++--------- examples/{pvc.yaml => pod_with_pvc.yaml} | 0 examples/simple_pod.yaml | 27 +++++++++++++++++++ examples/simple_pvc.yaml | 11 ++++++++ examples/storageclass.yaml | 1 + uninstall/uninstall.yaml | 2 +- 6 files changed, 62 insertions(+), 13 deletions(-) rename examples/{pvc.yaml => pod_with_pvc.yaml} (100%) create mode 100644 examples/simple_pod.yaml create mode 100644 examples/simple_pvc.yaml diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml index c41b9c5..42d233c 100644 --- a/deploy/longhorn.yaml +++ b/deploy/longhorn.yaml @@ -21,7 +21,7 @@ rules: verbs: - "*" - apiGroups: [""] - resources: ["pods", "events", "persistentvolumes", "persistentvolumeclaims", "nodes", "proxy/nodes", "pods/log", "secrets", "services", "endpoints", "configmaps"] + resources: ["pods", "events", "persistentvolumes", "persistentvolumeclaims","persistentvolumeclaims/status", "nodes", "proxy/nodes", "pods/log", "secrets", "services", "endpoints", "configmaps"] verbs: ["*"] - apiGroups: [""] resources: ["namespaces"] @@ -240,7 +240,7 @@ spec: spec: containers: - name: longhorn-manager - image: longhornio/longhorn-manager:v0.7.0 + image: longhornio/longhorn-manager:v0.8.0-rc1 imagePullPolicy: Always securityContext: privileged: true @@ -249,13 +249,18 @@ spec: - -d - daemon - --engine-image - - longhornio/longhorn-engine:v0.7.0 + - longhornio/longhorn-engine:v0.8.0-rc1 + - --instance-manager-image + - longhornio/longhorn-instance-manager:v1_20200301 - --manager-image - - longhornio/longhorn-manager:v0.7.0 + - longhornio/longhorn-manager:v0.8.0-rc1 - --service-account - longhorn-service-account ports: - containerPort: 9500 + readinessProbe: + tcpSocket: + port: 9500 volumeMounts: - name: dev mountPath: /host/dev/ @@ -264,7 +269,7 @@ spec: - name: varrun mountPath: /var/run/ - name: longhorn - mountPath: /var/lib/rancher/longhorn/ + mountPath: /var/lib/longhorn/ mountPropagation: Bidirectional - name: longhorn-default-setting mountPath: /var/lib/longhorn-setting/ @@ -296,11 +301,14 @@ spec: path: /var/run/ - name: longhorn hostPath: - path: /var/lib/rancher/longhorn/ + path: /var/lib/longhorn/ - name: longhorn-default-setting configMap: name: longhorn-default-setting serviceAccountName: longhorn-service-account + updateStrategy: + rollingUpdate: + maxUnavailable: "100%" --- kind: Service apiVersion: v1 @@ -336,7 +344,7 @@ spec: spec: containers: - name: longhorn-ui - image: longhornio/longhorn-ui:v0.7.0 + image: longhornio/longhorn-ui:v0.8.0-rc1 ports: - containerPort: 8000 env: @@ -357,7 +365,8 @@ spec: ports: - port: 80 targetPort: 8000 - type: LoadBalancer + nodePort: null + type: ClusterIP --- apiVersion: apps/v1 kind: Deployment @@ -376,18 +385,18 @@ spec: spec: initContainers: - name: wait-longhorn-manager - image: longhornio/longhorn-manager:v0.7.0 + image: longhornio/longhorn-manager:v0.8.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'] containers: - name: longhorn-driver-deployer - image: longhornio/longhorn-manager:v0.7.0 + image: longhornio/longhorn-manager:v0.8.0-rc1 imagePullPolicy: Always command: - longhorn-manager - -d - deploy-driver - --manager-image - - longhornio/longhorn-manager:v0.7.0 + - longhornio/longhorn-manager:v0.8.0-rc1 - --manager-url - http://longhorn-backend:9500/v1 # manually set root directory for csi @@ -419,9 +428,10 @@ apiVersion: storage.k8s.io/v1 metadata: name: longhorn provisioner: driver.longhorn.io +allowVolumeExpansion: true parameters: numberOfReplicas: "3" - staleReplicaTimeout: "2880" # 48 hours in minutes + staleReplicaTimeout: "2880" fromBackup: "" # diskSelector: "ssd,fast" # nodeSelector: "storage,fast" diff --git a/examples/pvc.yaml b/examples/pod_with_pvc.yaml similarity index 100% rename from examples/pvc.yaml rename to examples/pod_with_pvc.yaml diff --git a/examples/simple_pod.yaml b/examples/simple_pod.yaml new file mode 100644 index 0000000..5f02b88 --- /dev/null +++ b/examples/simple_pod.yaml @@ -0,0 +1,27 @@ +apiVersion: v1 +kind: Pod +metadata: + name: longhorn-simple-pod + namespace: default +spec: + restartPolicy: Always + containers: + - name: volume-test + image: nginx:stable-alpine + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: + - ls + - /data/lost+found + initialDelaySeconds: 5 + periodSeconds: 5 + volumeMounts: + - name: volv + mountPath: /data + ports: + - containerPort: 80 + volumes: + - name: volv + persistentVolumeClaim: + claimName: longhorn-simple-pvc diff --git a/examples/simple_pvc.yaml b/examples/simple_pvc.yaml new file mode 100644 index 0000000..72e864d --- /dev/null +++ b/examples/simple_pvc.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: longhorn-simple-pvc +spec: + accessModes: + - ReadWriteOnce + storageClassName: longhorn + resources: + requests: + storage: 1Gi \ No newline at end of file diff --git a/examples/storageclass.yaml b/examples/storageclass.yaml index 2d9f4c5..45ddc84 100644 --- a/examples/storageclass.yaml +++ b/examples/storageclass.yaml @@ -3,6 +3,7 @@ apiVersion: storage.k8s.io/v1 metadata: name: longhorn provisioner: driver.longhorn.io +allowVolumeExpansion: true parameters: numberOfReplicas: "3" staleReplicaTimeout: "2880" # 48 hours in minutes diff --git a/uninstall/uninstall.yaml b/uninstall/uninstall.yaml index c6ad9b9..f98a770 100644 --- a/uninstall/uninstall.yaml +++ b/uninstall/uninstall.yaml @@ -58,7 +58,7 @@ spec: spec: containers: - name: longhorn-uninstall - image: longhornio/longhorn-manager:v0.7.0-rc2 + image: longhornio/longhorn-manager:v0.8.0-rc1 imagePullPolicy: Always command: - longhorn-manager