csi: update csi-operator to v1.0.0

this commit update the csi-operator to latest v1.0.0.
we need to manually patch the csi drivers with the new serviceAccount
name that are being creating based on the latest ceph-csi-operator
release v1.0.0 where serviceAccount are being separate from csi-operator
chart.

co-authored-by: Travis Nielsen <tnielsen@redhat.com>
Signed-off-by: subhamkrai <srai@redhat.com>
This commit is contained in:
subhamkraiandTravis Nielsen committed 2026-05-21 21:52:32 +05:30
1 parent b0066cecdd
commit 06452991bf
9 files changed
+328 -7651

No files matched your search

+1 -1
View File
@@ -47,7 +47,7 @@ The following table lists the configurable parameters of the rook-operator chart
|-----------|-------------|---------|
| `allowLoopDevices` | If true, loop devices are allowed to be used for osds in test clusters | `false` |
| `annotations` | Pod annotations | `{}` |
| `ceph-csi-operator.controllerManager.manager.env.csiServiceAccountPrefix` | | `"ceph-csi-"` |
| `ceph-csi-operator.controllerManager.manager.env.csiServiceAccountPrefix` | | `""` |
| `ceph-csi-operator.fullnameOverride` | | `"ceph-csi"` |
| `ceph-csi-operator.nameOverride` | | `"ceph-csi"` |
| `cephCommandsTimeoutSeconds` | The timeout for ceph commands in seconds | `"15"` |
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies:
version: "0.0.1"
repository: "file://../library"
- name: ceph-csi-operator
version: 0.6.0
version: 1.0.0
repository: https://ceph.github.io/ceph-csi-operator
alias: ceph-csi-operator
condition: csi.installCsiOperator
+1 -2
View File
@@ -89,8 +89,7 @@ ceph-csi-operator:
controllerManager:
manager:
env:
csiServiceAccountPrefix: "ceph-csi-"
csiServiceAccountPrefix: ""
csi:
# -- When true, install the ceph-csi-operator subchart (see Chart.yaml `condition`).
installCsiOperator: true
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -2,7 +2,7 @@ docker.io/rook/ceph:master
gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v0.2.2
quay.io/ceph/ceph:v20.2.1
quay.io/ceph/cosi:v0.1.4
quay.io/cephcsi/ceph-csi-operator:v0.6.0
quay.io/cephcsi/ceph-csi-operator:v1.0.0
quay.io/cephcsi/cephcsi:v3.16.2
quay.io/csiaddons/k8s-sidecar:v0.14.0
registry.k8s.io/sig-storage/csi-attacher:v4.11.0
+1 -1
View File
@@ -22,7 +22,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/sns v1.39.17
github.com/aws/smithy-go v1.25.1
github.com/banzaicloud/k8s-objectmatcher v1.8.0
github.com/ceph/ceph-csi-operator/api v0.0.0-20260205113234-c2ca44439222
github.com/ceph/ceph-csi-operator/api v0.0.0-20260518095804-6df1327e1679
github.com/ceph/ceph-csi/api v0.0.0-20241216133622-88b7e0d6684f
github.com/ceph/go-ceph v0.39.0
github.com/coreos/pkg v0.0.0-20240122114842-bbd7aa9bf6fb
+2 -2
View File
@@ -549,8 +549,8 @@ github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
github.com/ceph/ceph-csi-operator/api v0.0.0-20260205113234-c2ca44439222 h1:jo+y+M8KXLU5aMF0HF7bzyMgdYNhgKqbtiJ3Br7C+kA=
github.com/ceph/ceph-csi-operator/api v0.0.0-20260205113234-c2ca44439222/go.mod h1:bg+f729jTaUmqNGa6VF52XWTD0BYYwHMf140tRYzcak=
github.com/ceph/ceph-csi-operator/api v0.0.0-20260518095804-6df1327e1679 h1:3fppcnZ9GDxBfbk2d4x4lYVr9aSd22QRfQ6KUNHlW2c=
github.com/ceph/ceph-csi-operator/api v0.0.0-20260518095804-6df1327e1679/go.mod h1:2ab/S0RLR3tkWnsYHc+LqYHCx4v5n3O48JZ6fj7oVb8=
github.com/ceph/ceph-csi/api v0.0.0-20241216133622-88b7e0d6684f h1:ja5xvJlv3Sq5dlQVQMeM/dlCwcUXgZXg/kTPmMMQhJ8=
github.com/ceph/ceph-csi/api v0.0.0-20241216133622-88b7e0d6684f/go.mod h1:NfzKbdhaXhWh1PJCExML9dAXHCqEDppf26ueLWYdxlk=
github.com/ceph/go-ceph v0.39.0 h1:fzINuBItJqhmTtnC4/iiTY+ONtsOqV7W+B/3xTS/DsY=
@@ -35,7 +35,7 @@ const (
cephCsiOperatorHelmRepoURL = "https://ceph.github.io/ceph-csi-operator"
cephCsiOperatorHelmRepoName = "ceph-csi-operator"
cephCsiDriversChartName = "ceph-csi-drivers"
cephCsiDriversChartVersion = "0.6.0"
cephCsiDriversChartVersion = "1.0.0"
cephCsiDriversReleaseName = "ceph-csi-drivers"
)
@@ -199,7 +199,7 @@ func (h *CephInstaller) InstallCephCsiDriversViaHelm() error {
if err := h.k8shelper.CreateSnapshotController("create"); err != nil {
return errors.Wrap(err, "failed to install snapshot controller")
}
if err := h.k8shelper.WaitForSnapshotController(15); err != nil {
if err := h.k8shelper.WaitForSnapshotController(30); err != nil {
return errors.Wrap(err, "snapshot controller is not ready")
}
op := h.settings.OperatorNamespace
+1 -1
View File
@@ -146,7 +146,7 @@ func (h *HelmHelper) InstallOrUpgradeHelmRepoChart(namespace, release, repoURL,
logger.Warningf("helm repo update failed: %v", err)
}
cmdArgs := []string{
"upgrade", "--install", "--create-namespace",
"upgrade", "--install", "--force", "--create-namespace",
release, repoName + "/" + chartName,
"--version", version,
"--namespace", namespace,