Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Unify test namespaces and storage class names #1876

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Unify test namespaces and storage class names #1876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7040a00
Rename rook-cephfs test namesapce
nirs Mar 2, 2025
5c3062b
Unify storage class names
nirs Mar 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/config.yaml.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pvcspecs:
storageclassname: rook-ceph-block
accessmodes: ReadWriteOnce
- name: cephfs
storageclassname: rook-cephfs-test-fs1
storageclassname: rook-cephfs-fs1
accessmodes: ReadWriteMany

# Sample cluster configurations:
Expand Down
2 changes: 1 addition & 1 deletion test/addons/rook-cephfs/provision-test/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

---
namespace: drenv-addon-test
namespace: rook-cephfs-test

resources:
- namespace.yaml
Expand Down
2 changes: 1 addition & 1 deletion test/addons/rook-cephfs/provision-test/namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: drenv-addon-test
name: rook-cephfs-test
4 changes: 2 additions & 2 deletions test/addons/rook-cephfs/provision-test/pvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ metadata:
name: cephfs-pvc
spec:
accessModes:
- ReadWriteMany
- ReadWriteMany
resources:
requests:
storage: 1Gi
storageClassName: rook-cephfs-test-fs1
storageClassName: rook-cephfs-fs1
2 changes: 1 addition & 1 deletion test/addons/rook-cephfs/start
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import drenv
from drenv import kubectl

STORAGE_CLASS_NAME_PREFIX = "rook-cephfs-"
FILE_SYSTEMS = ["test-fs1", "test-fs2"]
FILE_SYSTEMS = ["fs1", "fs2"]


def deploy(cluster):
Expand Down
2 changes: 1 addition & 1 deletion test/addons/rook-cephfs/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ from drenv import kubectl

PVC_NAME = "cephfs-pvc"
SNAP_NAME = "cephfs-snap"
NAMESPACE = "drenv-addon-test"
NAMESPACE = "rook-cephfs-test"


def test_provisioning(cluster):
Expand Down
2 changes: 1 addition & 1 deletion test/addons/volsync/app/file/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ patches:
patch: |-
- op: replace
path: /spec/storageClassName
value: rook-cephfs-test-fs1
value: rook-cephfs-fs1
- op: replace
path: /spec/accessModes
value:
Expand Down
4 changes: 2 additions & 2 deletions test/addons/volsync/rd/file/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ patches:
patch: |-
- op: replace
path: /spec/storageClassName
value: rook-cephfs-test-fs1
value: rook-cephfs-fs1
- op: replace
path: /spec/accessModes
value:
Expand All @@ -27,7 +27,7 @@ patches:
patch: |-
- op: replace
path: /spec/rsyncTLS/storageClassName
value: rook-cephfs-test-fs1
value: rook-cephfs-fs1
- op: replace
path: /spec/rsyncTLS/volumeSnapshotClassName
value: csi-cephfsplugin-snapclass