diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd9e8cf8..6ad5b320 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,11 +56,10 @@ jobs: go-version: 1.14.7 - name: Setup Minikube-Kubernetes - uses: manusa/actions-setup-minikube@v2.3.0 + uses: medyagh/setup-minikube@latest with: - minikube version: v1.16.0 - kubernetes version: v1.20.1 - github token: ${{ secrets.GITHUB_TOKEN }} + minikube-version: 1.24.0 + kubernetes-version: v1.22.3 - name: Build images locally run: make build && make container || exit 1; @@ -69,7 +68,7 @@ jobs: run: | kubectl cluster-info echo "KUBECONFIG=$HOME/.kube/config" >> $GITHUB_ENV - echo "VELERO_RELEASE=v1.6.0" >> $GITHUB_ENV + echo "VELERO_RELEASE=v1.13.2" >> $GITHUB_ENV echo "OPENEBS_RELEASE=master" >> $GITHUB_ENV - name: Installation diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index d1666ce1..9abbf2ea 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -56,11 +56,10 @@ jobs: go-version: 1.14.7 - name: Setup Minikube-Kubernetes - uses: manusa/actions-setup-minikube@v2.3.0 + uses: medyagh/setup-minikube@latest with: - minikube version: v1.16.0 - kubernetes version: v1.20.1 - github token: ${{ secrets.GITHUB_TOKEN }} + minikube-version: 1.24.0 + kubernetes-version: v1.22.3 - name: Build images locally run: make build && make container || exit 1; @@ -69,7 +68,7 @@ jobs: run: | kubectl cluster-info echo "KUBECONFIG=$HOME/.kube/config" >> $GITHUB_ENV - echo "VELERO_RELEASE=v1.6.0" >> $GITHUB_ENV + echo "VELERO_RELEASE=v1.13.2" >> $GITHUB_ENV echo "OPENEBS_RELEASE=master" >> $GITHUB_ENV - name: Installation diff --git a/script/install-openebs.sh b/script/install-openebs.sh index 9c5a7003..3417595c 100755 --- a/script/install-openebs.sh +++ b/script/install-openebs.sh @@ -25,7 +25,7 @@ sudo systemctl status iscsid --no-pager echo "Installation complete" #TODO add openebs release -kubectl apply -f https://raw.githubusercontent.com/openebs/openebs/master/k8s/openebs-operator.yaml +kubectl apply -f https://raw.githubusercontent.com/openebs/openebs/v3.10.0/k8s/openebs-operator.yaml function waitForDeployment() { DEPLOY=$1 diff --git a/tests/app/application_yaml.go b/tests/app/application_yaml.go index c0582dec..10760986 100644 --- a/tests/app/application_yaml.go +++ b/tests/app/application_yaml.go @@ -21,7 +21,7 @@ const ( BusyboxYaml = `apiVersion: v1 kind: Pod metadata: - name: busybox-cstor + name: busybox-zfs namespace: default spec: containers: @@ -38,6 +38,6 @@ spec: volumes: - name: demo-vol1 persistentVolumeClaim: - claimName: cstor-vol1-1r-claim + claimName: csi-zfspv ` ) diff --git a/tests/openebs/storage_yaml.go b/tests/openebs/storage_yaml.go index 0949267f..e17c63e7 100644 --- a/tests/openebs/storage_yaml.go +++ b/tests/openebs/storage_yaml.go @@ -36,23 +36,22 @@ spec: SCYaml = `apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - name: openebs-cstor-sparse-auto - annotations: - openebs.io/cas-type: cstor - cas.openebs.io/config: | - - name: StoragePoolClaim - value: "sparse-claim-auto" - - name: ReplicaCount - value: "1" -provisioner: openebs.io/provisioner-iscsi + name: openebs-zfspv +parameters: + recordsize: "128k" + compression: "off" + dedup: "off" + fstype: "zfs" + poolname: "zfspv-pool" +provisioner: zfs.csi.openebs.io ` // PVCYaml for PVC CR PVCYaml = `kind: PersistentVolumeClaim apiVersion: v1 metadata: - name: cstor-vol1-1r-claim + name: csi-zfspv spec: - storageClassName: openebs-cstor-sparse-auto + storageClassName: openebs-zfspv accessModes: - ReadWriteOnce resources: diff --git a/tests/sanity/backup_test.go b/tests/sanity/backup_test.go index ec391919..c913c164 100644 --- a/tests/sanity/backup_test.go +++ b/tests/sanity/backup_test.go @@ -61,9 +61,6 @@ var _ = BeforeSuite(func() { err = k8s.Client.CreateStorageClass(openebs.SCYaml) Expect(err).NotTo(HaveOccurred()) - err = openebs.Client.CreateSPC(openebs.SPCYaml) - Expect(err).NotTo(HaveOccurred()) - err = openebs.Client.CreateVolume(openebs.PVCYaml, AppNs, true) Expect(err).NotTo(HaveOccurred())