Skip to content

Commit fd16b2c

Browse files
committed
remove extra resources
Signed-off-by: kunal-511 <[email protected]>
1 parent 16254dd commit fd16b2c

24 files changed

+504
-152
lines changed

experimental/helm/charts/pipelines/ci/values-aws-enhanced.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ installMode:
1313
multiUser:
1414
enabled: false
1515

16+
crds:
17+
install: false
18+
19+
cacheDeployer:
20+
enabled: true
21+
serviceAccount:
22+
create: false
23+
1624
# Database Configuration
1725
mysql:
1826
enabled: false
@@ -79,7 +87,7 @@ env:
7987
enabled: true
8088
endpoint: "YOUR_RDS_ENDPOINT"
8189
s3:
82-
enabled: true
90+
enabled: false
8391
bucket: "YOUR_S3_BUCKET_NAME"
8492
region: "YOUR_AWS_REGION"
8593

experimental/helm/charts/pipelines/ci/values-azure-enhanced.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ installMode:
1717
mysql:
1818
enabled: false
1919

20+
crds:
21+
install: false
22+
23+
cacheDeployer:
24+
enabled: true
25+
serviceAccount:
26+
create: false
27+
2028
postgresql:
2129
enabled: false
2230

@@ -68,13 +76,15 @@ env:
6876
resourceGroup: "yourResourceGroup"
6977
storageAccount: "yourstorageaccount"
7078
sql:
71-
enabled: true
79+
enabled: false
7280
serverName: "[SQLSERVERNAME]"
7381
database: "mlpipeline"
7482
blob:
75-
enabled: true
83+
enabled: true
7684
storageAccount: "yourstorageaccount"
7785
container: "mlpipeline"
86+
createMinioGateway: true
87+
createMinioSecret: true
7888
managedIdentity:
7989
enabled: false
8090

@@ -186,7 +196,9 @@ ui:
186196
# Third-party components configuration
187197
thirdParty:
188198
minio:
189-
enabled: true
199+
enabled: false # Azure uses custom minio-azure-gateway, not the built-in MinIO
200+
mysql:
201+
enabled: false # Azure uses external MySQL/Azure SQL
190202

191203
# Enhanced resources for Azure deployment
192204
persistenceAgent:

experimental/helm/charts/pipelines/ci/values-dev-enhanced.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ installMode:
1313
multiUser:
1414
enabled: false
1515

16+
crds:
17+
install: true
18+
application: true
19+
20+
# Cache deployer for generic mode
21+
cacheDeployer:
22+
enabled: true
23+
serviceAccount:
24+
create: true
25+
1626
# Database Configuration
1727
mysql:
1828
enabled: false

experimental/helm/charts/pipelines/ci/values-gcp-enhanced.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,20 @@ installMode:
1212
type: generic
1313
multiUser:
1414
enabled: false
15+
legacyLabels: true
1516

1617
# Database Configuration - External Cloud SQL
1718
mysql:
1819
enabled: false
1920

21+
crds:
22+
install: false
23+
24+
cacheDeployer:
25+
enabled: true
26+
serviceAccount:
27+
create: false
28+
2029
postgresql:
2130
enabled: false
2231

@@ -35,7 +44,7 @@ minio:
3544

3645
objectStore:
3746
provider: gcs
38-
secure: true
47+
secure: false
3948
bucketName: "mlpipeline"
4049
gcs:
4150
projectId: "yourGcsProjectId"
@@ -86,10 +95,12 @@ env:
8695
region: "YOUR_GCP_REGION"
8796
gcs:
8897
enabled: true
89-
bucket: "yourGcsBucketName"
98+
bucket: "mlpipeline"
9099
projectId: "yourGcsProjectId"
91100
proxyAgent:
92101
enabled: true
102+
workloadIdentity:
103+
enabled: false
93104

94105
# GCP-specific API Server configuration
95106
apiServer:

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,13 @@ argo:
8282
enabled: false
8383
# Multi-user uses built-in minimal Argo instead of subchart
8484

85+
# Third Party Components
86+
thirdParty:
87+
argo:
88+
enabled: false
89+
metacontroller:
90+
enabled: false
91+
8592
# Environment Configuration
8693
env:
8794
platform: platform-agnostic
@@ -294,8 +301,8 @@ cache:
294301
key: password
295302

