From 1cfe6e9ffe8ea4519915795cc66e6c73bac0fe44 Mon Sep 17 00:00:00 2001
From: Shangjie Chen <deanchen@google.com>
Date: Thu, 31 Jul 2025 10:06:55 -0700
Subject: [PATCH] chore: Remove unnecessary flags

PiperOrigin-RevId: 789379877
---
 src/google/adk/cli/cli_deploy.py             |  5 ++--
 src/google/adk/cli/cli_tools_click.py        | 24 +++++---------------
 tests/unittests/cli/utils/test_cli_deploy.py |  1 -
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/google/adk/cli/cli_deploy.py b/src/google/adk/cli/cli_deploy.py
index b846f2e6..5dc730e7 100644
--- a/src/google/adk/cli/cli_deploy.py
+++ b/src/google/adk/cli/cli_deploy.py
@@ -466,7 +466,6 @@ def to_gke(
     trace_to_cloud: bool,
     with_ui: bool,
     log_level: str,
-    verbosity: str,
     adk_version: str,
     allow_origins: Optional[list[str]] = None,
     session_service_uri: Optional[str] = None,
@@ -487,7 +486,7 @@ def to_gke(
     port: The port of the ADK api server.
     trace_to_cloud: Whether to enable Cloud Trace.
     with_ui: Whether to deploy with UI.
-    verbosity: The verbosity level of the CLI.
+    log_level: The logging level.
     adk_version: The ADK version to use in GKE.
     allow_origins: The list of allowed origins for the ADK api server.
     session_service_uri: The URI of the session service.
@@ -581,7 +580,7 @@ def to_gke(
             '--tag',
             image_name,
             '--verbosity',
-            log_level.lower() if log_level else verbosity,
+            log_level.lower(),
             temp_folder,
         ],
         check=True,
diff --git a/src/google/adk/cli/cli_tools_click.py b/src/google/adk/cli/cli_tools_click.py
index c7480606..cd0ae87e 100644
--- a/src/google/adk/cli/cli_tools_click.py
+++ b/src/google/adk/cli/cli_tools_click.py
@@ -1154,11 +1154,6 @@ def cli_deploy_agent_engine(
         " only)"
     ),
 )
-@click.option(  # This is the crucial missing piece
-    "--verbosity",
-    type=LOG_LEVELS,
-    help="Deprecated. Use --log_level instead.",
-)
 @click.option(
     "--log_level",
     type=LOG_LEVELS,
@@ -1178,12 +1173,6 @@ def cli_deploy_agent_engine(
         " (default: a timestamped folder in the system temp directory)."
     ),
 )
-@click.argument(
-    "agent",
-    type=click.Path(
-        exists=True, dir_okay=True, file_okay=False, resolve_path=True
-    ),
-)
 @click.option(
     "--adk_version",
     type=str,
@@ -1195,7 +1184,12 @@ def cli_deploy_agent_engine(
     ),
 )
 @adk_services_options()
-@deprecated_adk_services_options()
+@click.argument(
+    "agent",
+    type=click.Path(
+        exists=True, dir_okay=True, file_okay=False, resolve_path=True
+    ),
+)
 def cli_deploy_gke(
     agent: str,
     project: Optional[str],
@@ -1207,14 +1201,11 @@ def cli_deploy_gke(
     port: int,
     trace_to_cloud: bool,
     with_ui: bool,
-    verbosity: str,
     adk_version: str,
     log_level: Optional[str] = None,
     session_service_uri: Optional[str] = None,
     artifact_service_uri: Optional[str] = None,
     memory_service_uri: Optional[str] = None,
-    session_db_url: Optional[str] = None,  # Deprecated
-    artifact_storage_uri: Optional[str] = None,  # Deprecated
 ):
   """Deploys an agent to GKE.
 
@@ -1224,8 +1215,6 @@ def cli_deploy_gke(
 
     adk deploy gke --project=[project] --region=[region] --cluster_name=[cluster_name] path/to/my_agent
   """
-  session_service_uri = session_service_uri or session_db_url
-  artifact_service_uri = artifact_service_uri or artifact_storage_uri
   try:
     cli_deploy.to_gke(
         agent_folder=agent,
@@ -1238,7 +1227,6 @@ def cli_deploy_gke(
         port=port,
         trace_to_cloud=trace_to_cloud,
         with_ui=with_ui,
-        verbosity=verbosity,
         log_level=log_level,
         adk_version=adk_version,
         session_service_uri=session_service_uri,
diff --git a/tests/unittests/cli/utils/test_cli_deploy.py b/tests/unittests/cli/utils/test_cli_deploy.py
index 3b708d10..dfcbf076 100644
--- a/tests/unittests/cli/utils/test_cli_deploy.py
+++ b/tests/unittests/cli/utils/test_cli_deploy.py
@@ -566,7 +566,6 @@ def test_to_gke_happy_path(
       trace_to_cloud=False,
       with_ui=True,
       log_level="debug",
-      verbosity="debug",
       adk_version="1.2.0",
       allow_origins=["http://localhost:3000", "https://my-app.com"],
       session_service_uri="sqlite:///",