kubeflow
/
model-registry
mirror of https://github.com/kubeflow/model-registry.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: Align PostgreSQL overlay and fix readiness probe (#1357) 

* updated postgres manifests and fixed readiness bug

Signed-off-by: Chanakya Thirumala Setty <cthiruma@redhat.com>

* updated passwords to match

Signed-off-by: Chanakya Thirumala Setty <cthiruma@redhat.com>

---------

Signed-off-by: Chanakya Thirumala Setty <cthiruma@redhat.com>
This commit is contained in:
Chanakya Thirumala Setty 2025-07-24 11:33:01 -05:00 committed by GitHub
parent 883f45696b
commit f86d88022e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 30 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/proxy/readiness.go
View File

@ -43,7 +43,7 @@ func ReadinessHandler(datastore datastore.Datastore) http.Handler {
var result struct {
Version int64
Dirty int
Dirty bool
}
query := "SELECT version, dirty FROM schema_migrations ORDER BY version DESC LIMIT 1"
@ -52,7 +52,7 @@ func ReadinessHandler(datastore datastore.Datastore) http.Handler {
return
}
if result.Dirty != 0 {
if result.Dirty {
http.Error(w, "database schema is in dirty state", http.StatusServiceUnavailable)
return
}

35
manifests/kustomize/overlays/postgres/kustomization.yaml
View File

@ -11,42 +11,27 @@ resources:
configMapGenerator:
- envs:
- params.env
name: metadata-registry-db-parameters
name: model-registry-db-parameters
secretGenerator:
- envs:
- secrets.env
name: metadata-registry-db-secrets
name: model-registry-db-secrets
generatorOptions:
disableNameSuffixHash: true
images:
- name: postgres
newName: postgres
newTag: 14.7-alpine3.17
newTag: "14.7-alpine3.17"
patches:
- path: patches/model-registry-deployment.yaml
replacements:
- source:
fieldPath: metadata.name
kind: Service
name: metadata-postgres-db
version: v1
targets:
- fieldPaths:
- spec.template.spec.containers.0.args.2
options:
delimiter: =
index: 1
select:
group: apps
kind: Deployment
name: model-registry-deployment
version: v1
- source:
fieldPath: data.POSTGRES_PORT
kind: ConfigMap
name: metadata-registry-db-parameters
name: model-registry-db-parameters
version: v1
targets:
- fieldPaths:
@ -56,13 +41,3 @@ replacements:
kind: Deployment
name: model-registry-deployment
version: v1
- fieldPaths:
- spec.template.spec.containers.0.args.3
options:
delimiter: =
index: 1
select:
group: apps
kind: Deployment
name: model-registry-deployment
version: v1

6
manifests/kustomize/overlays/postgres/model-registry-db-deployment.yaml
View File

@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: metadata-postgres-db
name: model-registry-db
labels:
component: db
spec:
@ -31,9 +31,9 @@ spec:
value: /var/lib/postgresql/data/pgdata
envFrom:
- configMapRef:
name: metadata-registry-db-parameters
name: model-registry-db-parameters
- secretRef:
name: metadata-registry-db-secrets
name: model-registry-db-secrets
ports:
- name: postgres
containerPort: 5432

2
manifests/kustomize/overlays/postgres/model-registry-db-pvc.yaml
View File

@ -7,4 +7,4 @@ spec:
- ReadWriteOnce
resources:
requests:
storage: 20Gi
storage: 10Gi

4
manifests/kustomize/overlays/postgres/model-registry-db-service.yaml
View File

@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
name: metadata-postgres-db
name: model-registry-db
labels:
component: db
spec:
@ -9,6 +9,6 @@ spec:
ports:
- port: 5432
protocol: TCP
name: postgres
name: dbapi
selector:
component: db

3
manifests/kustomize/overlays/postgres/params.env
View File

@ -1,2 +1,3 @@
POSTGRES_DB=metadb
POSTGRES_PORT=5432
POSTGRES_DBNAME=mlmdpostgres
POSTGRES_HOST=model-registry-db

31
manifests/kustomize/overlays/postgres/patches/model-registry-deployment.yaml
View File

@ -10,23 +10,20 @@ spec:
traffic.sidecar.istio.io/excludeOutboundPorts: POSTGRES_PORT_PLACEHOLDER
spec:
containers:
- name: grpc-container
- name: rest-container
# Remove existing environment variables
env:
- $patch: replace
- $patch: replace
envFrom:
- configMapRef:
name: metadata-registry-db-parameters
- secretRef:
name: metadata-registry-db-secrets
- configMapRef:
name: model-registry-configmap
args: ["--grpc_port=$(MODEL_REGISTRY_GRPC_SERVICE_PORT)",
"--metadata_source_config_type=postgresql",
"--postgres_config_host=MLMD_DB_HOST_PLACEHOLDER",
"--postgres_config_port=POSTGRES_PORT_PLACEHOLDER",
"--postgres_config_dbname=$(POSTGRES_DBNAME)",
"--postgres_config_user=$(POSTGRES_USER)",
"--postgres_config_password=$(POSTGRES_PASSWORD)",
# "--postgres_config_skip_db_creation=true",
"--enable_database_upgrade=true"]
- configMapRef:
name: model-registry-configmap
- secretRef:
name: model-registry-db-secrets
- configMapRef:
name: model-registry-db-parameters
args:
- --hostname=0.0.0.0
- --port=$(MODEL_REGISTRY_REST_SERVICE_PORT)
- --datastore-type=embedmd
- --embedmd-database-type=postgres
- --embedmd-database-dsn=postgresql://$(POSTGRES_USER):$(POSTGRES_PASSWORD)@$(POSTGRES_HOST):$(POSTGRES_PORT)/$(POSTGRES_DB)?sslmode=disable

2
manifests/kustomize/overlays/postgres/secrets.env
View File

@ -1,2 +1,2 @@
POSTGRES_USER=root
POSTGRES_PASSWORD=password
POSTGRES_PASSWORD=test