Merge pull request #277 from gibizer/volume-claim

[test]Handle PVC in StatefulSet and Deployment

Author: stuggi

modules/test/helpers/deployment.go

@@ -15,6 +15,7 @@ package helpers
 
 import (
 	"encoding/json"
+
 	networkv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	"github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
@@ -76,14 +77,22 @@ func (tc *TestHelper) SimulateDeploymentReplicaReady(name types.NamespacedName)
 //					map[string][]string{manilaName.Namespace + "/internalapi": {"10.0.0.1"}},
 //				)
 func (tc *TestHelper) SimulateDeploymentReadyWithPods(name types.NamespacedName, networkIPs map[string][]string) {
-	ss := tc.GetDeployment(name)
-	for i := 0; i < int(*ss.Spec.Replicas); i++ {
+	depl := tc.GetDeployment(name)
+	for i := 0; i < int(*depl.Spec.Replicas); i++ {
 		pod := &corev1.Pod{
-			ObjectMeta: ss.Spec.Template.ObjectMeta,
-			Spec:       ss.Spec.Template.Spec,
+			ObjectMeta: depl.Spec.Template.ObjectMeta,
+			Spec:       depl.Spec.Template.Spec,
 		}
 		pod.ObjectMeta.Namespace = name.Namespace
 		pod.ObjectMeta.GenerateName = name.Name
+		// NOTE(gibi): If there is a mount that refers to a volume created via
+		// persistent volume claim then that mount won't have a corresponding
+		// volume created in EnvTest as we are not simulating the k8s volume
+		// claim logic here at the moment. Therefore the Pod create would fail
+		// with a missing volume. So to avoid that we remove every mount and
+		// volume from the pod we create here.
+		pod.Spec.Volumes = []corev1.Volume{}
+		pod.Spec.Containers[0].VolumeMounts = []corev1.VolumeMount{}
 
 		var netStatus []networkv1.NetworkStatus
 		for network, IPs := range networkIPs {
@@ -103,10 +112,10 @@ func (tc *TestHelper) SimulateDeploymentReadyWithPods(name types.NamespacedName,
 	}
 
 	gomega.Eventually(func(g gomega.Gomega) {
-		ss := tc.GetDeployment(name)
-		ss.Status.Replicas = 1
-		ss.Status.ReadyReplicas = 1
-		g.Expect(tc.K8sClient.Status().Update(tc.Ctx, ss)).To(gomega.Succeed())
+		depl := tc.GetDeployment(name)
+		depl.Status.Replicas = 1
+		depl.Status.ReadyReplicas = 1
+		g.Expect(tc.K8sClient.Status().Update(tc.Ctx, depl)).To(gomega.Succeed())
 
 	}, tc.Timeout, tc.Interval).Should(gomega.Succeed())
 

modules/test/helpers/statefulset.go

@@ -15,6 +15,7 @@ package helpers
 
 import (
 	"encoding/json"
+
 	networkv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	t "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
@@ -71,6 +72,15 @@ func (tc *TestHelper) SimulateStatefulSetReplicaReadyWithPods(name types.Namespa
 		pod.ObjectMeta.Namespace = name.Namespace
 		pod.ObjectMeta.GenerateName = name.Name
 
+		// NOTE(gibi): If there is a mount that refers to a volume created via
+		// persistent volume claim then that mount won't have a corresponding
+		// volume created in EnvTest as we are not simulating the k8s volume
+		// claim logic here at the moment. Therefore the Pod create would fail
+		// with a missing volume. So to avoid that we remove every mount and
+		// volume from the pod we create here.
+		pod.Spec.Volumes = []corev1.Volume{}
+		pod.Spec.Containers[0].VolumeMounts = []corev1.VolumeMount{}
+
 		var netStatus []networkv1.NetworkStatus
 		for network, IPs := range networkIPs {
 			netStatus = append(