Skip to content

Wait for resources and don't use envsubst in tilt #1294

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

Merged
k8s-ci-robot merged 1 commit into from
Apr 7, 2021
Merged

Wait for resources and don't use envsubst in tilt #1294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ def deploy_worker_templates(template, substitutions):
value = substitutions[substitution]
yaml = yaml.replace("${" + substitution + "}", value)

yaml = envsubst(yaml)
yaml = yaml.replace('"', '\\"') # add escape character to double quotes in yaml

local_resource(
Expand All @@ -306,15 +305,15 @@ def base64_encode_file(path_to_encode):
def base64_decode(to_decode):
decode_blob = local("echo '{}' | base64 --decode -".format(to_decode), quiet=True)
return str(decode_blob)

def envsubst(yaml):
yaml = yaml.replace('"', '\\"')
return str(local("echo \"{}\" | {}".format(yaml, envsubst_cmd), quiet=True))

def kustomizesub(folder):
yaml = local('hack/kustomize-sub.sh {}'.format(folder), quiet=True)
return yaml

def waitforsystem():
local("kubectl wait --for=condition=ready --timeout=300s pod --all -n capi-kubeadm-bootstrap-system")
local("kubectl wait --for=condition=ready --timeout=300s pod --all -n capi-kubeadm-control-plane-system")
local("kubectl wait --for=condition=ready --timeout=300s pod --all -n capi-system")

##############################
# Actual work happens here
##############################
Expand All @@ -332,6 +331,8 @@ deploy_capi()

capz()

waitforsystem()

create_crs()

flavors()