From 1d5d7d0129020639e1ca5018cfa012cab64b7000 Mon Sep 17 00:00:00 2001 From: Cameron Rozean Date: Tue, 17 Oct 2023 08:45:49 -0700 Subject: [PATCH] Revert "update service account similar to access artifact account (#555)" This reverts commit 974b24edb20b6dbbadf0ed5244ff9d5cf3cf9bc7. --- .../golang-1-19-PROD-images-postsubmits.yaml | 2 +- .../golang-1-20-PROD-images-postsubmits.yaml | 2 +- .../golang-1-21-PROD-images-postsubmits.yaml | 2 +- .../golang-1-X-PROD-images-postsubmits.yaml | 9 ++++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/jobs/aws/eks-distro-build-tooling/golang-1-19-PROD-images-postsubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-19-PROD-images-postsubmits.yaml index 3c1f01a84..ebb2eeb36 100644 --- a/jobs/aws/eks-distro-build-tooling/golang-1-19-PROD-images-postsubmits.yaml +++ b/jobs/aws/eks-distro-build-tooling/golang-1-19-PROD-images-postsubmits.yaml @@ -38,7 +38,7 @@ postsubmits: image-build: "true" disk-usage: "true" spec: - serviceaccountName: release-build-account + serviceaccountName: postsubmits-build-account automountServiceAccountToken: true nodeSelector: arch: AMD64 diff --git a/jobs/aws/eks-distro-build-tooling/golang-1-20-PROD-images-postsubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-20-PROD-images-postsubmits.yaml index 3f70fbfec..8bd312703 100644 --- a/jobs/aws/eks-distro-build-tooling/golang-1-20-PROD-images-postsubmits.yaml +++ b/jobs/aws/eks-distro-build-tooling/golang-1-20-PROD-images-postsubmits.yaml @@ -38,7 +38,7 @@ postsubmits: image-build: "true" disk-usage: "true" spec: - serviceaccountName: release-build-account + serviceaccountName: postsubmits-build-account automountServiceAccountToken: true nodeSelector: arch: AMD64 diff --git a/jobs/aws/eks-distro-build-tooling/golang-1-21-PROD-images-postsubmits.yaml b/jobs/aws/eks-distro-build-tooling/golang-1-21-PROD-images-postsubmits.yaml index 962c53124..a20d4d742 100644 --- a/jobs/aws/eks-distro-build-tooling/golang-1-21-PROD-images-postsubmits.yaml +++ b/jobs/aws/eks-distro-build-tooling/golang-1-21-PROD-images-postsubmits.yaml @@ -38,7 +38,7 @@ postsubmits: image-build: "true" disk-usage: "true" spec: - serviceaccountName: release-build-account + serviceaccountName: postsubmits-build-account automountServiceAccountToken: true nodeSelector: arch: AMD64 diff --git a/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-images-postsubmits.yaml b/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-images-postsubmits.yaml index 69c634a30..d8084426e 100644 --- a/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-images-postsubmits.yaml +++ b/templater/jobs/postsubmit/eks-distro-build-tooling/golang-1-X-PROD-images-postsubmits.yaml @@ -3,9 +3,9 @@ runIfChanged: projects/golang/go/docker/debianBase/RELEASE imageBuild: true automountServiceAccountToken: true commands: - - make install-deps -C $PROJECT_PATH - - projects/golang/go/scripts/prow_release_images.sh - - projects/golang/go/scripts/debian_image_release_notification.sh +- make install-deps -C $PROJECT_PATH +- projects/golang/go/scripts/prow_release_images.sh +- projects/golang/go/scripts/debian_image_release_notification.sh projectPath: projects/golang/go resources: requests: @@ -23,5 +23,4 @@ envVars: - name: SNS_TOPIC_ARN value: arn:aws:sns:us-east-1:379412251201:eks-golang-image-updates - name: ARTIFACT_DEPLOYMENT_ROLE_ARN - value: arn:aws:iam::379412251201:role/ArtifactDeploymentRole -serviceAccountName: release-build-account + value: arn:aws:iam::379412251201:role/ArtifactDeploymentRole \ No newline at end of file