redhat-ai-services · strangiato · Aug 17, 2023 · Jul 10, 2023 · Jul 10, 2023 · Jul 10, 2023
diff --git a/components/argocd/applications/base/datascience-buckets.yaml b/components/argocd/applications/base/datascience-buckets.yaml
@@ -4,9 +4,8 @@ metadata:
   name: datascience-buckets
 spec:
   destination:
-    namespace: mlops-demo-datascience
     server: https://kubernetes.default.svc
-  project: mlops-demo-datascience
+  project: default
   source:
     path: environments/datascience/components/buckets/overlays/default
     repoURL: patch-me-see-tenant-overlays

diff --git a/components/argocd/applications/base/datascience-pipelines-instance.yaml b/components/argocd/applications/base/datascience-pipelines-instance.yaml
@@ -0,0 +1,17 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: datascience-pipelines-instance
+spec:
+  destination:
+    namespace: mlops-demo-pipelines
+    server: https://kubernetes.default.svc
+  project: mlops-demo-pipelines
+  source:
+    path: environments/pipelines/components/datascience-pipelines/overlays/default
+    repoURL: patch-me-see-tenant-overlays
+    targetRevision: patch-me-see-tenant-overlays
+  syncPolicy:
+    automated:
+      prune: false
+      selfHeal: true
diff --git a/components/argocd/applications/base/kustomization.yaml b/components/argocd/applications/base/kustomization.yaml
@@ -3,6 +3,7 @@ kind: Kustomization
 
 resources:
   - datascience-buckets.yaml
+  - datascience-pipelines-instance.yaml
   - grafana-applicationset.yaml
   - iris-inference-service-applicationset.yaml
   - iris-message-generator-applicationset.yaml
@@ -14,4 +15,4 @@ resources:
   - mlops-demo-pipeline-tasks.yaml
   - mlops-demo-pipelines-rbac.yaml
   - mlops-demo-pipelines.yaml
-  - odh-application.yaml
+  # - odh-application.yaml
diff --git a/components/tekton/pipelines/iris-inference-service/base/kustomization.yaml b/components/tekton/pipelines/iris-inference-service/base/kustomization.yaml
@@ -18,5 +18,5 @@ resources:
   - iris-inference-service-eventlistener-route.yaml
   - iris-inference-service-imagestream.yaml
   - iris-inference-service-pipeline.yaml
-  - iris-inference-service-pipelinerun.yaml
+  # - iris-inference-service-pipelinerun.yaml
   - iris-inference-service-trigger-template.yaml
diff --git a/components/tekton/pipelines/iris-training/base/iris-training-pipeline.yaml b/components/tekton/pipelines/iris-training/base/iris-training-pipeline.yaml
@@ -22,8 +22,8 @@ spec:
       description: 3.9-ubi8
       name: PYTHON_VERSION
       type: string
-    - default: 'https://ds-pipeline-ui-mlops-demo-datascience.apps.cluster-rn5gs.rn5gs.sandbox742.opentlc.com/'
-      description: The endpoint URL for Kubeflow
+    - default: 'https://ds-pipeline-pipelines-definition.mlops-demo-pipelines.svc.cluster.local:8443/'
+      description: The endpoint URL for ds-pipeline-pipelines-definition
       name: KUBEFLOW_ENDPOINT
       type: string
   tasks:

diff --git a/components/tekton/tasks/base/execute-kubeflow-pipeline.yaml b/components/tekton/tasks/base/execute-kubeflow-pipeline.yaml
@@ -17,7 +17,7 @@ spec:
       description: The location of the script to be executed
     - name: KUBEFLOW_ENDPOINT
       description: The endpoint URL for Kubeflow
-      default: "https://ds-pipeline-ui.mlops-demo-datascience.svc.cluster.local:8443"
+      default: "https://ds-pipeline-pipelines-definition:8443"
     - name: DEFAULT_STORAGE_CLASS
       description: The storage class Kubeflow will utilize for PVC creation
       default: "ocs-storagecluster-ceph-rbd"

diff --git a/environments/datascience/components/buckets/base/kustomization.yaml b/environments/datascience/components/buckets/base/kustomization.yaml
@@ -1,5 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+namespace: mlops-demo-datascience
+
 resources:
   - model-bucket.yaml
