Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: A job to install MicroK8s
uses: balchua/microk8s-actions@v0.4.3
with:
channel: '1.31/stable'
channel: '1.32/stable'
addons: '["dns", "rbac", "helm"]'

- name: Test and config MicroK8s
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.0.0 python3 -
else /root/.local/bin/poetry install -n -q --no-cache --all-extras --no-root; \
fi

FROM bitnami/kubectl:1.31.4 AS kubectl
FROM alpine/helm:3.18.3 AS helm
FROM bitnami/kubectl:1.32.4 AS kubectl
FROM alpine/helm:3.18.4 AS helm
FROM python:3.12.11-alpine3.22 AS runtime

ARG DISABLE_EXTRAS=false
Expand Down
6 changes: 3 additions & 3 deletions api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1155,11 +1155,11 @@ def get_content_review(request: HttpRequest) -> HttpResponse:
# Non-running user apps
if app.atn_app_status != "Running":
n_apps_not_running += 1
apps_not_running.append(app.name[:6])
apps_not_running.append(app.name[:12])

if app.atn_app_status.startswith("Error"):
n_apps_status_error += 1
apps_status_error.append(app.name[:6])
apps_status_error.append(app.name[:12])

# Suspect user app status
# Defined by if latest user action is either Creating or Changing
Expand All @@ -1174,7 +1174,7 @@ def get_content_review(request: HttpRequest) -> HttpResponse:
k8s_status = None if app.k8s_user_app_status is None else app.k8s_user_app_status.status
apps_suspect_status.append(
{
"name": app.name[:6],
"name": app.name[:12],
"action": app.latest_user_action,
"k8s_status": k8s_status,
"created": app.created_on,
Expand Down
9 changes: 6 additions & 3 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ schema = "^0.7.7"
flatten-json = "==0.1.13"
PyYAML = "==6.0.1"
Markdown = ">=3.4,<3.6"
kubernetes-validate = "==1.31.0"
kubernetes-validate = "==1.32.0"

# Logging
django-structlog = "^7.1.0"
Expand Down
2 changes: 1 addition & 1 deletion studio/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -572,4 +572,4 @@
LOKI_SVC = None

# k8s cluster version for validation of manifests
CLUSTER_VERSION = "1.31"
CLUSTER_VERSION = "1.32"