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

tests: pin deployed charms to a latest and stable version #353

Merged
merged 2 commits into from
Apr 16, 2024
Merged

tests: pin deployed charms to a latest and stable version #353

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
921d4ed
tests: pin deployed charms to a latest and stable version
DnPlas Apr 15, 2024
9fed253
skip: fix channels
DnPlas Apr 16, 2024
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
141 changes: 85 additions & 56 deletions tests/test_charms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,39 @@
UI_METADATA = yaml.safe_load(Path(f"{UI_PATH}/metadata.yaml").read_text())
CONTROLLER_APP_NAME = CONTROLLER_METADATA["name"]
UI_APP_NAME = UI_METADATA["name"]


INGRESSGATEWAY_NAME = "istio-ingressgateway"
PROFILE_NAME = "kubeflow-user"

ADMISSION_WEBHOOK = "admission-webhook"
ADMISSION_WEBHOOK_CHANNEL = "latest/edge"
ADMISSION_WEBHOOK_TRUST = True

ISTIO_OPERATORS_CHANNEL = "latest/edge"
ISTIO_PILOT = "istio-pilot"
ISTIO_PILOT_TRUST = True
ISTIO_PILOT_CONFIG = {"default-gateway": "kubeflow-gateway"}
ISTIO_GATEWAY = "istio-gateway"
ISTIO_GATEWAY_APP_NAME = "istio-ingressgateway"
ISTIO_GATEWAY_TRUST = True
ISTIO_GATEWAY_CONFIG = {"kind": "ingress"}

KUBEFLOW_DASHBOARD = "kubeflow-dashboard"
KUBEFLOW_DASHBOARD_CHANNEL = "latest/edge"
KUBEFLOW_DASHBOARD_TRUST = True

KUBEFLOW_PROFILES = "kubeflow-profiles"
KUBEFLOW_PROFILES_CHANNEL = "latest/edge"
KUBEFLOW_PROFILES_TRUST = True

PROMETHEUS_K8S = "prometheus-k8s"
PROMETHEUS_K8S_CHANNEL = "latest/stable"
PROMETHEUS_K8S_TRUST = True
GRAFANA_K8S = "grafana-k8s"
GRAFANA_K8S_CHANNEL = "latest/stable"
GRAFANA_K8S_TRUST = True
PROMETHEUS_SCRAPE_K8S = "prometheus-scrape-config-k8s"
PROMETHEUS_SCRAPE_K8S_CHANNEL = "latest/stable"
PROMETHEUS_SCRAPE_CONFIG = {"scrape_interval": "30s"}


