fix for PREPROCESS_IMAGE_VERSION

Signed-off-by: Kam D Kasravi <[email protected]>

Author: Kasravi, Kam D

k8s/object_detection/tensorflow/rfcn/inference/fp32/mlops/pipeline/user-allocated-pvc/Krmfile

@@ -61,14 +61,32 @@ openAPI:
       x-k8s-cli:
         substitution:
           name: IMAGE
-          pattern: ${REGISTRY}/intel/object-detection:tf-2.3.0-imz-2.2.0-${MODEL_NAME}${IMAGE_SUFFIX}
+          pattern: ${REGISTRY}/intel/object-detection:${IMAGE_VERSION}-${MODEL_NAME}${IMAGE_SUFFIX}
           values:
           - marker: ${REGISTRY}
             ref: '#/definitions/io.k8s.cli.setters.REGISTRY'
+          - marker: ${IMAGE_VERSION}
+            ref: '#/definitions/io.k8s.cli.setters.IMAGE_VERSION'
           - marker: ${MODEL_NAME}
             ref: '#/definitions/io.k8s.cli.setters.MODEL_NAME'
           - marker: ${IMAGE_SUFFIX}
             ref: '#/definitions/io.k8s.cli.setters.IMAGE_SUFFIX'
+    io.k8s.cli.setters.IMAGE_VERSION:
+      description: image version
+      x-k8s-cli:
+        setter:
+          name: IMAGE_VERSION
+          value: tf-2.3.0-imz-2.2.0
+          isSet: true
+          setBy: model-builder
+    io.k8s.cli.setters.PREPROCESS_IMAGE_VERSION:
+      description: image version
+      x-k8s-cli:
+        setter:
+          name: PREPROCESS_IMAGE_VERSION
+          value: tf-1.15.2-imz-2.2.0
+          isSet: true
+          setBy: model-builder
     io.k8s.cli.setters.IMAGE_SUFFIX:
       description: appended to image name
       x-k8s-cli:
@@ -158,11 +176,13 @@ openAPI:
       description: image name
       x-k8s-cli:
         substitution:
-          name: IMAGE
-          pattern: ${REGISTRY}/intel/object-detection:tf-1.15.2-imz-2.2.0-${PREPROCESS_NAME}
+          name: PREPROCESS_IMAGE
+          pattern: ${REGISTRY}/intel/object-detection:${PREPROCESS_IMAGE_VERSION}-${PREPROCESS_NAME}
           values:
           - marker: ${REGISTRY}
             ref: '#/definitions/io.k8s.cli.setters.REGISTRY'
+          - marker: ${PREPROCESS_IMAGE_VERSION}
+            ref: '#/definitions/io.k8s.cli.setters.PREPROCESS_IMAGE_VERSION'
           - marker: ${PREPROCESS_NAME}
             ref: '#/definitions/io.k8s.cli.setters.PREPROCESS_NAME'
           - marker: ${IMAGE_SUFFIX}

k8s/object_detection/tensorflow/rfcn/inference/fp32/mlops/pipeline/user-allocated-pvc/serving_accuracy.yaml

@@ -51,9 +51,15 @@ spec:
       - configMapRef:
           name: rfcn-fp32-inference # {"$openapi":"MODEL_NAME"}
       volumeMounts:
+      - name: coco-raw-data
+        mountPath: /datasets # {"$openapi":"DATASET_DIR"}
+        readOnly: true
       - name: pvc-path
         mountPath: /pvc # {"$openapi":"PVC_PATH"}
     volumes:
+    - name: coco-raw-data
+      hostPath:
+        path: /datasets # {"$openapi":"DATASET_DIR"}
     - name: pvc-path
       persistentVolumeClaim:
         claimName: workdisk # {"$openapi":"PVC_NAME"}

k8s/object_detection/tensorflow/rfcn/inference/fp32/mlops/pipeline/user-mounted-nfs/Krmfile

@@ -61,14 +61,24 @@ openAPI:
       x-k8s-cli:
         substitution:
           name: IMAGE
-          pattern: ${REGISTRY}/intel/object-detection:tf-2.3.0-imz-2.2.0-${MODEL_NAME}${IMAGE_SUFFIX}
+          pattern: ${REGISTRY}/intel/object-detection:${IMAGE_VERSION}-${MODEL_NAME}${IMAGE_SUFFIX}
           values:
           - marker: ${REGISTRY}
             ref: '#/definitions/io.k8s.cli.setters.REGISTRY'
+          - marker: ${IMAGE_VERSION}
+            ref: '#/definitions/io.k8s.cli.setters.IMAGE_VERSION'
           - marker: ${MODEL_NAME}
             ref: '#/definitions/io.k8s.cli.setters.MODEL_NAME'
           - marker: ${IMAGE_SUFFIX}
             ref: '#/definitions/io.k8s.cli.setters.IMAGE_SUFFIX'
+    io.k8s.cli.setters.IMAGE_VERSION:
+      description: image version
+      x-k8s-cli:
+        setter:
+          name: IMAGE_VERSION
+          value: tf-2.3.0-imz-2.2.0
+          isSet: true
+          setBy: model-builder
     io.k8s.cli.setters.IMAGE_SUFFIX:
       description: appended to image name
       x-k8s-cli:
@@ -168,15 +178,25 @@ openAPI:
           name: PREPROCESS_DIR
           value: /workspace/preprocess-coco-val
           setBy: model-builder
+    io.k8s.cli.setters.PREPROCESS_IMAGE_VERSION:
+      description: image version
+      x-k8s-cli:
+        setter:
+          name: PREPROCESS_IMAGE_VERSION
+          value: tf-1.15.2-imz-2.2.0
+          isSet: true
+          setBy: model-builder
     io.k8s.cli.substitutions.PREPROCESS_IMAGE:
       description: image name
       x-k8s-cli:
         substitution:
-          name: IMAGE
-          pattern: ${REGISTRY}/intel/object-detection:tf-1.15.2-imz-2.2.0-${PREPROCESS_NAME}
+          name: PREPROCESS_IMAGE
+          pattern: ${REGISTRY}/intel/object-detection:${PREPROCESS_IMAGE_VERSION}-${PREPROCESS_NAME}
           values:
           - marker: ${REGISTRY}
             ref: '#/definitions/io.k8s.cli.setters.REGISTRY'
+          - marker: ${PREPROCESS_IMAGE_VERSION}
+            ref: '#/definitions/io.k8s.cli.setters.PREPROCESS_IMAGE_VERSION'
           - marker: ${PREPROCESS_NAME}
             ref: '#/definitions/io.k8s.cli.setters.PREPROCESS_NAME'
           - marker: ${IMAGE_SUFFIX}

k8s/object_detection/tensorflow/rfcn/inference/fp32/mlops/pipeline/user-mounted-nfs/serving_accuracy.yaml

@@ -54,7 +54,13 @@ spec:
       volumeMounts:
       - name: nfs-path
         mountPath: /nfs # {"$openapi":"NFS_PATH"}
+      - name: coco-raw-data
+        mountPath: /datasets # {"$openapi":"DATASET_DIR"}
+        readOnly: true
     volumes:
+    - name: coco-raw-data
+      hostPath:
+        path: /datasets # {"$openapi":"DATASET_DIR"}
     - name: nfs-path
       nfs:
         server: 0.0.0.0 # {"$openapi":"NFS_SERVER"}