Cleanup on code verification and unit test

chewong · chewong · commit 7964fba978f6 · 2019-12-18T14:38:44.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -68,4 +68,4 @@ cscope.*
 
 /bazel-*
 *.pyc
-
+profile.cov
diff --git a/.travis.yml b/.travis.yml
diff --git a/Makefile b/Makefile
@@ -21,34 +21,56 @@ IMAGE_TAG_LATEST=$(REGISTRY_NAME)/$(IMAGE_NAME):latest
 GIT_COMMIT?=$(shell git rev-parse HEAD)
 BUILD_DATE?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 LDFLAGS?="-X ${PKG}/pkg/blobfuse.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/blobfuse.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/blobfuse.buildDate=${BUILD_DATE} -s -w -extldflags '-static'"
-
-.PHONY: all blobfuse blobfuse-container clean
+GO111MODULE = off
+export GO111MODULE
 
 all: blobfuse
 
-test:
+.PHONY: verify
+verify:
+	hack/verify-all.sh
+
+.PHONY: unit-test
+unit-test:
 	go test -covermode=count -coverprofile=profile.cov ./pkg/...
-	$GOPATH/bin/goveralls -coverprofile=profile.cov -service=travis-ci
-integration-test:
-	test/integration/run-tests-all-clouds.sh
+
+.PHONY: sanity-test
 sanity-test:
 	test/sanity/run-tests-all-clouds.sh
+
+.PHONY: integration-test
+integration-test:
+	test/integration/run-tests-all-clouds.sh
+
+.PHONY: e2e-test
 e2e-test:
 	test/e2e/run-test.sh
+
+.PHONY: blobfuse
 blobfuse:
 	if [ ! -d ./vendor ]; then dep ensure -vendor-only; fi
 	CGO_ENABLED=0 GOOS=linux go build -a -ldflags ${LDFLAGS} -o _output/blobfuseplugin ./pkg/blobfuseplugin
+
+.PHONY: blobfuse-windows
 blobfuse-windows:
 	if [ ! -d ./vendor ]; then dep ensure -vendor-only; fi
 	CGO_ENABLED=0 GOOS=windows go build -a -ldflags ${LDFLAGS} -o _output/blobfuseplugin.exe ./pkg/blobfuseplugin
+
+.PHONY: blobfuse-container
 blobfuse-container: blobfuse
 	docker build --no-cache -t $(IMAGE_TAG) -f ./pkg/blobfuseplugin/Dockerfile .
+
+.PHONY: push
 push: blobfuse-container
 	docker push $(IMAGE_TAG)
+
+.PHONY: push-latest
 push-latest: blobfuse-container
 	docker push $(IMAGE_TAG)
 	docker tag $(IMAGE_TAG) $(IMAGE_TAG_LATEST)
 	docker push $(IMAGE_TAG_LATEST)
+
+.PHONY: clean
 clean:
 	go clean -r -x
 	-rm -rf _output
diff --git a/charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-controller.yaml b/charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-controller.yaml
@@ -33,7 +33,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v1.0.1
+          image: "{{ .Values.image.csiAttacher.repository }}:{{ .Values.image.csiAttacher.tag }}"
           args:
             - --v=5
             - --csi-address=$(ADDRESS)
@@ -46,7 +46,7 @@ spec:
           - mountPath: /csi
             name: socket-dir
         - name: cluster-driver-registrar
-          image: quay.io/k8scsi/csi-cluster-driver-registrar:v1.0.1
+          image: "{{ .Values.image.clusterDriverRegistrar.repository }}:{{ .Values.image.clusterDriverRegistrar.tag }}"
           args:
             - --csi-address=$(ADDRESS)
             - --driver-requires-attachment=true
@@ -58,7 +58,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: liveness-probe
-          image: quay.io/k8scsi/livenessprobe:v1.1.0
+          image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
           args:
             - --csi-address=/csi/csi.sock
             - --connection-timeout=3s
