Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 33 additions & 3 deletions dkube/patches/cache-server-mysql-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,43 @@ spec:
containers:
- name: server
env:
- $patch: replace
- name: DBCONFIG_USER
valueFrom:
secretKeyRef:
name: katib-mysql-secrets
key: DBCONFIG_USER
name: mysql-secret
- name: DBCONFIG_PASSWORD
valueFrom:
secretKeyRef:
name: mysql-db-pxc-db
key: root
key: DBCONFIG_PASSWORD
name: mysql-secret
- name: DBCONFIG_HOST_NAME
valueFrom:
secretKeyRef:
key: DBCONFIG_HOST
name: mysql-secret
- name: DBCONFIG_PORT
valueFrom:
secretKeyRef:
key: DBCONFIG_PORT
name: mysql-secret
- name: NAMESPACE_TO_WATCH
value: ""
- name: CACHE_IMAGE
valueFrom:
configMapKeyRef:
key: cacheImage
name: pipeline-install-config
- name: CACHE_NODE_RESTRICTIONS
valueFrom:
configMapKeyRef:
key: cacheNodeRestrictions
name: pipeline-install-config
- name: DBCONFIG_DRIVER
value: mysql
- name: DBCONFIG_DB_NAME
valueFrom:
configMapKeyRef:
key: cacheDb
name: pipeline-install-config
14 changes: 7 additions & 7 deletions dkube/patches/katib-external-mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ spec:
- name: DB_USER
valueFrom:
secretKeyRef:
name: katib-mysql-secrets
name: mysql-secret
key: DBCONFIG_USER
- name: DB_PASSWORD
valueFrom:
secretKeyRef:
name: mysql-db-pxc-db
key: root
name: mysql-secret
key: DBCONFIG_PASSWORD
- name: KATIB_MYSQL_DB_DATABASE
valueFrom:
secretKeyRef:
Expand All @@ -50,10 +50,10 @@ spec:
- name: KATIB_MYSQL_DB_HOST
valueFrom:
secretKeyRef:
name: katib-mysql-secrets
key: KATIB_MYSQL_DB_HOST
name: mysql-secret
key: DBCONFIG_HOST
- name: KATIB_MYSQL_DB_PORT
valueFrom:
secretKeyRef:
name: katib-mysql-secrets
key: KATIB_MYSQL_DB_PORT
name: mysql-secret
key: DBCONFIG_PORT
22 changes: 16 additions & 6 deletions dkube/patches/metadata-external-mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,29 @@ spec:
- name: DBCONFIG_USER
valueFrom:
secretKeyRef:
name: katib-mysql-secrets
name: mysql-secret
key: DBCONFIG_USER
- name : DBCONFIG_PASSWORD
- name: DBCONFIG_PASSWORD
valueFrom:
secretKeyRef:
name: mysql-db-pxc-db
key: root
name: mysql-secret
key: DBCONFIG_PASSWORD
- name: DBCONFIG_HOST
valueFrom:
secretKeyRef:
name: mysql-secret
key: DBCONFIG_HOST
- name: DBCONFIG_PORT
valueFrom:
secretKeyRef:
name: mysql-secret
key: DBCONFIG_PORT
envFrom:
- configMapRef:
name: metadata-grpc-configmap
args: ["--grpc_port=$(METADATA_GRPC_SERVICE_PORT)",
"--mysql_config_host=metadata-db",
"--mysql_config_host=$(DBCONFIG_HOST)",
"--mysql_config_database=metadb",
"--mysql_config_port=3306",
"--mysql_config_port=$(DBCONFIG_PORT)",
"--mysql_config_user=$(DBCONFIG_USER)",
"--mysql_config_password=$(DBCONFIG_PASSWORD)"]
64 changes: 54 additions & 10 deletions dkube/patches/pipeline-external-mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ metadata:
namespace: kubeflow
$patch: delete
---
apiVersion: v1
kind: Secret
metadata:
name: mysql-secret
namespace: kubeflow
$patch: delete
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -44,13 +37,64 @@ spec:
containers:
- name: ml-pipeline-api-server
env:
- $patch: replace
- name: DBCONFIG_USER
valueFrom:
secretKeyRef:
name: katib-mysql-secrets
key: DBCONFIG_USER
name: mysql-secret
- name: DBCONFIG_PASSWORD
valueFrom:
secretKeyRef:
name: mysql-db-pxc-db
key: root
key: DBCONFIG_PASSWORD
name: mysql-secret
- name: DBCONFIG_HOST
valueFrom:
secretKeyRef:
key: DBCONFIG_HOST
name: mysql-secret
- name: DBCONFIG_PORT
valueFrom:
secretKeyRef:
key: DBCONFIG_PORT
name: mysql-secret
- name: KUBEFLOW_USERID_HEADER
value: kubeflow-userid
- name: KUBEFLOW_USERID_PREFIX
value: ""
- name: AUTO_UPDATE_PIPELINE_DEFAULT_VERSION
valueFrom:
configMapKeyRef:
key: autoUpdatePipelineDefaultVersion
name: pipeline-install-config
- name: POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: OBJECTSTORECONFIG_SECURE
value: "false"
- name: OBJECTSTORECONFIG_BUCKETNAME
valueFrom:
configMapKeyRef:
key: bucketName
name: pipeline-install-config
- name: DBCONFIG_DBNAME
valueFrom:
configMapKeyRef:
key: pipelineDb
name: pipeline-install-config
- name: DBCONFIG_CONMAXLIFETIMESEC
valueFrom:
configMapKeyRef:
key: ConMaxLifeTimeSec
name: pipeline-install-config
- name: OBJECTSTORECONFIG_ACCESSKEY
valueFrom:
secretKeyRef:
key: accesskey
name: mlpipeline-minio-artifact
- name: OBJECTSTORECONFIG_SECRETACCESSKEY
valueFrom:
secretKeyRef:
key: secretkey
name: mlpipeline-minio-artifact
3 changes: 0 additions & 3 deletions dkube/secrets.env
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
KATIB_MYSQL_DB_DATABASE=katib
KATIB_MYSQL_DB_HOST=katib-mysql
KATIB_MYSQL_DB_PORT=3306
DBCONFIG_USER=root