[KFP] Introducing KFP 2 (#165)

mlrun · Feb 15, 2025 · 9f0fa97 · 9f0fa97
1 parent 55c8144
commit 9f0fa97
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 82 deletions.
diff --git a/charts/mlrun-ce/Chart.yaml b/charts/mlrun-ce/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mlrun-ce
-version: 0.7.2
+version: 0.8.0-rc1
 description: MLRun Open Source Stack
 home: https://iguazio.com
 icon: https://www.iguazio.com/wp-content/uploads/2019/10/Iguazio-Logo.png

diff --git a/charts/mlrun-ce/kfp2.yaml b/charts/mlrun-ce/kfp2.yaml
@@ -1,45 +1,2 @@
-pipelines:
-  images:
-    argoexec:
-      repository: gcr.io/ml-pipeline/argoexec
-      tag: v3.4.17-license-compliance
-    workflowController:
-      repository: gcr.io/ml-pipeline/workflow-controller
-      tag: v3.4.17-license-compliance
-    apiServer:
-      repository: gcr.io/ml-pipeline/api-server
-      tag: 2.3.0
-    persistenceagent:
-      repository: gcr.io/ml-pipeline/persistenceagent
-      tag: 2.3.0
-    scheduledworkflow:
-      repository: gcr.io/ml-pipeline/scheduledworkflow
-      tag: 2.3.0
-    ui:
-      repository: gcr.io/ml-pipeline/frontend
-      tag: 2.3.0
-    viewerCrdController:
-      repository: gcr.io/ml-pipeline/viewer-crd-controller
-      tag: 2.3.0
-    visualizationServer:
-      repository: gcr.io/ml-pipeline/visualization-server
-      tag: 2.3.0
-    metadata:
-      container:
-        repository: gcr.io/tfx-oss-public/ml_metadata_store_server
-        tag: 1.16.0
-    metadataEnvoy:
-      repository: gcr.io/ml-pipeline/metadata-envoy
-      tag: 2.3.0
-    metadataWriter:
-      repository: gcr.io/ml-pipeline/metadata-writer
-      tag: 2.3.0
-    mysql:
-      # MySQL 8.0.26 because >= 8.0.27 has deprecated the default_authentication_plugin option
-      # which is required by MLMD workloads (metadata-grpc-deployment and metadata-writer).
-      # https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_default_authentication_plugin
-      repository: gcr.io/ml-pipeline/mysql
-      tag: "8.0.26"
-    cacheImage:
-      repository: gcr.io/google-containers/busybox
-      tag: latest
+# retaining the kfp2.yaml for old installation scripts compatibility
+---
diff --git a/charts/mlrun-ce/templates/_helpers.tpl b/charts/mlrun-ce/templates/_helpers.tpl
@@ -235,17 +235,6 @@ Pipelines labels
 {{ include "mlrun-ce.pipelines.selectorLabels" . }}
 {{- end -}}
 
-{{/*
-Determines whether kfp pipelines v2 is set to be installed
-*/}}
-{{- define "mlrun-ce.pipelinesV2" -}}
-{{- if semverCompare "~2.0" (.Values.pipelines.images.apiServer.tag | toString) -}}
-{{- true -}}
-{{- else -}}
-{{- false -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Model monitoring DSN
 */}}

diff --git a/charts/mlrun-ce/templates/pipelines/configmaps/workflow-controller-configmap.yaml b/charts/mlrun-ce/templates/pipelines/configmaps/workflow-controller-configmap.yaml
@@ -13,9 +13,6 @@ data:
       secretKeySecret:
         name: mlpipeline-minio-artifact
         key: secretkey
-  {{- if not (include "mlrun-ce.pipelinesV2" .) }}
-  containerRuntimeExecutor: emissary
-  {{- end }}
   executor: |
     imagePullPolicy: IfNotPresent
     resources:

diff --git a/charts/mlrun-ce/templates/pipelines/crd/workflowartifactgctasks.argoproj.io.yaml b/charts/mlrun-ce/templates/pipelines/crd/workflowartifactgctasks.argoproj.io.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.pipelines.crd.enabled -}}
-{{- if (include "mlrun-ce.pipelinesV2" .) }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -42,4 +41,3 @@ spec:
       subresources:
         status: {}
 {{- end -}}
-{{- end -}}
diff --git a/charts/mlrun-ce/templates/pipelines/deployments/mysql.yaml b/charts/mlrun-ce/templates/pipelines/deployments/mysql.yaml
@@ -29,15 +29,10 @@ spec:
       {{- end }}
       containers:
       - args:
-        {{- if semverCompare "~5.7" (.Values.pipelines.images.mysql.tag | toString) }}
-        - --ignore-db-dir=lost+found
-        {{- end }}
-        {{- if semverCompare "~8.0" (.Values.pipelines.images.mysql.tag | toString) }}
         # MLMD workloads (metadata-grpc-deployment and metadata-writer)
         # depend on mysql_native_password authentication plugin.
         - --default-authentication-plugin=mysql_native_password
         - --disable-log-bin
-        {{- end }}
         - --datadir
         - /var/lib/mysql
         env:

diff --git a/charts/mlrun-ce/templates/pipelines/roles/argo-role.yaml b/charts/mlrun-ce/templates/pipelines/roles/argo-role.yaml
@@ -53,9 +53,7 @@ rules:
   - workflows/finalizers
   - workflowtasksets
   - workflowtasksets/finalizers
-  {{- if (include "mlrun-ce.pipelinesV2" .) }}
   - workflowartifactgctasks
-  {{- end }}
   verbs:
   - get
   - list

diff --git a/charts/mlrun-ce/values.yaml b/charts/mlrun-ce/values.yaml
@@ -320,41 +320,44 @@ pipelines:
   images:
     argoexec:
       repository: gcr.io/ml-pipeline/argoexec
-      tag: v3.3.8-license-compliance
+      tag: v3.4.17-license-compliance
     workflowController:
       repository: gcr.io/ml-pipeline/workflow-controller
-      tag: v3.3.8-license-compliance
+      tag: v3.4.17-license-compliance
     apiServer:
       repository: gcr.io/ml-pipeline/api-server
-      tag: 1.8.3
+      tag: 2.3.0
     persistenceagent:
       repository: gcr.io/ml-pipeline/persistenceagent
-      tag: 1.8.3
+      tag: 2.3.0
     scheduledworkflow:
       repository: gcr.io/ml-pipeline/scheduledworkflow
-      tag: 1.8.3
+      tag: 2.3.0
     ui:
       repository: gcr.io/ml-pipeline/frontend
-      tag: 1.8.3
+      tag: 2.3.0
     viewerCrdController:
       repository: gcr.io/ml-pipeline/viewer-crd-controller
-      tag: 1.8.3
+      tag: 2.3.0
     visualizationServer:
       repository: gcr.io/ml-pipeline/visualization-server
-      tag: 1.8.3
+      tag: 2.3.0
     metadata:
       container:
         repository: gcr.io/tfx-oss-public/ml_metadata_store_server
-        tag: 1.5.0
+        tag: 1.16.0
     metadataEnvoy:
       repository: gcr.io/ml-pipeline/metadata-envoy
-      tag: 1.8.3
+      tag: 2.3.0
     metadataWriter:
       repository: gcr.io/ml-pipeline/metadata-writer
-      tag: 1.8.3
+      tag: 2.3.0
     mysql:
-      repository: mysql
-      tag: 5.7
+      # MySQL 8.0.26 because >= 8.0.27 has deprecated the default_authentication_plugin option
+      # which is required by MLMD workloads (metadata-grpc-deployment and metadata-writer).
+      # https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_default_authentication_plugin
+      repository: gcr.io/ml-pipeline/mysql
+      tag: "8.0.26"
     cacheImage:
       repository: gcr.io/google-containers/busybox
       tag: latest