Merge pull request #2 from berndverst/master

A few changes to use PVC, new container registry

code/pipeline.py

@@ -7,7 +7,7 @@
 )
 def dogsandcats_train(
     persistent_volume_name='azure',
-    persistent_volume_path='/mnt/azure'
+    persistent_volume_path='/mnt/azure',
     base_path='/mnt/azure',
     epochs=5,
     batch=32,
@@ -20,7 +20,7 @@ def dogsandcats_train(
     # preprocess data
     operations['preprocess'] = dsl.ContainerOp(
         name='preprocess',
-        image='tlaloc.azurecr.io/kubeflow/preprocess',
+        image='kubeflowregistry.azurecr.io/kubeflow/preprocess',
         command=['python'],
         arguments=[
             '/scripts/data.py',
@@ -35,7 +35,7 @@ def dogsandcats_train(
     # train
     operations['train'] = dsl.ContainerOp(
         name='train',
-        image='tlaloc.azurecr.io/kubeflow/train',
+        image='kubeflowregistry.azurecr.io/kubeflow/train',
         command=['python'],
         arguments=[
             '/scripts/train.py',
@@ -54,7 +54,7 @@ def dogsandcats_train(
     # score
     operations['score'] = dsl.ContainerOp(
         name='score',
-        image='tlaloc.azurecr.io/kubeflow/score',
+        image='kubeflowregistry.azurecr.io/kubeflow/score',
         command=['python'],
         arguments=[
             '/scripts/score.py',
@@ -67,7 +67,7 @@ def dogsandcats_train(
     #release
     operations['release'] = dsl.ContainerOp(
         name='release',
-        image='tlaloc.azurecr.io/kubeflow/release',
+        image='kubeflowregistry.azurecr.io/kubeflow/release',
         command=['python'],
         arguments=[
             '/scripts/release.py',
@@ -80,15 +80,17 @@ def dogsandcats_train(
 
     for _, op in operations.items():
         op.add_volume(
-                k8s_client.V1Volume(
-                    host_path=k8s_client.V1HostPathVolumeSource(
-                        path=persistent_volume_path),
-                        name=persistent_volume_name)
-                ) \
-            .add_volume_mount(k8s_client.V1VolumeMount(
+            k8s_client.V1Volume(
+                name=persistent_volume_name,
+                persistent_volume_claim=k8s_client.V1PersistentVolumeClaimVolumeSource(
+                    claim_name='azure-managed-disk')
+                )
+            ).add_volume_mount(k8s_client.V1VolumeMount(
                 mount_path=persistent_volume_path, 
-                name=persistent_volume_name))
+                name=persistent_volume_name)
+            )
+
 
 if __name__ == '__main__':
    import kfp.compiler as compiler
-   compiler.Compiler().compile(dogsandcats_train, __file__ + '.tar.gz')
+   compiler.Compiler().compile(dogsandcats_train, __file__ + '.tar.gz')

code/preprocess/build.sh

@@ -1,2 +1,2 @@
-IMAGE=tlaloc.azurecr.io/kubeflow/preprocess
-docker build -t $IMAGE . && docker run -it $IMAGE
+IMAGE=kubeflowregistry.azurecr.io/kubeflow/preprocess
+docker build -t $IMAGE . && docker run -it $IMAGE

code/release/build.sh

@@ -1,2 +1,2 @@
-IMAGE=tlaloc.azurecr.io/kubeflow/release
-docker build -t $IMAGE . && docker run -it --privileged --env-file aml.env $IMAGE
+IMAGE=kubeflowregistry.azurecr.io/kubeflow/release
+docker build -t $IMAGE . && docker run -it --privileged --env-file aml.env $IMAGE

code/scoring/build.sh

@@ -1,2 +1,2 @@
-IMAGE=tlaloc.azurecr.io/kubeflow/score
-docker build -t $IMAGE . && docker run -it $IMAGE
+IMAGE=kubeflowregistry.azurecr.io/kubeflow/score
+docker build -t $IMAGE . && docker run -it $IMAGE

code/training/build.sh

@@ -1,2 +1,2 @@
-IMAGE=tlaloc.azurecr.io/kubeflow/train
-docker build -t $IMAGE . && docker run -it --privileged --env-file blob.env $IMAGE
+IMAGE=kubeflowregistry.azurecr.io/kubeflow/train
+docker build -t $IMAGE . && docker run -it --privileged --env-file blob.env $IMAGE

kubernetes/pvc.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: azure-managed-disk
+spec:
+  accessModes:
+  - ReadWriteOnce
+  storageClassName: managed-premium
+  resources:
+    requests:
+      storage: 300Gi