Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Use workload identity for esp-v2 jobs #247

Merged
merged 1 commit into from
Jan 17, 2020
Merged

Use workload identity for esp-v2 jobs #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 5 additions & 46 deletions prow/prowjobs/GoogleCloudPlatform/esp-v2/esp-v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,25 @@ presubmits:
always_run: true
decorate: true
spec:
serviceAccountName: gcp-esp-v2-default
containers:
- image: gcr.io/cloudesf-testing/gcpproxy-prow:v20191114-v0.0.0-100-g901f883-master
command:
- ./prow/gcpproxy-build.sh
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/cloudesf-testing-github-prow-service-account/service-account.json
- name: CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE
value: /etc/cloudesf-testing-github-prow-service-account/service-account.json
volumeMounts:
- name: cloudesf-testing-github-prow-service-account
mountPath: /etc/cloudesf-testing-github-prow-service-account
volumes:
- name: cloudesf-testing-github-prow-service-account
secret:
secretName: cloudesf-testing-github-prow-service-account
- name: ESPv2-presubmit
always_run: true
decorate: true
spec:
serviceAccountName: gcp-esp-v2-default
containers:
- image: gcr.io/cloudesf-testing/gcpproxy-prow:v20191114-v0.0.0-100-g901f883-master
command:
- ./prow/gcpproxy-presubmit.sh
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/cloudesf-testing-github-prow-service-account/service-account.json
- name: CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE
value: /etc/cloudesf-testing-github-prow-service-account/service-account.json
volumeMounts:
- name: cloudesf-testing-github-prow-service-account
mountPath: /etc/cloudesf-testing-github-prow-service-account
volumes:
- name: cloudesf-testing-github-prow-service-account
secret:
secretName: cloudesf-testing-github-prow-service-account
- name: ESPv2-presubmit-asan
always_run: true
decorate: true
spec:
serviceAccountName: gcp-esp-v2-default
containers:
- image: gcr.io/cloudesf-testing/gcpproxy-prow:v20191114-v0.0.0-100-g901f883-master
command:
Expand Down Expand Up @@ -79,32 +58,23 @@ presubmits:
- /workspace/scenarios/kubernetes_e2e.py
image: gcr.io/k8s-testimages/kubekins-e2e:v20200114-6d2c483-master
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/service-account/service-account.json
- name: E2E_GOOGLE_APPLICATION_CREDENTIALS
value: /etc/service-account/service-account.json
- name: JENKINS_GCE_SSH_PRIVATE_KEY_FILE
value: /etc/cloudesf-ssh-key-secret/ssh-private
- name: JENKINS_GCE_SSH_PUBLIC_KEY_FILE
value: /etc/cloudesf-ssh-key-secret/ssh-public
volumeMounts:
- name: service
mountPath: /etc/service-account
readOnly: true
- name: cloudesf-ssh-key-secret
mountPath: /etc/cloudesf-ssh-key-secret
readOnly: true
volumes:
- name: service # TODO(fejta): remove https://github.com/GoogleCloudPlatform/oss-test-infra/issues/202
secret:
secretName: service-account
- name: cloudesf-ssh-key-secret
secret:
secretName: cloudesf-ssh-key-secret
- name: ESPv2-cloud-run-e2e-cloud-run-http-bookstore
always_run: true
decorate: true
spec:
serviceAccountName: gcp-esp-v2-default
containers:
- image: gcr.io/cloudesf-testing/gcpproxy-prow:v20191120-v0.0.0-125-geee50dd-master
env:
Expand All @@ -124,19 +94,8 @@ periodics:
annotations:
testgrid-dashboards: googleoss-esp-v2
spec:
serviceAccountName: gcp-esp-v2-default
containers:
- image: gcr.io/cloudesf-testing/gcpproxy-prow:v20191114-v0.0.0-100-g901f883-master
command:
- ./prow/continuous-build.sh
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/cloudesf-testing-github-prow-service-account/service-account.json
- name: CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE
value: /etc/cloudesf-testing-github-prow-service-account/service-account.json
volumeMounts:
- name: cloudesf-testing-github-prow-service-account
mountPath: /etc/cloudesf-testing-github-prow-service-account
volumes:
- name: cloudesf-testing-github-prow-service-account
secret:
secretName: cloudesf-testing-github-prow-service-account
4 changes: 2 additions & 2 deletions prow/serviceaccounts/build/GoogleCloudPlatform_esp-v2_serviceaccounts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
annotations: # TODO(fejta): https://github.com/GoogleCloudPlatform/oss-test-infra/issues/222 use a diff account
iam.gke.io/gcp-service-account: oss-prow@oss-prow.iam.gserviceaccount.com
annotations:
iam.gke.io/gcp-service-account: github-prow-jobs@cloudesf-testing.iam.gserviceaccount
name: gcp-esp-v2-default
namespace: test-pods