Skip to content

Commit 330cf3d

Browse files
committed
WIP: Hack hack hack
1 parent 1ef20eb commit 330cf3d

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

.gitpod.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,12 @@ ports:
3434
- port: 8022
3535
onOpen: ignore
3636
tasks:
37-
- name: Install Preview Environment kube-context
37+
- name: Preview environment configuration
38+
before: |
39+
leeway run dev/preview/previewctl:install
3840
command: |
41+
previewctl get-credentials
3942
previewctl install-context --watch
40-
exit
41-
- name: Add Harvester kubeconfig
42-
command: |
43-
./dev/preview/util/download-and-merge-harvester-kubeconfig.sh
44-
exit 0
4543
- name: Installer dependencies
4644
init: |
4745
(cd install/installer && make deps)

dev/BUILD.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ packages:
1010
- dev/blowtorch:app
1111
- dev/gpctl:app
1212
- dev/loadgen:app
13-
- dev/preview/previewctl:cli
1413
- dev/gp-gcloud:app
1514
- name: dev-utils
1615
type: docker
1716
deps:
1817
- dev/gpctl:app
1918
- dev/kubecdl:app
20-
- dev/preview/previewctl:cli
2119
- dev/gp-gcloud:app
2220
argdeps:
2321
- imageRepoBase

dev/image/BUILD.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ packages:
44
deps:
55
- dev/gpctl:app
66
- dev/kubecdl:app
7-
- dev/preview/previewctl:cli
87
argdeps:
98
- imageRepoBase
109
srcs:

dev/image/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ RUN brew install tmux tmuxinator
257257

258258
# Copy our own tools
259259
ENV NEW_KUBECDL=1
260-
COPY dev-kubecdl--app/kubecdl dev-gpctl--app/gpctl dev-preview-previewctl--cli/previewctl /usr/bin/
260+
COPY dev-kubecdl--app/kubecdl dev-gpctl--app/gpctl /usr/bin/
261261

262262
# Configure our tools' autocompletion
263-
RUN bash -c "echo . \<\(gpctl completion bash\) >> ~/.bashrc" && \
264-
bash -c "echo . \<\(previewctl completion bash\) >> ~/.bashrc"
263+
RUN bash -c "echo . \<\(gpctl completion bash\) >> ~/.bashrc"

dev/preview/previewctl/BUILD.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,13 @@ packages:
99
- CGO_ENABLED=0
1010
config:
1111
packaging: app
12-
dontTest: false
12+
scripts:
13+
- name: install
14+
description: Build and install previewctl into the current environment
15+
deps:
16+
- :cli
17+
script: |
18+
echo "Installing"
19+
echo $PATH
20+
# TODO: extract the path to the built previewctl binary from the PATH and move it to /usr/bin/
21+
# TODO: echo . \<\(gpctl completion bash\) >> ~/.bashrc

0 commit comments

Comments
 (0)