From caadaed172d13813d38974fe25aed380ccdf488c Mon Sep 17 00:00:00 2001
From: Guillaume Moutier <guillaume.moutier@gmail.com>
Date: Tue, 24 Sep 2024 13:27:16 -0400
Subject: [PATCH] reorder image-det-app

---
 .../ic-shared-img-det/add-model-job.yaml      |  2 +-
 .../create-data-connection.yaml               |  2 -
 .../ic-shared-img-det/kustomization.yaml      |  5 ++
 bootstrap/ic-shared-img-det/model.yaml        | 24 +-----
 bootstrap/ic-shared-img-det/runtime.yaml      | 80 +------------------
 5 files changed, 8 insertions(+), 105 deletions(-)

diff --git a/bootstrap/ic-shared-img-det/add-model-job.yaml b/bootstrap/ic-shared-img-det/add-model-job.yaml
index 81e9d381..8a452a76 100644
--- a/bootstrap/ic-shared-img-det/add-model-job.yaml
+++ b/bootstrap/ic-shared-img-det/add-model-job.yaml
@@ -4,7 +4,7 @@ kind: Job
 metadata:
   name: add-model-job
   annotations:
-    argocd.argoproj.io/sync-wave: "2"
+    argocd.argoproj.io/sync-wave: "3"
 spec:
   backoffLimit: 4
   template:
diff --git a/bootstrap/ic-shared-img-det/create-data-connection.yaml b/bootstrap/ic-shared-img-det/create-data-connection.yaml
index cdb01dfa..67342862 100644
--- a/bootstrap/ic-shared-img-det/create-data-connection.yaml
+++ b/bootstrap/ic-shared-img-det/create-data-connection.yaml
@@ -5,8 +5,6 @@ metadata:
   name: create-data-connection
   annotations:
     argocd.argoproj.io/sync-wave: "1"
-    argocd.argoproj.io/hook: Sync
-    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
 spec:
   backoffLimit: 4
   template:
diff --git a/bootstrap/ic-shared-img-det/kustomization.yaml b/bootstrap/ic-shared-img-det/kustomization.yaml
index e82ccc3b..688a655f 100644
--- a/bootstrap/ic-shared-img-det/kustomization.yaml
+++ b/bootstrap/ic-shared-img-det/kustomization.yaml
@@ -8,11 +8,16 @@ commonLabels:
 namespace: ic-shared-img-det
 
 resources:
+# wave 0
 - project.yaml
+# wave 1
 - setup-serviceaccount.yaml
+# wave 2
 - create-data-connection.yaml
+# wave 3
 - add-model-job.yaml
 - runtime.yaml
+# wave 4
 - model.yaml
 # pinger is not ready yet
 # - pinger.yaml
diff --git a/bootstrap/ic-shared-img-det/model.yaml b/bootstrap/ic-shared-img-det/model.yaml
index e3a8df64..bcd258a4 100644
--- a/bootstrap/ic-shared-img-det/model.yaml
+++ b/bootstrap/ic-shared-img-det/model.yaml
@@ -1,31 +1,9 @@
-# ---
-# apiVersion: serving.kserve.io/v1beta1
-# kind: InferenceService
-# metadata:
-#   annotations:
-#     openshift.io/display-name: accident
-#     serving.kserve.io/deploymentMode: ModelMesh
-#     argocd.argoproj.io/sync-wave: "3"
-#     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-#   labels:
-#     name: accident
-#     opendatahub.io/dashboard: "true"
-#   name: accident
-# spec:
-#   predictor:
-#     model:
-#       modelFormat:
-#         name: onnx
-#         version: "1"
-#       runtime: triton
-#       storage:
-#         key: aws-connection-minio
-#         path: accident/
 ---
 apiVersion: serving.kserve.io/v1beta1
 kind: InferenceService
 metadata:
   annotations:
+    argocd.argoproj.io/sync-wave: "4"
     openshift.io/display-name: img-det
     serving.kserve.io/deploymentMode: ModelMesh
   labels:
diff --git a/bootstrap/ic-shared-img-det/runtime.yaml b/bootstrap/ic-shared-img-det/runtime.yaml
index 4753e594..173185ff 100644
--- a/bootstrap/ic-shared-img-det/runtime.yaml
+++ b/bootstrap/ic-shared-img-det/runtime.yaml
@@ -1,87 +1,9 @@
-# ---
-# apiVersion: serving.kserve.io/v1alpha1
-# kind: ServingRuntime
-# metadata:
-#   annotations:
-#     enable-auth: "false"
-#     enable-route: "false"
-#     maxLoadingConcurrency: "2"
-#     opendatahub.io/template-display-name: Triton runtime 23.11
-#     opendatahub.io/template-name: triton-23.11-20231217
-#     openshift.io/display-name: "Triton 23.11 - added on 20231217"
-#     argocd.argoproj.io/sync-wave: "3"
-#     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-#   labels:
-#     name: triton
-#     opendatahub.io/dashboard: "true"
-#   name: triton
-# spec:
-#   builtInAdapter:
-#     memBufferBytes: 134217728
-#     modelLoadingTimeoutMillis: 90000
-#     runtimeManagementPort: 8001
-#     serverType: triton
-#   containers:
-#   - args:
-#     - -c
-#     - 'mkdir -p /models/_triton_models; chmod 777 /models/_triton_models; exec tritonserver
-#       "--model-repository=/models/_triton_models" "--model-control-mode=explicit"
-#       "--strict-model-config=false" "--strict-readiness=false" "--allow-http=true"
-#       "--allow-sagemaker=false" '
-#     command:
-#     - /bin/sh
-#     image: nvcr.io/nvidia/tritonserver:23.11-py3
-#     livenessProbe:
-#       exec:
-#         command:
-#         - curl
-#         - --fail
-#         - --silent
-#         - --show-error
-#         - --max-time
-#         - "9"
-#         - http://localhost:8000/v2/health/live
-#       initialDelaySeconds: 5
-#       periodSeconds: 30
-#       timeoutSeconds: 10
-#     name: triton
-#     resources:
-#       limits:
-#         cpu: "1"
-#         memory: 8Gi
-#       requests:
-#         cpu: "1"
-#         memory: 2Gi
-#   grpcDataEndpoint: port:8001
-#   grpcEndpoint: port:8085
-#   multiModel: true
-#   protocolVersions:
-#   - grpc-v2
-#   replicas: 1
-#   supportedModelFormats:
-#   - autoSelect: true
-#     name: keras
-#     version: "2"
-#   - autoSelect: true
-#     name: onnx
-#     version: "1"
-#   - autoSelect: true
-#     name: pytorch
-#     version: "1"
-#   - autoSelect: true
-#     name: tensorflow
-#     version: "1"
-#   - autoSelect: true
-#     name: tensorflow
-#     version: "2"
-#   - autoSelect: true
-#     name: tensorrt
-#     version: "7"
 ---
 apiVersion: serving.kserve.io/v1alpha1
 kind: ServingRuntime
 metadata:
   annotations:
+    argocd.argoproj.io/sync-wave: "3"
     enable-route: 'true'
     opendatahub.io/accelerator-name: ''
     opendatahub.io/template-display-name: OpenVINO Model Server