Merge tag 'v1.30.1' into feature/csiTimeout1.30

Author: MichaelEischer

.github/workflows/release-cpo.yaml

@@ -8,7 +8,8 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
-
+    permissions:
+      contents: write
     steps:
     - name: Checkout
       uses: actions/checkout@v3

.github/workflows/release.yaml

@@ -9,6 +9,8 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -21,6 +23,6 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.1.0
+        uses: helm/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.golangci.yaml

@@ -1,7 +1,10 @@
 run:
+  concurrency: 2
   timeout: 10m0s
 linters:
   enable:
     - gofmt
 output:
-  format: line-number
+  formats:
+    - format: line-number
+      path: stdout

Makefile

@@ -81,7 +81,7 @@ $(BUILD_CMDS): $(SOURCES)
 test: unit functional
 
 check: work
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.0 run ./...
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 run ./...
 
 unit: work
 	go test -tags=unit $(shell go list ./... | sed -e '/sanity/ { N; d; }' | sed -e '/tests/ {N; d;}') $(TESTARGS)

charts/cinder-csi-plugin/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: v1.30.0
+appVersion: v1.30.1
 description: Cinder CSI Chart for OpenStack
 name: openstack-cinder-csi
-version: 2.30.0
+version: 2.30.1
 home: https://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers:

charts/manila-csi-plugin/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: v1.30.0
+appVersion: v1.30.1
 description: Manila CSI Chart for OpenStack
 name: openstack-manila-csi
-version: 2.30.0
+version: 2.30.1
 home: http://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers:

charts/openstack-cloud-controller-manager/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: v1.30.0
+appVersion: v1.30.1
 description: Openstack Cloud Controller Manager Helm Chart
 icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png
 home: https://github.com/kubernetes/cloud-provider-openstack
 name: openstack-cloud-controller-manager
-version: 2.30.0
+version: 2.30.1
 maintainers:
   - name: eumel8
     email: [email protected]

cmd/cinder-csi-plugin/main.go

@@ -38,6 +38,7 @@ var (
 	httpEndpoint             string
 	provideControllerService bool
 	provideNodeService       bool
+	noClient                 bool
 )
 
 func main() {
@@ -70,6 +71,7 @@ func main() {
 
 	cmd.PersistentFlags().BoolVar(&provideControllerService, "provide-controller-service", true, "If set to true then the CSI driver does provide the controller service (default: true)")
 	cmd.PersistentFlags().BoolVar(&provideNodeService, "provide-node-service", true, "If set to true then the CSI driver does provide the node service (default: true)")
+	cmd.PersistentFlags().BoolVar(&noClient, "node-service-no-os-client", false, "If set to true then the CSI driver node service will not use the OpenStack client (default: false)")
 
 	openstack.AddExtraFlags(pflag.CommandLine)
 
@@ -82,17 +84,24 @@ func handle() {
 	d := cinder.NewDriver(&cinder.DriverOpts{Endpoint: endpoint, ClusterID: cluster})
 
 	openstack.InitOpenStackProvider(cloudConfig, httpEndpoint)
-	cloud, err := openstack.GetOpenStackProvider()
-	if err != nil {
-		klog.Warningf("Failed to GetOpenStackProvider: %v", err)
-		return
-	}
 
 	if provideControllerService {
+		cloud, err := openstack.GetOpenStackProvider(false)
+		if err != nil {
+			klog.Warningf("Failed to GetOpenStackProvider: %v", err)
+			return
+		}
+
 		d.SetupControllerService(cloud)
 	}
 
 	if provideNodeService {
+		cloud, err := openstack.GetOpenStackProvider(noClient)
+		if err != nil {
+			klog.Warningf("Failed to GetOpenStackProvider: %v", err)
+			return
+		}
+
 		//Initialize mount
 		mount := mount.GetMountProvider()
 

cmd/manila-csi-plugin/main.go

@@ -71,7 +71,7 @@ func main() {
 		Short: "CSI Manila driver",
 		Run: func(cmd *cobra.Command, args []string) {
 			if err := validateShareProtocolSelector(protoSelector); err != nil {
-				klog.Fatalf(err.Error())
+				klog.Fatal(err.Error())
 			}
 
 			manilaClientBuilder := &manilaclient.ClientBuilder{UserAgent: "manila-csi-plugin", ExtraUserAgentData: userAgentData}

docs/cinder-csi-plugin/using-cinder-csi-plugin.md

@@ -111,6 +111,13 @@ In addition to the standard set of klog flags, `cinder-csi-plugin` accepts the f
 
   The default is to provide the node service.
   </dd>
+
+  <dt>--node-service-no-os-client &lt;disabled&gt;</dt>
+  <dd>
+  If set to true then the CSI driver does not provide the OpenStack client in the node service.
+
+  The default is to provide the OpenStack client in the node service.
+  </dd>
 </dl>
 
 ## Driver Config