Skip to content

Commit b3f0645

Browse files
chore(k8s): handle deprecated_optional fields (#1686)
Co-authored-by: Mia-Cross <lmarabese@scaleway.com>
1 parent 3e9de30 commit b3f0645

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

scaleway-async/scaleway_async/k8s/v1/marshalling.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,12 +470,6 @@ def unmarshal_Cluster(data: Any) -> Cluster:
470470
else:
471471
args["apiserver_cert_sans"] = []
472472

473-
field = data.get("acl_available", None)
474-
if field is not None:
475-
args["acl_available"] = field
476-
else:
477-
args["acl_available"] = False
478-
479473
field = data.get("iam_nodes_group_id", None)
480474
if field is not None:
481475
args["iam_nodes_group_id"] = field
@@ -514,6 +508,12 @@ def unmarshal_Cluster(data: Any) -> Cluster:
514508
else:
515509
args["commitment_ends_at"] = None
516510

511+
field = data.get("acl_available", None)
512+
if field is not None:
513+
args["acl_available"] = field
514+
else:
515+
args["acl_available"] = None
516+
517517
return Cluster(**args)
518518

519519

scaleway-async/scaleway_async/k8s/v1/types.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -814,11 +814,6 @@ class Cluster:
814814
Additional Subject Alternative Names for the Kubernetes API server certificate.
815815
"""
816816

817-
acl_available: bool
818-
"""
819-
Defines whether ACL is available on the cluster.
820-
"""
821-
822817
iam_nodes_group_id: str
823818
"""
824819
IAM group that nodes are members of (this field might be empty during early stage of cluster creation).
@@ -874,6 +869,11 @@ class Cluster:
874869
Date on which it will be possible to switch to a smaller offer.
875870
"""
876871

872+
acl_available: Optional[bool] = None
873+
"""
874+
Defines whether ACL is available on the cluster.
875+
"""
876+
877877

878878
@dataclass
879879
class Node:

scaleway/scaleway/k8s/v1/marshalling.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,12 +470,6 @@ def unmarshal_Cluster(data: Any) -> Cluster:
470470
else:
471471
args["apiserver_cert_sans"] = []
472472

473-
field = data.get("acl_available", None)
474-
if field is not None:
475-
args["acl_available"] = field
476-
else:
477-
args["acl_available"] = False
478-
479473
field = data.get("iam_nodes_group_id", None)
480474
if field is not None:
481475
args["iam_nodes_group_id"] = field
@@ -514,6 +508,12 @@ def unmarshal_Cluster(data: Any) -> Cluster:
514508
else:
515509
args["commitment_ends_at"] = None
516510

511+
field = data.get("acl_available", None)
512+
if field is not None:
513+
args["acl_available"] = field
514+
else:
515+
args["acl_available"] = None
516+
517517
return Cluster(**args)
518518

519519

scaleway/scaleway/k8s/v1/types.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -814,11 +814,6 @@ class Cluster:
814814
Additional Subject Alternative Names for the Kubernetes API server certificate.
815815
"""
816816

817-
acl_available: bool
818-
"""
819-
Defines whether ACL is available on the cluster.
820-
"""
821-
822817
iam_nodes_group_id: str
823818
"""
824819
IAM group that nodes are members of (this field might be empty during early stage of cluster creation).
@@ -874,6 +869,11 @@ class Cluster:
874869
Date on which it will be possible to switch to a smaller offer.
875870
"""
876871

872+
acl_available: Optional[bool] = None
873+
"""
874+
Defines whether ACL is available on the cluster.
875+
"""
876+
877877

878878
@dataclass
879879
class Node:

0 commit comments

Comments
 (0)