From b070c16b91224bb9edf4dfc0bca9821301827ffd Mon Sep 17 00:00:00 2001 From: Anand Sanmukhani Date: Thu, 20 May 2021 10:44:19 -0400 Subject: [PATCH 1/2] Update jsonnet lock so newer templates are used --- jsonnet/jsonnetfile.lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json index 6deb2c52..cd90f166 100644 --- a/jsonnet/jsonnetfile.lock.json +++ b/jsonnet/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "jsonnet/lib" } }, - "version": "cbff1da9ba9371516a6254db359ae33545aefdf7", + "version": "db6ae0c36c832c497532cceed677f2c373e2488d", "sum": "Z86CgnoTybhpdQKWc2ptURmps1d9Qxhec0/IK6v71kY=", "name": "observatorium-api" }, @@ -19,8 +19,8 @@ "subdir": "configuration" } }, - "version": "8f5144ea1f8d86bce5e0b5ab7186f2b882f544dd", - "sum": "JJw7XVf0i3iBxjHrs/AgMQCVdNQgT6RlETcgVdSYUuk=" + "version": "0c524f875198cb46ed5596e4b6af3203c4b144d9", + "sum": "IJiVLQdaFs+UsJxbW0+DmID9ZqbCxoPaIDeFpSDEZJ8=" }, { "source": { From 058d0b913b44cf93a12a06412dfdbf4e414473ee Mon Sep 17 00:00:00 2001 From: Anand Sanmukhani Date: Thu, 20 May 2021 11:58:00 -0400 Subject: [PATCH 2/2] update test manifest location --- tests/e2e.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/e2e.sh b/tests/e2e.sh index ddfa7af5..8ef14923 100755 --- a/tests/e2e.sh +++ b/tests/e2e.sh @@ -18,10 +18,10 @@ kind() { dex() { $KUBECTL create ns dex || true $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/tests/manifests/observatorium-xyz-tls-dex.yaml - $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/environments/dev/manifests/dex-secret.yaml - $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/environments/dev/manifests/dex-pvc.yaml - $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/environments/dev/manifests/dex-deployment.yaml - $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/environments/dev/manifests/dex-service.yaml + $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/examples/dev/manifests/dex-secret.yaml + $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/examples/dev/manifests/dex-pvc.yaml + $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/examples/dev/manifests/dex-deployment.yaml + $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/examples/dev/manifests/dex-service.yaml # service CA for the first tenant, "test" $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/tests/manifests/test-ca-tls.yaml @@ -35,7 +35,7 @@ deploy() { $KUBECTL create ns observatorium-minio || true $KUBECTL create ns observatorium || true dex - $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/environments/dev/manifests + $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/examples/dev/manifests } wait_for_cr() { @@ -70,11 +70,11 @@ deploy_operator() { $KUBECTL create ns observatorium-minio || true $KUBECTL create ns observatorium || true dex - $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/environments/dev/manifests/minio-secret-thanos.yaml - $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/environments/dev/manifests/minio-secret-loki.yaml - $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/environments/dev/manifests/minio-pvc.yaml - $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/environments/dev/manifests/minio-deployment.yaml - $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/environments/dev/manifests/minio-service.yaml + $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/examples/dev/manifests/minio-secret-thanos.yaml + $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/examples/dev/manifests/minio-secret-loki.yaml + $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/examples/dev/manifests/minio-pvc.yaml + $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/examples/dev/manifests/minio-deployment.yaml + $KUBECTL apply -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/examples/dev/manifests/minio-service.yaml $KUBECTL apply -n observatorium -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/tests/manifests/observatorium-xyz-tls-configmap.yaml $KUBECTL apply -n observatorium -f jsonnet/vendor/github.com/observatorium/observatorium/configuration/tests/manifests/observatorium-xyz-tls-secret.yaml $KUBECTL apply -f manifests/crds