Skip to content

Commit

Permalink
[pre-commit.ci] pre-commit autoupdate (#1519)
Browse files Browse the repository at this point in the history
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 23.10.1 → 23.11.0](psf/black@23.10.1...23.11.0)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
pre-commit-ci[bot] authored Nov 13, 2023
1 parent c74af69 commit b2629e6
Show file tree
Hide file tree
Showing 31 changed files with 230 additions and 294 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repos:
- id: isort

- repo: https://github.com/psf/black
rev: "23.10.1"
rev: "23.11.0"
hooks:
- id: black
args: [--preview]
Expand Down
36 changes: 16 additions & 20 deletions ocp_resources/catalog_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,30 +38,26 @@ def __init__(
def to_dict(self):
super().to_dict()
if not self.yaml_file:
if not all(
[self.source_type, self.image, self.display_name, self.publisher]
):
if not all([
self.source_type, self.image, self.display_name, self.publisher
]):
raise ValueError(
"Passing yaml_file or all parameters 'source_type', 'image',"
" 'display_name' and 'publisher' is required."
)
self.res.update(
{
"spec": {
"sourceType": self.source_type,
"image": self.image,
"displayName": self.display_name,
"publisher": self.publisher,
}
self.res.update({
"spec": {
"sourceType": self.source_type,
"image": self.image,
"displayName": self.display_name,
"publisher": self.publisher,
}
)
})
if self.update_strategy_registry_poll_interval:
self.res["spec"].update(
{
"updateStrategy": {
"registryPoll": {
"interval": self.update_strategy_registry_poll_interval,
},
self.res["spec"].update({
"updateStrategy": {
"registryPoll": {
"interval": self.update_strategy_registry_poll_interval,
},
}
)
},
})
6 changes: 3 additions & 3 deletions ocp_resources/controller_revision.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ def to_dict(self):
super().to_dict()
if not self.yaml_file:
if self.owner_references:
self.res.setdefault("metadata", {}).update(
{"ownerReference": self.owner_references}
)
self.res.setdefault("metadata", {}).update({
"ownerReference": self.owner_references
})
if self.revision_object:
self.res.update({"data": self.revision_object.res})
12 changes: 5 additions & 7 deletions ocp_resources/cron_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,12 @@ def to_dict(self):
"yaml_file or parameters 'job_template' and 'schedule' are"
" required."
)
self.res.update(
{
"spec": {
"jobTemplate": self.job_template,
"schedule": self.schedule,
}
self.res.update({
"spec": {
"jobTemplate": self.job_template,
"schedule": self.schedule,
}
)
})
if self.timezone:
self.res["spec"]["timezone"] = self.timezone
if self.suspend:
Expand Down
8 changes: 3 additions & 5 deletions ocp_resources/csi_storage_capacity.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@ def to_dict(self):
raise ValueError(
"yaml_file or parameter 'storage_class_name' is required."
)
self.res.update(
{
"storageClassName": self.storage_class_name,
}
)
self.res.update({
"storageClassName": self.storage_class_name,
})
if self.maximum_volume_size:
self.res["maximumVolumeSize"] = self.maximum_volume_size
if self.node_topology:
Expand Down
34 changes: 14 additions & 20 deletions ocp_resources/data_import_cron.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,31 +59,25 @@ def to_dict(self):
if self.image_stream and self.url:
raise ValueError("imageStream and url can not coexist")

self.res.update(
{
"spec": {
"template": {
"spec": {
"source": {
"registry": {"pullMethod": self.pull_method}
},
"storage": {
"resources": {"requests": {"storage": self.size}}
},
}
self.res.update({
"spec": {
"template": {
"spec": {
"source": {"registry": {"pullMethod": self.pull_method}},
"storage": {
"resources": {"requests": {"storage": self.size}}
},
}
}
}
)
})
spec = self.res["spec"]["template"]["spec"]
if self.bind_immediate_annotation:
self.res["metadata"].setdefault("annotations", {}).update(
{
f"{NamespacedResource.ApiGroup.CDI_KUBEVIRT_IO}/storage.bind.immediate.requested": (
"true"
)
}
)
self.res["metadata"].setdefault("annotations", {}).update({
f"{NamespacedResource.ApiGroup.CDI_KUBEVIRT_IO}/storage.bind.immediate.requested": (
"true"
)
})
if self.image_stream:
spec["source"]["registry"]["imageStream"] = self.image_stream
if self.url:
Expand Down
12 changes: 5 additions & 7 deletions ocp_resources/data_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,11 @@ def __init__(
def to_dict(self):
super().to_dict()
if not self.yaml_file:
self.res.update(
{
"spec": {
"source": self.source,
},
}
)
self.res.update({
"spec": {
"source": self.source,
},
})

@property
def pvc(self):
Expand Down
58 changes: 25 additions & 33 deletions ocp_resources/datavolume.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,14 @@ def __init__(
def to_dict(self):
super().to_dict()
if not self.yaml_file:
self.res.update(
{
"spec": {
"source": {self.source: {"url": self.url}},
self.api_name: {
"resources": {"requests": {"storage": self.size}},
},
}
self.res.update({
"spec": {
"source": {self.source: {"url": self.url}},
self.api_name: {
"resources": {"requests": {"storage": self.size}},
},
}
)
})
if self.access_modes:
self.res["spec"][self.api_name]["accessModes"] = [self.access_modes]
if self.content_type:
Expand All @@ -185,25 +183,21 @@ def to_dict(self):
if self.source == "upload" or self.source == "blank":
self.res["spec"]["source"][self.source] = {}
if self.hostpath_node:
self.res["metadata"].setdefault("annotations", {}).update(
{
f"{NamespacedResource.ApiGroup.KUBEVIRT_IO}/provisionOnNode": (
self.hostpath_node
)
}
)
self.res["metadata"].setdefault("annotations", {}).update({
f"{NamespacedResource.ApiGroup.KUBEVIRT_IO}/provisionOnNode": (
self.hostpath_node
)
})
if self.multus_annotation:
self.res["metadata"].setdefault("annotations", {}).update(
{
f"{NamespacedResource.ApiGroup.K8S_V1_CNI_CNCF_IO}/networks": (
self.multus_annotation
)
}
)
self.res["metadata"].setdefault("annotations", {}).update({
f"{NamespacedResource.ApiGroup.K8S_V1_CNI_CNCF_IO}/networks": (
self.multus_annotation
)
})
if self.bind_immediate_annotation:
self.res["metadata"].setdefault("annotations", {}).update(
{f"{self.api_group}/storage.bind.immediate.requested": "true"}
)
self.res["metadata"].setdefault("annotations", {}).update({
f"{self.api_group}/storage.bind.immediate.requested": "true"
})
if self.source == "pvc":
self.res["spec"]["source"]["pvc"] = {
"name": self.source_pvc or "dv-source",
Expand All @@ -212,13 +206,11 @@ def to_dict(self):
if self.preallocation is not None:
self.res["spec"]["preallocation"] = self.preallocation
if self.delete_after_completion:
self.res["metadata"].setdefault("annotations", {}).update(
{
f"{self.api_group}/storage.deleteAfterCompletion": (
self.delete_after_completion
)
}
)
self.res["metadata"].setdefault("annotations", {}).update({
f"{self.api_group}/storage.deleteAfterCompletion": (
self.delete_after_completion
)
})

def wait_deleted(self, timeout=TIMEOUT_4MINUTES):
"""
Expand Down
10 changes: 4 additions & 6 deletions ocp_resources/endpoint_slice.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,9 @@ def to_dict(self):
"yaml_file or parameters 'address_type' and 'endpoints' are"
" required."
)
self.res.update(
{
"addressTypes": self.address_type,
"endpoints": self.endpoints,
}
)
self.res.update({
"addressTypes": self.address_type,
"endpoints": self.endpoints,
})
if self.ports:
self.res["ports"] = self.ports
12 changes: 5 additions & 7 deletions ocp_resources/endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,9 @@ def to_dict(self):
raise ValueError(
"yaml_file or parameters 'addresses' and 'ports' are required."
)
self.res.update(
{
"subsets": {
"addresses": self.addresses,
"ports": self.ports,
}
self.res.update({
"subsets": {
"addresses": self.addresses,
"ports": self.ports,
}
)
})
14 changes: 6 additions & 8 deletions ocp_resources/hook.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,9 @@ def __init__(
def to_dict(self):
super().to_dict()
if not self.yaml_file:
self.res.update(
{
"spec": {
"image": self.image,
"playbook": self.playbook,
},
}
)
self.res.update({
"spec": {
"image": self.image,
"playbook": self.playbook,
},
})
28 changes: 13 additions & 15 deletions ocp_resources/host.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,17 @@ def __init__(
def to_dict(self):
super().to_dict()
if not self.yaml_file:
self.res.update(
{
"spec": {
"id": self.host_id,
"ipAddress": self.ip_address,
"secret": {
"name": self.secret_name,
"namespace": self.secret_namespace,
},
"provider": {
"name": self.provider_name,
"namespace": self.provider_namespace,
},
}
self.res.update({
"spec": {
"id": self.host_id,
"ipAddress": self.ip_address,
"secret": {
"name": self.secret_name,
"namespace": self.secret_namespace,
},
"provider": {
"name": self.provider_name,
"namespace": self.provider_namespace,
},
}
)
})
12 changes: 5 additions & 7 deletions ocp_resources/image_stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@ def __init__(
def to_dict(self):
super().to_dict()
if not self.yaml_file:
self.res.update(
{
"spec": {
"lookupPolicy": {"local": self.lookup_policy},
"tags": self.tags,
}
self.res.update({
"spec": {
"lookupPolicy": {"local": self.lookup_policy},
"tags": self.tags,
}
)
})
20 changes: 9 additions & 11 deletions ocp_resources/kube_descheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,13 @@ def __init__(
def to_dict(self):
super().to_dict()
if not self.yaml_file:
self.res.update(
{
"spec": {
"deschedulingIntervalSeconds": self.descheduling_interval,
"logLevel": self.log_level,
"managementState": self.management_state,
"mode": self.mode,
"operatorLogLevel": self.operator_log_level,
"profiles": self.profiles,
}
self.res.update({
"spec": {
"deschedulingIntervalSeconds": self.descheduling_interval,
"logLevel": self.log_level,
"managementState": self.management_state,
"mode": self.mode,
"operatorLogLevel": self.operator_log_level,
"profiles": self.profiles,
}
)
})
14 changes: 6 additions & 8 deletions ocp_resources/migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,14 @@ def __init__(
def to_dict(self):
super().to_dict()
if not self.yaml_file:
self.res.update(
{
"spec": {
"plan": {
"name": self.plan_name,
"namespace": self.plan_namespace,
}
self.res.update({
"spec": {
"plan": {
"name": self.plan_name,
"namespace": self.plan_namespace,
}
}
)
})

if self.cut_over:
self.res["spec"]["cutover"] = self.cut_over.strftime(
Expand Down
Loading

0 comments on commit b2629e6

Please sign in to comment.