From d1be6b428caf448ddd0b5e6359ecfeafe75751dd Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Sat, 18 Jul 2020 12:55:24 -0700 Subject: [PATCH] Sync with manager commit 5be96bd1ad71fecbf670cd21313e8d1858c7ddb8 Author: Sheng Yang Date: Sat Jul 18 12:17:44 2020 -0700 Longhorn v1.0.1-rc3 release Signed-off-by: Sheng Yang Signed-off-by: Sheng Yang --- deploy/longhorn-images.txt | 6 +++--- deploy/longhorn.yaml | 14 +++++++------- deploy/release-images.txt | 6 +++--- uninstall/uninstall.yaml | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/deploy/longhorn-images.txt b/deploy/longhorn-images.txt index 7ab6017..b72ca2f 100644 --- a/deploy/longhorn-images.txt +++ b/deploy/longhorn-images.txt @@ -1,7 +1,7 @@ -longhornio/longhorn-engine:v1.0.1-rc2 +longhornio/longhorn-engine:v1.0.1-rc1 longhornio/longhorn-instance-manager:v1_20200514 -longhornio/longhorn-manager:v1.0.1-rc2 -longhornio/longhorn-ui:v1.0.1-rc2 +longhornio/longhorn-manager:v1.0.1-rc1 +longhornio/longhorn-ui:v1.0.1-rc1 longhornio/csi-attacher:v2.0.0 longhornio/csi-node-driver-registrar:v1.2.0 longhornio/csi-provisioner:v1.4.0 diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml index 98a236f..458ceaa 100644 --- a/deploy/longhorn.yaml +++ b/deploy/longhorn.yaml @@ -246,7 +246,7 @@ spec: spec: containers: - name: longhorn-manager - image: longhornio/longhorn-manager:v1.0.1-rc2 + image: longhornio/longhorn-manager:master imagePullPolicy: IfNotPresent securityContext: privileged: true @@ -255,11 +255,11 @@ spec: - -d - daemon - --engine-image - - longhornio/longhorn-engine:v1.0.1-rc2 + - longhornio/longhorn-engine:master - --instance-manager-image - longhornio/longhorn-instance-manager:v1_20200514 - --manager-image - - longhornio/longhorn-manager:v1.0.1-rc2 + - longhornio/longhorn-manager:master - --service-account - longhorn-service-account ports: @@ -355,7 +355,7 @@ spec: spec: containers: - name: longhorn-ui - image: longhornio/longhorn-ui:v1.0.1-rc2 + image: longhornio/longhorn-ui:master imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 @@ -402,18 +402,18 @@ spec: spec: initContainers: - name: wait-longhorn-manager - image: longhornio/longhorn-manager:v1.0.1-rc2 + 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'] containers: - name: longhorn-driver-deployer - image: longhornio/longhorn-manager:v1.0.1-rc2 + image: longhornio/longhorn-manager:master imagePullPolicy: IfNotPresent command: - longhorn-manager - -d - deploy-driver - --manager-image - - longhornio/longhorn-manager:v1.0.1-rc2 + - longhornio/longhorn-manager:master - --manager-url - http://longhorn-backend:9500/v1 env: diff --git a/deploy/release-images.txt b/deploy/release-images.txt index 69dafff..9d1ba95 100644 --- a/deploy/release-images.txt +++ b/deploy/release-images.txt @@ -1,7 +1,7 @@ -longhornio/longhorn-engine:v1.0.1-rc2 +longhornio/longhorn-engine:v1.0.1-rc1 longhornio/longhorn-instance-manager:v1_20200514 -longhornio/longhorn-manager:v1.0.1-rc2 -longhornio/longhorn-ui:v1.0.1-rc2 +longhornio/longhorn-manager:v1.0.1-rc1 +longhornio/longhorn-ui:v1.0.1-rc1 quay.io/k8scsi/csi-attacher:v2.0.0 quay.io/k8scsi/csi-node-driver-registrar:v1.2.0 quay.io/k8scsi/csi-provisioner:v1.4.0 diff --git a/uninstall/uninstall.yaml b/uninstall/uninstall.yaml index eed3b9e..4d20bae 100644 --- a/uninstall/uninstall.yaml +++ b/uninstall/uninstall.yaml @@ -61,7 +61,7 @@ spec: spec: containers: - name: longhorn-uninstall - image: longhornio/longhorn-manager:v1.0.1-rc2 + image: longhornio/longhorn-manager:master imagePullPolicy: Always command: - longhorn-manager