Skip to content

Commit

Permalink
Use the Site abstraction
Browse files Browse the repository at this point in the history
  • Loading branch information
@ssorj
ssorj committed Jan 5, 2024
1 parent f2dd71e commit 9dd2cae
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 82 deletions.
163 changes: 84 additions & 79 deletions python/skewer/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,26 +153,19 @@ def run_steps_minikube(skewer_file, debug=False):

skewer_data = read_yaml(skewer_file)

for site_name, site in skewer_data["sites"].items():
_Site(site_name, site)

for site in skewer_data["sites"].values():
for name, value in site["env"].items():
site["env"][name] = value.replace("~", work_dir)

try:
run("minikube -p skewer start")

for site_name, site in skewer_data["sites"].items():
if site["platform"] != "kubernetes":
continue

with working_env(**site["env"]):
run("minikube -p skewer update-context")
for site_name, site_data in skewer_data["sites"].items():
for name, value in site_data["env"].items():
site_data["env"][name] = value.replace("~", work_dir)

kubeconfig = ENV["KUBECONFIG"]
site = _Site(site_name, site_data)
site.check()

check_file(kubeconfig)
with site:
run("minikube -p skewer update-context")
check_file(ENV["KUBECONFIG"])

with open("/tmp/minikube-tunnel-output", "w") as tunnel_output_file:
with start("minikube -p skewer tunnel", output=tunnel_output_file):
Expand All @@ -199,28 +192,29 @@ def run_steps(work_dir, skewer_data, debug=False):
print("TROUBLE!")
print("-- Start of debug output")

for site_name, site in skewer_data["sites"].items():
print(f"---- Debug output for site '{site_name}'")

with logging_context(site_name):
with working_env(**site["env"]):
if site["platform"] == "kubernetes":
run("kubectl get services", check=False)
run("kubectl get deployments", check=False)
run("kubectl get statefulsets", check=False)
run("kubectl get pods", check=False)
run("kubectl get events", check=False)

run("skupper version", check=False)
run("skupper status", check=False)
run("skupper link status", check=False)
run("skupper service status", check=False)
run("skupper network status", check=False)
run("skupper debug events", check=False)

if site["platform"] == "kubernetes":
run("kubectl logs deployment/skupper-router", check=False)
run("kubectl logs deployment/skupper-service-controller", check=False)
for site_name, site_data in skewer_data["sites"].items():
site = _Site(site_name, site_data)

print(f"---- Debug output for site '{site.name}'")

with site:
if site.platform == "kubernetes":
run("kubectl get services", check=False)
run("kubectl get deployments", check=False)
run("kubectl get statefulsets", check=False)
run("kubectl get pods", check=False)
run("kubectl get events", check=False)

run("skupper version", check=False)
run("skupper status", check=False)
run("skupper link status", check=False)
run("skupper service status", check=False)
run("skupper network status", check=False)
run("skupper debug events", check=False)

if site.platform == "kubernetes":
run("kubectl logs deployment/skupper-router", check=False)
run("kubectl logs deployment/skupper-service-controller", check=False)

print("-- End of debug output")

Expand All @@ -232,30 +226,33 @@ def run_steps(work_dir, skewer_data, debug=False):
break

def _pause_for_demo(work_dir, skewer_data):
first_site_name, first_site = list(skewer_data["sites"].items())[0]
sites = list()
frontend_url = None

if first_site["platform"] == "kubernetes":
with logging_context(first_site_name):
with working_env(**first_site["env"]):
console_ip = await_external_ip("service/skupper")
console_url = f"https://{console_ip}:8010/"
password_data = call("kubectl get secret skupper-console-users -o jsonpath='{.data.admin}'", quiet=True)
password = base64_decode(password_data).decode("ascii")
for site_name, site_data in skewer_data["sites"].items():
site = _Site(site_name, site_data)
sites.append(site)

if sites[0].platform == "kubernetes":
with sites[0]:
console_ip = await_external_ip("service/skupper")
console_url = f"https://{console_ip}:8010/"
password_data = call("kubectl get secret skupper-console-users -o jsonpath='{.data.admin}'", quiet=True)
password = base64_decode(password_data).decode("ascii")

if run("kubectl get service/frontend", check=False, output=DEVNULL, quiet=True).exit_code == 0:
if call("kubectl get service/frontend -o jsonpath='{.spec.type}'", quiet=True) == "LoadBalancer":
frontend_ip = await_external_ip("service/frontend")
frontend_url = f"http://{frontend_ip}:8080/"
if run("kubectl get service/frontend", check=False, output=DEVNULL, quiet=True).exit_code == 0:
if call("kubectl get service/frontend -o jsonpath='{.spec.type}'", quiet=True) == "LoadBalancer":
frontend_ip = await_external_ip("service/frontend")
frontend_url = f"http://{frontend_ip}:8080/"

