Skip to content

Commit

Permalink
Merge pull request #318 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 Jun 14, 2024
2 parents bdd763c + 202f43c commit f97553a
Show file tree
Hide file tree
Showing 16 changed files with 34 additions and 62 deletions.
10 changes: 5 additions & 5 deletions build.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ GOLANGCI_VERSION=v1.57.2

# external snapshotter version
# Refer: https://github.com/kubernetes-csi/external-snapshotter/releases
SNAPSHOT_VERSION=v7.0.2
SNAPSHOT_VERSION=v8.0.1

# "go test" configuration
# set to stdout or html to enable coverage reporting, disabled by default
Expand All @@ -54,10 +54,10 @@ ROOK_VERSION=v1.12.1
ROOK_CEPH_CLUSTER_IMAGE=quay.io/ceph/ceph:v18

# CSI sidecar version
CSI_ATTACHER_VERSION=v4.5.1
CSI_SNAPSHOTTER_VERSION=v7.0.2
CSI_RESIZER_VERSION=v1.10.1
CSI_PROVISIONER_VERSION=v4.0.1
CSI_ATTACHER_VERSION=v4.6.1
CSI_SNAPSHOTTER_VERSION=v8.0.1
CSI_RESIZER_VERSION=v1.11.1
CSI_PROVISIONER_VERSION=v5.0.1
CSI_NODE_DRIVER_REGISTRAR_VERSION=v2.10.1

# e2e settings
Expand Down
6 changes: 3 additions & 3 deletions charts/ceph-csi-cephfs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,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 | `v4.0.1` |
| `provisioner.provisioner.image.tag` | Specifies image tag | `v5.0.1` |
| `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.10.1` |
| `provisioner.resizer.image.tag` | Specifies image tag | `v1.11.1` |
| `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 | `v7.0.2` |
| `provisioner.snapshotter.image.tag` | Specifies image tag | `v8.0.1` |
| `provisioner.snapshotter.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
| `provisioner.snapshotter.image.extraArgs` | Specifies extra arguments for the snapshotter sidecar | `[]` |
| `provisioner.snapshotter.args.enableVolumeGroupSnapshots` | enables the creation of volume group snapshots | `false` |
Expand Down
6 changes: 3 additions & 3 deletions charts/ceph-csi-cephfs/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ provisioner:
provisioner:
image:
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v4.0.1
tag: v5.0.1
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -219,7 +219,7 @@ provisioner:
enabled: true
image:
repository: registry.k8s.io/sig-storage/csi-resizer
tag: v1.10.1
tag: v1.11.1
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -229,7 +229,7 @@ provisioner:
snapshotter:
image:
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v7.0.2
tag: v8.0.1
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand Down
6 changes: 3 additions & 3 deletions charts/ceph-csi-rbd/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ 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 | `v4.0.1` |
| `provisioner.provisioner.image.tag` | Specifies image tag | `v5.0.1` |
| `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` |
| `provisioner.provisioner.image.extraArgs` | Specifies extra arguments for the provisioner sidecar | `[]` |
| `provisioner.podSecurityContext` | Specifies pod-level security context. | `{}` |
Expand All @@ -164,13 +164,13 @@ charts and their default values.
| `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.10.1` |
| `provisioner.resizer.image.tag` | Specifies image tag | `v1.11.1` |
| `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 | `v7.0.2` |
| `provisioner.snapshotter.image.tag` | Specifies image tag | `v8.0.1` |
| `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
2 changes: 1 addition & 1 deletion charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
- "--csi-addons-endpoint=$(CSI_ADDONS_ENDPOINT)"
- "--v={{ .Values.logLevel }}"
- "--drivername=$(DRIVER_NAME)"
{{- if .Values.topology.enabled }}
{{- if .Values.topology.domainLabels }}
- "--domainlabels={{ .Values.topology.domainLabels | join "," }}"
{{- end }}
{{- if .Values.nodeplugin.profiling.enabled }}
Expand Down
2 changes: 1 addition & 1 deletion charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ rules:
resources: ["persistentvolumeclaims/status"]
verbs: ["update", "patch"]
{{- end }}
{{- if .Values.topology.enabled }}
{{- if .Values.topology.domainLabels }}
- apiGroups: [""]
resources: ["nodes"]
verbs: ["get", "list","watch"]
Expand Down
3 changes: 0 additions & 3 deletions charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,6 @@ spec:
- "--extra-create-metadata=true"
- "--feature-gates=HonorPVReclaimPolicy=true"
- "--prevent-volume-mode-conversion=true"
{{- if .Values.topology.enabled }}
- "--feature-gates=Topology=true"
{{- end }}
{{- range .Values.provisioner.provisioner.extraArgs }}
- "--{{ . }}"
{{- end }}
Expand Down
11 changes: 4 additions & 7 deletions charts/ceph-csi-rbd/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ provisioner:
provisioner:
image:
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v4.0.1
tag: v5.0.1
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -258,7 +258,7 @@ provisioner:
enabled: true
image:
repository: registry.k8s.io/sig-storage/csi-attacher
tag: v4.5.1
tag: v4.6.1
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -270,7 +270,7 @@ provisioner:
enabled: true
image:
repository: registry.k8s.io/sig-storage/csi-resizer
tag: v1.10.1
tag: v1.11.1
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -280,7 +280,7 @@ provisioner:
snapshotter:
image:
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v7.0.2
tag: v8.0.1
pullPolicy: IfNotPresent
resources: {}
## For further options, check
Expand All @@ -300,9 +300,6 @@ provisioner:
podSecurityContext: {}

