Merge pull request ceph#162 from red-hat-storage/sync_ds--main

Syncing latest changes from main for ceph-csi-operator

Author: openshift-merge-bot[bot]

deploy/charts/ceph-csi-drivers/templates/operatorConfig.yaml

@@ -35,7 +35,7 @@ spec:
     grpcTimeout: {{ $config.driverSpecDefaults.grpcTimeout }}
     snapshotPolicy: {{ $config.driverSpecDefaults.snapshotPolicy }}
     generateOMapInfo: {{ $config.driverSpecDefaults.generateOMapInfo }}
-    fsGroupPolicy: {{ $config.driverSpecDefaultsfsGroupPolicy }}
+    fsGroupPolicy: {{ $config.driverSpecDefaults.fsGroupPolicy }}
     {{- if $config.driverSpecDefaults.encryption }}
       {{- if $config.driverSpecDefaults.encryption.configMapRef.name }}
     encryption:
@@ -48,20 +48,22 @@ spec:
     cephFsClientType: {{ $config.driverSpecDefaults.cephFsClientType  }}
     kernelMountOptions:
       {{- if $config.driverSpecDefaults.kernelMountOptions }}
-      {{- toYaml $config.driverSpecDefaults.kernelMountOptions | nindent 4 }}
+      {{- toYaml $config.driverSpecDefaults.kernelMountOptions | nindent 6 }}
       {{- else }}
       {}  # Empty map if not defined
       {{- end }}
     fuseMountOptions:
       {{- if $config.driverSpecDefaults.fuseMountOptions }}
-      {{- toYaml $config.driverSpecDefaults.fuseMountOptions | nindent 4 }}
+      {{- toYaml $config.driverSpecDefaults.fuseMountOptions | nindent 6 }}
       {{- else }}
       {}  # Empty map if not defined
       {{- end }}
     # Node Plugin Configuration
     nodePlugin:
       {{- if $config.driverSpecDefaults.nodePlugin }}
+      {{- if $config.driverSpecDefaults.nodePlugin.updateStrategy }}
       updateStrategy: {{ $config.driverSpecDefaults.nodePlugin.updateStrategy | toYaml | nindent 8 }}
+      {{- end }}
       {{- if $config.driverSpecDefaults.nodePlugin.resources }}
       resources:
         registrar: {{ $config.driverSpecDefaults.nodePlugin.resources.registrar | toYaml | nindent 4 }}

deploy/charts/ceph-csi-drivers/values.yaml

@@ -111,6 +111,9 @@ operatorConfig:
       # Pod's priority class name
       priorityClassName: ""
 
+      # kubelet directory path (default is "/var/lib/kubelet")
+      kubeletDirPath: "/var/lib/kubelet"
+
       # Custom labels for the pod
       labels: {}
 
@@ -120,6 +123,9 @@ operatorConfig:
       # Affinity settings for the pod
       affinity: {}
 
+      # Daemonset update strategy.
+      updateStrategy: {}
+
       # List of tolerations for the pod
       tolerations: []
 
@@ -149,6 +155,12 @@ operatorConfig:
       # List of tolerations for the controller plugin
       tolerations: []
 
+      # Affinity settings for the pod
+      affinity: {}
+
+      # Image pull policy
+      imagePullPolicy: "IfNotPresent"
+
 # Drivers configuration
 drivers:
   rbd: # Driver name for RBD

docs/helm-charts/drivers-chart.md

@@ -161,8 +161,10 @@ The following table lists the configurable parameters of the ceph-csi-drivers ch
 | `operatorConfig.driverSpecDefaults.attachRequired` |  | `true` |
 | `operatorConfig.driverSpecDefaults.cephFsClientType` |  | `"kernel"` |
 | `operatorConfig.driverSpecDefaults.clusterName` |  | `""` |
+| `operatorConfig.driverSpecDefaults.controllerPlugin.affinity` |  | `{}` |
 | `operatorConfig.driverSpecDefaults.controllerPlugin.deploymentStrategy` |  | `{}` |
 | `operatorConfig.driverSpecDefaults.controllerPlugin.hostNetwork` |  | `false` |
+| `operatorConfig.driverSpecDefaults.controllerPlugin.imagePullPolicy` |  | `"IfNotPresent"` |
 | `operatorConfig.driverSpecDefaults.controllerPlugin.privileged` |  | `false` |
 | `operatorConfig.driverSpecDefaults.controllerPlugin.replicas` |  | `1` |
 | `operatorConfig.driverSpecDefaults.controllerPlugin.resources` |  | `{}` |
@@ -184,9 +186,11 @@ The following table lists the configurable parameters of the ceph-csi-drivers ch
 | `operatorConfig.driverSpecDefaults.nodePlugin.affinity` |  | `{}` |
 | `operatorConfig.driverSpecDefaults.nodePlugin.annotations` |  | `{}` |
 | `operatorConfig.driverSpecDefaults.nodePlugin.imagePullPolicy` |  | `"IfNotPresent"` |
