Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update jsonnet lock so newer templates are used #70

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update jsonnet lock so newer templates are used #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b070c16
Update jsonnet lock so newer templates are used
May 20, 2021
058d0b9
update test manifest location
May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions jsonnet/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "jsonnet/lib"
}
},
"version": "cbff1da9ba9371516a6254db359ae33545aefdf7",
"version": "db6ae0c36c832c497532cceed677f2c373e2488d",
"sum": "Z86CgnoTybhpdQKWc2ptURmps1d9Qxhec0/IK6v71kY=",
"name": "observatorium-api"
},
Expand All @@ -19,8 +19,8 @@
"subdir": "configuration"
}
},
"version": "8f5144ea1f8d86bce5e0b5ab7186f2b882f544dd",
"sum": "JJw7XVf0i3iBxjHrs/AgMQCVdNQgT6RlETcgVdSYUuk="
"version": "0c524f875198cb46ed5596e4b6af3203c4b144d9",
"sum": "IJiVLQdaFs+UsJxbW0+DmID9ZqbCxoPaIDeFpSDEZJ8="
},
{
"source": {
Expand Down
20 changes: 10 additions & 10 deletions tests/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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() {
Expand Down Expand Up @@ -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
Expand Down