Merge pull request #117 from andyzhangx/switch-mcr-image

test: switch to use mcr nginx image

Author: andyzhangx

Makefile

@@ -166,3 +166,10 @@ endif
 .PHONY: create-metrics-svc
 create-metrics-svc:
 	kubectl create -f deploy/example/metrics/csi-smb-controller-svc.yaml
+
+.PHONY: create-example-deployment
+create-example-deployment:
+	kubectl apply -f deploy/example/storageclass-smb.yaml
+	kubectl apply -f deploy/example/pvc-smb.yaml
+	kubectl apply -f deploy/example/deployment.yaml
+	kubectl apply -f deploy/example/statefulset.yaml

deploy/example/deployment.yaml

@@ -20,7 +20,7 @@ spec:
         "kubernetes.io/os": linux
       containers:
         - name: deployment-smb
-          image: nginx
+          image: mcr.microsoft.com/oss/nginx/nginx:1.17.3-alpine
           command:
             - "/bin/sh"
             - "-c"

deploy/example/nginx-pod-smb.yaml

@@ -5,7 +5,7 @@ metadata:
   name: nginx-smb
 spec:
   containers:
-    - image: nginx
+    - image: mcr.microsoft.com/oss/nginx/nginx:1.17.3-alpine
       name: nginx-smb
       command:
         - "/bin/sh"

deploy/example/statefulset.yaml

@@ -17,7 +17,7 @@ spec:
         "kubernetes.io/os": linux
       containers:
         - name: statefulset-smb
-          image: nginx
+          image: mcr.microsoft.com/oss/nginx/nginx:1.17.3-alpine
           command:
             - "/bin/sh"
             - "-c"

hack/verify-golint.sh

@@ -18,7 +18,7 @@ set -euo pipefail
 
 if [[ -z "$(command -v golangci-lint)" ]]; then
   echo "Cannot find golangci-lint. Installing golangci-lint..."
-  curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.30.0
+  curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.31.0
 fi
 
 golangci-lint run --no-config --enable=golint --disable=typecheck --deadline=10m

test/e2e/suite_test.go

@@ -26,6 +26,7 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/kubernetes-csi/csi-driver-smb/pkg/smb"
 	"github.com/kubernetes-csi/csi-driver-smb/test/utils/testutil"
@@ -138,6 +139,16 @@ var _ = ginkgo.BeforeSuite(func() {
 
 var _ = ginkgo.AfterSuite(func() {
 	if testutil.IsRunningInProw() {
+		createExampleDeployment := testCmd{
+			command:  "make",
+			args:     []string{"create-example-deployment"},
+			startLog: "create example deployments",
+			endLog:   "example deployments created",
+		}
+		execTestCmd([]testCmd{createExampleDeployment})
+		// sleep 120s waiting for deployment running complete
+		time.Sleep(120 * time.Second)
+
 		smbLog := testCmd{
 			command:  "bash",
 			args:     []string{"test/utils/smb_log.sh"},

test/utils/smb_log.sh

@@ -23,6 +23,10 @@ echo "print out all nodes status ..."
 kubectl get nodes -o wide
 echo "======================================================================================"
 
+echo "print out all default namespace pods status ..."
+kubectl get pods -n default -o wide
+echo "======================================================================================"
+
 echo "print out all $NS namespace pods status ..."
 kubectl get pods -n${NS} -o wide
 echo "======================================================================================"