djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some broken resource grouping/ordering in Tiltfile.

Browse Source 
Signed-off-by: Matt Moyer <moyerm@vmware.com>
This commit is contained in:
Matt Moyer 2020-11-17 12:21:15 -06:00
parent 6ce2f109bf
commit 0d1ad6e1df
No known key found for this signature in database
GPG Key ID: EAE88AD172C5AE2D
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hack/lib/tilt/Tiltfile
View File

@ -19,35 +19,25 @@ local_resource(
) )
##################################################################################################### #####################################################################################################
# Dex # Test IDP (Dex + cert generation + squid proxy)
# #
# Render the Dex installation manifest using ytt. # Render the IDP installation manifest using ytt.
k8s_yaml(local(['ytt','--file', '../../../test/deploy/dex'])) k8s_yaml(local(['ytt','--file', '../../../test/deploy/dex']))
# Tell tilt to watch all of those files for changes. # Tell tilt to watch all of those files for changes.
watch_file('../../../test/deploy/dex') watch_file('../../../test/deploy/dex')
# Collect all the deployed certificate issuer resources under a "cert-issuer" resource tab. k8s_resource(objects=['dex:namespace'], new_name='dex-ns')
k8s_resource( k8s_resource(workload='cert-issuer', resource_deps=['dex-ns'], objects=[
workload='cert-issuer',
objects=[
# these are the objects that would otherwise appear in the "uncategorized" tab in the tilt UI
'cert-issuer:serviceaccount', 'cert-issuer:serviceaccount',
'cert-issuer:role', 'cert-issuer:role',
'cert-issuer:rolebinding', 'cert-issuer:rolebinding',
], ])
) k8s_resource(workload='proxy', resource_deps=['dex-ns'])
k8s_resource(workload='dex', resource_deps=['dex-ns', 'cert-issuer'], objects=[
# Collect all the deployed Dex resources under a "dex" resource tab.
k8s_resource(
workload='dex', # this is the deployment name
objects=[
# these are the objects that would otherwise appear in the "uncategorized" tab in the tilt UI
'dex:namespace',
'dex-config:configmap', 'dex-config:configmap',
], ])
resource_deps=['cert-issuer'],
)
##################################################################################################### #####################################################################################################
# Local-user-authenticator app # Local-user-authenticator app
@ -198,6 +188,6 @@ k8s_resource(
local_resource( local_resource(
'test-env', 'test-env',
'TILT_MODE=yes ../../prepare-for-integration-tests.sh', 'TILT_MODE=yes ../../prepare-for-integration-tests.sh',
resource_deps=['local-user-auth', 'concierge', 'supervisor', 'dex', 'cert-issuer'], resource_deps=['local-user-auth', 'concierge', 'supervisor', 'dex', 'proxy'],
deps=['../../prepare-for-integration-tests.sh'], deps=['../../prepare-for-integration-tests.sh'],
) )