topology:
# Specifies whether topology based provisioning support should
# be exposed by CSI
enabled: false
# domainLabels define which node labels to use as domains
# for CSI nodeplugins to advertise their domains
# NOTE: the value here serves as an example and needs to be
Expand Down
7 changes: 3 additions & 4 deletions deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,13 @@ spec:
- name: ceph-csi-encryption-kms-config
mountPath: /etc/ceph-csi-encryption-kms-config/
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.1
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
- "--timeout=150s"
- "--leader-election=true"
- "--retry-interval-start=500ms"
- "--feature-gates=Topology=false"
- "--feature-gates=HonorPVReclaimPolicy=true"
- "--prevent-volume-mode-conversion=true"
- "--extra-create-metadata=true"
Expand All @@ -111,7 +110,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.10.1
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
Expand All @@ -128,7 +127,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-snapshotter
image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.2
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
Expand Down
6 changes: 3 additions & 3 deletions deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
- name: keys-tmp-dir
mountPath: /tmp/csi/keys
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.1
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
Expand All @@ -90,7 +90,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.10.1
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
Expand All @@ -107,7 +107,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-snapshotter
image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.2
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
Expand Down
10 changes: 4 additions & 6 deletions deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,13 @@ spec:
mountPath: /run/secrets/tokens
readOnly: true
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.1
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
- "--timeout=150s"
- "--retry-interval-start=500ms"
- "--leader-election=true"
# set it to true to use topology based provisioning
- "--feature-gates=Topology=false"
- "--feature-gates=HonorPVReclaimPolicy=true"
- "--prevent-volume-mode-conversion=true"
# if fstype is not specified in storageclass, ext4 is default
Expand All @@ -126,7 +124,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-snapshotter
image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.2
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
Expand All @@ -142,7 +140,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-attacher
image: registry.k8s.io/sig-storage/csi-attacher:v4.5.1
image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
args:
- "--v=1"
- "--csi-address=$(ADDRESS)"
Expand All @@ -157,7 +155,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.10.1
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
args:
- "--csi-address=$(ADDRESS)"
- "--v=1"
Expand Down
7 changes: 0 additions & 7 deletions e2e/deployment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,6 @@ type yamlResourceNamespaced struct {
// set the number of replicas in a Deployment to 1.
oneReplica bool

// enable topology support (for RBD)
enableTopology bool

// enable read affinity support (for RBD)
enableReadAffinity bool
}
Expand All @@ -257,10 +254,6 @@ func (yrn *yamlResourceNamespaced) Do(action kubectlAction) error {
data = oneReplicaDeployYaml(data)
}

if yrn.enableTopology {
data = enableTopologyInTemplate(data)
}

if yrn.domainLabel != "" {
data = addTopologyDomainsToDSYaml(data, yrn.domainLabel)
}
Expand Down
7 changes: 3 additions & 4 deletions e2e/rbd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,9 @@ func createORDeleteRbdResources(action kubectlAction) {
},
// the provisioner itself
&yamlResourceNamespaced{
filename: rbdDirPath + rbdProvisioner,
namespace: cephCSINamespace,
oneReplica: true,
enableTopology: true,
filename: rbdDirPath + rbdProvisioner,
namespace: cephCSINamespace,
oneReplica: true,
},
// dependencies for the node-plugin
&yamlResourceNamespaced{
Expand Down
Loading

0 comments on commit f97553a

Please sign in to comment.