+| `operatorConfig.driverSpecDefaults.nodePlugin.kubeletDirPath` |  | `"/var/lib/kubelet"` |
 | `operatorConfig.driverSpecDefaults.nodePlugin.labels` |  | `{}` |
 | `operatorConfig.driverSpecDefaults.nodePlugin.priorityClassName` |  | `""` |
 | `operatorConfig.driverSpecDefaults.nodePlugin.tolerations` |  | `[]` |
+| `operatorConfig.driverSpecDefaults.nodePlugin.updateStrategy` |  | `{}` |
 | `operatorConfig.driverSpecDefaults.nodePlugin.volumes` |  | `[]` |
 | `operatorConfig.driverSpecDefaults.snapshotPolicy` |  | `"none"` |
 | `operatorConfig.name` |  | `"ceph-csi-operator-config"` |

docs/kubernetes-installation.md

@@ -15,7 +15,7 @@
     - [3. Deploy Ceph-CSI Drivers](#3-deploy-ceph-csi-drivers)
       - [3.1 Deploy the RBD Driver](#31-deploy-the-rbd-driver)
       - [3.2 Deploy the CephFS Driver](#32-deploy-the-cephfs-driver)
-    - [3.3 Deploy the Ceph-NFS Driver](#33-deploy-the-ceph-nfs-driver)
+      - [3.3 Deploy the Ceph-NFS Driver](#33-deploy-the-ceph-nfs-driver)
   - [4. Verify Installation](#4-verify-installation)
   - [5. Create CephConnection](#5-create-cephconnection)
   - [6. Create ClientProfile](#6-create-clientprofile)
@@ -155,7 +155,7 @@ metadata:
 ' | kubectl create -f -
 ```
 
-### 3.3 Deploy the Ceph-NFS Driver
+#### 3.3 Deploy the Ceph-NFS Driver
 
 ```console
 echo '

go.mod

@@ -5,8 +5,8 @@ go 1.24.0
 require (
 	github.com/ceph/ceph-csi-operator/api v0.0.0-00010101000000-000000000000
 	github.com/go-logr/logr v1.4.3
-	github.com/kubernetes-csi/external-snapshot-metadata/client v0.1.0
-	github.com/onsi/ginkgo/v2 v2.26.0
+	github.com/kubernetes-csi/external-snapshot-metadata/client v0.2.0
+	github.com/onsi/ginkgo/v2 v2.27.2
 	github.com/onsi/gomega v1.38.2
 	github.com/stretchr/testify v1.11.1
 	k8s.io/api v0.34.1
@@ -70,7 +70,6 @@ require (
 	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
 	go.opentelemetry.io/otel/trace v1.35.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
-	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect

go.sum

@@ -34,8 +34,8 @@ github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BN
 github.com/gkampitakis/ciinfo v0.3.2/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo=
 github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZdC4M=
 github.com/gkampitakis/go-diff v1.3.2/go.mod h1:LLgOrpqleQe26cte8s36HTWcTmMEur6OPYerdAAS9tk=
-github.com/gkampitakis/go-snaps v0.5.14 h1:3fAqdB6BCPKHDMHAKRwtPUwYexKtGrNuw8HX/T/4neo=
-github.com/gkampitakis/go-snaps v0.5.14/go.mod h1:HNpx/9GoKisdhw9AFOBT1N7DBs9DiHo/hGheFGBZ+mc=
+github.com/gkampitakis/go-snaps v0.5.15 h1:amyJrvM1D33cPHwVrjo9jQxX8g/7E2wYdZ+01KS3zGE=
+github.com/gkampitakis/go-snaps v0.5.15/go.mod h1:HNpx/9GoKisdhw9AFOBT1N7DBs9DiHo/hGheFGBZ+mc=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -95,8 +95,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubernetes-csi/external-snapshot-metadata/client v0.1.0 h1:tKiB2KIZapKQ3mGBLvzoAaSdip7WBeoEehJlx9DXoxQ=
-github.com/kubernetes-csi/external-snapshot-metadata/client v0.1.0/go.mod h1:u3KUZClAM2oUbRclI0UT15yrrnhFs3lO2a+y/WP1DSE=
+github.com/kubernetes-csi/external-snapshot-metadata/client v0.2.0 h1:5xYdUXsEsT/6iDNxdrNtxsoaFZkbIZ89sJQkqL01y5g=
+github.com/kubernetes-csi/external-snapshot-metadata/client v0.2.0/go.mod h1:kwzkmGSLaSFZpAW67PmrXN7j/B34LIkUvfPZjwQfad8=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -113,16 +113,14 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.26.0 h1:1J4Wut1IlYZNEAWIV3ALrT9NfiaGW2cDCJQSFQMs/gE=
-github.com/onsi/ginkgo/v2 v2.26.0/go.mod h1:qhEywmzWTBUY88kfO0BRvX4py7scov9yR+Az2oavUzw=
+github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns=
+github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
 github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
 github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
 github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
@@ -183,8 +181,6 @@ go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt
 go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
 go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
 go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
-go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
-go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=