fix warnings in overlays/postgres

Signed-off-by: mahdikhashan <mahdikhashan1@gmail.com>
kubeflow · Feb 15, 2025 · 4d3cc25 · 4d3cc25
1 parent 6ac01f8
commit 4d3cc25
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 22 deletions.
diff --git a/apps/model-registry/upstream/overlays/postgres/kustomization.yaml b/apps/model-registry/upstream/overlays/postgres/kustomization.yaml
@@ -2,24 +2,21 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 
-bases:
-- ../../base
 resources:
 - model-registry-db-pvc.yaml
 - model-registry-db-deployment.yaml
 - model-registry-db-service.yaml
+- ../../base
 
-patchesStrategicMerge:
-- patches/model-registry-deployment.yaml
 
 configMapGenerator:
-- name: metadata-postgres-db-parameters
-  envs:
+- envs:
   - params.env
+  name: metadata-postgres-db-parameters
 secretGenerator:
-- name: metadata-postgres-db-secrets
-  envs:
+- envs:
   - secrets.env
+  name: metadata-postgres-db-secrets
 generatorOptions:
   disableNameSuffixHash: true
 
@@ -28,18 +25,35 @@ images:
   newName: postgres
   newTag: 14.7-alpine3.17
 
-vars:
-- name: MLMD_DB_HOST
-  objref:
+patches:
+- path: patches/model-registry-deployment.yaml
+replacements:
+- source:
+    fieldPath: metadata.name
     kind: Service
     name: metadata-postgres-db
-    apiVersion: v1
-  fieldref:
-    fieldpath: metadata.name
-- name: POSTGRES_PORT
-  objref:
+    version: v1
+  targets:
+  - fieldPaths:
+    - spec.template.spec.containers.0.args.2
+    options:
+      delimiter: =
+      index: 1
+    select: {}
+- source:
+    fieldPath: data.POSTGRES_PORT
     kind: ConfigMap
     name: model-registry-db-parameters
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.POSTGRES_PORT
+    version: v1
+  targets:
+  - fieldPaths:
+    - |-
+      spec.template.metadata.annotations.[# db doesn't use istio
+      traffic.sidecar.istio.io/excludeOutboundPorts]
+    select: {}
+  - fieldPaths:
+    - spec.template.spec.containers.0.args.3
+    options:
+      delimiter: =
+      index: 1
+    select: {}
diff --git a/apps/model-registry/upstream/overlays/postgres/patches/model-registry-deployment.yaml b/apps/model-registry/upstream/overlays/postgres/patches/model-registry-deployment.yaml
@@ -7,7 +7,7 @@ spec:
     metadata:
       annotations:
         # db doesn't use istio
-        traffic.sidecar.istio.io/excludeOutboundPorts: $(POSTGRES_PORT)
+        traffic.sidecar.istio.io/excludeOutboundPorts: POSTGRES_PORT_PLACEHOLDER
     spec:
       containers:
         - name: grpc-container
@@ -23,8 +23,8 @@ spec:
               name: model-registry-configmap
           args: ["--grpc_port=$(MODEL_REGISTRY_GRPC_SERVICE_PORT)",
                  "--metadata_source_config_type=postgresql",
-                 "--postgres_config_host=$(MLMD_DB_HOST)",
-                 "--postgres_config_port=$(POSTGRES_PORT)",
+                 "--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)",