Skip to content

Commit cdd8029

Browse files
committed
Fix controller and e2e configurations
- Update Python container files for monorepo build paths - Copy Kind cluster config with dex nodeport pre-configured - Configure controller and e2e values with certificate placeholder - Patch deploy_with_helm.sh to support EXTRA_VALUES for Helm overlay pattern
1 parent 3707366 commit cdd8029

4 files changed

Lines changed: 14 additions & 13 deletions

File tree

controller/hack/deploy_with_helm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ helm ${METHOD} --namespace jumpstarter-lab \
5151
--create-namespace \
5252
${HELM_SETS} \
5353
--set global.timestamp=$(date +%s) \
54-
--values ./deploy/helm/jumpstarter/values.kind.yaml jumpstarter \
54+
--values ./deploy/helm/jumpstarter/values.kind.yaml jumpstarter \
5555
./deploy/helm/jumpstarter/
5656

5757
kubectl config set-context --current --namespace=jumpstarter-lab

controller/hack/kind_cluster.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,25 @@ nodes:
1717
- containerPort: 80 # ingress controller
1818
hostPort: 5080
1919
protocol: TCP
20-
- containerPort: 443
21-
hostPort: 5443
22-
protocol: TCP
2320
- containerPort: 30010 # grpc nodeport
2421
hostPort: 8082
2522
protocol: TCP
26-
- containerPort: 30011 # grpc router nodeport (replica 0)
23+
- containerPort: 30011 # grpc router nodeport
2724
hostPort: 8083
2825
protocol: TCP
29-
- containerPort: 30012 # grpc router nodeport (replica 1)
26+
- containerPort: 30012 # grpc router nodeport
3027
hostPort: 8084
3128
protocol: TCP
32-
- containerPort: 30013 # grpc router nodeport (replica 2)
29+
- containerPort: 30013 # grpc router nodeport
3330
hostPort: 8085
3431
protocol: TCP
35-
32+
- containerPort: 32000 # dex nodeport
33+
hostPort: 5556
34+
protocol: TCP
35+
- containerPort: 443
36+
hostPort: 5443
37+
protocol: TCP
3638
# if we needed to mount a hostPath volume into the kind cluster, we can do it like this
3739
# extraMounts:
3840
# - hostPath: ./bin/e2e-certs
3941
# containerPath: /tmp/e2e-certs
40-

python/.devfile/Containerfile.client

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN dnf install -y make git && \
66
rm -rf /var/cache/dnf
77
COPY --from=uv /uv /uvx /bin/
88
ADD . /src
9-
RUN make -C /src build
9+
RUN make -C /src/python build
1010

1111

1212
FROM quay.io/devfile/base-developer-image:ubi9-latest
@@ -28,7 +28,7 @@ RUN dnf -y install make git python3.12 python3.12 libusbx python3-pyusb python3.
2828

2929
USER 10001
3030

31-
RUN --mount=from=builder,source=/src/dist,target=/dist python3.12 -m pip install /dist/*.whl
31+
RUN --mount=from=builder,source=/src/python/dist,target=/dist python3.12 -m pip install /dist/*.whl
3232

3333
RUN python3.12 -m pip install pytest
3434

python/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
1414

1515
FROM builder AS wheels
1616
ADD . /src
17-
RUN make -C /src build
17+
RUN make -C /src/python build
1818

1919
FROM product
20-
RUN --mount=from=wheels,source=/src/dist,target=/dist \
20+
RUN --mount=from=wheels,source=/src/python/dist,target=/dist \
2121
uv venv /jumpstarter && \
2222
VIRTUAL_ENV=/jumpstarter uv pip install /dist/*.whl
2323
ENV PATH="/jumpstarter/bin:$PATH"

0 commit comments

Comments
 (0)