Skip to content

Commit

Permalink
Update chart deps, bump chart versions
Browse files Browse the repository at this point in the history
  • Loading branch information
meln5674 committed May 28, 2024
1 parent fc8d809 commit aa94100
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 12 deletions.
4 changes: 2 additions & 2 deletions deploy/helm/mlflow-multitenant-deps/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions deploy/helm/mlflow-multitenant/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 4 additions & 4 deletions deploy/helm/mlflow-multitenant/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/mlflow-oidc-proxy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
5 changes: 1 addition & 4 deletions e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 2 additions & 0 deletions integration-test/keycloak-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}]' \
Expand Down

0 comments on commit aa94100

Please sign in to comment.