296303
cacheDeployer:
297-
# Typically disabled in multi-user mode
298-
enabled: false
304+
# Cache deployer is included in base multi-user install
305+
enabled: true
299306

300307
visualization:
301308
resources:

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

Lines changed: 167 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,16 @@ profileController:
3131
create: true
3232
name: "profiles-controller-service-account"
3333
annotations: {}
34-
34+
additionalEnv:
35+
- name: KFP_VERSION
36+
key: appVersion
37+
- name: KFP_DEFAULT_PIPELINE_ROOT
38+
key: defaultPipelineRoot
39+
- name: MINIO_ACCESS_KEY
40+
key: accesskey
41+
- name: MINIO_SECRET_KEY
42+
key: secretkey
43+
3544
# Resources
3645
resources:
3746
requests:
@@ -62,23 +71,131 @@ apiServer:
6271

6372
# Additional environment variables for multi-user mode
6473
additionalEnv:
65-
- name: MULTI_USER
66-
value: "true"
6774
- name: KUBEFLOW_USERID_HEADER
6875
value: "kubeflow-userid"
6976
- name: KUBEFLOW_USERID_PREFIX
7077
value: ""
78+
- name: PUBLISH_LOGS
79+
value: "true"
80+
- name: LOG_LEVEL
81+
value: "info"
82+
- name: PIPELINE_LOG_LEVEL
83+
value: "1"
84+
- name: AUTO_UPDATE_PIPELINE_DEFAULT_VERSION
85+
key: autoUpdatePipelineDefaultVersion
86+
configMapName: pipeline-install-config
87+
- name: POD_NAMESPACE
88+
valueFrom:
89+
fieldRef:
90+
fieldPath: metadata.namespace
91+
- name: OBJECTSTORECONFIG_SECURE
92+
value: "false"
93+
- name: OBJECTSTORECONFIG_BUCKETNAME
94+
key: bucketName
95+
configMapName: pipeline-install-config
96+
- name: DBCONFIG_USER
97+
key: username
98+
secretName: mysql-secret
99+
- name: DBCONFIG_PASSWORD
100+
key: password
101+
secretName: mysql-secret
102+
- name: DBCONFIG_DBNAME
103+
key: pipelineDb
104+
configMapName: pipeline-install-config
105+
- name: DBCONFIG_HOST
106+
key: dbHost
107+
configMapName: pipeline-install-config
108+
- name: DBCONFIG_PORT
109+
key: dbPort
110+
configMapName: pipeline-install-config
111+
- name: DBCONFIG_CONMAXLIFETIME
112+
key: ConMaxLifeTime
113+
configMapName: pipeline-install-config
114+
- name: DB_DRIVER_NAME
115+
key: dbType
116+
configMapName: pipeline-install-config
117+
- name: DBCONFIG_MYSQLCONFIG_USER
118+
key: username
119+
secretName: mysql-secret
120+
- name: DBCONFIG_MYSQLCONFIG_PASSWORD
121+
key: password
122+
secretName: mysql-secret
123+
- name: DBCONFIG_MYSQLCONFIG_DBNAME
124+
key: pipelineDb
125+
configMapName: pipeline-install-config
126+
- name: DBCONFIG_MYSQLCONFIG_HOST
127+
key: mysqlHost
128+
configMapName: pipeline-install-config
129+
- name: DBCONFIG_MYSQLCONFIG_PORT
130+
key: mysqlPort
131+
configMapName: pipeline-install-config
132+
- name: OBJECTSTORECONFIG_ACCESSKEY
133+
key: accesskey
134+
secretName: mlpipeline-minio-artifact
135+
- name: OBJECTSTORECONFIG_SECRETACCESSKEY
136+
key: secretkey
137+
secretName: mlpipeline-minio-artifact
138+
- name: V2_DRIVER_IMAGE
139+
value: "ghcr.io/kubeflow/kfp-driver:2.14.3"
140+
- name: V2_LAUNCHER_IMAGE
141+
value: "ghcr.io/kubeflow/kfp-launcher:2.14.3"
142+
71143