@@ -67,7 +67,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: blobfuse
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.blobfuse.repository }}:{{ .Values.image.blobfuse.tag }}"
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
diff --git a/charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-node.yaml b/charts/latest/blobfuse-csi-driver/templates/csi-blobfuse-node.yaml
@@ -23,13 +23,13 @@ spec:
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
-          image: quay.io/k8scsi/livenessprobe:v1.0.2
+          image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
           args:
             - --csi-address=/csi/csi.sock
             - --connection-timeout=3s
             - --health-port=9802
         - name: node-driver-registrar
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
+          image: "{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
@@ -49,7 +49,7 @@ spec:
             - name: registration-dir
               mountPath: /registration
         - name: blobfuse
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.blobfuse.repository }}:{{ .Values.image.blobfuse.tag }}"
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
diff --git a/charts/latest/blobfuse-csi-driver/values.yaml b/charts/latest/blobfuse-csi-driver/values.yaml
@@ -1,7 +1,28 @@
 image:
-  repository: mcr.microsoft.com/k8s/csi/blobfuse-csi
-  tag: latest
-  pullPolicy: Always
+  blobfuse:
+    repository: mcr.microsoft.com/k8s/csi/blobfuse-csi
+    tag: latest
+    pullPolicy: Always
+  csiProvisioner:
+    repository: quay.io/k8scsi/csi-provisioner
+    tag: v1.0.1
+    pullPolicy: Always
+  csiAttacher:
+    repository: quay.io/k8scsi/csi-attacher
+    tag: v1.0.1
+    pullPolicy: Always
+  clusterDriverRegistrar:
+    repository: quay.io/k8scsi/csi-cluster-driver-registrar
+    tag: v1.0.1
+    pullPolicy: Always
+  livenessProbe:
+    repository: quay.io/k8scsi/livenessprobe
+    tag: v1.1.0
+    pullPolicy: Always
+  nodeDriverRegistrar:
+    repository: quay.io/k8scsi/csi-node-driver-registrar
+    tag: v1.1.0
+    pullPolicy: Always
 
 serviceAccount:
   create: true
diff --git a/deploy/csi-blobfuse-node.yaml b/deploy/csi-blobfuse-node.yaml
@@ -22,7 +22,7 @@ spec:
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
-          image: quay.io/k8scsi/livenessprobe:v1.0.2
+          image: quay.io/k8scsi/livenessprobe:v1.1.0
           args:
             - --csi-address=/csi/csi.sock
             - --connection-timeout=3s
diff --git a/hack/verify-all.sh b/hack/verify-all.sh
@@ -23,4 +23,5 @@ ${PKG_ROOT}/hack/verify-govet.sh
 ${PKG_ROOT}/hack/verify-golint.sh
 ${PKG_ROOT}/hack/verify-dep.sh
 ${PKG_ROOT}/hack/verify-boilerplate.sh
-${PKG_ROOT}/hack/verify-spelling.sh
+${PKG_ROOT}/hack/verify-spelling.sh
+${PKG_ROOT}/hack/verify-helm-chart.sh
diff --git a/hack/verify-dep.sh b/hack/verify-dep.sh
@@ -17,5 +17,6 @@
 set -euo pipefail
 
 echo "Verifying dep check"
+go get github.com/golang/dep/cmd/dep
 dep check
-echo "No issue found"
+echo "No issue found"
diff --git a/hack/verify-golint.sh b/hack/verify-golint.sh
@@ -21,7 +21,6 @@ if ! which golangci-lint > /dev/null; then
     go get github.com/golangci/golangci-lint/cmd/golangci-lint
 fi
 
-golangci-lint run --deadline=10m 
+golangci-lint run --deadline=10m
 
 echo "Congratulations! All Go source files have been linted."