@pytest.fixture(scope="module")
def lightkube_client(ops_test):
Expand Down Expand Up @@ -77,42 +105,52 @@ async def test_build_and_deploy(ops_test, lightkube_client, dummy_resources_for_

# Deploy istio-operators first
await ops_test.model.deploy(
"istio-pilot",
channel="latest/edge",
config={"default-gateway": "test-gateway"},
trust=True,
entity_url=ISTIO_PILOT,
channel=ISTIO_OPERATORS_CHANNEL,
config=ISTIO_PILOT_CONFIG,
trust=ISTIO_PILOT_TRUST,
)
await ops_test.model.deploy(
"istio-gateway",
application_name=INGRESSGATEWAY_NAME,
channel="latest/edge",
trust=True,
config={"kind": "ingress"},
entity_url=ISTIO_GATEWAY,
application_name=ISTIO_GATEWAY_APP_NAME,
channel=ISTIO_OPERATORS_CHANNEL,
config=ISTIO_GATEWAY_CONFIG,
trust=ISTIO_GATEWAY_TRUST,
)

await ops_test.model.add_relation(
ISTIO_PILOT,
ISTIO_GATEWAY_APP_NAME,
)
await ops_test.model.add_relation("istio-pilot", INGRESSGATEWAY_NAME)

await ops_test.model.wait_for_idle(
["istio-pilot", INGRESSGATEWAY_NAME],
raise_on_blocked=False,
status="active",
timeout=90 * 10,
raise_on_blocked=False,
raise_on_error=True,
timeout=300,
)

# Deploy jupyter-ui and relate to istio
await ops_test.model.deploy(
ui_charm, resources={"oci-image": ui_image_path}, application_name=UI_APP_NAME, trust=True
)
await ops_test.model.add_relation(UI_APP_NAME, "istio-pilot")
await ops_test.model.add_relation(UI_APP_NAME, ISTIO_PILOT)
await ops_test.model.wait_for_idle(apps=[UI_APP_NAME], status="active", timeout=60 * 15)

# Deploy jupyter-controller, admission-webhook, kubeflow-profiles and kubeflow-dashboard
await ops_test.model.deploy(
controller_charm, resources={"oci-image": controller_image_path}, trust=True
)
await ops_test.model.deploy("admission-webhook", channel="latest/edge", trust=True)
await ops_test.model.deploy("kubeflow-profiles", channel="latest/edge", trust=True)
await ops_test.model.wait_for_idle(["kubeflow-profiles"], status="active", timeout=60 * 15)
await ops_test.model.deploy("kubeflow-dashboard", channel="latest/edge", trust=True)
await ops_test.model.add_relation("kubeflow-profiles", "kubeflow-dashboard")
await ops_test.model.deploy(
ADMISSION_WEBHOOK, channel=ADMISSION_WEBHOOK_CHANNEL, trust=ADMISSION_WEBHOOK_TRUST
)
await ops_test.model.deploy(
KUBEFLOW_PROFILES, channel=KUBEFLOW_PROFILES_CHANNEL, trust=KUBEFLOW_PROFILES_TRUST
)
await ops_test.model.wait_for_idle([KUBEFLOW_PROFILES], status="active", timeout=60 * 15)
await ops_test.model.deploy(
KUBEFLOW_DASHBOARD, channel=KUBEFLOW_DASHBOARD_CHANNEL, trust=KUBEFLOW_DASHBOARD_TRUST
)
await ops_test.model.add_relation(KUBEFLOW_PROFILES, KUBEFLOW_DASHBOARD)

# Wait for everything to deploy
await ops_test.model.wait_for_idle(status="active", timeout=60 * 20)
Expand All @@ -123,7 +161,7 @@ def driver(request, ops_test, lightkube_client):
this_namespace = ops_test.model_name

ingress_service = lightkube_client.get(
res=Service, name=f"{INGRESSGATEWAY_NAME}-workload", namespace=this_namespace
res=Service, name=f"{ISTIO_GATEWAY_APP_NAME}-workload", namespace=this_namespace
)
gateway_ip = ingress_service.status.loadBalancer.ingress[0].ip

Expand Down Expand Up @@ -273,51 +311,42 @@ def test_create_notebook(driver, ops_test, dummy_resources_for_testing):

async def test_prometheus_grafana_integration(ops_test):
"""Deploy prometheus, grafana and required relations, then test the metrics."""
prometheus = "prometheus-k8s"
grafana = "grafana-k8s"
prometheus_scrape = "prometheus-scrape-config-k8s"
scrape_config = {"scrape_interval": "30s"}

# Deploy and relate prometheus
# FIXME: Unpin revision once https://github.com/canonical/bundle-kubeflow/issues/688 is closed
await ops_test.juju(
"deploy",
prometheus,
"--channel",
"latest/edge",
"--revision",
"137",
"--trust",
check=True,
await ops_test.model.deploy(
PROMETHEUS_K8S,
channel=PROMETHEUS_K8S_CHANNEL,
trust=PROMETHEUS_K8S_TRUST,
)
# FIXME: Unpin revision once https://github.com/canonical/bundle-kubeflow/issues/690 is closed
await ops_test.juju(
"deploy",
grafana,
"--channel",
"latest/edge",
"--revision",
"89",
"--trust",
check=True,
await ops_test.model.deploy(
GRAFANA_K8S,
channel=GRAFANA_K8S_CHANNEL,
trust=GRAFANA_K8S_TRUST,
)
await ops_test.model.deploy(
PROMETHEUS_SCRAPE_K8S,
channel=PROMETHEUS_SCRAPE_K8S_CHANNEL,
config=PROMETHEUS_SCRAPE_CONFIG,
)
await ops_test.model.deploy(prometheus_scrape, channel="latest/beta", config=scrape_config)

await ops_test.model.add_relation(CONTROLLER_APP_NAME, prometheus_scrape)
await ops_test.model.add_relation(CONTROLLER_APP_NAME, PROMETHEUS_SCRAPE_K8S)
await ops_test.model.add_relation(
f"{prometheus}:grafana-dashboard", f"{grafana}:grafana-dashboard"
f"{PROMETHEUS_K8S}:grafana-dashboard",
f"{GRAFANA_K8S}:grafana-dashboard",
)
await ops_test.model.add_relation(
f"{CONTROLLER_APP_NAME}:grafana-dashboard", f"{grafana}:grafana-dashboard"
f"{CONTROLLER_APP_NAME}:grafana-dashboard",
f"{GRAFANA_K8S}:grafana-dashboard",
)
await ops_test.model.add_relation(
f"{prometheus}:metrics-endpoint", f"{prometheus_scrape}:metrics-endpoint"
f"{PROMETHEUS_K8S}:metrics-endpoint",
f"{PROMETHEUS_SCRAPE_K8S}:metrics-endpoint",
)

await ops_test.model.wait_for_idle(status="active", timeout=60 * 20)

status = await ops_test.model.get_status()
prometheus_unit_ip = status["applications"][prometheus]["units"][f"{prometheus}/0"]["address"]
prometheus_unit_ip = status["applications"][PROMETHEUS_K8S]["units"][f"{PROMETHEUS_K8S}/0"][
"address"
]
logger.info(f"Prometheus available at http://{prometheus_unit_ip}:9090")

for attempt in retry_for_5_attempts:
Expand Down
Loading