Skip to content

Commit 4ff4ac2

Browse files
committed
Update helm charts
Signed-off-by: kunal-511 <[email protected]>
1 parent 75dd137 commit 4ff4ac2

File tree

73 files changed

+1299
-735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1299
-735
lines changed

experimental/helm/charts/pipeline/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ dependencies:
2525
condition: minio.enabled
2626
repository: "https://charts.min.io/"
2727
- name: mysql
28-
version: "~9.0.0"
28+
version: "~14.0.0"
2929
condition: mysql.enabled
3030
repository: "https://charts.bitnami.com/bitnami"
3131
- name: postgresql
32-
version: "~12.0.0"
32+
version: "~16.0.0"
3333
condition: postgresql.enabled
3434
repository: "https://charts.bitnami.com/bitnami"
3535
annotations:

experimental/helm/charts/pipeline/ci/values-platform-agnostic-enhanced.yaml

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ installMode:
1414
multiUser:
1515
enabled: false
1616

17-
# Database Configuration - Using MySQL subchart
17+
# Database Configuration - Using built-in MySQL
1818
mysql:
19-
enabled: true
19+
enabled: false
2020
auth:
2121
rootPassword: "root123"
2222
username: "mlpipeline"
@@ -35,12 +35,12 @@ externalDatabase:
3535
host: ""
3636
port: 3306
3737
database: mlpipeline
38-
username: mlpipeline
38+
username: root
3939
password: ""
4040

41-
# Object Storage Configuration - Using MinIO subchart
41+
# Object Storage Configuration - Using built-in MinIO
4242
minio:
43-
enabled: true
43+
enabled: false
4444
auth:
4545
rootUser: "minio"
4646
rootPassword: "minio123"
@@ -62,57 +62,61 @@ database:
6262

6363
# Pipeline Configuration
6464
pipeline:
65+
# Platform-agnostic specific: Empty defaultPipelineRoot to match kustomize
66+
defaultPipelineRoot: ""
6567
cache:
6668
image: "registry.k8s.io/busybox"
6769
nodeRestrictions: false
6870
maximumStaleness: ""
6971
defaultStaleness: ""
7072

71-
# Argo Workflows Configuration
73+
# Argo Workflows Configuration - use built-in
7274
argo:
73-
enabled: true
75+
enabled: false
7476
# Basic Argo configuration for platform-agnostic deployment
7577

78+
# Built-in third-party components
79+
thirdParty:
80+
mysql:
81+
enabled: true
82+
minio:
83+
enabled: true
84+
argo:
85+
enabled: true
86+
7687
# Environment Configuration
7788
env:
7889
platform: platform-agnostic
7990

80-
# Resource Configuration
91+
# Resource Configuration
8192
apiServer:
8293
resources:
8394
requests:
8495
cpu: 250m
8596
memory: 500Mi
86-
limits:
87-
cpu: 500m
88-
memory: 1Gi
8997

9098
persistenceAgent:
9199
resources:
92100
requests:
93101
cpu: 120m
94102
memory: 500Mi
95-
limits:
96-
cpu: 250m
97-
memory: 1Gi
98103

99104
scheduledWorkflow:
100105
resources:
101-
requests:
102-
cpu: 120m
103-
memory: 100Mi
104-
limits:
105-
cpu: 250m
106-
memory: 500Mi
107106

108107
ui:
109108
resources:
110109
requests:
111110
cpu: 10m
112111
memory: 70Mi
113-
limits:
114-
cpu: 100m
115-
memory: 200Mi
112+
113+
# Disable CRDs for platform-agnostic scenario
114+
crds:
115+
install: false
116+
117+
# Disable webhooks for platform-agnostic scenario
118+
webhooks:
119+
enabled: false
116120

117121
metadata:
118122
grpc:
@@ -145,20 +149,13 @@ cache:
145149
visualization:
146150
resources:
147151
requests:
148-
cpu: 50m
149-
memory: 200Mi
150-
limits:
151-
cpu: 100m
152-
memory: 400Mi
152+
cpu: 30m
153+
memory: 500Mi
153154

154155
viewerCrd:
156+
image:
157+
pullPolicy: Always
155158
resources:
156-
requests:
157-
cpu: 120m
158-
memory: 100Mi
159-
limits:
160-
cpu: 250m
161-
memory: 200Mi
162159

163160
# Monitoring disabled for platform-agnostic
164161
monitoring:

experimental/helm/charts/pipeline/ci/values-standalone.yaml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
env:
66
platform: platform-agnostic
77

8-
# Database configuration - use MySQL subchart
8+
# Database configuration - use built-in MySQL
99
mysql:
10-
enabled: true
10+
enabled: false
1111
auth:
1212
rootPassword: ""
1313
database: "mlpipeline"
@@ -23,12 +23,12 @@ postgresql:
2323
externalDatabase:
2424
type: mysql
2525

26-
# Object storage configuration - use MinIO subchart
26+
# Object storage configuration - use built-in MinIO
2727
objectStore:
2828
provider: minio
2929

