Container builder

sdk/python/kfp/compiler/_container_builder.py

@@ -18,19 +18,31 @@
 import os
 import uuid
 
+SERVICEACCOUNT_NAMESPACE = "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
+
 class ContainerBuilder(object):
   """
   ContainerBuilder helps build a container image
   """
-  def __init__(self, gcs_staging, namespace):
+  def __init__(self, gcs_staging, namespace=None):
     """
     Args:
       gcs_staging (str): GCS blob that can store temporary build files
+      namespace (str): kubernetes namespace where the pod is launched,
+          default is the same namespace as the notebook service account in cluster
+              or 'kubeflow' if not in cluster
     """
     if not gcs_staging.startswith('gs://'):
       raise ValueError('Error: {} should be a GCS path.'.format(gcs_staging))
     self._gcs_staging = gcs_staging
     self._namespace = namespace
+    if namespace is None:
+      import os
+      if os.path.exists(SERVICEACCOUNT_NAMESPACE):
+        with open(SERVICEACCOUNT_NAMESPACE, 'r') as f:
+          self._namespace = f.read()
+      else:
+        self._namespace = 'kubeflow'
 
   def _generate_kaniko_spec(self, context, docker_filename, target_image):
     """_generate_kaniko_yaml generates kaniko job yaml based on a template yaml """
@@ -39,6 +51,9 @@ def _generate_kaniko_spec(self, context, docker_filename, target_image):
         'metadata': {
             'generateName': 'kaniko-',
             'namespace': self._namespace,
+            'annotations': {
+                'sidecar.istio.io/inject': 'false'
+            },
         },
         'kind': 'Pod',
         'spec': {

sdk/python/kfp/compiler/_k8s_helper.py

@@ -44,7 +44,8 @@ def _configure_k8s(self):
 
   def _create_k8s_job(self, yaml_spec):
     """ _create_k8s_job creates a kubernetes job based on the yaml spec """
-    pod = k8s_client.V1Pod(metadata=k8s_client.V1ObjectMeta(generate_name=yaml_spec['metadata']['generateName']))
+    pod = k8s_client.V1Pod(metadata=k8s_client.V1ObjectMeta(generate_name=yaml_spec['metadata']['generateName'],
+                                                            annotations=yaml_spec['metadata']['annotations']))
     container = k8s_client.V1Container(name = yaml_spec['spec']['containers'][0]['name'],
                                        image = yaml_spec['spec']['containers'][0]['image'],
                                        args = yaml_spec['spec']['containers'][0]['args'],

sdk/python/tests/compiler/testdata/kaniko.basic.yaml

@@ -18,6 +18,8 @@ kind: Pod
 metadata:
   generateName: kaniko-
   namespace: default
+  annotations:
+    sidecar.istio.io/inject: 'false'
 spec:
   restartPolicy: Never
   serviceAccountName: default