Merge remote-tracking branch 'origin/sebastian/prod-2981-set-up-catal…

…og-pipeline' into sebastian/prod-2981-set-up-catalog-pipeline
pluralsh · Dec 17, 2024 · eb004c5 · eb004c5
2 parents 9690829 + 1eaf21b
commit eb004c5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/catalogs/data/mlflow/helm/mlflow.yaml.liquid b/catalogs/data/mlflow/helm/mlflow.yaml.liquid
@@ -15,18 +15,18 @@ tracking:
 externalDatabase:
   dialectDriver: "postgresql"
   host: {{ imports[imports_mlflow_key].postgres_host }}
-  port: '5432'
+  port: 5432
   user: 'mlflow'
   database: 'mlflow'
   authDatabase: 'mlflow_auth'
-  password: {{ imports[imports_airbyte_key].postgres_password }}
+  password: {{ imports[imports_mlflow_key].postgres_password }}
 
 externalS3:
   host: {{ configuration.region }}.amazonaws.com
   port: 443
   useCredentialsInSecret: true
-  accessKeyID: {{imports[imports_airbyte_key].access_key_id}}
-  accessKeySecret: {{imports[imports_airbyte_key].secret_access_key}}
+  accessKeyID: {{imports[imports_mlflow_key].access_key_id}}
+  accessKeySecret: {{imports[imports_mlflow_key].secret_access_key}}
   existingSecret: ~
   existingSecretAccessKeyIDKey: AWS_ACCESS_KEY_ID
   existingSecretKeySecretKey: AWS_SECRET_ACCESS_KEY

diff --git a/catalogs/data/mlflow/helm/oauth-proxy-config.yaml.liquid b/catalogs/data/mlflow/helm/oauth-proxy-config.yaml.liquid
@@ -5,24 +5,17 @@ service:
   name: mlflow-oauth2-proxy
   selector:
     app.kubernetes.io/instance: mlflow
-    app.kubernetes.io/name: webapp
+    app.kubernetes.io/component: tracking
+    app.kubernetes.io/name: mlflow
 
 secret:
   clientID: {{ imports[imports_mlflow_key].oidc_client_id }}
   clientSecret: {{ imports[imports_mlflow_key].oidc_client_secret }}
   cookieSecret: {{ imports[imports_mlflow_key].oidc_cookie_secret }}
   issuer: https://oidc.plural.sh/
-  upstream: http://localhost:8080
+  upstream: http://localhost:5000
   name: mlflow-proxy-config
   env:
     OAUTH2_PROXY_UPSTREAM_TIMEOUT: '120s'
 
-{% if configuration["basicAuth"] %}
-{% assign basicAuth = configuration["basicAuth"] | from_json %}
-users:
-{% for user in basicAuth %}
-  {{ user[0] }}: {{ user[1] }}
-{% endfor %}
-{% endif %}
-
 {% endraw %}
diff --git a/catalogs/data/mlflow/mlflow-servicedeployment.yaml b/catalogs/data/mlflow/mlflow-servicedeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: mlflow-{{ context.cluster }}
   namespace: apps
 spec:
-  namespace: mflow
+  namespace: mlflow
   git:
     folder: helm/mlflow/{{ context.cluster }}
     ref: main