Merge pull request #114 from davidz627/feature/k8sIntegrationTest

Adding Kubernetes Integration Test Framework

Author: k8s-ci-robot

.dockerignore

@@ -0,0 +1,2 @@
+# Possible Kubernetes source location
+test/k8s-integration

.gitignore

@@ -1,5 +1,6 @@
 # Compiled binaries and deployment files 
 bin/
+test/k8s-integration/src/
 
 # Personal testing
 /my_test/

Makefile

@@ -16,7 +16,7 @@
 # GCE_PD_CSI_STAGING_IMAGE: Staging image repository
 
 STAGINGIMAGE=${GCE_PD_CSI_STAGING_IMAGE}
-STAGINGVERSION=latest
+STAGINGVERSION=${GCE_PD_CSI_STAGING_VERSION}
 
 PRODIMAGE=gcr.io/google-containers/volume-csi/gcp-compute-persistent-disk-csi-driver
 PRODVERSION=v0.1.0.alpha
@@ -25,11 +25,17 @@ all: gce-pd-driver
 
 gce-pd-driver:
 	mkdir -p bin
+ifndef GCE_PD_CSI_STAGING_VERSION
+	$(error "Must set environment variable GCE_PD_CSI_STAGING_VERSION to staging version")
+endif
 	go build -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/gce-pd-csi-driver ./cmd/
 
 build-container:
 ifndef GCE_PD_CSI_STAGING_IMAGE
 	$(error "Must set environment variable GCE_PD_CSI_STAGING_IMAGE to staging image repository")
+endif
+ifndef GCE_PD_CSI_STAGING_VERSION
+	$(error "Must set environment variable GCE_PD_CSI_STAGING_VERSION to staging version")
 endif
 	docker build --build-arg TAG=$(STAGINGVERSION) -t $(STAGINGIMAGE):$(STAGINGVERSION) .
 
@@ -44,3 +50,6 @@ prod-push-container: prod-build-container
 
 test-sanity: gce-pd-driver
 	go test -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/test -run ^TestSanity$
+
+test-k8s-integration:
+	go build -o bin/k8s-integration-test ./test/k8s-integration

pkg/gce-pd-csi-driver/controller.go

@@ -46,8 +46,8 @@ var _ csi.ControllerServer = &GCEControllerServer{}
 const (
 	// MaxVolumeSizeInBytes is the maximum standard and ssd size of 64TB
 	MaxVolumeSizeInBytes     int64 = 64 * 1024 * 1024 * 1024 * 1024
-	MinimumVolumeSizeInBytes int64 = 5 * 1024 * 1024 * 1024
-	MinimumDiskSizeInGb            = 5
+	MinimumVolumeSizeInBytes int64 = 1 * 1024 * 1024 * 1024
+	MinimumDiskSizeInGb            = 1
 
 	DiskTypeSSD      = "pd-ssd"
 	DiskTypeStandard = "pd-standard"

test/e2e/utils/utils.go

@@ -56,6 +56,11 @@ func GCEClientAndDriverSetup(instance *remote.InstanceInfo) (*remote.TestContext
 		Port:         port,
 	}
 
+	err := os.Setenv("GCE_PD_CSI_STAGING_VERSION", "latest")
+	if err != nil {
+		return nil, err
+	}
+
 	return remote.SetupNewDriverAndClient(instance, config)
 }
 
@@ -104,7 +109,7 @@ func SetupProwConfig() (project, serviceAccount string) {
 	// Default Compute Engine service account
 	// [PROJECT_NUMBER][email protected]
 	serviceAccount = fmt.Sprintf("%[email protected]", resp.ProjectNumber)
-	glog.V(4).Infof("Using project %v", project)
+	glog.Infof("Using project %v and service account %v", project, serviceAccount)
 	return project, serviceAccount
 }
 

test/k8s-integration/.dockerized-kube-version-defs

@@ -0,0 +1,5 @@
+KUBE_GIT_COMMIT='somefakecommit'
+KUBE_GIT_TREE_STATE='dirty'
+KUBE_GIT_VERSION='v888.888.888-fake-testing-master.version'
+KUBE_GIT_MAJOR='888'
+KUBE_GIT_MINOR='888+'