Merge branch 'fixbug-mount-root-node' into dev

Author: tytv2

.github/workflows/build_prod.yml

@@ -1,36 +1,84 @@
-name: Build image on MAIN branch
+name: Release PROD - Build & Push Image
 
 on:
-  push:
-    tags:
-      - 'v*'
-  pull_request:
-    tags:
-      - 'v*'
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Tag version to build'
+        required: true
+      registry:
+        description: 'Select which registry to build & push to'
+        required: true
+        default: 'ALL'
+        type: choice
+        options:
+          - ALL
+          - VCR_REGISTRY
+          - VCR_HAN_REGISTRY
 
 jobs:
-  package-image:
+  build-and-push:
     runs-on: ubuntu-latest
-    environment:
-      name: production  # Set the environment name
+    environment: production
+
     steps:
-      - uses: actions/checkout@v4
-      - name: Login to VngCloud Registry
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set common environment
+        run: |
+          echo "REGISTRY_INPUT=${{ github.event.inputs.registry }}" >> $GITHUB_ENV
+          echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
+      - name: Show build config
+        run: |
+          echo "Building version: ${{ inputs.version }}"
+          echo "Target registry: ${{ inputs.registry }}"
+      ###########################
+      # VCR_REGISTRY
+      ###########################
+      - name: Build image for VCR_REGISTRY
+        if: env.REGISTRY_INPUT == 'VCR_REGISTRY' || env.REGISTRY_INPUT == 'ALL'
+        env:
+          REGISTRY: ${{ vars.VCR_REGISTRY }}
+          VERSION: ${{ env.VERSION }}
+        run: make build-local-images
+
+      - name: Login to VCR_REGISTRY
+        if: env.REGISTRY_INPUT == 'VCR_REGISTRY' || env.REGISTRY_INPUT == 'ALL'
         uses: docker/login-action@v3
         with:
           registry: ${{ vars.VCR_REGISTRY }}
           username: ${{ secrets.VCR_USERNAME }}
           password: ${{ secrets.VCR_PASSWORD }}
-      - name: Get previous tag
-        id: previoustag
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+
+      - name: Push image to VCR_REGISTRY
+        if: env.REGISTRY_INPUT == 'VCR_REGISTRY' || env.REGISTRY_INPUT == 'ALL'
+        env:
+          REGISTRY: ${{ vars.VCR_REGISTRY }}
+          VERSION: ${{ env.VERSION }}
+        run: make push-local-images
+
+      ###########################
+      # VCR_HAN_REGISTRY
+      ###########################
+
+      - name: Build image for VCR_HAN_REGISTRY
+        if: env.REGISTRY_INPUT == 'VCR_HAN_REGISTRY' || env.REGISTRY_INPUT == 'ALL'
+        env:
+          REGISTRY: ${{ vars.VCR_HAN_REGISTRY }}
+          VERSION: ${{ env.VERSION }}
+        run: make build-local-images
+
+      - name: Login to VCR_HAN_REGISTRY
+        if: env.REGISTRY_INPUT == 'VCR_HAN_REGISTRY' || env.REGISTRY_INPUT == 'ALL'
+        uses: docker/login-action@v3
         with:
-          fallback: 1.0.0 # Optional fallback tag to use when no tag can be found
-          #workingDirectory: another/path/where/a/git/repo/is/checked/out # Optional alternative working directory
-      - name: Build and push vngcloud-blockstorage-csi-driver image
+          registry: ${{ vars.VCR_HAN_REGISTRY }}
+          username: ${{ secrets.VCR_HAN_USERNAME }}
+          password: ${{ secrets.VCR_HAN_PASSWORD }}
+
+      - name: Push image to VCR_HAN_REGISTRY
+        if: env.REGISTRY_INPUT == 'VCR_HAN_REGISTRY' || env.REGISTRY_INPUT == 'ALL'
         env:
-          NEW_VERSION: ${{ steps.previoustag.outputs.tag }}
-        run: |
-          export REGISTRY=${{ vars.VCR_REGISTRY }}
-          export VERSION=${{ github.ref_name }}
-          make bush-local-images
+          REGISTRY: ${{ vars.VCR_HAN_REGISTRY }}
+          VERSION: ${{ env.VERSION }}
+        run: make push-local-images

Makefile

@@ -145,18 +145,13 @@ build-local-image-%:
 		--tag $(REGISTRY)/$*:$(VERSION) \
 		.
 
-bush-image-%:
-	$(CONTAINER_ENGINE) build \
-		--build-arg VERSION=$(VERSION) \
-		--tag $(REGISTRY)/$*:$(VERSION) \
-		.
-
+push-image-%:
 	$(CONTAINER_ENGINE) image push $(REGISTRY)/$*:$(VERSION)
 
 # Build all images locally
 build-local-images: $(addprefix build-local-image-,$(IMAGE_NAMES))
 
-bush-local-images: $(addprefix bush-image-,$(IMAGE_NAMES))
+push-local-images: $(addprefix push-image-,$(IMAGE_NAMES))
 
 # Build a single image for all architectures in ARCHS and push it to REGISTRY
 push-multiarch-image-%:

pkg/driver/node.go

@@ -758,10 +758,9 @@ func (s *nodeService) isMounted(_ string, target string) (bool, error) {
 }
 
 func (s *nodeService) getDevicePath(volumeID string) (string, error) {
-	var devicePath string
 	devicePath, err := s.mounter.GetDevicePathBySerialID(volumeID)
 	if err != nil {
-		klog.Warningf("Couldn't get device path from mount: %v", err)
+		return "", fmt.Errorf("failed to get device path for volume %s: %w", volumeID, err)
 	}
 
 	return devicePath, nil
@@ -893,7 +892,7 @@ func checkAllocatable(clientset kubernetes.Interface, nodeName string) error {
 	}
 	klog.InfoS("CSINode drivers: ", "nodeName", nodeName, "driverName", csiNode.Spec)
 	for _, driver := range csiNode.Spec.Drivers {
-		klog.InfoS("CSINode driver info", "nodeName", nodeName, "driverName", driver.Name, "count", *driver.Allocatable.Count)
+		klog.InfoS("CSINode driver info", "nodeName", nodeName, "driverName", driver)
 		if driver.Name == DriverName {
 			if driver.Allocatable != nil && driver.Allocatable.Count != nil {
 				klog.InfoS("CSINode Allocatable value is set", "nodeName", nodeName, "count", *driver.Allocatable.Count)

pkg/util/util.go

@@ -73,7 +73,7 @@ func ConvertPortalZoneToVMZone(zone string) string {
 		return "HCM-1C"
 	case "BKK-01":
 		return "BKK01"
-	case "HAN-01":
+	case "HAN01-1A":
 		return "az01"
 	default:
 		return zone
@@ -91,7 +91,7 @@ func ConvertVMZoneToPortalZone(zone string) string {
 	case "BKK01":
 		return "BKK-01"
 	case "az01":
-		return "HAN-01"
+		return "HAN01-1A"
 	default:
 		return zone
 	}