Set k8s deployment to default (google#3323)

vanhauser-thc · Sep 11, 2023 · 21cc440 · 21cc440
1 parent 7af106f
commit 21cc440
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/butler.py b/butler.py
@@ -157,7 +157,7 @@ def main():
   parser_deploy.add_argument(
       '--prod', action='store_true', help='Deploy to production.')
   parser_deploy.add_argument(
-      '--targets', nargs='*', default=['appengine', 'zips'])
+      '--targets', nargs='*', default=['appengine', 'k8s', 'zips'])
 
   parser_run_server = subparsers.add_parser(
       'run_server', help='Run the local Clusterfuzz server.')

diff --git a/src/local/butler/deploy.py b/src/local/butler/deploy.py
@@ -384,7 +384,7 @@ def _staging_deployment_helper(python3=True):
 def _prod_deployment_helper(config_dir,
                             package_zip_paths,
                             deploy_appengine=True,
-                            deploy_k8s=False,
+                            deploy_k8s=True,
                             python3=True):
   """Helper for production deployment."""
   config = local_config.Config()
@@ -432,8 +432,8 @@ def _deploy_terraform(config_dir):
   terraform_dir = os.path.join(config_dir, 'terraform')
   terraform = f'terraform -chdir={terraform_dir}'
   common.execute(f'{terraform} init')
-  # TODO(gongh): Set apply to auto-approve after testing.
-  common.execute(f'{terraform} apply -target=module.clusterfuzz')
+  common.execute(f'{terraform} apply -target=module.clusterfuzz -auto-approve')
+  common.execute(f'rm -rf {terraform_dir}/.terraform*')
 
 
 def _deploy_k8s(config_dir):