Skip to content

Commit 07e2320

Browse files
committed
Update helm charts to reduce differences
Signed-off-by: kunal-511 <[email protected]>
1 parent 4ff4ac2 commit 07e2320

Some content is hidden

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

43 files changed

+1639
-269
lines changed

experimental/helm/charts/pipeline/ci/values-multi-user-enhanced.yaml

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ global:
55
namespace: kubeflow
66
imageRegistry: ghcr.io/kubeflow
77
imageTag: "2.5.0"
8-
imagePullPolicy: IfNotPresent
8+
imagePullPolicy: Always
99

1010
# Installation mode - Multi-user enabled
1111
installMode:
@@ -71,9 +71,9 @@ database:
7171
pipeline:
7272
cache:
7373
image: "registry.k8s.io/busybox"
74-
nodeRestrictions: true
75-
maximumStaleness: "P0D"
76-
defaultStaleness: "P0D"
74+
nodeRestrictions: false
75+
maximumStaleness: ""
76+
defaultStaleness: ""
7777

7878
# Argo Workflows Configuration - Multi-user
7979
argo:
@@ -114,23 +114,24 @@ ui:
114114

115115
resources:
116116
requests:
117-
cpu: 100m
118-
memory: 200Mi
119-
limits:
120-
cpu: 500m
121-
memory: 1Gi
117+
cpu: 10m
118+
memory: 70Mi
119+
122120

123121
# Enhanced resources for multi-user deployment
124122
persistenceAgent:
125123
resources:
126124
requests:
127-
cpu: 250m
128-
memory: 1Gi
129-
limits:
130-
cpu: 1
131-
memory: 2Gi
125+
cpu: 120m
126+
memory: 500Mi
132127

133128
scheduledWorkflow:
129+
additionalEnv:
130+
- name: NAMESPACE
131+
value: ''
132+
- name: LOG_LEVEL
133+
value: "info"
134+
valueFrom: null
134135
resources:
135136
requests:
136137
cpu: 250m
@@ -168,6 +169,24 @@ cache:
168169
limits:
169170
cpu: 1
170171
memory: 2Gi
172+
additionalEnv:
173+
- name: NAMESPACE_TO_WATCH
174+
- name: DEFAULT_CACHE_STALENESS
175+
key: DEFAULT_CACHE_STALENESS
176+
- name: MAXIMUM_CACHE_STALENESS
177+
key: MAXIMUM_CACHE_STALENESS
178+
- name: CACHE_IMAGE
179+
key: cacheImage
180+
- name: CACHE_NODE_RESTRICTIONS
181+
- name: DBCONFIG_DRIVER
182+
- name: DBCONFIG_DB_NAME
183+
key: cacheDb
184+
- name: DBCONFIG_HOST_NAME
185+
key: dbHost
186+
- name: DBCONFIG_PORT
187+
- name: DBCONFIG_USER
188+
key: username
189+
- name: DBCONFIG_PASSWORD
171190

172191
cacheDeployer:
173192
# Typically disabled in multi-user mode
@@ -176,22 +195,24 @@ cacheDeployer:
176195
visualization:
177196
resources:
178197
requests:
179-
cpu: 100m
198+
cpu: 30m
180199
memory: 500Mi
181-
limits:
182-
cpu: 500m
183-
memory: 1Gi
184200

185201
viewerCrd:
186202
env:
187-
maxNumViewers: "200"
203+
maxNumViewers: ""
188204
resources:
189205
requests:
190206
cpu: 250m
191207
memory: 500Mi
192208
limits:
193209
cpu: 500m
194210
memory: 1Gi
211+
additionalEnv:
212+
- name: NAMESPACE
213+
value: ""
214+
- name: MAX_NUM_VIEWERS
215+
value: 50
195216

196217
# Profile Controller Configuration (for multi-user)
197218
profileController:

experimental/helm/charts/pipeline/ci/values-multi-user.yaml

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -113,38 +113,54 @@ serviceAccounts:
113113
create: true
114114
name: "profiles-controller-service-account"
115115

116-
# Database configuration
117-
mysql:
118-
enabled: true
119-
auth:
120-
rootPassword: ""
121-
database: "mlpipeline"
122-
username: "root"
123-
primary:
116+
# Third party services configuration
117+
thirdParty:
118+
# Argo Workflows configuration
119+
argo:
120+
enabled: true
121+
122+
# Database configuration
123+
mysql:
124+
enabled: true
125+
auth:
126+
rootPassword: ""
127+
database: "mlpipeline"
128+
username: "root"
129+
primary:
130+
persistence:
131+
enabled: true
132+
size: 20Gi
133+
134+
# Object storage configuration
135+
minio:
136+
enabled: true
137+
auth:
138+
rootUser: "minio"
139+
rootPassword: "minio123"
140+
defaultBuckets: "mlpipeline"
124141
persistence:
125142
enabled: true
126143
size: 20Gi
127144

128-
postgresql:
129-
enabled: false
130-
131-
# Object storage configuration
132-
objectStore:
133-
provider: minio
134-
135-
minio:
136-
enabled: true
137-
auth:
138-
rootUser: "minio"
139-
rootPassword: "minio123"
140-
defaultBuckets: "mlpipeline"
141-
persistence:
145+
# Metacontroller for profile controller
146+
metacontroller:
142147
enabled: true
143-
size: 20Gi
144148

145-
# Argo Workflows configuration
146-
argo:
149+
# Metadata service configuration
150+
metadata:
147151
enabled: true
152+
grpc:
153+
image:
154+
repository: gcr.io/tfx-oss-public/ml_metadata_store_server
155+
tag: "1.14.0"
156+
pullPolicy: IfNotPresent
157+
resources:
158+
requests:
159+
cpu: 100m
160+
memory: 100Mi
161+
162+
postgresql:
163+
enabled: false
148164

149165
# Istio configuration for multi-user
150166
networking:

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,13 @@ persistenceAgent:
103103

104104
scheduledWorkflow:
105105
resources:
106+
additionalEnv:
107+
- name: LOG_LEVEL
108+
value: "info"
109+
- name: NAMESPACE
110+
valueFrom:
111+
fieldRef:
112+
fieldPath: metadata.namespace
106113

107114
ui:
108115
resources:
@@ -145,6 +152,25 @@ cache:
145152
limits:
146153
cpu: 250m
147154
memory: 1Gi
155+
additionalEnv:
156+
- name: DEFAULT_CACHE_STALENESS
157+
- name: MAXIMUM_CACHE_STALENESS
158+
key: MAXIMUM_CACHE_STALENESS
159+
- name: CACHE_IMAGE
160+
key: cacheImage
161+
- name: CACHE_NODE_RESTRICTIONS
162+
key: cacheNodeRestrictions
163+
- name: DBCONFIG_DRIVER
164+
- name: DBCONFIG_DB_NAME
165+
- name: DBCONFIG_HOST_NAME
166+
key: dbHost
167+
- name: DBCONFIG_PORT
168+
key: dbPort
169+
- name: DBCONFIG_USER
170+
- name: DBCONFIG_PASSWORD
171+
key: password
172+
- name: NAMESPACE_TO_WATCH
173+
148174

149175
visualization:
150176
resources:
@@ -156,6 +182,11 @@ viewerCrd:
156182
image:
157183
pullPolicy: Always
158184
resources:
185+
additionalEnv:
186+
- name: MAX_NUM_VIEWERS
187+
value: 50
188+
- name: NAMESPACE
189+
value: ""
159190

160191
# Monitoring disabled for platform-agnostic
161192
monitoring:

0 commit comments

Comments
 (0)