Merge branch 'master' into f/chrisma/remove-uuid-event-ingester

armadaproject · Sep 2, 2024 · 21c0ec8 · 21c0ec8
2 parents 574ecbe + 1ce6040
commit 21c0ec8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/third_party/airflow/armada/log_manager.py b/third_party/airflow/armada/log_manager.py
@@ -47,15 +47,12 @@ def _k8s_client(self, k8s_context) -> client.CoreV1Api:
                 k8s_client = client.CoreV1Api(
                     api_client=client.ApiClient(configuration=configuration)
                 )
-                k8s_client.api_client.configuration.api_key_prefix["authorization"] = (
-                    "Bearer"
-                )
                 KubernetesPodLogManager.CLIENTS[k8s_context] = k8s_client
         return KubernetesPodLogManager.CLIENTS[k8s_context]
 
     def _with_bearer_auth(self, client):
         client.api_client.configuration.api_key["authorization"] = (
-            self._token_retriever.get_token()
+            f"Bearer {self._token_retriever.get_token()}"
         )
 
     def fetch_container_logs(

diff --git a/third_party/airflow/pyproject.toml b/third_party/airflow/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "armada_airflow"
-version = "1.0.2"
+version = "1.0.3"
 description = "Armada Airflow Operator"
 readme='README.md'
 authors = [{name = "Armada-GROSS", email = "armada@armadaproject.io"}]