Merge pull request #113 from gnufied/rebase-v3.1.2

STOR-1578: Rebase v3.1.2

.gitlab-ci.yml

@@ -5,6 +5,8 @@ stages:
   - e2e-tests-dev
   - deploy-staging
   - tests-staging
+  - prod-rollout
+  - cleanup-dev
 
 run-unit-tests:
   stage: unit-test
@@ -51,44 +53,59 @@ deploy-images-dev:
   stage: deploy-dev
   # This resource group is configured with process_mode=oldest_first to make sure the pipelines are run serially.
   resource_group: production
-  # Image built from cd-infra/images/ci-deploy/Dockerfile from Calatrava project.
+  # Image built from cd-infra/images/ci-deploy/Dockerfile.
   image: $CNS_IMAGE_CI_DEPLOY_STAGE
   script:
     - ./pipeline/deploy.sh
   dependencies:
     - build-images
   artifacts:
+    paths:
+      - ./env.json
+      - ./sv_kubeconfig_content.yaml
     reports:
       dotenv: build.env
 
 e2e-tests-dev:
   stage: e2e-tests-dev
   # This resource group is configured with process_mode=oldest_first to make sure the pipelines are run serially.
   resource_group: production
-  image: $CNS_IMAGE_GOLANG
+  # Image built by docker file images/ci/e2e/Dockerfile.
+  # Command to build new image is
+  # docker build -t <image-name:version> --platform=Linux/x86_64 -f Dockerfile . 
+  # docker tag <image-name:version> <repo>/<image-name:version>
+  # docker push <repo>/<image-name:version>
+  image: $CSI_FVT_GOLANG
   dependencies:
     - deploy-images-dev
   script:
     - ./pipeline/e2e-tests.sh
+  artifacts:
+    paths:
+      - ./env.json
+      - ./sv_kubeconfig_content.yaml
+    reports:
+      dotenv: build.env
 
 deploy-images-staging:
   stage: deploy-staging
-  # Image built from cd-infra/images/ci-deploy/Dockerfile from Calatrava project.
+  # Image built from cd-infra/images/ci-deploy/Dockerfile.
   image: $CNS_IMAGE_CI_DEPLOY_STAGE
   script:
     - ./pipeline/deploy-staging.sh
   dependencies:
     - build-images
   only:
     - master
-  artifacts:
-    reports:
-      dotenv: build.env
 
 e2e-tests-staging:
   stage: tests-staging
-  # Image built from cd-infra//images/ci-e2e/Dockerfile from Calatrava project.
-  image: $CNS_IMAGE_E2E
+  # Image built by docker file images/ci/e2e/Dockerfile.
+  # Command to build new image is
+  # docker build -t <image-name:version> --platform=Linux/x86_64 -f Dockerfile . 
+  # docker tag <image-name:version> <repo>/<image-name:version>
+  # docker push <repo>/<image-name:version>
+  image: $CSI_FVT_GOLANG
   dependencies:
     - deploy-images-staging
   script:
@@ -98,7 +115,7 @@ e2e-tests-staging:
 
 system-tests-staging:
   stage: tests-staging
-  # Image built from cd-infra//images/ci-e2e/Dockerfile from Calatrava project.
+  # Image built from cd-infra//images/ci-e2e/Dockerfile.
   image: $CNS_IMAGE_E2E
   dependencies:
     - deploy-images-staging
@@ -109,11 +126,33 @@ system-tests-staging:
 
 perf-tests-staging:
   stage: tests-staging
-  # Image built from cd-infra//images/ci-e2e/Dockerfile from Calatrava project.
+  # Image built from cd-infra//images/ci-e2e/Dockerfile.
   image: $CNS_IMAGE_E2E
   dependencies:
     - deploy-images-staging
   script:
     - echo "TODO - Add perf tests."
   only:
     - master
