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