Fix kubernetes engine system test (#18548)

- Add 'in_cluster=False' argument to 'GKEStartPodOperator' - Change order of activating service account and setting project
apache · Sep 27, 2021 · 2fadf3c · 2fadf3c
1 parent a458fcc
commit 2fadf3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/airflow/providers/google/cloud/example_dags/example_kubernetes_engine.py b/airflow/providers/google/cloud/example_dags/example_kubernetes_engine.py
@@ -61,6 +61,7 @@
  namespace="default",
  image="perl",
  name="test-pod",
+ in_cluster=False,
  )
 
  # [START howto_operator_gke_start_pod_xcom]
@@ -74,6 +75,7 @@
  image="alpine",
  cmds=["sh", "-c", 'mkdir -p /airflow/xcom/;echo \'[1,2,3,4]\' > /airflow/xcom/return.json'],
  name="test-pod-xcom",
+ in_cluster=False,
  )
  # [END howto_operator_gke_start_pod_xcom]
 

diff --git a/airflow/providers/google/common/hooks/base_google.py b/airflow/providers/google/common/hooks/base_google.py
@@ -493,9 +493,6 @@ def provide_authorized_gcloud(self):
  gcloud_config_tmp = exit_stack.enter_context(tempfile.TemporaryDirectory())
  exit_stack.enter_context(patch_environ({CLOUD_SDK_CONFIG_DIR: gcloud_config_tmp}))
 
- if project_id:
- # Don't display stdout/stderr for security reason
- check_output(["gcloud", "config", "set", "core/project", project_id])
  if CREDENTIALS in os.environ:
  # This solves most cases when we are logged in using the service key in Airflow.
  # Don't display stdout/stderr for security reason
@@ -507,6 +504,9 @@ def provide_authorized_gcloud(self):
  f"--key-file={os.environ[CREDENTIALS]}",
  ]
  )
+ if project_id:
+ # Don't display stdout/stderr for security reason
+ check_output(["gcloud", "config", "set", "core/project", project_id])
  elif os.path.exists(credentials_path):
  # If we are logged in by `gcloud auth application-default` then we need to log in manually.
  # This will make the `gcloud auth application-default` and `gcloud auth` credentials equals.