Skip to content

Remove unused code #679

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2025
Merged

Remove unused code #679

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
86aef39
fix: remove unused code
scaliby Oct 9, 2025
cf68dfe
Merge branch 'develop' into scaliby/remove-unused-code
scaliby Oct 10, 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
132 changes: 0 additions & 132 deletions src/xpk/core/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@
)
from .gcloud_context import (
add_zone_and_project,
get_gke_server_config,
zone_to_region,
)
from .nodepool import upgrade_gke_nodepools_version
from .resources import get_cluster_system_characteristics
from .system_characteristics import SystemCharacteristics

Expand Down Expand Up @@ -565,34 +563,6 @@ def create_role_binding(sa: str, role_name: str) -> None:
xpk_exit(1)


def update_gke_cluster_with_clouddns(args) -> int:
"""Run the GKE cluster update command for existing clusters and enable CloudDNS.

Args:
args: user provided arguments for running the command.

Returns:
0 if successful and 1 otherwise.
"""
command = (
'gcloud container clusters update'
f' {args.cluster} --project={args.project}'
f' --region={zone_to_region(args.zone)}'
' --cluster-dns=clouddns'
' --cluster-dns-scope=vpc'
f' --cluster-dns-domain={args.cluster}-domain'
' --quiet'
)
xpk_print('Updating GKE cluster to use Cloud DNS, may take a while!')
return_code = run_command_with_updates(
command, 'GKE Cluster Update to enable Cloud DNS'
)
if return_code != 0:
xpk_print(f'GKE Cluster Update request returned ERROR {return_code}')
return 1
return 0


def update_gke_cluster_with_workload_identity_enabled(args) -> int:
"""Run the GKE cluster update command for existing cluster and enable Workload Identity Federation.
Args:
Expand Down Expand Up @@ -672,61 +642,6 @@ def update_gke_cluster_with_lustre_driver_enabled(args) -> int:
return 0


def upgrade_gke_control_plane_version(args, default_rapid_gke_version) -> int:
"""Upgrade GKE cluster's control plane version before updating nodepools to use CloudDNS.

Args:
args: user provided arguments for running the command.
default_rapid_gke_version: Rapid default version for the upgrade.

Returns:
0 if successful and 1 otherwise.
"""
command = (
'gcloud container clusters upgrade'
f' {args.cluster} --project={args.project}'
f' --region={zone_to_region(args.zone)}'
f' --cluster-version={default_rapid_gke_version}'
' --master'
' --quiet'
)
xpk_print("Updating GKE cluster's control plane version, may take a while!")
return_code = run_command_with_updates(
command,
'GKE Cluster control plane version update to enable Cloud DNS',
)
if return_code != 0:
xpk_print(
"GKE cluster's control plane version update request returned"
f' ERROR {return_code}'
)
return 1
return 0


def is_cluster_using_clouddns(args) -> bool:
"""Checks if cluster is using CloudDNS.
Args:
args: user provided arguments for running the command.

Returns:
True if cluster is using CloudDNS and False otherwise.
"""
command = (
f'gcloud container clusters describe {args.cluster}'
f' --project={args.project} --region={zone_to_region(args.zone)}'
' 2> /dev/null | grep "clusterDns: CLOUD_DNS"'
)
return_code, _ = run_command_for_value(
command,
'Check if Cloud DNS is enabled in cluster describe.',
)
if return_code == 0:
xpk_print('Cloud DNS is enabled on the cluster, no update needed.')
return True
return False


def is_workload_identity_enabled_on_cluster(args) -> bool:
"""Checks if Workload Identity Federation is enabled on the cluster.
Args:
Expand Down Expand Up @@ -778,53 +693,6 @@ def is_gcsfuse_driver_enabled_on_cluster(args) -> bool:
return False


def update_cluster_with_clouddns_if_necessary(args) -> int:
"""Updates a GKE cluster to use CloudDNS, if not enabled already.

Args:
args: user provided arguments for running the command.

Returns:
0 if successful and error code otherwise.
"""
all_clusters, return_code = get_all_clusters_programmatic(args)
if return_code > 0:
xpk_print('Listing all clusters failed!')
return 1
if args.cluster in all_clusters:
# If cluster is already using clouddns, no update necessary!
if is_cluster_using_clouddns(args):
return 0
cluster_update_return_code = update_gke_cluster_with_clouddns(args)
if cluster_update_return_code > 0:
xpk_print('Updating GKE cluster to use CloudDNS failed!')
return cluster_update_return_code

# Find default rapid control plane version and update the control plane to the same.
server_config_return_code, gke_server_config = get_gke_server_config(args)
if server_config_return_code != 0:
xpk_exit(server_config_return_code)
assert gke_server_config

upgrade_master_return_code = upgrade_gke_control_plane_version(
args,
gke_server_config.default_rapid_gke_version,
)
if upgrade_master_return_code > 0:
xpk_print("Updating GKE cluster's control plane upgrade failed!")
return upgrade_master_return_code

# Upgrade nodepools version after the master upgrade.
node_pool_update_code = upgrade_gke_nodepools_version(
args,
gke_server_config.default_rapid_gke_version,
)
if node_pool_update_code > 0:
xpk_print('Upgrading nodepools version failed!')
return node_pool_update_code
return 0


def update_cluster_with_workload_identity_if_necessary(args) -> int:
"""Updates a GKE cluster to enable Workload Identity Federation, if not enabled already.
Args:
Expand Down
45 changes: 0 additions & 45 deletions src/xpk/core/nodepool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,51 +545,6 @@ def get_gke_node_pool_version(
return 0, node_pool_gke_version


def upgrade_gke_nodepools_version(args, default_rapid_gke_version) -> int:
"""Upgrade nodepools in the cluster to default rapid gke version. Recreates the nodes.

Args:
args: user provided arguments for running the command.
default_rapid_gke_version: Rapid default version for the upgrade.

Returns:
0 if successful and 1 otherwise.
"""
existing_node_pool_names, return_code = get_all_nodepools_programmatic(args)
if return_code != 0:
xpk_print('Listing all node pools failed!')
return return_code

# Batch execution to upgrade node pools simultaneously
commands = []
task_names = []
for node_pool_name in existing_node_pool_names:
commands.append(
'gcloud container clusters upgrade'
f' {args.cluster} --project={args.project}'
f' --region={zone_to_region(args.zone)}'
f' --cluster-version={default_rapid_gke_version}'
f' --node-pool={node_pool_name}'
' --quiet'
)
task_names.append(f'Upgrading node pool {node_pool_name}.')

for i, command in enumerate(commands):
xpk_print(f'To complete {task_names[i]} we are executing {command}')
max_return_code = run_commands(
commands,
'Update GKE node pools to default RAPID GKE version',
task_names,
)
if max_return_code != 0:
xpk_print(
'GKE node pools update to default RAPID GKE version returned ERROR:'
f' {max_return_code}'
)
return int(max_return_code)
return 0


def get_nodepool_workload_metadata_mode(
args, nodepool_name
) -> tuple[int, str | None]:
Expand Down
Loading