diff --git a/.travis.yml b/.travis.yml index 1dc437760..2c1ab9fe9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ services: language: go branches: only: - - csi-v0.3 - master + - release-v1.1.0 go: 1.12.x diff --git a/Makefile b/Makefile index 89eff2d11..8b9b7cfab 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ CONTAINER_CMD?=docker CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),quay.io/cephcsi/cephcsi) -CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),canary) +CSI_IMAGE_VERSION=$(if $(ENV_CSI_IMAGE_VERSION),$(ENV_CSI_IMAGE_VERSION),v1.1.0) $(info cephcsi image settings: $(CSI_IMAGE_NAME) version $(CSI_IMAGE_VERSION)) diff --git a/scripts/minikube.sh b/scripts/minikube.sh index e8560f678..9af41d98e 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -101,7 +101,7 @@ ssh) ;; cephcsi) echo "copying the cephcsi image" - copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:canary "${CEPHCSI_IMAGE_REPO}"/cephcsi:canary + copy_image_to_cluster "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.1.0 "${CEPHCSI_IMAGE_REPO}"/cephcsi:v1.1.0 ;; k8s-sidecar) echo "copying the kubernetes sidecar images"