Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
refactor(minikube): extract the context identity predicates shared with branch-profile
Alfredo Lopeze403f84eb29f
diff --git a/scripts/minikube/context-identity.sh b/scripts/minikube/context-identity.shnew file mode 100644index 000000000..61e4c2ab7--- /dev/null+++ b/scripts/minikube/context-identity.sh@@ -0,0 +1,77 @@+#!/usr/bin/env bash+# Pure predicates that bind a kube context to a local Minikube profile.+#+# Shared by the T2 lane (t2-common.sh) and the branch profile helper+# (scripts/minikube-profiles/branch-profile.sh) so both apply the same rule.+# Every input is an argument, nothing is printed on a negative answer, and no+# function here contacts a cluster: callers fetch the kubeconfig endpoint, the+# node list and the Minikube IP themselves, with their own timeouts.++# kube_endpoint_host <server-url>+# Prints the lowercased host of an API server URL (brackets stripped from an+# IPv6 literal, port and path dropped).+kube_endpoint_host() {+ local host="${1#*://}"+ host="${host%%/*}"+ if [[ "${host}" == \[*\]* ]]; then+ host="${host#\[}"+ host="${host%%\]*}"+ else+ host="${host%%:*}"+ fi+ printf '%s' "${host}" | tr '[:upper:]' '[:lower:]'+}++# kube_endpoint_is_local <server-url>+# Succeeds when the API server is on this machine or a private network:+# loopback, localhost, *.minikube, or a private/loopback/link-local IP literal.+# A DNS name other than localhost and *.minikube is not local.+kube_endpoint_is_local() {+ local host+ host="$(kube_endpoint_host "${1:-}")"+ [[ -n "${host}" ]] || return 1+ if [[ "${host}" == 127.0.0.1 || "${host}" == localhost || "${host}" == ::1 || "${host}" == *.minikube ]]; then+ return 0+ fi+ python3 - "${host}" <<'PY'+import ipaddress+import sys++try:+ address = ipaddress.ip_address(sys.argv[1])+except ValueError:+ raise SystemExit(1)+raise SystemExit(0 if (address.is_private or address.is_loopback or address.is_link_local) else 1)+PY+}++# minikube_nodes_identify_profile <nodes-json> <profile> <ip>+# Succeeds when `kubectl get nodes -o json` output contains a node labelled+# minikube.k8s.io/name=<profile> whose InternalIP is <ip>, the address that+# `minikube -p <profile> ip` reports. A localhost endpoint alone does not prove+# the context belongs to this profile: kubeconfig can point at another local+# Minikube profile, and the private-address allowlist admits LAN clusters.+minikube_nodes_identify_profile() {+ local nodes_json="${1:-}" profile="${2:-}" expected_ip="${3:-}"+ [[ -n "${nodes_json}" && -n "${profile}" && -n "${expected_ip}" ]] || return 1+ python3 - "${nodes_json}" "${profile}" "${expected_ip}" <<'PY'+import json+import sys++try:+ payload = json.loads(sys.argv[1])+except ValueError:+ raise SystemExit(1)+profile = sys.argv[2]+expected_ip = sys.argv[3]+for node in payload.get("items", []):+ metadata = node.get("metadata") or {}+ labels = metadata.get("labels") or {}+ if labels.get("minikube.k8s.io/name") != profile:+ continue+ for address in (node.get("status") or {}).get("addresses", []):+ if address.get("type") == "InternalIP" and address.get("address") == expected_ip:+ raise SystemExit(0)+raise SystemExit(1)+PY+}diff --git a/scripts/minikube/t2-common.sh b/scripts/minikube/t2-common.shindex 79e049a08..131814f8e 100755--- a/scripts/minikube/t2-common.sh+++ b/scripts/minikube/t2-common.sh@@ -17,6 +17,8 @@ if [ -z "$T2_SCRIPT_DIR" ]; then T2_SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SO. "$T2_SCRIPT_DIR/profile-readiness.sh"# shellcheck source=pre-gate-marker.sh. "$T2_SCRIPT_DIR/pre-gate-marker.sh"+# shellcheck source=context-identity.sh+. "$T2_SCRIPT_DIR/context-identity.sh"T2_PROJECT_DIR="$T2_PROJECT_DIR"if [ -z "$T2_PROJECT_DIR" ]; then T2_PROJECT_DIR="$(cd -- "$T2_SCRIPT_DIR/../.." && pwd -P)"; fiT2_PROFILE="$T2_PROFILE"@@ -311,37 +313,15 @@ t2_context_check() {T2_NEXT_COMMAND='select the explicit Kubernetes context generated with the profile't2_fail DEVELOPMENT_SCOPE_REQUIRED "Kubernetes context is unavailable: $T2_CONTEXT"fi- local endpoint host+ local endpointendpoint="$(t2_kc config view --raw --minify -o jsonpath='{.clusters[0].cluster.server}' 2>/dev/null || true)"if [ -z "$endpoint" ]; thenT2_NEXT_COMMAND='select a Kubernetes context with a resolvable local cluster endpoint't2_fail DEVELOPMENT_SCOPE_REQUIRED "Kubernetes context endpoint is unavailable: $T2_CONTEXT"fi- host="${endpoint#*://}"- host="${host%%/*}"- if [[ "$host" == \[*\]* ]]; then- host="${host#\[}"- host="${host%%\]*}"- else- host="${host%%:*}"- fi- host="$(printf '%s' "$host" | tr '[:upper:]' '[:lower:]')"- if [[ "$host" == 127.0.0.1 || "$host" == localhost || "$host" == ::1 || "$host" == *.minikube ]]; then- return 0- fi- if ! python3 - "$host" <<'PY'-import ipaddress-import sys--try:- address = ipaddress.ip_address(sys.argv[1])-except ValueError:- raise SystemExit(1)-raise SystemExit(0 if (address.is_private or address.is_loopback or address.is_link_local) else 1)-PY- then+ if ! kube_endpoint_is_local "$endpoint"; thenT2_NEXT_COMMAND='select the generated branch-owned Minikube context, not a remote cluster context'- t2_fail DEVELOPMENT_SCOPE_REQUIRED "Kubernetes context endpoint is not local: $host"+ t2_fail DEVELOPMENT_SCOPE_REQUIRED "Kubernetes context endpoint is not local: $(kube_endpoint_host "$endpoint")"return 1fi}@@ -362,24 +342,7 @@ t2_profile_context_identity_check() {return 1finodes_json="$(t2_kc get nodes -o json 2>/dev/null || true)"- if [ -z "$nodes_json" ] || ! python3 - "$nodes_json" "$T2_PROFILE" "$expected_ip" <<'PY'-import json-import sys--payload = json.loads(sys.argv[1])-profile = sys.argv[2]-expected_ip = sys.argv[3]-for node in payload.get("items", []):- metadata = node.get("metadata") or {}- labels = metadata.get("labels") or {}- if labels.get("minikube.k8s.io/name") != profile:- continue- for address in (node.get("status") or {}).get("addresses", []):- if address.get("type") == "InternalIP" and address.get("address") == expected_ip:- raise SystemExit(0)-raise SystemExit(1)-PY- then+ if ! minikube_nodes_identify_profile "$nodes_json" "$T2_PROFILE" "$expected_ip"; thenT2_NEXT_COMMAND='select the kube-context generated for this exact branch-owned Minikube profile't2_fail DEVELOPMENT_SCOPE_REQUIRED "Kubernetes context does not identify Minikube profile $T2_PROFILE at $expected_ip"return 1diff --git a/scripts/tests/test-minikube-build-images-hardening.sh b/scripts/tests/test-minikube-build-images-hardening.shindex 62409bf60..3254e3b6d 100755--- a/scripts/tests/test-minikube-build-images-hardening.sh+++ b/scripts/tests/test-minikube-build-images-hardening.sh@@ -141,6 +141,7 @@ prepare_fixture() {"$FIXTURE/deploy/minikube" "$FIXTURE/control-api"cp \"$ROOT/scripts/minikube/build-images.sh" \+ "$ROOT/scripts/minikube/context-identity.sh" \"$ROOT/scripts/minikube/docker-cli-env.sh" \"$ROOT/scripts/minikube/image-mode.sh" \"$ROOT/scripts/minikube/port-forward-owner.sh" \