Merge branch 'main' of https://github.com/shapeblue/cloudstack-csi-driver into enhancements-csi

Author: Pearl1594

.github/workflows/charts-release.yaml

@@ -3,7 +3,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - 'charts/**' 
 

.github/workflows/release.yaml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - v*
 
@@ -38,12 +38,12 @@ jobs:
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}
 
-      - name: Push master
-        if: github.ref == 'refs/heads/master'
+      - name: Push main
+        if: github.ref == 'refs/heads/main'
         run: |
           for img in $IMAGES; do
-              docker tag ${img} ${REGISTRY_NAME}/${img}:master
-              docker push ${REGISTRY_NAME}/${img}:master
+              docker tag ${img} ${REGISTRY_NAME}/${img}:main
+              docker push ${REGISTRY_NAME}/${img}:main
           done
 
       - name: Push tagged release

README.md

@@ -240,18 +240,22 @@ kubectl logs -f <cloudstack-csi-controller pod_name> -n kube-system -c external-
 - [CloudStack documentation on storage](http://docs.cloudstack.apache.org/en/latest/adminguide/storage.html)
 - [CSI (Container Storage Interface) specification](https://github.com/container-storage-interface/spec)
 
----
+## History
 
-    Copyright 2021 Apalia SAS
+Apalia SAS originally started the [CloudStack CSI Driver](https://github.com/apalia/cloudstack-csi-driver)
+project, which was later [forked and progressed](https://github.com/apalia/cloudstack-csi-driver/forks)
+by several members of the CloudStack community, notably [Leaseweb](https://github.com/leaseweb/cloudstack-csi-driver).
 
-    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
+This repository attempts to widen the scope of the original project to make it work across
+hypervisors (KVM, VMware, XenServer/XCP-ng) and add support for domains, projects, CKS, CAPC, and advanced storage
+operations such as volume snapshots.
 
-            http://www.apache.org/licenses/LICENSE-2.0
+## License
 
-    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.
+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>
+
+## Contributors
+
+[![CloudStack CSI Driver Contributors](https://contrib.rocks/image?repo=shapeblue/cloudstack-csi-driver&anon=0&max=500)](https://github.com/shapeblue/cloudstack-csi-driver/graphs/contributors)

charts/cloudstack-csi/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: cloudstack-csi
 description: A Helm chart for CloudStack CSI driver
 type: application
-version: 2.0.2
+version: 3.0.0
 appVersion: 0.6.1
 sources:
   - https://github.com/shapeblue/cloudstack-csi-driver

deploy/k8s/controller-deployment.yaml

@@ -61,7 +61,7 @@ spec:
 
       containers:
         - name: cloudstack-csi-controller
-          image: ghcr.io/shapeblue/cloudstack-csi-driver:master
+          image: ghcr.io/shapeblue/cloudstack-csi-driver:main
           imagePullPolicy: Always
           args:
             - "controller"

deploy/k8s/node-daemonset.yaml

@@ -36,7 +36,7 @@ spec:
 
       containers:
         - name: cloudstack-csi-node
-          image: ghcr.io/shapeblue/cloudstack-csi-driver:master
+          image: ghcr.io/shapeblue/cloudstack-csi-driver:main
           imagePullPolicy: IfNotPresent
           args:
             - "node"