Skip to content

Commit

Permalink
Merge pull request #220 from red-hat-storage/sync_us--devel
Browse files Browse the repository at this point in the history 
Syncing latest changes from upstream devel for ceph-csi
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Nov 21, 2023
2 parents 904d1c2 + afe3873 commit 93beaf4
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 36 deletions.
10 changes: 5 additions & 5 deletions build.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ ROOK_VERSION=v1.12.1
ROOK_CEPH_CLUSTER_IMAGE=quay.io/ceph/ceph:v18

# CSI sidecar version
CSI_ATTACHER_VERSION=v4.4.0
CSI_SNAPSHOTTER_VERSION=v6.3.0
CSI_RESIZER_VERSION=v1.9.0
CSI_PROVISIONER_VERSION=v3.6.0
CSI_NODE_DRIVER_REGISTRAR_VERSION=v2.9.0
CSI_ATTACHER_VERSION=v4.4.2
CSI_SNAPSHOTTER_VERSION=v6.3.2
CSI_RESIZER_VERSION=v1.9.2
CSI_PROVISIONER_VERSION=v3.6.2
CSI_NODE_DRIVER_REGISTRAR_VERSION=v2.9.1

# e2e settings
# - enable CEPH_CSI_RUN_ALL_TESTS when running tests with if it has root
Expand Down
8 changes: 4 additions & 4 deletions charts/ceph-csi-cephfs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ charts and their default values.
| `nodeplugin.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` |
| `nodeplugin.profiling.enabled` | Specifies whether profiling should be enabled | `false` |
| `nodeplugin.registrar.image.repository` | Node-Registrar image repository URL | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
| `nodeplugin.registrar.image.tag` | Image tag | `v2.9.0` |
| `nodeplugin.registrar.image.tag` | Image tag | `v2.9.1` |
| `nodeplugin.registrar.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `nodeplugin.plugin.image.repository` | Nodeplugin image repository URL | `quay.io/cephcsi/cephcsi` |
| `nodeplugin.plugin.image.tag` | Image tag | `canary` |
Expand All @@ -145,17 +145,17 @@ charts and their default values.
| `provisioner.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` |
| `provisioner.profiling.enabled` | Specifies whether profiling should be enabled | `false` |
| `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `registry.k8s.io/sig-storage/csi-provisioner` |
| `provisioner.provisioner.image.tag` | Specifies image tag | `v3.6.0` |
| `provisioner.provisioner.image.tag` | Specifies image tag | `v3.6.2` |
| `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
| `provisioner.provisioner.image.extraArgs` | Specifies extra arguments for the provisioner sidecar | `[]` |
| `provisioner.resizer.image.repository` | Specifies the csi-resizer image repository URL | `registry.k8s.io/sig-storage/csi-resizer` |
| `provisioner.resizer.image.tag` | Specifies image tag | `v1.9.0` |
| `provisioner.resizer.image.tag` | Specifies image tag | `v1.9.2` |
| `provisioner.resizer.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
| `provisioner.resizer.image.extraArgs` | Specifies extra arguments for the resizer sidecar | `[]` |
| `provisioner.resizer.name` | Specifies the name of csi-resizer sidecar | `resizer` |
| `provisioner.resizer.enabled` | Specifies whether resizer sidecar is enabled | `true` |
| `provisioner.snapshotter.image.repository` | Specifies the csi-snapshotter image repository URL | `registry.k8s.io/sig-storage/csi-snapshotter` |
| `provisioner.snapshotter.image.tag` | Specifies image tag | `v6.3.0` |
| `provisioner.snapshotter.image.tag` | Specifies image tag | `v6.3.2` |
| `provisioner.snapshotter.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
| `provisioner.snapshotter.image.extraArgs` | Specifies extra arguments for the snapshotter sidecar | `[]` |
| `provisioner.nodeSelector` | Specifies the node selector for provisioner deployment | `{}` |
Expand Down
8 changes: 4 additions & 4 deletions charts/ceph-csi-cephfs/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ nodeplugin:
registrar:
image:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.9.0
tag: v2.9.1
pullPolicy: IfNotPresent
resources: {}

Expand Down Expand Up @@ -184,7 +184,7 @@ provisioner:
provisioner:
image:
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v3.6.0
tag: v3.6.2
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -199,7 +199,7 @@ provisioner:
enabled: true
image:
repository: gcr.io/k8s-staging-sig-storage/csi-resizer
tag: v1.9.0
tag: v1.9.2
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -209,7 +209,7 @@ provisioner:
snapshotter:
image:
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v6.3.0
tag: v6.3.2
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand Down
10 changes: 5 additions & 5 deletions charts/ceph-csi-rbd/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ charts and their default values.
| `nodeplugin.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` |
| `nodeplugin.profiling.enabled` | Specifies whether profiling should be enabled | `false` |
| `nodeplugin.registrar.image.repository` | Node Registrar image repository URL | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
| `nodeplugin.registrar.image.tag` | Image tag | `v2.9.0` |
| `nodeplugin.registrar.image.tag` | Image tag | `v2.9.1` |
| `nodeplugin.registrar.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `nodeplugin.plugin.image.repository` | Nodeplugin image repository URL | `quay.io/cephcsi/cephcsi` |
| `nodeplugin.plugin.image.tag` | Image tag | `canary` |
Expand All @@ -151,23 +151,23 @@ charts and their default values.
| `provisioner.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` |
| `provisioner.profiling.enabled` | Specifies whether profiling should be enabled | `false` |
| `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `registry.k8s.io/sig-storage/csi-provisioner` |
| `provisioner.provisioner.image.tag` | Specifies image tag | `v3.6.0` |
| `provisioner.provisioner.image.tag` | Specifies image tag | `v3.6.2` |
| `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
| `provisioner.provisioner.image.extraArgs` | Specifies extra arguments for the provisioner sidecar | `[]` |
| `provisioner.attacher.image.repository` | Specifies the csi-attacher image repository URL | `registry.k8s.io/sig-storage/csi-attacher` |
| `provisioner.attacher.image.tag` | Specifies image tag | `v4.4.0` |
| `provisioner.attacher.image.tag` | Specifies image tag | `v4.4.2` |
| `provisioner.attacher.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
| `provisioner.attacher.image.extraArgs` | Specifies extra arguments for the attacher sidecar | `[]` |
| `provisioner.attacher.name` | Specifies the name of csi-attacher sidecar | `attacher` |
| `provisioner.attacher.enabled` | Specifies whether attacher sidecar is enabled | `true` |
| `provisioner.resizer.image.repository` | Specifies the csi-resizer image repository URL | `registry.k8s.io/sig-storage/csi-resizer` |
| `provisioner.resizer.image.tag` | Specifies image tag | `v1.9.0` |
| `provisioner.resizer.image.tag` | Specifies image tag | `v1.9.2` |
| `provisioner.resizer.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
| `provisioner.resizer.image.extraArgs` | Specifies extra arguments for the resizer sidecar | `[]` |
| `provisioner.resizer.name` | Specifies the name of csi-resizer sidecar | `resizer` |
| `provisioner.resizer.enabled` | Specifies whether resizer sidecar is enabled | `true` |
| `provisioner.snapshotter.image.repository` | Specifies the csi-snapshotter image repository URL | `registry.k8s.io/sig-storage/csi-snapshotter` |
| `provisioner.snapshotter.image.tag` | Specifies image tag | `v6.3.0` |
| `provisioner.snapshotter.image.tag` | Specifies image tag | `v6.3.2` |
| `provisioner.snapshotter.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
| `provisioner.snapshotter.image.extraArgs` | Specifies extra arguments for the snapshotter sidecar | `[]` |
| `provisioner.nodeSelector` | Specifies the node selector for provisioner deployment | `{}` |
Expand Down
10 changes: 5 additions & 5 deletions charts/ceph-csi-rbd/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ nodeplugin:
registrar:
image:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.9.0
tag: v2.9.1
pullPolicy: IfNotPresent
resources: {}

Expand Down Expand Up @@ -222,7 +222,7 @@ provisioner:
provisioner:
image:
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v3.6.0
tag: v3.6.2
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -237,7 +237,7 @@ provisioner:
enabled: true
image:
repository: registry.k8s.io/sig-storage/csi-attacher
tag: v4.4.0
tag: v4.4.2
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -249,7 +249,7 @@ provisioner:
enabled: true
image:
repository: gcr.io/k8s-staging-sig-storage/csi-resizer
tag: v1.9.0
tag: v1.9.2
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -259,7 +259,7 @@ provisioner:
snapshotter:
image:
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v6.3.0
tag: v6.3.2
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand Down
6 changes: 3 additions & 3 deletions deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
Expand All @@ -62,7 +62,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-resizer
image: gcr.io/k8s-staging-sig-storage/csi-resizer:v1.9.0
image: gcr.io/k8s-staging-sig-storage/csi-resizer:v1.9.2
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
Expand All @@ -79,7 +79,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-snapshotter
image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.0
image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
Expand Down
Loading

0 comments on commit 93beaf4

Please sign in to comment.