print()
print("Demo time!")
print()
print("Sites:")

for site_name, site in skewer_data["sites"].items():
if site["platform"] == "kubernetes":
kubeconfig = site["env"]["KUBECONFIG"]
for site in sites:
if site.platform == "kubernetes":
kubeconfig = site.env["KUBECONFIG"]
print(f" {site_name}: export KUBECONFIG={kubeconfig}")

if frontend_url:
Expand All @@ -279,38 +276,34 @@ def _run_step(work_dir, skewer_data, step_data, check=True):
if "title" in step_data:
notice("Running step '{}'", step_data["title"])

items = step_data["commands"].items()
for site_name, commands in step_data["commands"].items():
site_data = skewer_data["sites"][site_name]

for site_name, commands in items:
site = skewer_data["sites"][site_name]
with _Site(site_name, site_data) as site:
if site.platform == "kubernetes":
run(f"kubectl config set-context --current --namespace {site.namespace}", stdout=DEVNULL, quiet=True)

with logging_context(site_name):
with working_env(**site["env"]):
if site["platform"] == "kubernetes":
namespace = site["namespace"]
run(f"kubectl config set-context --current --namespace {namespace}", stdout=DEVNULL, quiet=True)

for command in commands:
if command.get("apply") == "readme":
continue
for command in commands:
if command.get("apply") == "readme":
continue

if "run" in command:
run(command["run"].replace("~", work_dir), shell=True, check=check)
if "run" in command:
run(command["run"].replace("~", work_dir), shell=True, check=check)

if "await_resource" in command:
resource = command["await_resource"]
await_resource(resource)
if "await_resource" in command:
resource = command["await_resource"]
await_resource(resource)

if "await_external_ip" in command:
service = command["await_external_ip"]
await_external_ip(service)
if "await_external_ip" in command:
service = command["await_external_ip"]
await_external_ip(service)

if "await_http_ok" in command:
service, url_template = command["await_http_ok"]
await_http_ok(service, url_template)
if "await_http_ok" in command:
service, url_template = command["await_http_ok"]
await_http_ok(service, url_template)

if "await_console_ok" in command:
await_console_ok()
if "await_console_ok" in command:
await_console_ok()

def generate_readme(skewer_file, output_file):
notice("Generating the readme")
Expand Down Expand Up @@ -390,7 +383,6 @@ def generate_readme(skewer_file, output_file):
else:
title = step_data["title"]


out.append(f"## {title}")
out.append("")
out.append(_generate_readme_step(skewer_data, step_data))
Expand Down Expand Up @@ -542,10 +534,12 @@ def _resolve_commands(commands, site):

class _Site:
def __init__(self, name, data):
assert name is not None

self.name = name
self.title = data.get("title")
self.platform = data["platform"]
self.namespace = None
self.namespace = data.get("namespace")
self.env = data["env"]

self._logging_context = logging_context(self.name)
Expand All @@ -555,6 +549,17 @@ def __enter__(self):
self._logging_context.__enter__()
self._working_env.__enter__()

return self

def __exit__(self, exc_type, exc_value, traceback):
self._working_env.__exit__(exc_type, exc_value, traceback)
self._logging_context.__exit__(exc_type, exc_value, traceback)

def check(self):
if self.platform == "kubernetes":
assert self.namespace is not None
assert "KUBECONFIG" in self.env

if self.platform == "podman":
assert "SKUPPER_PLATFORM" in self.env
assert self.env["SKUPPER_PLATFORM"] == "podman"
3 changes: 2 additions & 1 deletion python/skewer/standardsteps.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ test_the_application:
frontend LoadBalancer 10.103.232.28 <external-ip> 8080:30407/TCP 15s
- run: curl http://<external-ip>:8080/api/health
apply: readme
output: OK
output: |
OK
- await_http_ok: [service/frontend, "http://{}:8080/api/health"]
postamble: |
If everything is in order, you can now access the web interface by
Expand Down
5 changes: 3 additions & 2 deletions test-example/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ _Sample output:_
~~~ console
$ skupper init
Waiting for LoadBalancer IP or hostname...
Waiting for status...
Skupper is now installed in namespace '<namespace>'. Use 'skupper status' to get more information.
~~~

Expand Down Expand Up @@ -247,8 +248,8 @@ Check the status of the link using 'skupper link status'.
~~~

If your console sessions are on different machines, you may need
to use `sftp` or a similar tool to transfer the token securely.
By default, tokens expire after a single use or 15 minutes after
to use `scp` or a similar tool to transfer the token securely. By
default, tokens expire after a single use or 15 minutes after
creation.

## Step 8: Fail on demand
Expand Down

0 comments on commit 9dd2cae

Please sign in to comment.