From 810735578e38ee27baa03aa1ed84b88d6de0a70c Mon Sep 17 00:00:00 2001 From: Pudong Zheng Date: Mon, 5 Sep 2022 05:28:52 +0000 Subject: [PATCH 1/3] [dev] upgrade gcloud cli --- dev/image/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile index b20c2a95e3f4d4..c162d8cc35bf3a 100644 --- a/dev/image/Dockerfile +++ b/dev/image/Dockerfile @@ -2,9 +2,9 @@ # Licensed under the GNU Affero General Public License (AGPL). # See License-AGPL.txt in the project root for license information. -FROM gitpod/workspace-full:2022-08-04-13-40-17 +FROM gitpod/workspace-full:2022-09-03-08-31-56 -ENV TRIGGER_REBUILD 20 +ENV TRIGGER_REBUILD 21 USER root @@ -149,7 +149,7 @@ ARG GCS_DIR=/opt/google-cloud-sdk ENV PATH=$GCS_DIR/bin:$PATH RUN sudo chown gitpod: /opt \ && mkdir $GCS_DIR \ - && curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-393.0.0-linux-x86_64.tar.gz \ + && curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-x86_64.tar.gz \ | tar -xzvC /opt \ && /opt/google-cloud-sdk/install.sh --quiet --usage-reporting=false --bash-completion=true \ --additional-components gke-gcloud-auth-plugin docker-credential-gcr alpha beta \ From 7232fc6f44d9bfbe9350ee818d74126ecf284e86 Mon Sep 17 00:00:00 2001 From: Pudong Zheng Date: Mon, 5 Sep 2022 05:29:10 +0000 Subject: [PATCH 2/3] [dev] Use gke-gcloud-auth-plugin for kubectl --- dev/image/kubeconfig.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dev/image/kubeconfig.yaml b/dev/image/kubeconfig.yaml index aba016d07f34fa..597d0f1713e840 100644 --- a/dev/image/kubeconfig.yaml +++ b/dev/image/kubeconfig.yaml @@ -19,5 +19,11 @@ preferences: {} users: - name: gke_gitpod-core-dev_europe-west1-b_core-dev user: - auth-provider: - name: gcp + exec: + apiVersion: client.authentication.k8s.io/v1beta1 + args: + - --use_application_default_credentials + command: gke-gcloud-auth-plugin + installHint: Install gke-gcloud-auth-plugin for use with kubectl by following + https://cloud.google.com/blog/products/containers-kubernetes/kubectl-auth-changes-in-gke + provideClusterInfo: true From 84f071c2d6842fc4c9245d9d1322520eeacacd99 Mon Sep 17 00:00:00 2001 From: Pudong Zheng Date: Mon, 5 Sep 2022 07:34:40 +0000 Subject: [PATCH 3/3] [dev] Update dev-environment image --- .gitpod.yml | 2 +- .werft/aks-installer-tests.yaml | 2 +- .werft/build.yaml | 2 +- .werft/cleanup-installer-tests.yaml | 2 +- .werft/debug.yaml | 2 +- .werft/eks-installer-tests.yaml | 2 +- .werft/gke-installer-tests.yaml | 2 +- .werft/ide-integration-tests-startup.yaml | 2 +- .werft/k3s-installer-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/workspace-run-integration-tests.yaml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index a0f7a0191fdcc9..619804f3dfa722 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-dl.1 +image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workspaceLocation: gitpod/gitpod-ws.code-workspace checkoutLocation: gitpod ports: diff --git a/.werft/aks-installer-tests.yaml b/.werft/aks-installer-tests.yaml index 2b90940f70d3bf..5766013d4daae8 100644 --- a/.werft/aks-installer-tests.yaml +++ b/.werft/aks-installer-tests.yaml @@ -53,7 +53,7 @@ pod: secretName: sh-playground-dns-perm containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/build.yaml b/.werft/build.yaml index 25040f7840bc28..57b5f01abc0bb7 100644 --- a/.werft/build.yaml +++ b/.werft/build.yaml @@ -75,7 +75,7 @@ pod: - name: MYSQL_TCP_PORT value: 23306 - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: IfNotPresent resources: diff --git a/.werft/cleanup-installer-tests.yaml b/.werft/cleanup-installer-tests.yaml index 75822192e40ff0..4e659f25a49299 100644 --- a/.werft/cleanup-installer-tests.yaml +++ b/.werft/cleanup-installer-tests.yaml @@ -24,7 +24,7 @@ pod: secretName: aks-credentials containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/debug.yaml b/.werft/debug.yaml index f9592b235dc34e..990076a2186c79 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:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/eks-installer-tests.yaml b/.werft/eks-installer-tests.yaml index f6064d53ba0b05..f29da176f81c9a 100644 --- a/.werft/eks-installer-tests.yaml +++ b/.werft/eks-installer-tests.yaml @@ -53,7 +53,7 @@ pod: secretName: sh-playground-dns-perm containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/gke-installer-tests.yaml b/.werft/gke-installer-tests.yaml index b96a63fe3100aa..19456c28dfbbd3 100644 --- a/.werft/gke-installer-tests.yaml +++ b/.werft/gke-installer-tests.yaml @@ -53,7 +53,7 @@ pod: secretName: sh-playground-dns-perm containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/ide-integration-tests-startup.yaml b/.werft/ide-integration-tests-startup.yaml index c1bf007898e4cf..07c45be56141d4 100644 --- a/.werft/ide-integration-tests-startup.yaml +++ b/.werft/ide-integration-tests-startup.yaml @@ -16,7 +16,7 @@ pod: secretName: github-token-gitpod-bot containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/.werft/k3s-installer-tests.yaml b/.werft/k3s-installer-tests.yaml index a272c544a7887e..c84bf7ff934348 100644 --- a/.werft/k3s-installer-tests.yaml +++ b/.werft/k3s-installer-tests.yaml @@ -53,7 +53,7 @@ pod: secretName: sh-playground-dns-perm containers: - name: nightly-test - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/platform-delete-preview-environments-cron.yaml b/.werft/platform-delete-preview-environments-cron.yaml index fbdffaadd23300..560e1a07125b3f 100644 --- a/.werft/platform-delete-preview-environments-cron.yaml +++ b/.werft/platform-delete-preview-environments-cron.yaml @@ -24,7 +24,7 @@ pod: secretName: harvester-vm-ssh-keys containers: - name: build - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/platform-trigger-werft-cleanup.yaml b/.werft/platform-trigger-werft-cleanup.yaml index d285e3d7737890..4553eb5a08daf9 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:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/run-integration-tests.yaml b/.werft/run-integration-tests.yaml index 989a9af14a8667..702f672d49563b 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:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/workspace-run-integration-tests.yaml b/.werft/workspace-run-integration-tests.yaml index 0e932798de7b08..f2140021c5e499 100644 --- a/.werft/workspace-run-integration-tests.yaml +++ b/.werft/workspace-run-integration-tests.yaml @@ -21,7 +21,7 @@ pod: secretName: github-token-gitpod-bot containers: - name: gcloud - image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-dl.1 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-dev-image-gcloud.2 workingDir: /workspace imagePullPolicy: IfNotPresent env: