github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add GCE-PD CSI Driver test to E2E test suite

Browse Source
This commit is contained in:
David Zhu
2018-03-09 10:57:50 -08:00
parent 7ba97b9200
commit 01d916167b
8 changed files with 315 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/storage/BUILD
View File

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = [
"csi_hostpath.go",
"csi_defs.go",
"csi_volumes.go",
"empty_dir_wrapper.go",
"flexvolume.go",
@@ -39,6 +39,7 @@ go_library(
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/metrics:go_default_library",
"//test/e2e/generated:go_default_library",
"//test/e2e/manifest:go_default_library",
"//test/e2e/storage/utils:go_default_library",
"//test/e2e/storage/vsphere:go_default_library",
"//test/utils/image:go_default_library",

58
test/e2e/storage/csi_hostpath.go → test/e2e/storage/csi_defs.go
View File

@@ -21,10 +21,12 @@ package storage
import (
"k8s.io/api/core/v1"
apierrs "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/manifest"
)
const (
@@ -197,3 +199,59 @@ func csiHostPathPod(
framework.ExpectNoError(framework.WaitForPodRunningInNamespace(client, ret))
return ret
}
func csiGCEPDSetup(
client clientset.Interface,
config framework.VolumeTestConfig,
teardown bool,
f *framework.Framework,
nodeSA *v1.ServiceAccount,
controllerSA *v1.ServiceAccount,
) {
// Get API Objects from manifests
nodeds, err := manifest.DaemonSetFromManifest("test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml", config.Namespace)
framework.ExpectNoError(err, "Failed to create DaemonSet from manifest")
nodeds.Spec.Template.Spec.ServiceAccountName = nodeSA.GetName()
controllerss, err := manifest.StatefulSetFromManifest("test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml", config.Namespace)
framework.ExpectNoError(err, "Failed to create StatefulSet from manifest")
controllerss.Spec.Template.Spec.ServiceAccountName = controllerSA.GetName()
controllerservice, err := manifest.SvcFromManifest("test/e2e/testing-manifests/storage-csi/gce-pd/controller_service.yaml")
framework.ExpectNoError(err, "Failed to create Service from manifest")
// Got all objects from manifests now try to delete objects
err = client.CoreV1().Services(config.Namespace).Delete(controllerservice.GetName(), nil)
if err != nil {
if !apierrs.IsNotFound(err) {
framework.ExpectNoError(err, "Failed to delete Service: %v", controllerservice.GetName())
}
}
err = client.AppsV1().StatefulSets(config.Namespace).Delete(controllerss.Name, nil)
if err != nil {
if !apierrs.IsNotFound(err) {
framework.ExpectNoError(err, "Failed to delete StatefulSet: %v", controllerss.GetName())
}
}
err = client.AppsV1().DaemonSets(config.Namespace).Delete(nodeds.Name, nil)
if err != nil {
if !apierrs.IsNotFound(err) {
framework.ExpectNoError(err, "Failed to delete DaemonSet: %v", nodeds.GetName())
}
}
if teardown {
return
}
// Create new API Objects through client
_, err = client.CoreV1().Services(config.Namespace).Create(controllerservice)
framework.ExpectNoError(err, "Failed to create Service: %v", controllerservice.Name)
_, err = client.AppsV1().StatefulSets(config.Namespace).Create(controllerss)
framework.ExpectNoError(err, "Failed to create StatefulSet: %v", controllerss.Name)
_, err = client.AppsV1().DaemonSets(config.Namespace).Create(nodeds)
framework.ExpectNoError(err, "Failed to create DaemonSet: %v", nodeds.Name)
}

64
test/e2e/storage/csi_volumes.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package storage
import (
"fmt"
"math/rand"
"time"
@@ -28,10 +29,12 @@ import (
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/storage/utils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
const (
@@ -95,7 +98,7 @@ func csiServiceAccount(
componentName string,
teardown bool,
) *v1.ServiceAccount {
By("Creating a CSI service account")
By(fmt.Sprintf("Creating a CSI service account for %v", componentName))
serviceAccountName := config.Prefix + "-" + componentName + "-service-account"
serviceAccountClient := client.CoreV1().ServiceAccounts(config.Namespace)
sa := &v1.ServiceAccount{
@@ -130,7 +133,7 @@ func csiClusterRoleBindings(
sa *v1.ServiceAccount,
clusterRolesNames []string,
) {
By("Binding cluster roles to the CSI service account")
By(fmt.Sprintf("Binding cluster roles %v to the CSI service account %v", clusterRolesNames, sa.GetName()))
clusterRoleBindingClient := client.RbacV1().ClusterRoleBindings()
for _, clusterRoleName := range clusterRolesNames {
@@ -237,4 +240,61 @@ var _ = utils.SIGDescribe("CSI Volumes [Flaky]", func() {
testDynamicProvisioning(t, cs, claim, class)
})
})
Describe("[Feature: CSI] Sanity CSI plugin test using GCE-PD CSI driver", func() {
var (
controllerClusterRoles []string = []string{
csiExternalAttacherClusterRoleName,
csiExternalProvisionerClusterRoleName,
}
nodeClusterRoles []string = []string{
csiDriverRegistrarClusterRoleName,
}
controllerServiceAccount *v1.ServiceAccount
nodeServiceAccount *v1.ServiceAccount
)
BeforeEach(func() {
framework.SkipUnlessProviderIs("gce", "gke")
// Currently you will need to manually add the required GCP Credentials as a secret "cloud-sa"
// kubectl create generic cloud-sa --from-file=PATH/TO/cloud-sa.json --namespace={{config.Namespace}}
// TODO(GITHUBISSUE): Inject the necessary credentials automatically to the driver containers in e2e test
framework.SkipUnlessSecretExistsAfterWait(cs, "cloud-sa", config.Namespace, 3*time.Minute)
By("deploying gce-pd driver")
controllerServiceAccount = csiServiceAccount(cs, config, "gce-controller", false)
nodeServiceAccount = csiServiceAccount(cs, config, "gce-node", false)
csiClusterRoleBindings(cs, config, false, controllerServiceAccount, controllerClusterRoles)
csiClusterRoleBindings(cs, config, false, nodeServiceAccount, nodeClusterRoles)
csiGCEPDSetup(cs, config, false, f, nodeServiceAccount, controllerServiceAccount)
})
AfterEach(func() {
By("uninstalling gce-pd driver")
csiGCEPDSetup(cs, config, true, f, nodeServiceAccount, controllerServiceAccount)
csiClusterRoleBindings(cs, config, true, controllerServiceAccount, controllerClusterRoles)
csiClusterRoleBindings(cs, config, true, nodeServiceAccount, nodeClusterRoles)
csiServiceAccount(cs, config, "gce-controller", true)
csiServiceAccount(cs, config, "gce-node", true)
})
It("should provision storage with a GCE-PD CSI driver", func() {
nodeZone, ok := node.GetLabels()[kubeletapis.LabelZoneFailureDomain]
Expect(ok).To(BeTrue(), "Could not get label %v from node %v", kubeletapis.LabelZoneFailureDomain, node.GetName())
t := storageClassTest{
name: "csi-gce-pd",
provisioner: "csi-gce-pd",
parameters: map[string]string{"type": "pd-standard", "zone": nodeZone},
claimSize: "5Gi",
expectedSize: "5Gi",
nodeName: node.Name,
}
claim := newClaim(t, ns.GetName(), "")
class := newStorageClass(t, ns.GetName(), "")
claim.Spec.StorageClassName = &class.ObjectMeta.Name
testDynamicProvisioning(t, cs, claim, class)
})
})
})