From 1ce88bd83ef167781d9cfc68bcc4c3c72d3f83ff Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Wed, 2 Mar 2022 14:08:50 +0000 Subject: [PATCH] Add Replicated/KOTS dependencies to workspace image --- .gitpod.yml | 2 +- .werft/build.yaml | 2 +- .werft/clean-up-werft-build-nodes.yaml | 2 +- .werft/debug.yaml | 2 +- .../delete-preview-environments-cron.yaml | 2 +- .../delete-preview-environments.yaml | 2 +- .werft/run-integration-tests.yaml | 2 +- .werft/wipe-devstaging.yaml | 2 +- dev/image/Dockerfile | 4 ++++ 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 75b77f4c33406c..b647f30fbe3ab9 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0 +image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6 workspaceLocation: gitpod/gitpod-ws.code-workspace checkoutLocation: gitpod ports: diff --git a/.werft/build.yaml b/.werft/build.yaml index 590849c4a4a1cd..29200b3b6dbc06 100644 --- a/.werft/build.yaml +++ b/.werft/build.yaml @@ -68,7 +68,7 @@ pod: - name: MYSQL_TCP_PORT value: 23306 - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/clean-up-werft-build-nodes.yaml b/.werft/clean-up-werft-build-nodes.yaml index 8534a5d1ebcda1..3cbed755d8a4c8 100644 --- a/.werft/clean-up-werft-build-nodes.yaml +++ b/.werft/clean-up-werft-build-nodes.yaml @@ -16,7 +16,7 @@ pod: type: Directory containers: - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/.werft/debug.yaml b/.werft/debug.yaml index 5452e473f11f3a..43970861580823 100644 --- a/.werft/debug.yaml +++ b/.werft/debug.yaml @@ -53,7 +53,7 @@ pod: - name: MYSQL_TCP_PORT value: 23306 - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/delete-preview-environments/delete-preview-environments-cron.yaml b/.werft/delete-preview-environments/delete-preview-environments-cron.yaml index a918b966e6817a..873ddc569081b2 100644 --- a/.werft/delete-preview-environments/delete-preview-environments-cron.yaml +++ b/.werft/delete-preview-environments/delete-preview-environments-cron.yaml @@ -18,7 +18,7 @@ pod: secretName: gcp-sa-gitpod-release-deployer containers: - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/delete-preview-environments/delete-preview-environments.yaml b/.werft/delete-preview-environments/delete-preview-environments.yaml index 86dd149bd45ff0..aa8cf8c5fdae9a 100644 --- a/.werft/delete-preview-environments/delete-preview-environments.yaml +++ b/.werft/delete-preview-environments/delete-preview-environments.yaml @@ -18,7 +18,7 @@ pod: secretName: gcp-sa-gitpod-release-deployer containers: - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/run-integration-tests.yaml b/.werft/run-integration-tests.yaml index 3110cd73fb43af..1e0f21ca6138d9 100644 --- a/.werft/run-integration-tests.yaml +++ b/.werft/run-integration-tests.yaml @@ -22,7 +22,7 @@ pod: emptyDir: {} initContainers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/wipe-devstaging.yaml b/.werft/wipe-devstaging.yaml index e9ada32e5b3490..833bcd306c4565 100644 --- a/.werft/wipe-devstaging.yaml +++ b/.werft/wipe-devstaging.yaml @@ -14,7 +14,7 @@ pod: secretName: gcp-sa-gitpod-dev-deployer containers: - name: wipe-devstaging - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-bmp-leeway.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:sje-add-kots.6 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile index e6ef4d30fe4611..b7d557759e7a07 100644 --- a/dev/image/Dockerfile +++ b/dev/image/Dockerfile @@ -231,5 +231,9 @@ RUN curl -LO https://github.com/brancz/gojsontoyaml/releases/download/v${GOJSONT tar -xzvf gojsontoyaml_${GOJSONTOYAML_VERSION}_linux_amd64.tar.gz && \ sudo mv gojsontoyaml /usr/local/bin/gojsontoyaml +# Install Replicated and KOTS +RUN curl https://raw.githubusercontent.com/replicatedhq/replicated/v0.38.0/install.sh | sudo bash && \ + curl https://kots.io/install/1.65.0 | bash + # Copy our own tools COPY dev-kubecdl--app/kubecdl dev-gpctl--app/gpctl /usr/bin/ \ No newline at end of file