From c02f69d6f7457d524c2680ce9cfb615641405ba2 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Tue, 21 Apr 2020 16:55:45 -0700 Subject: [PATCH] Sync with manager and update chart tags commit 364ff6b1bbb9bd5d3f20757304fd27f3f583feb4 Author: Sheng Yang Date: Tue Apr 21 15:49:31 2020 -0700 Longhorn v0.8.1-rc2 release Signed-off-by: Sheng Yang Signed-off-by: Sheng Yang --- chart/Chart.yaml | 4 ++-- chart/values.yaml | 6 ++--- deploy/longhorn.yaml | 52 +++++++++++++++++++++------------------- uninstall/uninstall.yaml | 2 +- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index b2d4c39..7824c64 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: longhorn -version: 0.8.1-rc1 -appVersion: v0.8.1-rc1 +version: 0.8.1-rc2 +appVersion: v0.8.1-rc2 kubeVersion: ">=v1.14.0-r0" description: Longhorn is a distributed block storage system for Kubernetes powered by Rancher Labs. keywords: diff --git a/chart/values.yaml b/chart/values.yaml index ca148dd..110b0e7 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -4,11 +4,11 @@ image: longhorn: engine: longhornio/longhorn-engine - engineTag: v0.8.1-rc1 + engineTag: v0.8.1-rc2 manager: longhornio/longhorn-manager - managerTag: v0.8.1-rc1 + managerTag: v0.8.1-rc2 ui: longhornio/longhorn-ui - uiTag: v0.8.1-rc1 + uiTag: v0.8.1-rc2 instanceManager: longhornio/longhorn-instance-manager instanceManagerTag: v1_20200301 pullPolicy: IfNotPresent diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml index 1005511..b5791a1 100644 --- a/deploy/longhorn.yaml +++ b/deploy/longhorn.yaml @@ -241,7 +241,7 @@ spec: spec: containers: - name: longhorn-manager - image: longhornio/longhorn-manager:v0.8.1-rc1 + image: longhornio/longhorn-manager:v0.8.1-rc2 imagePullPolicy: Always securityContext: privileged: true @@ -250,15 +250,16 @@ spec: - -d - daemon - --engine-image - - longhornio/longhorn-engine:v0.8.1-rc1 + - longhornio/longhorn-engine:v0.8.1-rc2 - --instance-manager-image - longhornio/longhorn-instance-manager:v1_20200301 - --manager-image - - longhornio/longhorn-manager:v0.8.1-rc1 + - longhornio/longhorn-manager:v0.8.1-rc2 - --service-account - longhorn-service-account ports: - containerPort: 9500 + name: manager readinessProbe: tcpSocket: port: 9500 @@ -290,8 +291,6 @@ spec: # Should be: mount path of the volume longhorn-default-setting + the key of the configmap data in 04-default-setting.yaml - name: DEFAULT_SETTING_PATH value: /var/lib/longhorn-setting/default-setting.yaml - #imagePullSecrets: - #- name: volumes: - name: dev hostPath: @@ -308,25 +307,29 @@ spec: - name: longhorn-default-setting configMap: name: longhorn-default-setting +# imagePullSecrets: +# - name: "" serviceAccountName: longhorn-service-account updateStrategy: rollingUpdate: maxUnavailable: "100%" --- -kind: Service apiVersion: v1 +kind: Service metadata: labels: app: longhorn-manager name: longhorn-backend namespace: longhorn-system spec: + type: ClusterIP + sessionAffinity: ClientIP selector: app: longhorn-manager ports: - - port: 9500 - targetPort: 9500 - sessionAffinity: ClientIP + - name: manager + port: 9500 + targetPort: manager --- apiVersion: apps/v1 kind: Deployment @@ -347,14 +350,15 @@ spec: spec: containers: - name: longhorn-ui - image: longhornio/longhorn-ui:v0.8.1-rc1 + image: longhornio/longhorn-ui:v0.8.1-rc2 ports: - containerPort: 8000 + name: http env: - name: LONGHORN_MANAGER_IP value: "http://longhorn-backend:9500" - #imagePullSecrets: - #- name: +# imagePullSecrets: +# - name: serviceAccountName: longhorn-service-account --- kind: Service @@ -390,29 +394,20 @@ spec: spec: initContainers: - name: wait-longhorn-manager - image: longhornio/longhorn-manager:v0.8.1-rc1 + image: longhornio/longhorn-manager:v0.8.1-rc2 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.8.1-rc1 + image: longhornio/longhorn-manager:v0.8.1-rc2 imagePullPolicy: Always command: - longhorn-manager - -d - deploy-driver - --manager-image - - longhornio/longhorn-manager:v0.8.1-rc1 + - longhornio/longhorn-manager:v0.8.1-rc2 - --manager-url - http://longhorn-backend:9500/v1 - # manually set root directory for csi - #- --kubelet-root-dir - #- /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: - name: POD_NAMESPACE valueFrom: @@ -426,6 +421,9 @@ spec: valueFrom: fieldRef: fieldPath: spec.serviceAccountName + # Manually set root directory for csi + #- name: KUBELET_ROOT_DIR + # value: /var/lib/rancher/k3s/agent/kubelet # For AirGap Installation # Replce PREFIX with your private registery #- name: CSI_ATTACHER_IMAGE @@ -436,6 +434,12 @@ spec: # value: PREFIX/csi-node-driver-registrar:v1.2.0 #- name: CSI_RESIZER_IMAGE # value: PREFIX/csi-resizer:v0.3.0 + # Manually specify number of CSI attacher replicas + #- name: CSI_ATTACHER_REPLICA_COUNT + # value: "3" + # Manually specify number of CSI provisioner replicas + #- name: CSI_PROVISIONER_REPLICA_COUNT + # value: "3" #imagePullSecrets: #- name: serviceAccountName: longhorn-service-account diff --git a/uninstall/uninstall.yaml b/uninstall/uninstall.yaml index 44037b7..4ecfc0d 100644 --- a/uninstall/uninstall.yaml +++ b/uninstall/uninstall.yaml @@ -58,7 +58,7 @@ spec: spec: containers: - name: longhorn-uninstall - image: longhornio/longhorn-manager:v0.8.1-rc1 + image: longhornio/longhorn-manager:v0.8.1-rc2 imagePullPolicy: Always command: - longhorn-manager