3030
minio:
31-
enabled: true
31+
enabled: false
3232
auth:
3333
rootUser: "minio"
3434
rootPassword: "minio123"
@@ -37,9 +37,18 @@ minio:
3737
enabled: true
3838
size: 20Gi
3939

40-
# Argo Workflows configuration
40+
# Argo Workflows configuration - use built-in
4141
argo:
42-
enabled: true
42+
enabled: false
43+
44+
# Built-in third-party components
45+
thirdParty:
46+
mysql:
47+
enabled: true
48+
minio:
49+
enabled: true
50+
argo:
51+
enabled: true
4352

4453
# Disable cloud-specific features
4554
monitoring:
@@ -54,3 +63,11 @@ certManager:
5463
networking:
5564
istio:
5665
enabled: false
66+
67+
# Disable CRDs for platform-agnostic scenario
68+
crds:
69+
install: false
70+
71+
# Disable webhooks for platform-agnostic scenario
72+
webhooks:
73+
enabled: false

experimental/helm/charts/pipeline/templates/_helpers.tpl

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,9 @@ Create chart name and version as used by the chart label.
3131
{{- end }}
3232

3333
{{/*
34-
Common labels
34+
Common labels - simplified to match kustomize output
3535
*/}}
3636
{{- define "kubeflow-pipelines.labels" -}}
37-
helm.sh/chart: {{ include "kubeflow-pipelines.chart" . }}
38-
{{ include "kubeflow-pipelines.selectorLabels" . }}
39-
{{- if .Chart.AppVersion }}
40-
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
41-
{{- end }}
42-
app.kubernetes.io/managed-by: {{ .Release.Service }}
43-
app.kubernetes.io/component: ml-pipeline
4437
application-crd-id: kubeflow-pipelines
4538
{{- with .Values.commonLabels }}
4639
{{ toYaml . }}
@@ -55,12 +48,48 @@ app.kubernetes.io/name: {{ include "kubeflow-pipelines.name" . }}
5548
app.kubernetes.io/instance: {{ .Release.Name }}
5649
{{- end }}
5750

51+
{{/*
52+
Cache server labels
53+
*/}}
54+
{{- define "kubeflow-pipelines.cacheLabels" -}}
55+
app: cache-server
56+
application-crd-id: kubeflow-pipelines
57+
{{- with .Values.commonLabels }}
58+
{{ toYaml . }}
59+
{{- end }}
60+
{{- end }}
61+
62+
{{/*
63+
Cache deployer labels
64+
*/}}
65+
{{- define "kubeflow-pipelines.cacheDeployerLabels" -}}
66+
app: cache-deployer
67+
application-crd-id: kubeflow-pipelines
68+
{{- with .Values.commonLabels }}
69+
{{ toYaml . }}
70+
{{- end }}
71+
{{- end }}
72+
5873
{{/*
5974
ML Pipeline specific labels - matching original manifests
6075
*/}}
6176
{{- define "kubeflow-pipelines.mlPipelineLabels" -}}
62-
{{ include "kubeflow-pipelines.labels" . }}
6377
app: ml-pipeline
78+
application-crd-id: kubeflow-pipelines
79+
{{- with .Values.commonLabels }}
80+
{{ toYaml . }}
81+
{{- end }}
82+
{{- end }}
83+
84+
{{/*
85+
ML Pipeline UI labels
86+
*/}}
87+
{{- define "kubeflow-pipelines.uiLabels" -}}
88+
app: ml-pipeline-ui
89+
application-crd-id: kubeflow-pipelines
90+
{{- with .Values.commonLabels }}
91+
{{ toYaml . }}
92+
{{- end }}
6493
{{- end }}
6594

6695
{{/*
@@ -121,7 +150,7 @@ Create the name of the service account to use for Cache Server
121150
*/}}
122151
{{- define "kubeflow-pipelines.cache.serviceAccountName" -}}
123152
{{- if .Values.cache.serviceAccount.create }}
124-
{{- default "cache-server" .Values.cache.serviceAccount.name }}
153+
{{- default "kubeflow-pipelines-cache" .Values.cache.serviceAccount.name }}
125154
{{- else }}
126155
{{- default "default" .Values.cache.serviceAccount.name }}
127156
{{- end }}
@@ -132,7 +161,7 @@ Create the name of the service account to use for Cache Deployer
132161
*/}}
133162
{{- define "kubeflow-pipelines.cacheDeployer.serviceAccountName" -}}
134163
{{- if .Values.cacheDeployer.serviceAccount.create }}
135-
{{- default "cache-deployer-sa" .Values.cacheDeployer.serviceAccount.name }}
164+
{{- default "kubeflow-pipelines-cache-deployer-sa" .Values.cacheDeployer.serviceAccount.name }}
136165
{{- else }}
137166
{{- default "default" .Values.cacheDeployer.serviceAccount.name }}
138167
{{- end }}
@@ -233,7 +262,7 @@ mysql-secret
233262
{{- else if .Values.postgresql.enabled -}}
234263
postgresql-secret
235264
{{- else -}}
236-
{{ include "kubeflow-pipelines.fullname" . }}-mysql-secret
265+
mysql-secret
237266
{{- end -}}
238267
{{- end }}
239268

0 commit comments

Comments
 (0)