Skip to content

Commit 4ad5fb3

Browse files
raballewclaude
andcommitted
fix: remove vestigial METHOD deployment abstraction
Since Helm support was removed, "operator" is the only deployment method. Remove the METHOD variable, its branching logic, and the parameterized print_deployment_success function throughout the e2e scripts, CI workflows, and hack utilities. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 518159b commit 4ad5fb3

6 files changed

Lines changed: 3 additions & 33 deletions

File tree

.github/workflows/e2e.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,11 @@ jobs:
5959
run: make e2e-setup
6060
env:
6161
CI: true
62-
METHOD: operator
6362

6463
- name: Run e2e tests
6564
run: make e2e-run
6665
env:
6766
CI: true
68-
METHOD: operator
6967

7068
# ============================================================================
7169
# Compatibility tests: cross-version interop between controller and client/exporter

controller/hack/deploy_with_operator.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,5 +217,5 @@ wait_for_jumpstarter_resources
217217
check_grpc_endpoints
218218

219219
# Print success banner
220-
print_deployment_success "operator"
220+
print_deployment_success
221221

controller/hack/utils

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -244,17 +244,8 @@ check_grpc_endpoints() {
244244
}
245245

246246
# Print deployment success banner
247-
# Args:
248-
# $1: deployment method (e.g., "operator") - optional
249247
print_deployment_success() {
250-
local method=${1:-""}
251-
local method_text=""
252-
253-
if [ -n "${method}" ]; then
254-
method_text=" via ${method}"
255-
fi
256-
257-
echo -e "${GREEN}Jumpstarter controller deployed successfully${method_text}!${NC}"
248+
echo -e "${GREEN}Jumpstarter controller deployed successfully!${NC}"
258249
echo -e " gRPC endpoint: ${GRPC_ENDPOINT}"
259250
echo -e " gRPC router endpoint: ${GRPC_ROUTER_ENDPOINT}"
260251
}

e2e/compat/setup.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ REPO_ROOT="$(cd "$E2E_DIR/.." && pwd)"
2424
# Default namespace for tests
2525
export JS_NAMESPACE="${JS_NAMESPACE:-jumpstarter-lab}"
2626

27-
export METHOD="operator"
28-
2927
# Scenario configuration
3028
COMPAT_SCENARIO="${COMPAT_SCENARIO:-old-controller}"
3129
COMPAT_CONTROLLER_TAG="${COMPAT_CONTROLLER_TAG:-v0.7.0}"
@@ -312,7 +310,6 @@ ENDPOINT=$ENDPOINT
312310
JS_NAMESPACE=$JS_NAMESPACE
313311
REPO_ROOT=$REPO_ROOT
314312
SCRIPT_DIR=$SCRIPT_DIR
315-
METHOD=$METHOD
316313
BATS_LIB_PATH=${BATS_LIB_PATH:-}
317314
EOF
318315

e2e/setup-e2e.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
1313
# Default namespace for tests
1414
export JS_NAMESPACE="${JS_NAMESPACE:-jumpstarter-lab}"
1515

16-
# Deployment method
17-
export METHOD="${METHOD:-operator}"
18-
1916
# Color output
2017
RED='\033[0;31m'
2118
GREEN='\033[0;32m'
@@ -264,7 +261,7 @@ deploy_dex() {
264261

265262
# Step 3: Deploy jumpstarter controller
266263
deploy_controller() {
267-
log_info "Deploying jumpstarter controller (method: $METHOD)..."
264+
log_info "Deploying jumpstarter controller..."
268265

269266
cd "$REPO_ROOT"
270267

@@ -322,8 +319,6 @@ setup_test_environment() {
322319
echo "JS_NAMESPACE=$JS_NAMESPACE" >> "$REPO_ROOT/.e2e-setup-complete"
323320
echo "REPO_ROOT=$REPO_ROOT" >> "$REPO_ROOT/.e2e-setup-complete"
324321
echo "SCRIPT_DIR=$SCRIPT_DIR" >> "$REPO_ROOT/.e2e-setup-complete"
325-
echo "METHOD=$METHOD" >> "$REPO_ROOT/.e2e-setup-complete"
326-
327322
# Set SSL certificate paths for Python to use the generated CA
328323
echo "SSL_CERT_FILE=$REPO_ROOT/ca.pem" >> "$REPO_ROOT/.e2e-setup-complete"
329324
echo "REQUESTS_CA_BUNDLE=$REPO_ROOT/ca.pem" >> "$REPO_ROOT/.e2e-setup-complete"
@@ -338,7 +333,6 @@ setup_test_environment() {
338333
main() {
339334
log_info "=== Jumpstarter E2E Setup ==="
340335
log_info "Namespace: $JS_NAMESPACE"
341-
log_info "Deployment Method: $METHOD"
342336
log_info "Repository Root: $REPO_ROOT"
343337
log_info "Script Directory: $SCRIPT_DIR"
344338
echo ""

e2e/tests.bats

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,6 @@ _wait_for_single_exporter() {
284284
}
285285

286286
@test "can login with simplified login" {
287-
# This test only works with operator-based deployment, which deploys the CA ConfigMap
288-
if [ "${METHOD:-}" != "operator" ]; then
289-
skip "CA certificate injection only configured with operator deployment (METHOD=$METHOD)"
290-
fi
291-
292287
jmp config client delete test-client-oidc
293288

294289
run jmp login test-client-oidc@http://${LOGIN_ENDPOINT} --insecure-tls --nointeractive \
@@ -351,11 +346,6 @@ EOF
351346
}
352347

353348
@test "legacy client config contains CA certificate and works with secure TLS" {
354-
# This test only works with operator-based deployment, which creates the CA ConfigMap
355-
if [ "${METHOD:-}" != "operator" ]; then
356-
skip "CA certificate injection only available with operator deployment (METHOD=$METHOD)"
357-
fi
358-
359349
wait_for_exporter
360350

361351
# Get the config file path from jmp (clients are saved to ~/.config/jumpstarter/clients/)

0 commit comments

Comments
 (0)