72144
# Enhanced UI configuration for multi-user
73145
ui:
74146
additionalEnv:
75-
- name: MULTI_USER
147+
- name: VIEWER_TENSORBOARD_POD_TEMPLATE_SPEC_PATH
148+
value: "/etc/config/viewer-pod-template.json"
149+
- name: DEPLOYMENT
150+
value: "KUBEFLOW"
151+
- name: ARTIFACTS_SERVICE_PROXY_NAME
152+
value: "ml-pipeline-ui-artifact"
153+
- name: ARTIFACTS_SERVICE_PROXY_PORT
154+
value: "80"
155+
- name: ARTIFACTS_SERVICE_PROXY_ENABLED
156+
value: "true"
157+
- name: ENABLE_AUTHZ
76158
value: "true"
77159
- name: KUBEFLOW_USERID_HEADER
78160
value: "kubeflow-userid"
79161
- name: KUBEFLOW_USERID_PREFIX
162+
key: null
163+
- name: MINIO_NAMESPACE
164+
valueFrom:
165+
fieldRef:
166+
fieldPath: metadata.namespace
167+
- name: MINIO_ACCESS_KEY
168+
key: accesskey
169+
- name: MINIO_SECRET_KEY
170+
key: secretkey
171+
- name: ALLOW_CUSTOM_VISUALIZATIONS
172+
value: "true"
173+
- name: FRONTEND_SERVER_NAMESPACE
174+
valueFrom:
175+
fieldRef:
176+
fieldPath: metadata.namespace
177+
- name: ARGO_ARCHIVE_LOGS
178+
value: "true"
179+
- name: DISABLE_GKE_METADATA
180+
value: "true"
181+
182+
persistenceAgent:
183+
resources:
184+
requests:
185+
cpu: 120m
186+
memory: 500Mi
187+
additionalEnv:
188+
- name: NAMESPACE
80189
value: ""
81190

191+
scheduledWorkflow:
192+
additionalEnv:
193+
- name: NAMESPACE
194+
value: ''
195+
- name: LOG_LEVEL
196+
value: "info"
197+
valueFrom: null
198+
82199
# Enhanced RBAC for multi-user
83200
rbac:
84201
create: true
@@ -119,7 +236,7 @@ serviceAccounts:
119236
thirdParty:
120237
# Argo Workflows configuration
121238
argo:
122-
enabled: true
239+
enabled: false
123240

124241
# Database configuration
125242
mysql:
@@ -157,13 +274,55 @@ metadata:
157274
tag: "1.14.0"
158275
pullPolicy: IfNotPresent
159276
resources:
160-
requests:
161-
cpu: 100m
162-
memory: 100Mi
163277

164278
postgresql:
165279
enabled: false
166280

281+
cache:
282+
# Cache deployer disabled in multi-user mode
283+
enabled: true
284+
server:
285+
resources:
286+
requests:
287+
cpu: 250m
288+
memory: 1Gi
289+
limits:
290+
cpu: 1
291+
memory: 2Gi
292+
additionalEnv:
293+
- name: NAMESPACE_TO_WATCH
294+
key: null
295+
- name: DEFAULT_CACHE_STALENESS
296+
key: DEFAULT_CACHE_STALENESS
297+
- name: MAXIMUM_CACHE_STALENESS
298+
key: MAXIMUM_CACHE_STALENESS
299+
- name: CACHE_IMAGE
300+
key: cacheImage
301+
- name: CACHE_NODE_RESTRICTIONS
302+
key: cacheNodeRestrictions
303+
- name: DBCONFIG_DRIVER
304+
value: "mysql"
305+
- name: DBCONFIG_DB_NAME
306+
key: cacheDb
307+
- name: DBCONFIG_HOST_NAME
308+
key: dbHost
309+
- name: DBCONFIG_PORT
310+
key: dbPort
311+
- name: DBCONFIG_USER
312+
key: username
313+
- name: DBCONFIG_PASSWORD
314+
key: password
315+
316+
viewerCrd:
317+
env:
318+
maxNumViewers: ""
319+
additionalEnv:
320+
- name: NAMESPACE
321+
value: ""
322+
- name: MAX_NUM_VIEWERS
323+
value: 50
324+
325+
167326
# Istio configuration for multi-user
168327
networking:
169328
istio:

experimental/helm/charts/pipelines/ci/values-platform-agnostic-multi-user-enhanced.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ application:
102102
# Metadata (MLMD) Configuration
103103
metadata:
104104
enabled: true
105+
grpc:
106+
resources:
105107

106108
# Environment Configuration
107109
env:

0 commit comments

Comments
 (0)