feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

csi: update csi-operator to v1.0.0

Browse Source 
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>
(cherry picked from commit 06452991bf)
This commit is contained in:
subhamkrai
2026-05-21 15:22:41 -06:00
committed by Travis Nielsen
parent 8abf77d763
commit ec3953ea34
11 changed files with 340 additions and 7663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/Helm-Charts/operator-chart.md
+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"` |
deploy/charts/rook-ceph/Chart.yaml
+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
deploy/charts/rook-ceph/values.yaml
+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
deploy/examples/csi-operator.yaml
+318 -7640
View File
File diff suppressed because it is too large Load Diff
deploy/examples/images.txt
+1 -1
View File
@@ -2,7 +2,7 @@ docker.io/rook/ceph:v1.20-beta.0
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
go.mod
+3 -3
View File
@@ -22,7 +22,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/sns v1.39.15
github.com/aws/smithy-go v1.24.3
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.38.0
github.com/coreos/pkg v0.0.0-20240122114842-bbd7aa9bf6fb
@@ -49,9 +49,9 @@ require (
golang.org/x/sync v0.20.0
gopkg.in/ini.v1 v1.67.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.35.3
k8s.io/api v0.35.4
k8s.io/apiextensions-apiserver v0.35.3
k8s.io/apimachinery v0.35.3
k8s.io/apimachinery v0.35.4
k8s.io/cli-runtime v0.35.3
k8s.io/client-go v0.35.3
k8s.io/cloud-provider v0.35.3
go.sum
+6 -6
View File
@@ -551,8 +551,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.38.0 h1:Ux0sIpl6VJNgY21hxuBZI9Z2Z8tQsBMJhjLjYBoa7s0=
@@ -2141,8 +2141,8 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ=
k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8=
k8s.io/api v0.26.0/go.mod h1:k6HDTaIFC8yn1i6pSClSqIwLABIcLV9l5Q4EcngKnQg=
k8s.io/api v0.35.3 h1:pA2fiBc6+N9PDf7SAiluKGEBuScsTzd2uYBkA5RzNWQ=
k8s.io/api v0.35.3/go.mod h1:9Y9tkBcFwKNq2sxwZTQh1Njh9qHl81D0As56tu42GA4=
k8s.io/api v0.35.4 h1:P7nFYKl5vo9AGUp1Z+Pmd3p2tA7bX2wbFWCvDeRv988=
k8s.io/api v0.35.4/go.mod h1:yl4lqySWOgYJJf9RERXKUwE9g2y+CkuwG+xmcOK8wXU=
k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
k8s.io/apiextensions-apiserver v0.18.3/go.mod h1:TMsNGs7DYpMXd+8MOCX8KzPOCx8fnZMoIGB24m03+JE=
k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk=
@@ -2157,8 +2157,8 @@ k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRp
k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
k8s.io/apimachinery v0.26.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
k8s.io/apimachinery v0.35.3 h1:MeaUwQCV3tjKP4bcwWGgZ/cp/vpsRnQzqO6J6tJyoF8=
k8s.io/apimachinery v0.35.3/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
k8s.io/apimachinery v0.35.4 h1:xtdom9RG7e+yDp71uoXoJDWEE2eOiHgeO4GdBzwWpds=
k8s.io/apimachinery v0.35.4/go.mod h1:NNi1taPOpep0jOj+oRha3mBJPqvi0hGdaV8TCqGQ+cc=
k8s.io/apiserver v0.18.3/go.mod h1:tHQRmthRPLUtwqsOnJJMoI8SW3lnoReZeE861lH8vUw=
k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
k8s.io/cli-runtime v0.35.3 h1:UZq4ipNimtzBmhN7PPKbfAdqo8quK0H0UdGl6qAQnqI=
pkg/apis/go.mod
+2 -2
View File
@@ -20,8 +20,8 @@ require (
github.com/openshift/api v0.0.0-20241216151652-de9de05a8e43
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.11.1
k8s.io/api v0.35.3
k8s.io/apimachinery v0.35.3
k8s.io/api v0.35.4
k8s.io/apimachinery v0.35.4
)
require (
pkg/apis/go.sum
+4 -4
View File
@@ -1437,8 +1437,8 @@ k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ=
k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8=
k8s.io/api v0.26.0/go.mod h1:k6HDTaIFC8yn1i6pSClSqIwLABIcLV9l5Q4EcngKnQg=
k8s.io/api v0.35.3 h1:pA2fiBc6+N9PDf7SAiluKGEBuScsTzd2uYBkA5RzNWQ=
k8s.io/api v0.35.3/go.mod h1:9Y9tkBcFwKNq2sxwZTQh1Njh9qHl81D0As56tu42GA4=
k8s.io/api v0.35.4 h1:P7nFYKl5vo9AGUp1Z+Pmd3p2tA7bX2wbFWCvDeRv988=
k8s.io/api v0.35.4/go.mod h1:yl4lqySWOgYJJf9RERXKUwE9g2y+CkuwG+xmcOK8wXU=
k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
k8s.io/apiextensions-apiserver v0.18.3/go.mod h1:TMsNGs7DYpMXd+8MOCX8KzPOCx8fnZMoIGB24m03+JE=
k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk=
@@ -1451,8 +1451,8 @@ k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRp
k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
k8s.io/apimachinery v0.26.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
k8s.io/apimachinery v0.35.3 h1:MeaUwQCV3tjKP4bcwWGgZ/cp/vpsRnQzqO6J6tJyoF8=
k8s.io/apimachinery v0.35.3/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
k8s.io/apimachinery v0.35.4 h1:xtdom9RG7e+yDp71uoXoJDWEE2eOiHgeO4GdBzwWpds=
k8s.io/apimachinery v0.35.4/go.mod h1:NNi1taPOpep0jOj+oRha3mBJPqvi0hGdaV8TCqGQ+cc=
k8s.io/apiserver v0.18.3/go.mod h1:tHQRmthRPLUtwqsOnJJMoI8SW3lnoReZeE861lH8vUw=
k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
k8s.io/client-go v0.18.3/go.mod h1:4a/dpQEvzAhT1BbuWW09qvIaGw6Gbu1gZYiQZIi1DMw=
tests/framework/installer/ceph_helm_installer.go
+2 -2
View File
@@ -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
tests/framework/utils/helm_helper.go
+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,