From 048177dd8c13ccbb163490a32896da822ac2f2d2 Mon Sep 17 00:00:00 2001 From: Liam Bennett Date: Fri, 17 Jun 2022 11:47:30 +0000 Subject: [PATCH 1/3] update env to use werft grpc --- dev/image/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile index 3455fe44a00843..6e6ff7b788b980 100644 --- a/dev/image/Dockerfile +++ b/dev/image/Dockerfile @@ -64,8 +64,9 @@ RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/leeway/releases/downl RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/dazzle/releases/download/v0.1.11/dazzle_0.1.11_Linux_x86_64.tar.gz | tar xz # werft CLI -ENV WERFT_K8S_NAMESPACE=werft -ENV WERFT_DIAL_MODE=kubernetes +ENV WERFT_CREDENTIAL_HELPER=/workspace/gitpod/gitpod-core/dev/preview/werft-credential-helper.sh +ENV WERFT_HOST=werft-grpc.gitpod-dev.com:443 +ENV WERFT_TLS_MODE=system RUN cd /usr/bin && curl -fsSL https://github.com/csweichel/werft/releases/download/v0.3.3/werft-client-linux-amd64.tar.gz | tar xz && mv werft-client-linux-amd64 werft # yq - jq for YAML files From 5327262f9a0f7c0d3863f9f4d2cbb0959c12515a Mon Sep 17 00:00:00 2001 From: Liam Bennett Date: Fri, 17 Jun 2022 12:03:50 +0000 Subject: [PATCH 2/3] upgrade build docker tags --- .gitpod.yml | 2 +- .werft/build.yaml | 2 +- .werft/debug.yaml | 2 +- .werft/gke-installer-tests.yaml | 2 +- .werft/ide-integration-tests-startup-jetbrains.yaml | 2 +- .werft/ide-integration-tests-startup-vscode.yaml | 2 +- .werft/ide-run-integration-tests.yaml | 2 +- .werft/platform-delete-preview-environments-cron.yaml | 2 +- .werft/platform-trigger-werft-cleanup.yaml | 2 +- .werft/run-integration-tests.yaml | 2 +- .werft/wipe-devstaging.yaml | 2 +- .werft/workspace-run-integration-tests.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index a32dcf9abc3a47..15815a739677b7 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 +image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workspaceLocation: gitpod/gitpod-ws.code-workspace checkoutLocation: gitpod ports: diff --git a/.werft/build.yaml b/.werft/build.yaml index 884e01eed55766..fa69681713f9e4 100644 --- a/.werft/build.yaml +++ b/.werft/build.yaml @@ -71,7 +71,7 @@ pod: - name: MYSQL_TCP_PORT value: 23306 - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: IfNotPresent resources: diff --git a/.werft/debug.yaml b/.werft/debug.yaml index 4b01a5fb32a77c..67194e34475115 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:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/gke-installer-tests.yaml b/.werft/gke-installer-tests.yaml index 6a79f679f28387..6eaa686aff4662 100644 --- a/.werft/gke-installer-tests.yaml +++ b/.werft/gke-installer-tests.yaml @@ -21,7 +21,7 @@ pod: secretName: sh-playground-dns-perm containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/ide-integration-tests-startup-jetbrains.yaml b/.werft/ide-integration-tests-startup-jetbrains.yaml index 0fb026ba70da06..8b75c12357fb9a 100644 --- a/.werft/ide-integration-tests-startup-jetbrains.yaml +++ b/.werft/ide-integration-tests-startup-jetbrains.yaml @@ -12,7 +12,7 @@ pod: emptyDir: {} containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/.werft/ide-integration-tests-startup-vscode.yaml b/.werft/ide-integration-tests-startup-vscode.yaml index 25b1a4c11bd426..a92e23eae72039 100644 --- a/.werft/ide-integration-tests-startup-vscode.yaml +++ b/.werft/ide-integration-tests-startup-vscode.yaml @@ -12,7 +12,7 @@ pod: emptyDir: {} containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/.werft/ide-run-integration-tests.yaml b/.werft/ide-run-integration-tests.yaml index e4bfd7b8f09caa..74efb080f45392 100644 --- a/.werft/ide-run-integration-tests.yaml +++ b/.werft/ide-run-integration-tests.yaml @@ -25,7 +25,7 @@ pod: emptyDir: {} initContainers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/platform-delete-preview-environments-cron.yaml b/.werft/platform-delete-preview-environments-cron.yaml index 78ab1a75e45c2d..347aa895e04f16 100644 --- a/.werft/platform-delete-preview-environments-cron.yaml +++ b/.werft/platform-delete-preview-environments-cron.yaml @@ -27,7 +27,7 @@ pod: secretName: harvester-vm-ssh-keys containers: - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/platform-trigger-werft-cleanup.yaml b/.werft/platform-trigger-werft-cleanup.yaml index 378ff8363ddf90..566fea5d6898df 100644 --- a/.werft/platform-trigger-werft-cleanup.yaml +++ b/.werft/platform-trigger-werft-cleanup.yaml @@ -21,7 +21,7 @@ pod: secretName: gcp-sa-gitpod-dev-deployer containers: - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/run-integration-tests.yaml b/.werft/run-integration-tests.yaml index d6db859906852a..2aceb8dbfd5e17 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:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/wipe-devstaging.yaml b/.werft/wipe-devstaging.yaml index 9024c0dfbfa1e4..1831bc93a7afa1 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:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/workspace-run-integration-tests.yaml b/.werft/workspace-run-integration-tests.yaml index bae3aa00ce3eb8..9398c8dbc4f966 100644 --- a/.werft/workspace-run-integration-tests.yaml +++ b/.werft/workspace-run-integration-tests.yaml @@ -12,7 +12,7 @@ pod: emptyDir: {} containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 workingDir: /workspace imagePullPolicy: IfNotPresent env: From 5e3e1fd9a0a71cb3651bcd0cc2b11ed1a99e2103 Mon Sep 17 00:00:00 2001 From: Liam Bennett Date: Fri, 17 Jun 2022 12:22:36 +0000 Subject: [PATCH 3/3] fix auth file reference --- .gitpod.yml | 2 +- .werft/build.yaml | 2 +- .werft/debug.yaml | 2 +- .werft/gke-installer-tests.yaml | 2 +- .werft/ide-integration-tests-startup-jetbrains.yaml | 2 +- .werft/ide-integration-tests-startup-vscode.yaml | 2 +- .werft/ide-run-integration-tests.yaml | 2 +- .werft/platform-delete-preview-environments-cron.yaml | 2 +- .werft/platform-trigger-werft-cleanup.yaml | 2 +- .werft/run-integration-tests.yaml | 2 +- .werft/wipe-devstaging.yaml | 2 +- .werft/workspace-run-integration-tests.yaml | 2 +- dev/image/Dockerfile | 4 +--- 13 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 15815a739677b7..efca58c07a68cc 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 +image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workspaceLocation: gitpod/gitpod-ws.code-workspace checkoutLocation: gitpod ports: diff --git a/.werft/build.yaml b/.werft/build.yaml index fa69681713f9e4..fb7821c552c675 100644 --- a/.werft/build.yaml +++ b/.werft/build.yaml @@ -71,7 +71,7 @@ pod: - name: MYSQL_TCP_PORT value: 23306 - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: IfNotPresent resources: diff --git a/.werft/debug.yaml b/.werft/debug.yaml index 67194e34475115..49f511a96bcf20 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:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/gke-installer-tests.yaml b/.werft/gke-installer-tests.yaml index 6eaa686aff4662..ba657369ce276d 100644 --- a/.werft/gke-installer-tests.yaml +++ b/.werft/gke-installer-tests.yaml @@ -21,7 +21,7 @@ pod: secretName: sh-playground-dns-perm containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/ide-integration-tests-startup-jetbrains.yaml b/.werft/ide-integration-tests-startup-jetbrains.yaml index 8b75c12357fb9a..59c56212f888c0 100644 --- a/.werft/ide-integration-tests-startup-jetbrains.yaml +++ b/.werft/ide-integration-tests-startup-jetbrains.yaml @@ -12,7 +12,7 @@ pod: emptyDir: {} containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/.werft/ide-integration-tests-startup-vscode.yaml b/.werft/ide-integration-tests-startup-vscode.yaml index a92e23eae72039..56d25d1f6fbbff 100644 --- a/.werft/ide-integration-tests-startup-vscode.yaml +++ b/.werft/ide-integration-tests-startup-vscode.yaml @@ -12,7 +12,7 @@ pod: emptyDir: {} containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/.werft/ide-run-integration-tests.yaml b/.werft/ide-run-integration-tests.yaml index 74efb080f45392..c9821b47eb673d 100644 --- a/.werft/ide-run-integration-tests.yaml +++ b/.werft/ide-run-integration-tests.yaml @@ -25,7 +25,7 @@ pod: emptyDir: {} initContainers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/platform-delete-preview-environments-cron.yaml b/.werft/platform-delete-preview-environments-cron.yaml index 347aa895e04f16..4de18541145c54 100644 --- a/.werft/platform-delete-preview-environments-cron.yaml +++ b/.werft/platform-delete-preview-environments-cron.yaml @@ -27,7 +27,7 @@ pod: secretName: harvester-vm-ssh-keys containers: - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/platform-trigger-werft-cleanup.yaml b/.werft/platform-trigger-werft-cleanup.yaml index 566fea5d6898df..359b19bceabbdb 100644 --- a/.werft/platform-trigger-werft-cleanup.yaml +++ b/.werft/platform-trigger-werft-cleanup.yaml @@ -21,7 +21,7 @@ pod: secretName: gcp-sa-gitpod-dev-deployer containers: - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/run-integration-tests.yaml b/.werft/run-integration-tests.yaml index 2aceb8dbfd5e17..bbdb1dafb3974b 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:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/wipe-devstaging.yaml b/.werft/wipe-devstaging.yaml index 1831bc93a7afa1..1d597d7a575f16 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:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/workspace-run-integration-tests.yaml b/.werft/workspace-run-integration-tests.yaml index 9398c8dbc4f966..d779ddfbe1623b 100644 --- a/.werft/workspace-run-integration-tests.yaml +++ b/.werft/workspace-run-integration-tests.yaml @@ -12,7 +12,7 @@ pod: emptyDir: {} containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile index 6e6ff7b788b980..5593d83843fdb1 100644 --- a/dev/image/Dockerfile +++ b/dev/image/Dockerfile @@ -64,7 +64,7 @@ RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/leeway/releases/downl RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/dazzle/releases/download/v0.1.11/dazzle_0.1.11_Linux_x86_64.tar.gz | tar xz # werft CLI -ENV WERFT_CREDENTIAL_HELPER=/workspace/gitpod/gitpod-core/dev/preview/werft-credential-helper.sh +ENV WERFT_CREDENTIAL_HELPER=/workspace/gitpod/dev/preview/werft-credential-helper.sh ENV WERFT_HOST=werft-grpc.gitpod-dev.com:443 ENV WERFT_TLS_MODE=system RUN cd /usr/bin && curl -fsSL https://github.com/csweichel/werft/releases/download/v0.3.3/werft-client-linux-amd64.tar.gz | tar xz && mv werft-client-linux-amd64 werft @@ -243,8 +243,6 @@ RUN curl -fsSLO https://github.com/brancz/gojsontoyaml/releases/download/v${GOJS RUN curl https://raw.githubusercontent.com/replicatedhq/replicated/v0.38.0/install.sh | sudo bash && \ curl https://kots.io/install/1.65.0 | bash -ENV WERFT_CREDENTIAL_HELPER=/workspace/gitpod/dev/preview/werft-credential-helper.sh - # Copy our own tools ENV NEW_KUBECDL=1 COPY dev-kubecdl--app/kubecdl dev-gpctl--app/gpctl dev-preview-previewctl--cli/previewctl /usr/bin/