+
+patch-prod-images:
+  stage: prod-rollout
+  # Image built from cd-infra/images/ci-deploy/Dockerfile
+  image: $CNS_IMAGE_CI_DEPLOY_STAGE
+  script:
+    - ./pipeline/patch-prod.sh
+  dependencies:
+    - build-images
+  only:
+    - master
+
+cleanup-dev:
+  stage: cleanup-dev
+  image: $CNS_IMAGE_CI_DEPLOY_STAGE
+  when: always
+  artifacts:
+    reports:
+      dotenv: build.env
+  script:
+    - chmod 777 pipeline/release-testbed.sh
+    - ./pipeline/release-testbed.sh

README.md

@@ -5,20 +5,16 @@ The vSphere CSI Driver is a Kubernetes plugin that allows persistent storage for
 
 This driver is in a stable `GA` state and is suitable for production use.  
 
-The vSphere CSI Driver is supported on vSphere 6.7U3 and later versions.
-If you are using an earlier version of vSphere, you may need to upgrade to a supported version to use the vSphere CSI Driver.
-It's also important to note that the vSphere CSI Driver has different versions, and each version may have different requirements or limitations, so it's essential to check the [documentation](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/2.0/vmware-vsphere-csp-getting-started/GUID-D4AAD99E-9128-40CE-B89C-AD451DA8379D.html) for your specific version.
-
 It is recommended to install an out-of-tree Cloud Provider Interface like [vSphere Cloud Provider Interface](https://github.com/kubernetes/cloud-provider-vsphere) in the Kubernetes cluster to keep the Kubernetes cluster fully operational.
 
 ## Documentation
 
 Documentation for vSphere CSI Driver is available here:
 
-* [vSphere CSI Driver Concepts](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/2.0/vmware-vsphere-csp-getting-started/GUID-74AF02D7-1562-48BD-A9FE-C81A53342AC3.html)
-* [vSphere CSI Driver Features](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/2.0/vmware-vsphere-csp-getting-started/GUID-D4AAD99E-9128-40CE-B89C-AD451DA8379D.html#GUID-E59B13F5-6F49-4619-9877-DF710C365A1E)
-* [vSphere CSI Driver Deployment Guide](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/2.0/vmware-vsphere-csp-getting-started/GUID-6DBD2645-FFCF-4076-80BE-AD44D7141521.html)
-* [vSphere CSI Driver User Guide](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/2.0/vmware-vsphere-csp-getting-started/GUID-6DBD2645-FFCF-4076-80BE-AD44D7141521.html)
+* [vSphere CSI Driver Concepts](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-74AF02D7-1562-48BD-A9FE-C81A53342AC3.html)
+* [vSphere CSI Driver Features](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-D4AAD99E-9128-40CE-B89C-AD451DA8379D.html#GUID-E59B13F5-6F49-4619-9877-DF710C365A1E)
+* [vSphere CSI Driver Deployment Guide](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-6DBD2645-FFCF-4076-80BE-AD44D7141521.html)
+* [vSphere CSI Driver User Guide](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/3.0/vmware-vsphere-csp-getting-started/GUID-6DBD2645-FFCF-4076-80BE-AD44D7141521.html)
 
 ## vSphere CSI Driver Releases
 
@@ -28,7 +24,6 @@ Documentation for vSphere CSI Driver is available here:
 * [Release 2.5](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/2.5/rn/vmware-vsphere-container-storage-plugin-25-release-notes/index.html)
 * [Release 2.4](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/2.4/rn/vmware-vsphere-container-storage-plugin-24-release-notes/index.html)
 * [Release 2.3](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/2.3/rn/vmware-vsphere-container-storage-plugin-23-release-notes/index.html)
-* [Release 2.2](https://docs.vmware.com/en/VMware-vSphere-Container-Storage-Plug-in/2.2/rn/vmware-vsphere-container-storage-plugin-22-release-notes/index.html)
 
 ## Contributing