From 95d08d692ee0bcb951881fab0daf22b6ec4bb109 Mon Sep 17 00:00:00 2001 From: Andrew Farries Date: Thu, 16 Jun 2022 06:54:54 +0000 Subject: [PATCH 1/2] Use gke-gcloud-auth-plugin for kubectl Start using the kubectl auth plugin for GKE. See https://cloud.google.com/blog/products/containers-kubernetes/kubectl-auth-changes-in-gke --- dev/image/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile index 6aa465abe82d1c..3455fe44a00843 100644 --- a/dev/image/Dockerfile +++ b/dev/image/Dockerfile @@ -148,10 +148,12 @@ RUN sudo chown gitpod: /opt \ && curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-388.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 docker-credential-gcr alpha beta \ + --additional-components gke-gcloud-auth-plugin docker-credential-gcr alpha beta \ # needed for access to our private registries && docker-credential-gcr configure-docker +ENV USE_GKE_GCLOUD_AUTH_PLUGIN=True + # Install tools for gsutil RUN sudo install-packages \ gcc \ From b4801edd978645df3592ee6ed057ccf70c4d60aa Mon Sep 17 00:00:00 2001 From: Andrew Farries Date: Thu, 16 Jun 2022 07:18:47 +0000 Subject: [PATCH 2/2] Update image references --- .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 016e2f172f6327..a32dcf9abc3a47 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-upgrade-werft-cli.0 +image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workspaceLocation: gitpod/gitpod-ws.code-workspace checkoutLocation: gitpod ports: diff --git a/.werft/build.yaml b/.werft/build.yaml index b479aa8a5cb142..884e01eed55766 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: IfNotPresent resources: diff --git a/.werft/debug.yaml b/.werft/debug.yaml index d24e329454d0ac..4b01a5fb32a77c 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/gke-installer-tests.yaml b/.werft/gke-installer-tests.yaml index 469de64614c556..6a79f679f28387 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: Always volumeMounts: diff --git a/.werft/ide-integration-tests-startup-jetbrains.yaml b/.werft/ide-integration-tests-startup-jetbrains.yaml index d0cf0645f536a8..0fb026ba70da06 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/.werft/ide-integration-tests-startup-vscode.yaml b/.werft/ide-integration-tests-startup-vscode.yaml index 9be8baa6b17950..25b1a4c11bd426 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: IfNotPresent env: diff --git a/.werft/ide-run-integration-tests.yaml b/.werft/ide-run-integration-tests.yaml index 4dc802c9560d27..e4bfd7b8f09caa 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/platform-delete-preview-environments-cron.yaml b/.werft/platform-delete-preview-environments-cron.yaml index 897a5ad6032256..78ab1a75e45c2d 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/platform-trigger-werft-cleanup.yaml b/.werft/platform-trigger-werft-cleanup.yaml index 735571f3c20dfe..378ff8363ddf90 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/run-integration-tests.yaml b/.werft/run-integration-tests.yaml index 5a1a04eac3d9ed..d6db859906852a 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/wipe-devstaging.yaml b/.werft/wipe-devstaging.yaml index 78befb592f3089..9024c0dfbfa1e4 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: IfNotPresent volumeMounts: diff --git a/.werft/workspace-run-integration-tests.yaml b/.werft/workspace-run-integration-tests.yaml index 4cdc19b21dc474..bae3aa00ce3eb8 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-upgrade-werft-cli.0 + image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gcloud-auth.6 workingDir: /workspace imagePullPolicy: IfNotPresent env: