Merge branch '43-update-chart-components-to-v1.8.0' into 'helmcharts'

Resolve "Update chart components to v1.8.0" Closes kubeflow#43 See merge request mlops/innersource-kubeflow/manifests!20
kromanow94 · Jul 12, 2024 · 5ecab5d · 5ecab5d
2 parents ff5cc3b + 915ec55
commit 5ecab5d
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 34 deletions.
diff --git a/charts/kubeflow/templates/_helpers/kubeflow.pipelines.mlPipeline.config.tpl b/charts/kubeflow/templates/_helpers/kubeflow.pipelines.mlPipeline.config.tpl
@@ -23,31 +23,31 @@ Environment names for database config.
 # This env name is currently hardcoded:
 # https://github.com/kubeflow/pipelines/blob/63ca91850a9f42a357f3417110a3011ddbf43290/backend/src/apiserver/client_manager.go#L46
 {{- define "kubeflow.pipelines.mlPipeline.config.db.user.env.name" -}}
-{{- "DBCONFIG_USER" }}
+{{- "DBCONFIG_MYSQLCONFIG_USER" }}
 {{- end }}
 
 # This env name is currently hardcoded:
 # https://github.com/kubeflow/pipelines/blob/63ca91850a9f42a357f3417110a3011ddbf43290/backend/src/apiserver/client_manager.go#L47
 {{- define "kubeflow.pipelines.mlPipeline.config.db.password.env.name" -}}
-{{- "DBCONFIG_PASSWORD" }}
+{{- "DBCONFIG_MYSQLCONFIG_PASSWORD" }}
 {{- end }}
 
 # This env name is currently hardcoded:
 # https://github.com/kubeflow/pipelines/blob/63ca91850a9f42a357f3417110a3011ddbf43290/backend/src/apiserver/client_manager.go#L44
 {{- define "kubeflow.pipelines.mlPipeline.config.db.host.env.name" -}}
-{{- "DBCONFIG_HOST" }}
+{{- "DBCONFIG_MYSQLCONFIG_HOST" }}
 {{- end }}
 
 # This env name is currently hardcoded:
 # https://github.com/kubeflow/pipelines/blob/63ca91850a9f42a357f3417110a3011ddbf43290/backend/src/apiserver/client_manager.go#L45
 {{- define "kubeflow.pipelines.mlPipeline.config.db.port.env.name" -}}
-{{- "DBCONFIG_PORT" }}
+{{- "DBCONFIG_MYSQLCONFIG_PORT" }}
 {{- end }}
 
 # This env name is currently hardcoded:
 # https://github.com/kubeflow/pipelines/blob/63ca91850a9f42a357f3417110a3011ddbf43290/backend/src/apiserver/client_manager.go#L48
 {{- define "kubeflow.pipelines.mlPipeline.config.db.pipelineDatabaseName.env.name" -}}
-{{- "DBCONFIG_DBNAME" }}
+{{- "DBCONFIG_MYSQLCONFIG_DBNAME" }}
 {{- end }}
 
 # This env name is currently hardcoded:
@@ -56,6 +56,10 @@ Environment names for database config.
 {{- "DBCONFIG_CONMAXLIFETIME" }}
 {{- end }}
 
+{{- define "kubeflow.pipelines.mlPipeline.config.db.driver.env.name" -}}
+{{- "DB_DRIVER_NAME" }}
+{{- end }}
+
 {{/*
 Environment names for object store config.
 */}}
@@ -161,6 +165,15 @@ value or through Secrets.
 ) }}
 {{- end }}
 
+{{- define "kubeflow.pipelines.mlPipeline.config.db.driver.env.spec" -}}
+{{- include "kubeflow.component.env.spec" (
+    list
+    (include "kubeflow.pipelines.mlPipeline.config.db.driver.env.name" . )
+    .Values.pipelines.config.db.existingSecretName
+    .Values.pipelines.config.db.driver
+) }}
+{{- end }}
+
 {{/*
 Environment Entries parametrization for object store config with plaintext value
 or through Secrets.

diff --git a/charts/kubeflow/templates/_helpers/validation.tpl b/charts/kubeflow/templates/_helpers/validation.tpl
@@ -10,6 +10,10 @@ Dex validations.
 {{- fail "Currently only 'dexIntegration.integrationMode: istio' is supported." -}}
 {{- end }}
 
+{{- if (ne .Values.pipelines.config.db.driver.value "mysql" ) -}}
+{{- fail "Currently only 'pipelines.config.db.driver: mysql' is supported." -}}
+{{- end }}
+
 {{/*
 Kubeflow Pipelines validations.
 */}}

diff --git a/charts/kubeflow/templates/pipelines/ml-pipeline/apiserver/deployment.yaml b/charts/kubeflow/templates/pipelines/ml-pipeline/apiserver/deployment.yaml
@@ -39,6 +39,7 @@ spec:
         {{- include "kubeflow.pipelines.mlPipeline.config.db.port.env.spec" . | nindent 8 }}
         {{- include "kubeflow.pipelines.mlPipeline.config.db.pipelineDatabaseName.env.spec" . | nindent 8 }}
         {{- include "kubeflow.pipelines.mlPipeline.config.db.conMaxLifetime.env.spec" . | nindent 8 }}
+        {{- include "kubeflow.pipelines.mlPipeline.config.db.driver.env.spec" . | nindent 8 }}
 
         {{- include "kubeflow.pipelines.mlPipeline.config.objectStore.accessKey.env.spec" . | nindent 8 }}
         {{- include "kubeflow.pipelines.mlPipeline.config.objectStore.secretAccessKey.env.spec" . | nindent 8 }}

diff --git a/charts/kubeflow/templates/pipelines/ml-pipeline/persistenceagent/deployment.yaml b/charts/kubeflow/templates/pipelines/ml-pipeline/persistenceagent/deployment.yaml
@@ -37,12 +37,6 @@ spec:
           value: {{ .Values.pipelines.persistenceAgent.config.ttlSecondsAfterWorkflowFinish | quote }}
         - name: NUM_WORKERS
           value: {{ .Values.pipelines.persistenceAgent.config.numWorkers | quote }}
-        - name: KUBEFLOW_USERID_HEADER
-          value: {{ .Values.auth.userHeaderName | quote }}
-        - name: KUBEFLOW_USERID_PREFIX
-          value: {{ .Values.auth.userIdPrefix | quote }}
-        - name: MULTIUSER
-          value: {{ (include "kubeflow.isMultiuser" .) | quote }}
         - name: NAMESPACE
           {{- if (include "kubeflow.deploymentMode.namespace" .) }}
           valueFrom:

diff --git a/charts/kubeflow/templates/pipelines/ml-pipeline/persistenceagent/role-or-clusterrole.yaml b/charts/kubeflow/templates/pipelines/ml-pipeline/persistenceagent/role-or-clusterrole.yaml
@@ -32,10 +32,11 @@ rules:
   verbs:
   - report
 - apiGroups:
-  - ''
+  - pipelines.kubeflow.org
   resources:
-  - namespaces
+  - runs
   verbs:
-  - get
+  - reportMetrics
+  - readArtifact
 
 {{- end }}
diff --git a/charts/kubeflow/templates/profiles-controller/deployment.yaml b/charts/kubeflow/templates/profiles-controller/deployment.yaml
@@ -40,6 +40,14 @@ spec:
         - {{ default "" .Values.profilesController.config.workloadIdentity | quote }}
 
         env:
+        - name: ADMIN
+          value: {{ default "" .Values.profilesController.config.admin | quote }}
+        - name: WORKLOAD_IDENTITY
+          value: {{ default "" .Values.profilesController.config.workloadIdentity | quote }}
+        - name: USERID_HEADER
+          value: {{ .Values.auth.userHeaderName | quote }}
+        - name: USERID_PREFIX
+          value: {{ default "" .Values.auth.userIdPrefix | quote }}
         - name: NOTEBOOK_CONTROLLER_PRINCIPAL
           value: {{ include "kubeflow.notebooks.controller.serviceAccountPrincipal" . }}
         - name: KFP_UI_PRINCIPAL
@@ -72,6 +80,7 @@ spec:
       - name: kfam
         image: {{ include "kubeflow.profilesController.kfam.image" . }}
         imagePullPolicy: {{ include "kubeflow.profilesController.kfam.imagePullPolicy" . }}
+
         command:
         - /access-management
         - "-cluster-admin"
@@ -80,6 +89,25 @@ spec:
         - {{ .Values.auth.userHeaderName | quote }}
         - "-userid-prefix"
         - {{ default "" .Values.auth.userIdPrefix | quote }}
+
+        env:
+        - name: ADMIN
+          value: {{ default "" .Values.profilesController.config.admin | quote }}
+        - name: WORKLOAD_IDENTITY
+          value: {{ default "" .Values.profilesController.config.workloadIdentity | quote }}
+        - name: USERID_HEADER
+          value: {{ .Values.auth.userHeaderName | quote }}
+        - name: USERID_PREFIX
+          value: {{ default "" .Values.auth.userIdPrefix | quote }}
+        - name: NOTEBOOK_CONTROLLER_PRINCIPAL
+          value: {{ include "kubeflow.notebooks.controller.serviceAccountPrincipal" . }}
+        - name: KFP_UI_PRINCIPAL
+          value: {{ include "kubeflow.pipelines.ui.serviceAccountPrincipal" . }}
+        {{- if (include "kubeflow.istioIntegration.enabled" . ) }}
+        - name: ISTIO_INGRESS_GATEWAY_PRINCIPAL
+          value: {{ include "kubeflow.istioIntegration.istioIngressGateway.serviceAccountPrincipal" . }}
+        {{- end }}
+
         livenessProbe:
           httpGet:
             path: /metrics

diff --git a/charts/kubeflow/values.yaml b/charts/kubeflow/values.yaml
@@ -1,5 +1,3 @@
-# NOTE: the manifests were taken from kubeflow/manifests with tag v1.8.0-rc.1 (or v1.8.0-rc.0)
-
 # NOTE: try disabling cache in the ml-pipeline
 # or, try using newer version
 
@@ -300,15 +298,15 @@ notebooks:
       ################################################################
       image:
         # the default container image
-        value: kubeflownotebookswg/jupyter-scipy:v1.8.0-rc.0
+        value: kubeflownotebookswg/jupyter-scipy:v1.8.0
 
         # the list of available container images in the dropdown
         options:
-          - kubeflownotebookswg/jupyter-scipy:v1.8.0-rc.0
-          - kubeflownotebookswg/jupyter-pytorch-full:v1.8.0-rc.0
-          - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.8.0-rc.0
-          - kubeflownotebookswg/jupyter-tensorflow-full:v1.8.0-rc.0
-          - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.8.0-rc.0
+          - kubeflownotebookswg/jupyter-scipy:v1.8.0
+          - kubeflownotebookswg/jupyter-pytorch-full:v1.8.0
+          - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.8.0
+          - kubeflownotebookswg/jupyter-tensorflow-full:v1.8.0
+          - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.8.0
 
       ################################################################
       # VSCode-like Container Images (Group 1)
@@ -323,11 +321,11 @@ notebooks:
       ################################################################
       imageGroupOne:
         # the default container image
-        value: kubeflownotebookswg/codeserver-python:v1.8.0-rc.0
+        value: kubeflownotebookswg/codeserver-python:v1.8.0
 
         # the list of available container images in the dropdown
         options:
-          - kubeflownotebookswg/codeserver-python:v1.8.0-rc.0
+          - kubeflownotebookswg/codeserver-python:v1.8.0
 
       ################################################################
       # RStudio-like Container Images (Group 2)
@@ -344,11 +342,11 @@ notebooks:
       ################################################################
       imageGroupTwo:
         # the default container image
-        value: kubeflownotebookswg/rstudio-tidyverse:v1.8.0-rc.0
+        value: kubeflownotebookswg/rstudio-tidyverse:v1.8.0
 
         # the list of available container images in the dropdown
         options:
-          - kubeflownotebookswg/rstudio-tidyverse:v1.8.0-rc.0
+          - kubeflownotebookswg/rstudio-tidyverse:v1.8.0
 
       ################################################################
       # CPU Resources
@@ -392,12 +390,11 @@ notebooks:
           # the list of available vendors in the dropdown
           #  `limitsKey` - what will be set as the actual limit
           #  `uiName` - what will be displayed in the dropdown UI
-          vendors: []
-          #vendors:
-          #  - limitsKey: "nvidia.com/gpu"
-          #    uiName: "NVIDIA"
-          #  - limitsKey: "amd.com/gpu"
-          #    uiName: "AMD"
+          vendors:
+            - limitsKey: "nvidia.com/gpu"
+              uiName: "NVIDIA"
+            - limitsKey: "amd.com/gpu"
+              uiName: "AMD"
 
           # the default value of the limit
           # (possible values: "none", "1", "2", "4", "8")
@@ -823,7 +820,7 @@ pipelines:
   # the container images are stored in a different registry.
   image:
     registry: gcr.io/ml-pipeline
-    tag: 2.0.1
+    tag: 2.0.5
     pullPolicy: IfNotPresent
   config:
     # If this is empty, the kfp backend will automatically configure that with:
@@ -1322,7 +1319,7 @@ pipelines:
     image:
       registryOverwrite: gcr.io/tfx-oss-public
       repository: ml_metadata_store_server
-      tagOverwrite: 1.5.0
+      tagOverwrite: 1.14.0
       pullPolicyOverwrite:
     resources:
       # requests: