Merge pull request #110 from gnufied/revert-311-415

[release-4.15] OCPBUGS-26013: Revert "Merge pull request #97 from jsafrane/rebase-v3.1.1"

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+<!-- This form is for bug reports and feature requests! -->
+
+**Is this a BUG REPORT or FEATURE REQUEST?**:
+
+> Uncomment only one, leave it on its own line:
+>
+> /kind bug
+> /kind feature
+
+
+**What happened**:
+
+**What you expected to happen**:
+
+**How to reproduce it (as minimally and precisely as possible)**:
+
+
+**Anything else we need to know?**:
+
+**Environment**:
+- csi-vsphere version:
+- vsphere-cloud-controller-manager version:
+- Kubernetes version:
+- vSphere version:
+- OS (e.g. from /etc/os-release):
+- Kernel (e.g. `uname -a`):
+- Install tools:
+- Others:

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,22 @@
+<!-- Thanks for sending a pull request! -->
+
+**What this PR does / why we need it**:
+
+**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
+
+**Testing done**:
+A PR must be marked "[WIP]", if no test result is provided. A WIP PR won't be reviewed, nor merged.
+The requester can determine a sufficient test, e.g. build for a cosmetic change, E2E test in a predeployed setup, etc.
+For new features, new tests should be done, in addition to regression tests.
+If jtest is used to trigger precheckin tests, paste the result after jtest completes and remove [WIP] in the PR subject.
+The review cycle will start, only after "[WIP]" is removed from the PR subject.
+
+**Special notes for your reviewer**:
+
+**Release note**:
+<!--  Steps to write your release note:
+1. Use the release-note-* labels to set the release note state (if you have access)
+2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`.
+-->
+```release-note
+```

.gitlab-ci.yml

@@ -5,8 +5,6 @@ stages:
   - e2e-tests-dev
   - deploy-staging
   - tests-staging
-  - prod-rollout
-  - cleanup-dev
 
 run-unit-tests:
   stage: unit-test
@@ -53,59 +51,44 @@ 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.
+  # Image built from cd-infra/images/ci-deploy/Dockerfile from Calatrava project.
   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 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
+  image: $CNS_IMAGE_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.
+  # Image built from cd-infra/images/ci-deploy/Dockerfile from Calatrava project.
   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 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
+  # Image built from cd-infra//images/ci-e2e/Dockerfile from Calatrava project.
+  image: $CNS_IMAGE_E2E
   dependencies:
     - deploy-images-staging
   script:
@@ -115,7 +98,7 @@ e2e-tests-staging:
 
 system-tests-staging:
   stage: tests-staging
-  # Image built from cd-infra//images/ci-e2e/Dockerfile.
+  # Image built from cd-infra//images/ci-e2e/Dockerfile from Calatrava project.
   image: $CNS_IMAGE_E2E
   dependencies:
     - deploy-images-staging
@@ -126,33 +109,11 @@ system-tests-staging:
 
 perf-tests-staging:
   stage: tests-staging
-  # Image built from cd-infra//images/ci-e2e/Dockerfile.
+  # Image built from cd-infra//images/ci-e2e/Dockerfile from Calatrava project.
   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,16 +5,20 @@ 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/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 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 Releases
 
@@ -24,6 +28,7 @@ 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