-
diff --git a/hack/verify-helm-chart.sh b/hack/verify-helm-chart.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Copyright 2019 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -euo pipefail
+
+readonly PKG_ROOT="$(git rev-parse --show-toplevel)"
+
+function get_image_from_helm_chart() {
+  local -r image_name="${1}"
+  image_repository="$(cat ${PKG_ROOT}/charts/latest/blobfuse-csi-driver/values.yaml | yq -r .image.${image_name}.repository)"
+  image_tag="$(cat ${PKG_ROOT}/charts/latest/blobfuse-csi-driver/values.yaml | yq -r .image.${image_name}.tag)"
+  echo "${image_repository}:${image_tag}"
+}
+
+function validate_image() {
+  local -r expected_image="${1}"
+  local -r image="${2}"
+
+  if [[ "${expected_image}" != "${image}" ]]; then
+    echo "Expected ${expected_image}, but got ${image} in helm chart"
+    exit 1
+  fi
+}
+
+echo "Comparing image version between helm chart and manifests in deploy folder"
+
+# jq-equivalent for yaml
+pip install yq
+
+# Extract images from csi-blobfuse-controller.yaml
+expected_csi_provisioner_image="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-controller.yaml | yq -r .spec.template.spec.containers[0].image | head -n 1)"
+expected_csi_attacher_image="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-controller.yaml | yq -r .spec.template.spec.containers[1].image | head -n 1)"
+expected_cluster_driver_registrar_image="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-controller.yaml | yq -r .spec.template.spec.containers[2].image | head -n 1)"
+expected_liveness_probe_image="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-controller.yaml | yq -r .spec.template.spec.containers[3].image | head -n 1)"
+expected_blobfuse_image="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-controller.yaml | yq -r .spec.template.spec.containers[4].image | head -n 1)"
+
+csi_provisioner_image="$(get_image_from_helm_chart "csiProvisioner")"
+validate_image "${expected_csi_provisioner_image}" "${csi_provisioner_image}"
+
+csi_attacher_image="$(get_image_from_helm_chart "csiAttacher")"
+validate_image "${expected_csi_attacher_image}" "${csi_attacher_image}"
+
+cluster_driver_registrar_image="$(get_image_from_helm_chart "clusterDriverRegistrar")"
+validate_image "${expected_cluster_driver_registrar_image}" "${cluster_driver_registrar_image}"
+
+liveness_probe_image="$(get_image_from_helm_chart "livenessProbe")"
+validate_image "${expected_liveness_probe_image}" "${liveness_probe_image}"
+
+blobfuse_image="$(get_image_from_helm_chart "blobfuse")"
+validate_image "${expected_blobfuse_image}" "${blobfuse_image}"
+
+# Extract images from csi-blobfuse-node.yaml
+expected_liveness_probe_image="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-node.yaml | yq -r .spec.template.spec.containers[0].image | head -n 1)"
+expected_node_driver_registrar="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-node.yaml | yq -r .spec.template.spec.containers[1].image | head -n 1)"
+expected_blobfuse_image="$(cat ${PKG_ROOT}/deploy/csi-blobfuse-node.yaml | yq -r .spec.template.spec.containers[2].image | head -n 1)"
+
+validate_image "${expected_liveness_probe_image}" "${liveness_probe_image}"
+
+node_driver_registrar="$(get_image_from_helm_chart "nodeDriverRegistrar")"
+validate_image "${expected_node_driver_registrar}" "${node_driver_registrar}"
+
+validate_image "${expected_blobfuse_image}" "${blobfuse_image}"
+
+echo "Images in deploy/ matches those in the latest helm chart."
diff --git a/hack/verify-spelling.sh b/hack/verify-spelling.sh
@@ -51,4 +51,4 @@ if [[ -s "${ERROR_LOG}" ]]; then
   echo "Found spelling errors!"
   RES=1
 fi
-exit "${RES}"
+exit "${RES}"
diff --git a/test/e2e/driver/blobfuse_csi_driver.go b/test/e2e/driver/blobfuse_csi_driver.go
@@ -19,8 +19,9 @@ package driver
 import (
 	"fmt"
 
-	blobfuse "github.com/kubernetes-sigs/blobfuse-csi-driver/pkg/blobfuse"
 	"github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1alpha1"
+	"github.com/kubernetes-sigs/blobfuse-csi-driver/pkg/blobfuse"
+
 	v1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
diff --git a/test/e2e/testsuites/testsuites.go b/test/e2e/testsuites/testsuites.go
@@ -22,14 +22,13 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-sigs/blobfuse-csi-driver/pkg/blobfuse"
-	"github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1alpha1"
 
+	"github.com/container-storage-interface/spec/lib/go/csi"
+	"github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1alpha1"
 	snapshotclientset "github.com/kubernetes-csi/external-snapshotter/pkg/client/clientset/versioned"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
 	apps "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
