Skip to content

[dev] Use gke-gcloud-auth-plugin for kubectl #10687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/gke-installer-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/ide-integration-tests-startup-jetbrains.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/ide-integration-tests-startup-vscode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/ide-run-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/platform-delete-preview-environments-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/platform-trigger-werft-cleanup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/run-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/wipe-devstaging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .werft/workspace-run-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion dev/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down