Skip to content

Commit 66b0c1c

Browse files
committed
remove default value
1 parent fde7a8d commit 66b0c1c

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

ocp_resources/datavolume.py

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def __init__(
9090
privileged_client=None,
9191
yaml_file=None,
9292
delete_timeout=TIMEOUT_4MINUTES,
93-
use_storage_api=False,
93+
api_name="pvc",
9494
):
9595
super().__init__(
9696
name=name,
@@ -107,47 +107,41 @@ def __init__(
107107
self.secret = secret
108108
self.content_type = content_type
109109
self.size = size
110-
self.access_modes = (
111-
access_modes if use_storage_api or access_modes else self.AccessMode.ROX
112-
)
110+
self.access_modes = access_modes
113111
self.storage_class = storage_class
114-
self.volume_mode = (
115-
volume_mode if use_storage_api or volume_mode else self.VolumeMode.FILE
116-
)
112+
self.volume_mode = volume_mode
117113
self.hostpath_node = hostpath_node
118114
self.source_pvc = source_pvc
119115
self.source_namespace = source_namespace
120116
self.multus_annotation = multus_annotation
121117
self.bind_immediate_annotation = bind_immediate_annotation
122118
self.preallocation = preallocation
123-
self.use_storage_api = use_storage_api
119+
self.api_name = api_name
124120

125121
def to_dict(self):
126122
res = super().to_dict()
127-
api_to_use = "storage" if self.use_storage_api else "pvc"
128123
if self.yaml_file:
129124
return res
130-
131125
res.update(
132126
{
133127
"spec": {
134128
"source": {self.source: {"url": self.url}},
135-
api_to_use: {
129+
self.api_name: {
136130
"resources": {"requests": {"storage": self.size}},
137131
},
138132
}
139133
}
140134
)
141135
if self.access_modes:
142-
res["spec"][api_to_use]["accessModes"] = [self.access_modes]
136+
res["spec"][self.api_name]["accessModes"] = [self.access_modes]
143137
if self.content_type:
144138
res["spec"]["contentType"] = self.content_type
145139
if self.storage_class:
146-
res["spec"][api_to_use]["storageClassName"] = self.storage_class
140+
res["spec"][self.api_name]["storageClassName"] = self.storage_class
147141
if self.secret:
148142
res["spec"]["source"][self.source]["secretRef"] = self.secret.name
149143
if self.volume_mode:
150-
res["spec"][api_to_use]["volumeMode"] = self.volume_mode
144+
res["spec"][self.api_name]["volumeMode"] = self.volume_mode
151145
if self.source == "http" or "registry":
152146
res["spec"]["source"][self.source]["url"] = self.url
153147
if self.cert_configmap:

0 commit comments

Comments
 (0)