Skip to content

Commit 2dfdfc5

Browse files
authored
feat(k8s): add migration to SBS CSI (#624)
1 parent c8bd434 commit 2dfdfc5

File tree

4 files changed

+58
-36
lines changed

4 files changed

+58
-36
lines changed

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -429,14 +429,6 @@ def unmarshal_Cluster(data: Any) -> Cluster:
429429
if field is not None:
430430
args["feature_gates"] = field
431431

432-
field = data.get("admission_plugins", None)
433-
if field is not None:
434-
args["admission_plugins"] = field
435-
436-
field = data.get("apiserver_cert_sans", None)
437-
if field is not None:
438-
args["apiserver_cert_sans"] = field
439-
440432
field = data.get("created_at", None)
441433
if field is not None:
442434
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
@@ -461,6 +453,14 @@ def unmarshal_Cluster(data: Any) -> Cluster:
461453
else:
462454
args["auto_upgrade"] = None
463455

456+
field = data.get("admission_plugins", None)
457+
if field is not None:
458+
args["admission_plugins"] = field
459+
460+
field = data.get("apiserver_cert_sans", None)
461+
if field is not None:
462+
args["apiserver_cert_sans"] = field
463+
464464
field = data.get("open_id_connect_config", None)
465465
if field is not None:
466466
args["open_id_connect_config"] = unmarshal_ClusterOpenIDConnectConfig(field)
@@ -487,6 +487,12 @@ def unmarshal_Cluster(data: Any) -> Cluster:
487487
else:
488488
args["routed_ip_enabled"] = None
489489

490+
field = data.get("sbs_csi_enabled", None)
491+
if field is not None:
492+
args["sbs_csi_enabled"] = field
493+
else:
494+
args["sbs_csi_enabled"] = None
495+
490496
return Cluster(**args)
491497

492498

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -817,16 +817,6 @@ class Cluster:
817817
List of enabled feature gates.
818818
"""
819819

820-
admission_plugins: List[str]
821-
"""
822-
List of enabled admission plugins.
823-
"""
824-
825-
apiserver_cert_sans: List[str]
826-
"""
827-
Additional Subject Alternative Names for the Kubernetes API server certificate.
828-
"""
829-
830820
created_at: Optional[datetime]
831821
"""
832822
Date on which the cluster was created.
@@ -847,6 +837,16 @@ class Cluster:
847837
Auto upgrade configuration of the cluster.
848838
"""
849839

840+
admission_plugins: List[str]
841+
"""
842+
List of enabled admission plugins.
843+
"""
844+
845+
apiserver_cert_sans: List[str]
846+
"""
847+
Additional Subject Alternative Names for the Kubernetes API server certificate.
848+
"""
849+
850850
open_id_connect_config: Optional[ClusterOpenIDConnectConfig]
851851
"""
852852
This configuration enables to update the OpenID Connect configuration of the Kubernetes API server.
@@ -867,6 +867,11 @@ class Cluster:
867867
Defines whether routed IPs are enabled for nodes of this cluster.
868868
"""
869869

870+
sbs_csi_enabled: Optional[bool]
871+
"""
872+
Defines whether the SBS-enabled CSI starting from v0.3 is installed on the cluster.
873+
"""
874+
870875

871876
@dataclass
872877
class Node:

scaleway/scaleway/k8s/v1/marshalling.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -429,14 +429,6 @@ def unmarshal_Cluster(data: Any) -> Cluster:
429429
if field is not None:
430430
args["feature_gates"] = field
431431

432-
field = data.get("admission_plugins", None)
433-
if field is not None:
434-
args["admission_plugins"] = field
435-
436-
field = data.get("apiserver_cert_sans", None)
437-
if field is not None:
438-
args["apiserver_cert_sans"] = field
439-
440432
field = data.get("created_at", None)
441433
if field is not None:
442434
args["created_at"] = parser.isoparse(field) if isinstance(field, str) else field
@@ -461,6 +453,14 @@ def unmarshal_Cluster(data: Any) -> Cluster:
461453
else:
462454
args["auto_upgrade"] = None
463455

456+
field = data.get("admission_plugins", None)
457+
if field is not None:
458+
args["admission_plugins"] = field
459+
460+
field = data.get("apiserver_cert_sans", None)
461+
if field is not None:
462+
args["apiserver_cert_sans"] = field
463+
464464
field = data.get("open_id_connect_config", None)
465465
if field is not None:
466466
args["open_id_connect_config"] = unmarshal_ClusterOpenIDConnectConfig(field)
@@ -487,6 +487,12 @@ def unmarshal_Cluster(data: Any) -> Cluster:
487487
else:
488488
args["routed_ip_enabled"] = None
489489

490+
field = data.get("sbs_csi_enabled", None)
491+
if field is not None:
492+
args["sbs_csi_enabled"] = field
493+
else:
494+
args["sbs_csi_enabled"] = None
495+
490496
return Cluster(**args)
491497

492498

scaleway/scaleway/k8s/v1/types.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -817,16 +817,6 @@ class Cluster:
817817
List of enabled feature gates.
818818
"""
819819

820-
admission_plugins: List[str]
821-
"""
822-
List of enabled admission plugins.
823-
"""
824-
825-
apiserver_cert_sans: List[str]
826-
"""
827-
Additional Subject Alternative Names for the Kubernetes API server certificate.
828-
"""
829-
830820
created_at: Optional[datetime]
831821
"""
832822
Date on which the cluster was created.
@@ -847,6 +837,16 @@ class Cluster:
847837
Auto upgrade configuration of the cluster.
848838
"""
849839

840+
admission_plugins: List[str]
841+
"""
842+
List of enabled admission plugins.
843+
"""
844+
845+
apiserver_cert_sans: List[str]
846+
"""
847+
Additional Subject Alternative Names for the Kubernetes API server certificate.
848+
"""
849+
850850
open_id_connect_config: Optional[ClusterOpenIDConnectConfig]
851851
"""
852852
This configuration enables to update the OpenID Connect configuration of the Kubernetes API server.
@@ -867,6 +867,11 @@ class Cluster:
867867
Defines whether routed IPs are enabled for nodes of this cluster.
868868
"""
869869

870+
sbs_csi_enabled: Optional[bool]
871+
"""
872+
Defines whether the SBS-enabled CSI starting from v0.3 is installed on the cluster.
873+
"""
874+
870875

871876
@dataclass
872877
class Node:

0 commit comments

Comments
 (0)