From f37f812dfd37e8591ad2d1c3612f10af1d3b7cba Mon Sep 17 00:00:00 2001 From: Leah Tacke genannt Unterberg <leah.tgu@pads.rwth-aachen.de> Date: Thu, 15 May 2025 17:47:09 +0200 Subject: [PATCH] just justfiles --- docker.just | 19 +++++++++++++++++ helm.just | 27 ++++++++++++++++++++++++ justfile | 31 ++++++--------------------- kube.just | 61 +++++++++++++++++++++++------------------------------ 4 files changed, 78 insertions(+), 60 deletions(-) create mode 100644 docker.just create mode 100644 helm.just diff --git a/docker.just b/docker.just new file mode 100644 index 0000000000..6ca6b80edc --- /dev/null +++ b/docker.just @@ -0,0 +1,19 @@ +up: + docker compose up --build + +appcont: + docker exec -it superset_app bash + +frontcont: + docker exec -it superset_node bash + +rebuild-service: + docker compose up -d --build --force-recreate superset-mitm-service + +build-image: + docker build --target mitm-superset -t registry.git-ce.rwth-aachen.de/machine-data/mitm-superset:latest -t registry.git-ce.rwth-aachen.de/machine-data/mitm-superset:release -f Dockerfile . + +push-image: + docker login registry.git-ce.rwth-aachen.de/machine-data/mitm-superset + docker push registry.git-ce.rwth-aachen.de/machine-data/mitm-superset:latest + docker push registry.git-ce.rwth-aachen.de/machine-data/mitm-superset:release diff --git a/helm.just b/helm.just new file mode 100644 index 0000000000..937a3e3c56 --- /dev/null +++ b/helm.just @@ -0,0 +1,27 @@ +helm-login: + helm registry login registry-1.docker.io -u leahtgu + +helm-package: + cd helm/ && helm package {{CHART_FOLDER}} + +helm-push a: helm-package + cd helm/ && helm push {{a}} oci://registry-1.docker.io/leahtgu + +helm *args: + helm --kube-context c4c -n mdata {{args}} + +helm-install *args: + @just helm install {{CHART_NAME}} helm/{{CHART_FOLDER}} --timeout 10m {{args}} + +helm-upgrade *args: + @just helm upgrade --install {{CHART_NAME}} helm/{{CHART_FOLDER}} --timeout 10m {{args}} + +helm-install-dry: + @just helm install {{CHART_NAME}} helm/{{CHART_FOLDER}} --dry-run > helm/dryrun.yaml + +helm-uninstall: + @just helm uninstall {{CHART_NAME}} + +helm-abort: + @just helm-uninstall + @just kube delete job mitm-superset-init-db diff --git a/justfile b/justfile index ea609b86dd..71a6bf1fd2 100644 --- a/justfile +++ b/justfile @@ -1,23 +1,16 @@ set windows-shell := ["pwsh", "-c"] +CHART_NAME := "mitm-superset" +CHART_FOLDER := CHART_NAME +DEPENDENCY_CHART := "superset-mitm-service" + +import "docker.just" +import "helm.just" import "kube.just" _default: @just --list -up: - docker compose up --build - -pyvenv: - ./.venv/Scripts/python.exe -m pip install -r requirements/development.txt - ./.venv/Scripts/python.exe -m pip install -e . - -appcont: - docker exec -it superset_app bash - -frontcont: - docker exec -it superset_node bash - build-dep: wsl ./scripts/uv-pip-compile.sh @@ -29,15 +22,3 @@ install-requirements: uv pip install -r requirements-local/base.txt uv pip install requirements-local/python_ldap-3.4.4-cp311-cp311-win_amd64.whl uv pip install -r requirements-local/development.txt - - -rebuild-service: - docker compose up -d --build --force-recreate superset-mitm-service - -build-image: - docker build --target mitm-superset -t registry.git-ce.rwth-aachen.de/machine-data/mitm-superset:latest -t registry.git-ce.rwth-aachen.de/machine-data/mitm-superset:release -f Dockerfile . - -push-image: - docker login registry.git-ce.rwth-aachen.de/machine-data/mitm-superset - docker push registry.git-ce.rwth-aachen.de/machine-data/mitm-superset:latest - docker push registry.git-ce.rwth-aachen.de/machine-data/mitm-superset:release diff --git a/kube.just b/kube.just index dde2253ae6..8fa155d587 100644 --- a/kube.just +++ b/kube.just @@ -1,36 +1,3 @@ -CHART_NAME := "mitm-superset" -CHART_FOLDER := CHART_NAME -DEPENDENCY_CHART := "superset-mitm-service" - -helm-login: - helm registry login registry-1.docker.io -u leahtgu - -helm-package: - cd helm/ && helm package {{CHART_FOLDER}} - -helm-push a: helm-package - cd helm/ && helm push {{a}} oci://registry-1.docker.io/leahtgu - -helm *args: - helm --kube-context c4c -n mdata {{args}} - -helm-install *args: - @just helm install {{CHART_NAME}} helm/{{CHART_FOLDER}} --timeout 10m {{args}} - -helm-upgrade *args: - @just helm upgrade --install {{CHART_NAME}} helm/{{CHART_FOLDER}} --timeout 10m {{args}} - -helm-install-dry: - @just helm install {{CHART_NAME}} helm/{{CHART_FOLDER}} --dry-run > helm/dryrun.yaml - -helm-uninstall: - @just helm uninstall {{CHART_NAME}} - -helm-abort: - @just helm-uninstall - @just kube delete job mitm-superset-init-db - - kube *arg: kubectl --context=c4c -n mdata {{arg}} @@ -73,12 +40,27 @@ kubelogs-suff suffix="" *args: kube-clear-pvc: @just kube delete pvc data-mitm-superset-postgresql-0 + @just kube delete pvc data-mitm-superset-mitm-postgresql-0 + +kuberestart suff="": + @just kube rollout restart deployment {{CHART_NAME}}{{suff}} + +kr-sup: + @just kuberestart + +kr-work: + @just kuberestart "-worker" + +kr-mitm: + @just kuberestart -{{DEPENDENCY_CHART}} + +kr: kr-sup kr-work kr-mitm kf-sup: @just kubeforward-suff "" 8880 kf-mitm: - @just kubeforward "" 8881 + @just kubeforward ki-sup: @just kubeinto-suff @@ -87,4 +69,13 @@ ki-work: @just kubeinto-suff "-worker" ki-mitm: - @just kubeinto-mitm + @just kubeinto + +kl-sup: + @just kubelogs-suff + +kl-work: + @just kubelogs-suff "-worker" + +kl-mitm: + @just kubelogs -- GitLab