Skip to content

Commit 77e77ff

Browse files
raballewclaude
andcommitted
fix: deploy old controller v0.8.1 via operator installer in compat tests
v0.7.0 predated the operator installer and was only deployable via Helm. Replace it with v0.8.1 which ships an operator-installer.yaml release asset. Also bump old-client version from 0.7.1 to 0.8.1 so both compat scenarios test against the previous release. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent f89be06 commit 77e77ff

3 files changed

Lines changed: 13 additions & 14 deletions

File tree

.github/workflows/e2e.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ jobs:
231231

232232
# ============================================================================
233233
# Compatibility tests: cross-version interop between controller and client/exporter
234-
# These jobs can be removed once 0.7.x controller support is no longer needed.
235234
# ============================================================================
236235

237236
e2e-compat-old-controller:
@@ -251,11 +250,11 @@ jobs:
251250
with:
252251
go-version: "1.22"
253252

254-
- name: Setup compat environment (old controller v0.7.0)
253+
- name: Setup compat environment (old controller v0.8.1)
255254
run: make e2e-compat-setup COMPAT_SCENARIO=old-controller
256255
env:
257256
CI: true
258-
COMPAT_CONTROLLER_TAG: v0.7.0
257+
COMPAT_CONTROLLER_TAG: v0.8.1
259258

260259
- name: Run compat tests (old controller + new client/exporter)
261260
run: make e2e-compat-run COMPAT_TEST=old-controller
@@ -294,11 +293,11 @@ jobs:
294293
- name: Load controller image
295294
run: docker load < /tmp/artifacts/controller-image.tar
296295

297-
- name: Setup compat environment (old client v0.7.1)
296+
- name: Setup compat environment (old client v0.8.1)
298297
run: make e2e-compat-setup COMPAT_SCENARIO=old-client
299298
env:
300299
CI: true
301-
COMPAT_CLIENT_VERSION: "0.7.1"
300+
COMPAT_CLIENT_VERSION: "0.8.1"
302301
SKIP_BUILD: "true"
303302
PREBUILT_WHEELS_DIR: /tmp/python-wheels
304303

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ test-e2e: e2e-run
166166
# Compatibility E2E testing (cross-version tests, separate from main e2e)
167167
COMPAT_SCENARIO ?= old-controller
168168
COMPAT_TEST ?= old-controller
169-
COMPAT_CONTROLLER_TAG ?= v0.7.0
170-
COMPAT_CLIENT_VERSION ?= 0.7.1
169+
COMPAT_CONTROLLER_TAG ?= v0.8.1
170+
COMPAT_CLIENT_VERSION ?= 0.8.1
171171

172172
.PHONY: e2e-compat-setup
173173
e2e-compat-setup:

e2e/compat/setup.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#
88
# Environment variables:
99
# COMPAT_SCENARIO - "old-controller" or "old-client" (required)
10-
# COMPAT_CONTROLLER_TAG - Controller image tag for old-controller scenario (default: v0.7.0)
11-
# COMPAT_CLIENT_VERSION - PyPI version for old-client scenario (default: 0.7.1)
10+
# COMPAT_CONTROLLER_TAG - Controller release tag for old-controller scenario (default: v0.8.1)
11+
# COMPAT_CLIENT_VERSION - PyPI version for old-client scenario (default: 0.8.1)
1212

1313
set -euo pipefail
1414

@@ -26,8 +26,8 @@ export JS_NAMESPACE="${JS_NAMESPACE:-jumpstarter-lab}"
2626

2727
# Scenario configuration
2828
COMPAT_SCENARIO="${COMPAT_SCENARIO:-old-controller}"
29-
COMPAT_CONTROLLER_TAG="${COMPAT_CONTROLLER_TAG:-v0.7.0}"
30-
COMPAT_CLIENT_VERSION="${COMPAT_CLIENT_VERSION:-0.7.1}"
29+
COMPAT_CONTROLLER_TAG="${COMPAT_CONTROLLER_TAG:-v0.8.1}"
30+
COMPAT_CLIENT_VERSION="${COMPAT_CLIENT_VERSION:-0.8.1}"
3131

3232
# Color output
3333
RED='\033[0;31m'
@@ -103,10 +103,10 @@ deploy_old_controller() {
103103

104104
kubectl config use-context kind-jumpstarter
105105

106-
# Install old controller using operator installer from the release tag
107-
local INSTALLER_URL="https://raw.githubusercontent.com/jumpstarter-dev/jumpstarter/${COMPAT_CONTROLLER_TAG}/controller/deploy/operator/dist/install.yaml"
106+
# Install old controller using operator installer from the release assets
107+
local INSTALLER_URL="https://github.com/jumpstarter-dev/jumpstarter/releases/download/${COMPAT_CONTROLLER_TAG}/operator-installer.yaml"
108108
log_info "Installing old controller via operator (version: ${COMPAT_CONTROLLER_TAG})..."
109-
kubectl apply -f "${INSTALLER_URL}" || log_warn "Operator installer may not be available for ${COMPAT_CONTROLLER_TAG}, skipping"
109+
kubectl apply -f "${INSTALLER_URL}"
110110

111111
kubectl config set-context --current --namespace=jumpstarter-lab
112112

0 commit comments

Comments
 (0)