review comment

pawanpraka1 · pawanpraka1 · commit 80b3d2eaa059 · 2021-03-01T20:17:27.000+05:30
Signed-off-by: Pawan &lt;pawan@mayadata.io&gt;
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 The OpenEBS Authors. All rights reserved.
+# Copyright 2020 The OpenEBS Authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/buildscripts/generate-manifests.sh b/buildscripts/generate-manifests.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Copyright 2019 The Kubernetes Authors.
 # Copyright 2020 The OpenEBS Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/buildscripts/tools.go b/buildscripts/tools.go
@@ -1,8 +1,7 @@
 // +build tools
 
 /*
-Copyright 2019 The Kubernetes Authors.
-copyright 2020 the kubernetes authors.
+Copyright 2020 the kubernetes authors.
 
 licensed under the apache license, version 2.0 (the "license");
 you may not use this file except in compliance with the license.
diff --git a/buildscripts/travis-build.sh b/buildscripts/travis-build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-# Copyright 2019 The OpenEBS Authors.
+# Copyright 2020 The OpenEBS Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ci/ci-test.sh b/ci/ci-test.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2019 The OpenEBS Authors.
+# Copyright 2021 The OpenEBS Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,32 +27,33 @@ SNAP_CLASS=deploy/sample/lvmsnapclass.yaml
 
 export LVM_NAMESPACE="openebs"
 export TEST_DIR="tests"
+export NAMESPACE="kube-system"
 
-# Prepare env for runnging BDD tests
+# Prepare env for running BDD tests
 # Minikube is already running
 kubectl apply -f $LVM_OPERATOR
 kubectl apply -f $SNAP_CLASS
 
 dumpAgentLogs() {
   NR=$1
-  AgentPOD=$(kubectl get pods -l app=openebs-lvm-node -o jsonpath='{.items[0].metadata.name}' -n kube-system)
-  kubectl describe po "$AgentPOD" -n kube-system
+  AgentPOD=$(kubectl get pods -l app=openebs-lvm-node -o jsonpath='{.items[0].metadata.name}' -n "$NAMESPACE")
+  kubectl describe po "$AgentPOD" -n "$NAMESPACE"
   printf "\n\n"
-  kubectl logs --tail="${NR}" "$AgentPOD" -n kube-system -c openebs-lvm-plugin
+  kubectl logs --tail="${NR}" "$AgentPOD" -n "$NAMESPACE" -c openebs-lvm-plugin
   printf "\n\n"
 }
 
 dumpControllerLogs() {
   NR=$1
-  ControllerPOD=$(kubectl get pods -l app=openebs-lvm-controller -o jsonpath='{.items[0].metadata.name}' -n kube-system)
-  kubectl describe po "$ControllerPOD" -n kube-system
+  ControllerPOD=$(kubectl get pods -l app=openebs-lvm-controller -o jsonpath='{.items[0].metadata.name}' -n "$NAMESPACE")
+  kubectl describe po "$ControllerPOD" -n "$NAMESPACE"
   printf "\n\n"
-  kubectl logs --tail="${NR}" "$ControllerPOD" -n kube-system -c openebs-lvm-plugin
+  kubectl logs --tail="${NR}" "$ControllerPOD" -n "$NAMESPACE" -c openebs-lvm-plugin
   printf "\n\n"
 }
 
 isPodReady(){
-  [ "$(kubectl get po "$1" -o 'jsonpath={.status.conditions[?(@.type=="Ready")].status}' -n kube-system)" = 'True' ]
+  [ "$(kubectl get po "$1" -o 'jsonpath={.status.conditions[?(@.type=="Ready")].status}' -n "$NAMESPACE")" = 'True' ]
 }
 
 isDriverReady(){
@@ -67,7 +68,7 @@ waitForLVMDriver() {
 
   i=0
   while [ "$i" -le "$period" ]; do
-    lvmDriver="$(kubectl get pods -l role=openebs-lvm -o 'jsonpath={.items[*].metadata.name}' -n kube-system)"
+    lvmDriver="$(kubectl get pods -l role=openebs-lvm -o 'jsonpath={.items[*].metadata.name}' -n "$NAMESPACE")"
     if isDriverReady "$lvmDriver"; then
       return 0
     fi
@@ -86,7 +87,7 @@ waitForLVMDriver
 
 cd $TEST_DIR
 
-kubectl get po -n kube-system
+kubectl get po -n "$NAMESPACE"
 
 set +e
 
@@ -127,4 +128,4 @@ kubectl get lvmsnapshots.local.openebs.io -n openebs -oyaml
 exit 1
 fi
 
-echo "\n\n######### All test cases passed #########\n\n"
+printf "\n\n######### All test cases passed #########\n\n"
diff --git a/deploy/sample/lvmsnapshot.yaml b/deploy/sample/lvmsnapshot.yaml
@@ -1,17 +1,8 @@
-kind: VolumeSnapshotClass
-apiVersion: snapshot.storage.k8s.io/v1
-metadata:
-  name: lvm-localpv-snapclass
-  annotations:
-    snapshot.storage.kubernetes.io/is-default-class: "true"
-driver: local.csi.openebs.io
-deletionPolicy: Delete
----
 apiVersion: snapshot.storage.k8s.io/v1
 kind: VolumeSnapshot
 metadata:
   name: lvm-localpv-snap
 spec:
-  volumeSnapshotClassName: lvm-localpv-snapclass
+  volumeSnapshotClassName: lvmpv-snapclass
   source:
     persistentVolumeClaimName: csi-lvmpvc
diff --git a/pkg/builder/volbuilder/volume.go b/pkg/builder/volbuilder/volume.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2020 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/pkg/mgmt/volume/builder.go b/pkg/mgmt/volume/builder.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2020 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/pkg/mgmt/volume/start.go b/pkg/mgmt/volume/start.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2020 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/pkg/mgmt/volume/volume.go b/pkg/mgmt/volume/volume.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2020 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/container/container.go b/tests/container/container.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/deploy/deployment.go b/tests/deploy/deployment.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/tests/deploy/kubernetes.go b/tests/deploy/kubernetes.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/deploy/rollout_status.go b/tests/deploy/rollout_status.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/k8svolume/build.go b/tests/k8svolume/build.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/k8svolume/volume.go b/tests/k8svolume/volume.go
@@ -1,4 +1,4 @@
-// Copyright 2019 The OpenEBS Authors
+// Copyright 2021 The OpenEBS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tests/pod/build.go b/tests/pod/build.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/pod/buildlist.go b/tests/pod/buildlist.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/pod/kubernetes.go b/tests/pod/kubernetes.go
@@ -1,4 +1,4 @@
-// Copyright 2019 The OpenEBS Authors
+// Copyright 2021 The OpenEBS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tests/pod/pod.go b/tests/pod/pod.go
@@ -1,4 +1,4 @@
-// Copyright 2019 The OpenEBS Authors
+// Copyright 2021 The OpenEBS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tests/provision_test.go b/tests/provision_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -37,12 +37,17 @@ func fsVolCreationTest() {
 
 		// btrfs does not support online resize
 		if fstype != "btrfs" {
-			By("Resizing the PVC", resizeAndVerifyPVC)
+			resizeAndVerifyPVC(true, "8Gi")
 		}
 		// do not resize after creating the snapshot(not supported)
 		createSnapshot(pvcName, snapName)
 		verifySnapshotCreated(snapName)
 
+		if fstype != "btrfs" {
+			// if snapshot is there, resize should fail
+			resizeAndVerifyPVC(false, "10Gi")
+		}
+
 		By("Deleting the application deployment")
 		deleteAppDeployment(appName)
 
diff --git a/tests/pts/pts.go b/tests/pts/pts.go
@@ -1,4 +1,4 @@
-// Copyright 2019 The OpenEBS Authors
+// Copyright 2021 The OpenEBS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tests/pvc/build.go b/tests/pvc/build.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/pvc/buildlist.go b/tests/pvc/buildlist.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/pvc/kubernetes.go b/tests/pvc/kubernetes.go
@@ -1,4 +1,4 @@
-// Copyright 2019 The OpenEBS Authors
+// Copyright 2021 The OpenEBS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tests/pvc/persistentvolumeclaim.go b/tests/pvc/persistentvolumeclaim.go
@@ -1,4 +1,4 @@
-// Copyright 2019 The OpenEBS Authors
+// Copyright 2021 The OpenEBS Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/tests/sc/build.go b/tests/sc/build.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/sc/buildlist.go b/tests/sc/buildlist.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/sc/kubernetes.go b/tests/sc/kubernetes.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/sc/storageclass.go b/tests/sc/storageclass.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/stringer/stringer.go b/tests/stringer/stringer.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tests/suite_test.go b/tests/suite_test.go
@@ -61,7 +61,6 @@ var (
 	appPod           *corev1.PodList
 	accessModes      = []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}
 	capacity         = "5368709120" // 5Gi
-	NewCapacity      = "8Gi"        // 8Gi, for testing resize
 	KubeConfigPath   string
 	OpenEBSNamespace string
 )
diff --git a/tests/utils.go b/tests/utils.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The OpenEBS Authors
+Copyright 2021 The OpenEBS Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -50,11 +50,16 @@ func IsPVCBoundEventually(pvcName string) bool {
 }
 
 // IsPVCResizedEventually checks if the pvc is bound or not eventually
-func IsPVCResizedEventually(pvcName string, newCapacity string) bool {
+func IsPVCResizedEventually(pvcName string, newCapacity string, shouldPass bool) bool {
 	newStorage, err := resource.ParseQuantity(newCapacity)
 	if err != nil {
 		return false
 	}
+	status := gomega.BeFalse()
+	if shouldPass {
+		status = gomega.BeTrue()
+	}
+
 	return gomega.Eventually(func() bool {
 		volume, err := PVCClient.
 			Get(pvcName, metav1.GetOptions{})
@@ -63,7 +68,7 @@ func IsPVCResizedEventually(pvcName string, newCapacity string) bool {
 		return pvcStorage == newStorage
 	},
 		120, 5).
-		Should(gomega.BeTrue())
+		Should(status)
 }
 
 // IsPodRunningEventually return true if the pod comes to running state
@@ -247,15 +252,15 @@ func createAndVerifyBlockPVC() {
 	)
 }
 
-func resizeAndVerifyPVC() {
+func resizeAndVerifyPVC(shouldPass bool, size string) {
 	var (
 		err     error
 		pvcName = "lvmpv-pvc"
 	)
 	ginkgo.By("updating the pvc with new size")
 	pvcObj, err = PVCClient.WithNamespace(OpenEBSNamespace).Get(pvcObj.Name, metav1.GetOptions{})
 	pvcObj, err = pvc.BuildFrom(pvcObj).
-		WithCapacity(NewCapacity).Build()
+		WithCapacity(size).Build()
 	gomega.Expect(err).To(
 		gomega.BeNil(),
 		"while building pvc {%s} in namespace {%s}",
@@ -272,9 +277,7 @@ func resizeAndVerifyPVC() {
 
 	ginkgo.By("verifying pvc size to be updated")
 
-	status := IsPVCResizedEventually(pvcName, NewCapacity)
-	gomega.Expect(status).To(gomega.Equal(true),
-		"while checking pvc resize")
+	IsPVCResizedEventually(pvcName, size, shouldPass)
 
 	pvcObj, err = PVCClient.WithNamespace(OpenEBSNamespace).Get(pvcObj.Name, metav1.GetOptions{})
 	gomega.Expect(err).To(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2019-2020 The OpenEBS Authors. All rights reserved.`
	`1`	`+# Copyright 2020 The OpenEBS Authors. All rights reserved.`
`2`	`2`	`#`
`3`	`3`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`		`-# Copyright 2019 The Kubernetes Authors.`
`4`	`3`	`# Copyright 2020 The OpenEBS Authors.`
`5`	`4`	`#`
`6`	`5`	`# Licensed under the Apache License, Version 2.0 (the "License");`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`	`set -e`
`3`		`-# Copyright 2019 The OpenEBS Authors.`
	`3`	`+# Copyright 2020 The OpenEBS Authors.`
`4`	`4`	`#`
`5`	`5`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2019 The OpenEBS Authors`
	`1`	`+// Copyright 2021 The OpenEBS Authors`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ var (`
`61`	`61`	`appPod *corev1.PodList`
`62`	`62`	`accessModes = []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}`
`63`	`63`	`capacity = "5368709120" // 5Gi`
`64`		`- NewCapacity = "8Gi" // 8Gi, for testing resize`
`65`	`64`	`KubeConfigPath string`
`66`	`65`	`OpenEBSNamespace string`
`67`	`66`	`)`