diff --git a/environments/datascience/components/buckets/overlays/default/copy-obc-job/copy-obc-job.yaml b/environments/datascience/components/buckets/overlays/default/copy-obc-job/copy-obc-job.yaml
@@ -0,0 +1,35 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: copy-obc
+  namespace: mlops-demo-datascience
+  generateName: copy-obc
+  annotations:
+    argocd.argoproj.io/hook: PostSync
+spec:
+  template:
+    spec:
+      containers:
+        - name: copy-obc
+          image: image-registry.openshift-image-registry.svc:5000/openshift/tools
+          env:
+            - name: TARGET_NAMESPACE
+              value: 'mlops-demo-pipelines'
+            - name: OBC_NAME
+              value: 'iris-model'
+          command:
+            - /bin/bash
+            - -c
+            - |
+              echo "Copy secret ${OBC_NAME} to namespace ${TARGET_NAMESPACE}"
+              oc get secret ${OBC_NAME} -o json | \
+                jq 'del(.metadata["namespace","creationTimestamp","resourceVersion","selfLink","uid","ownerReferences","finalizers"])' | \
+                oc apply -f - -n ${TARGET_NAMESPACE}
+              echo "Copy configmap ${OBC_NAME} to namespace ${TARGET_NAMESPACE}"
+              oc get configmap ${OBC_NAME} -o json | \
+                jq 'del(.metadata["namespace","creationTimestamp","resourceVersion","selfLink","uid","ownerReferences","finalizers"])' | \
+                oc apply -f - -n ${TARGET_NAMESPACE}
+      restartPolicy: Never
+      serviceAccount: copy-obc
+      serviceAccountName: copy-obc
+  backoffLimit: 4
diff --git a/environments/datascience/components/buckets/overlays/default/copy-obc-job/kustomization.yaml b/environments/datascience/components/buckets/overlays/default/copy-obc-job/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - copy-obc-job.yaml
+  - rbac.yaml
+  - service-account.yaml
diff --git a/environments/datascience/components/buckets/overlays/default/copy-obc-job/rbac.yaml b/environments/datascience/components/buckets/overlays/default/copy-obc-job/rbac.yaml
@@ -0,0 +1,61 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: copy-obc
+  namespace: mlops-demo-datascience
+rules:
+  - apiGroups: [""]
+    resources:
+      - secrets
+      - configmaps
+    verbs:
+      - get
+      - list
+      - patch
+      - create
+      - update
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: copy-obc
+  namespace: mlops-demo-datascience
+subjects:
+  - kind: ServiceAccount
+    name: copy-obc
+    namespace: mlops-demo-datascience
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: copy-obc
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: copy-obc
+  namespace: mlops-demo-pipelines
+rules:
+  - apiGroups: [""]
+    resources:
+      - secrets
+      - configmaps
+    verbs:
+      - get
+      - list
+      - patch
+      - create
+      - update
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: copy-obc
+  namespace: mlops-demo-pipelines
+subjects:
+  - kind: ServiceAccount
+    name: copy-obc
+    namespace: mlops-demo-datascience
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: copy-obc
diff --git a/...onments/datascience/components/buckets/overlays/default/copy-obc-job/service-account.yaml b/...onments/datascience/components/buckets/overlays/default/copy-obc-job/service-account.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: copy-obc
+  namespace: mlops-demo-datascience
+  annotations:
+    argocd.argoproj.io/sync-wave: "-10"
diff --git a/environments/datascience/components/buckets/overlays/default/kustomization.yaml b/environments/datascience/components/buckets/overlays/default/kustomization.yaml
@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: mlops-demo-datascience
-
 resources:
   - ../../base
+  - copy-obc-job/
diff --git a/environments/dev/charts/iris-inference-service/values.yaml b/environments/dev/charts/iris-inference-service/values.yaml
@@ -6,4 +6,4 @@ iris-inference-service:
     repository: image-registry.openshift-image-registry.svc:5000/mlops-demo-pipelines/iris-inference-service
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "301eae8-1-20230803-222243"
+    tag: "301eae8-1-20230803-225748"
diff --git a/environments/pipelines/components/datascience-pipelines/base/kustomization.yaml b/environments/pipelines/components/datascience-pipelines/base/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - pipeline-defenition.yaml
diff --git a/environments/pipelines/components/datascience-pipelines/base/pipeline-defenition.yaml b/environments/pipelines/components/datascience-pipelines/base/pipeline-defenition.yaml
@@ -0,0 +1,36 @@
+apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
+kind: DataSciencePipelinesApplication
+metadata:
+  name: pipelines-definition
+spec:
+  apiServer:
+    stripEOF: true
+    dbConfigConMaxLifetimeSec: 120
+    applyTektonCustomResource: true
+    deploy: true
+    enableSamplePipeline: false
+    autoUpdatePipelineDefaultVersion: true
+    archiveLogs: false
+    terminateStatus: Cancelled
+    enableOauth: true
+    trackArtifacts: true
+    collectMetrics: true
+    injectDefaultScript: true
+  database:
+    mariaDB:
+      deploy: true
+      pipelineDBName: mlpipeline
+      pvcSize: 10Gi
+      username: mlpipeline
+  objectStorage:
+    minio:
+      bucket: data-science-pipelines
+      deploy: true
+      image: quay.io/minio/minio:RELEASE.2023-06-19T19-52-50Z
+      pvcSize: 10Gi
+  persistenceAgent:
+    deploy: true
+    numWorkers: 2
+  scheduledWorkflow:
+    cronScheduleTimezone: UTC
+    deploy: true
diff --git a/environments/pipelines/components/datascience-pipelines/overlays/default/kustomization.yaml b/environments/pipelines/components/datascience-pipelines/overlays/default/kustomization.yaml
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: mlops-demo-pipelines
+
+resources:
+  - ../../base
diff --git a/environments/prod/charts/iris-inference-service/values.yaml b/environments/prod/charts/iris-inference-service/values.yaml
@@ -5,4 +5,4 @@ iris-inference-service:
     repository: image-registry.openshift-image-registry.svc:5000/mlops-demo-pipelines/iris-inference-service
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "301eae8-1-20230511-150435"
+    tag: "301eae8-1-20230803-225748"
diff --git a/environments/test/charts/iris-inference-service/values.yaml b/environments/test/charts/iris-inference-service/values.yaml
@@ -5,4 +5,4 @@ iris-inference-service:
     repository: image-registry.openshift-image-registry.svc:5000/mlops-demo-pipelines/iris-inference-service
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "301eae8-1-20230511-150435"
+    tag: "301eae8-1-20230803-225748"