Remove Helm tailor option deprecation scheduled for 2.19 (pantsbuild#…

…19771)
Mitsuwa · Sep 6, 2023 · acb83fd · acb83fd
1 parent 70c0d45
commit acb83fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/src/python/pants/backend/helm/goals/tailor.py b/src/python/pants/backend/helm/goals/tailor.py
@@ -50,11 +50,7 @@ async def find_putative_helm_targets(
 ) -> PutativeTargets:
     putative_targets = []
 
-    tailor_charts = helm_subsystem.tailor_charts
-    if not tailor_charts and helm_subsystem.options.is_default("tailor_charts"):
-        tailor_charts = helm_subsystem.tailor
-
-    if tailor_charts:
+    if helm_subsystem.tailor_charts:
         all_chart_files = await Get(
             Paths, PathGlobs, request.path_globs(*HELM_CHART_METADATA_FILENAMES)
         )

diff --git a/src/python/pants/backend/helm/subsystems/helm.py b/src/python/pants/backend/helm/subsystems/helm.py
@@ -151,15 +151,8 @@ class HelmSubsystem(TemplatedExternalTool):
         ),
         advanced=True,
     )
-    tailor = BoolOption(
-        default=True,
-        help="If true, add `helm_chart` targets with the `tailor` goal.",
-        advanced=True,
-        removal_hint="Use `[helm].tailor_charts` instead.",
-        removal_version="2.19.0.dev0",
-    )
     tailor_charts = BoolOption(
-        default=None,
+        default=True,
         help="If true, add `helm_chart` targets with the `tailor` goal.",
         advanced=True,
     )