diff --git a/deploy/helm/mlflow-multitenant-deps/Chart.yaml b/deploy/helm/mlflow-multitenant-deps/Chart.yaml index 1704a45..b14017a 100644 --- a/deploy/helm/mlflow-multitenant-deps/Chart.yaml +++ b/deploy/helm/mlflow-multitenant-deps/Chart.yaml @@ -5,8 +5,8 @@ description: >- These charts provide the required operators for the mlflow-multitenant chart, and are collected here for conveninence. type: application -version: 0.1.1 -appVersion: 0.1.1 +version: 0.2.0 +appVersion: 0.2.0 dependencies: - name: cert-manager repository: https://charts.jetstack.io diff --git a/deploy/helm/mlflow-multitenant/Chart.lock b/deploy/helm/mlflow-multitenant/Chart.lock new file mode 100644 index 0000000..66aa372 --- /dev/null +++ b/deploy/helm/mlflow-multitenant/Chart.lock @@ -0,0 +1,15 @@ +dependencies: +- name: mlflow-oidc-proxy + repository: file://../mlflow-oidc-proxy + version: 0.2.0 +- name: keycloak + repository: oci://registry-1.docker.io/bitnamicharts + version: 21.3.1 +- name: oauth2-proxy + repository: oci://registry-1.docker.io/bitnamicharts + version: 5.3.0 +- name: minio + repository: https://charts.min.io/ + version: 5.0.8 +digest: sha256:d8895ea28bf2286cfe99ca563ade37a005be76686186057b722a7b5997b02194 +generated: "2024-05-27T15:28:31.811137115-06:00" diff --git a/deploy/helm/mlflow-multitenant/Chart.yaml b/deploy/helm/mlflow-multitenant/Chart.yaml index 2fae53b..6ed316f 100644 --- a/deploy/helm/mlflow-multitenant/Chart.yaml +++ b/deploy/helm/mlflow-multitenant/Chart.yaml @@ -2,19 +2,19 @@ apiVersion: v2 name: mlflow-multitenant description: Multitenant MLFlow using oauth2-proxy, mlflow-oicd-proxy, the zalando postgres-operator, and minio type: application -version: 0.1.1 +version: 0.2.0 appVersion: "v2.13.0" dependencies: - name: mlflow-oidc-proxy repository: file://../mlflow-oidc-proxy # This is set to the actual chart repo in the github actions - version: 0.1.1 + version: 0.2.0 - name: keycloak repository: oci://registry-1.docker.io/bitnamicharts - version: 14.2.0 + version: 21.3.1 condition: keycloak.enabled - name: oauth2-proxy repository: oci://registry-1.docker.io/bitnamicharts - version: 3.5.0 + version: 5.3.0 condition: oauth2-proxy.enabled - name: minio repository: https://charts.min.io/ diff --git a/deploy/helm/mlflow-oidc-proxy/Chart.yaml b/deploy/helm/mlflow-oidc-proxy/Chart.yaml index 6889d18..995ec70 100644 --- a/deploy/helm/mlflow-oidc-proxy/Chart.yaml +++ b/deploy/helm/mlflow-oidc-proxy/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.1 +version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.1" +appVersion: "0.2.0" diff --git a/e2e_suite_test.go b/e2e_suite_test.go index eb7a302..b80f3a4 100644 --- a/e2e_suite_test.go +++ b/e2e_suite_test.go @@ -719,6 +719,7 @@ spec: `keycloak.ingress.annotations.nginx\.ingress\.kubernetes\.io/proxy-buffer-size`: "1m", "keycloak.tls.keystorePassword": "keystore-password", "keycloak.tls.truststorePassword": "truststore-password", + "keycloak.proxy": "edge", "keycloak.service.type": "ClusterIP", "keycloak.auth.adminUser": "admin", "keycloak.auth.adminPassword": "adminPassword", @@ -1079,10 +1080,6 @@ func keycloakSetup(pod string, extraEnv ...string) func(g gingk8s.Gingk8s, ctx c fullScriptParts = append(fullScriptParts, string(keycloakSetupScript)) return func(g gingk8s.Gingk8s, ctx context.Context, cluster gingk8s.Cluster) error { return gosh.Then( - // If this isn't delted, it will conflict between setups - g.Kubectl(ctx, cluster, "delete", "secret", "mlflow-oidc-proxy"), - g.Kubectl(ctx, cluster, "delete", "secret", "mlflow-multitenant-oidc"), - g.Kubectl(ctx, cluster, "delete", "secret", "mlflow-multitenant-jupyterhub-oidc"), g.KubectlExec(ctx, cluster, pod, "bash", []string{"-xe"}). WithStreams(gosh.StringIn(strings.Join(fullScriptParts, "\n"))), ).Run() diff --git a/integration-test/keycloak-setup.sh b/integration-test/keycloak-setup.sh index 7d31bba..50e7265 100644 --- a/integration-test/keycloak-setup.sh +++ b/integration-test/keycloak-setup.sh @@ -118,6 +118,8 @@ for tenant in 1 2; do kcadm.sh create users \ -r "${REALM}" \ -s username="tenant-${tenant}" \ + -s firstName=Dummy \ + -s lastName=Dummy \ -s email="tenant-${tenant}@test.test" \ -s emailVerified=true \ -s credentials='[{"type": "password", "value": "test", "temporary": false}]' \