Merge pull request #272 from jiaxunsongucb/customization_for_azurestack

chore: customization for Azure Stack Cloud

Author: k8s-ci-robot

charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml

@@ -95,6 +95,8 @@ spec:
                   optional: true
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
+            - name: AZURE_ENVIRONMENT_FILEPATH  # For Azure Stack Cloud
+              value: /etc/kubernetes/azurestackcloud.json
           imagePullPolicy: {{ .Values.image.blob.pullPolicy }}
           volumeMounts:
             - mountPath: /csi
@@ -104,6 +106,9 @@ spec:
             - mountPath: /var/lib/waagent/ManagedIdentity-Settings
               readOnly: true
               name: msi
+            - name: ssl
+              mountPath: /etc/ssl/certs
+              readOnly: true
           resources:
             limits:
               cpu: 200m
@@ -121,4 +126,7 @@ spec:
         - name: msi
           hostPath:
             path: /var/lib/waagent/ManagedIdentity-Settings
+        - name: ssl
+          hostPath:
+            path: /etc/ssl/certs
 ---

charts/latest/blob-csi-driver/templates/csi-blob-node.yaml

@@ -113,6 +113,8 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
+            - name: AZURE_ENVIRONMENT_FILEPATH  # For Azure Stack Cloud
+              value: /etc/kubernetes/azurestackcloud.json
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           securityContext:
             privileged: true
@@ -129,6 +131,9 @@ spec:
               name: msi
             - mountPath: /mnt
               name: blob-cache
+            - name: ssl
+              mountPath: /etc/ssl/certs
+              readOnly: true
           resources:
             limits:
               cpu: 2
@@ -159,3 +164,6 @@ spec:
         - hostPath:
             path: /mnt
           name: blob-cache
+        - name: ssl
+          hostPath:
+            path: /etc/ssl/certs

deploy/csi-blob-controller.yaml

@@ -93,6 +93,8 @@ spec:
                   optional: true
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
+            - name: AZURE_ENVIRONMENT_FILEPATH  # For Azure Stack Cloud
+              value: /etc/kubernetes/azurestackcloud.json
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
@@ -101,6 +103,9 @@ spec:
             - mountPath: /var/lib/waagent/ManagedIdentity-Settings
               readOnly: true
               name: msi
+            - name: ssl
+              mountPath: /etc/ssl/certs
+              readOnly: true
           resources:
             limits:
               cpu: 200m
@@ -118,3 +123,6 @@ spec:
         - name: msi
           hostPath:
             path: /var/lib/waagent/ManagedIdentity-Settings
+        - name: ssl
+          hostPath:
+            path: /etc/ssl/certs

deploy/csi-blob-node.yaml

@@ -112,6 +112,8 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
+            - name: AZURE_ENVIRONMENT_FILEPATH  # For Azure Stack Cloud
+              value: /etc/kubernetes/azurestackcloud.json
           securityContext:
             privileged: true
           volumeMounts:
@@ -127,6 +129,9 @@ spec:
               name: msi
             - mountPath: /mnt
               name: blob-cache
+            - name: ssl
+              mountPath: /etc/ssl/certs
+              readOnly: true
           resources:
             limits:
               cpu: 2
@@ -157,4 +162,7 @@ spec:
         - hostPath:
             path: /mnt
           name: blob-cache
+        - name: ssl
+          hostPath:
+            path: /etc/ssl/certs
 ---

hack/verify-boilerplate.sh

@@ -18,6 +18,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+echo "Verifying boilerplate"
+
+if [[ -z "$(command -v python)" ]]; then
+  echo "Cannot find python. Make link to python3..."
+  update-alternatives --install /usr/bin/python python /usr/bin/python3 1
+fi
 
 REPO_ROOT=$(dirname "${BASH_SOURCE}")/..
 
@@ -40,4 +46,6 @@ if [[ ${#files_need_boilerplate[@]} -gt 0 ]]; then
   done
 
   exit 1
-fi
+fi
+
+echo "Done"

hack/verify-golint.sh

@@ -19,8 +19,11 @@ 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.31.0
+  export PATH=$PATH:$(go env GOPATH)/bin
 fi
 
+echo "Verifying golint"
+
 golangci-lint run --no-config --enable=golint --disable=typecheck --deadline=10m
 
 echo "Congratulations! Lint check completed for all Go source files."

hack/verify-gomod.sh

@@ -16,6 +16,7 @@
 
 set -euo pipefail
 
+echo "Verifying gomod"
 export GO111MODULE=on
 echo "go mod tidy"
 go mod tidy

hack/verify-helm-chart.sh

@@ -37,6 +37,17 @@ function validate_image() {
 
 echo "Comparing image version between helm chart and manifests in deploy folder"
 
+if [[ -z "$(command -v pip)" ]]; then
+  echo "Cannot find pip. Installing pip3..."
+  apt install python3-pip -y
+  update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
+fi
+
+if [[ -z "$(command -v jq)" ]]; then
+  echo "Cannot find jq. Installing yq..."
+  apt install jq -y
+fi
+
 # jq-equivalent for yaml
 pip install yq
 

pkg/blob/azure.go

@@ -40,6 +40,11 @@ var (
 	DefaultCredFilePath           = "/etc/kubernetes/azure.json"
 )
 
+// IsAzureStackCloud decides whether the driver is running on Azure Stack Cloud.
+func IsAzureStackCloud(cloud *azureprovider.Cloud) bool {
+	return strings.EqualFold(cloud.Config.Cloud, "AZURESTACKCLOUD")
+}
+
 // GetCloudProvider get Azure Cloud Provider
 func GetCloudProvider(kubeconfig string) (*azureprovider.Cloud, error) {
 	kubeClient, err := getKubeClient(kubeconfig)

pkg/blob/controllerserver.go

@@ -110,6 +110,9 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	if strings.HasPrefix(strings.ToLower(storageAccountType), "premium") {
 		accountKind = string(storage.BlockBlobStorage)
 	}
+	if IsAzureStackCloud(d.cloud) {
+		accountKind = string(storage.Storage)
+	}
 
 	tags, err := azure.ConvertTagsToMap(customTags)
 	if err != nil {