From 143ae1f93ed4df6a1dd3cc893127729b0d49dfd0 Mon Sep 17 00:00:00 2001 From: jianglai Date: Tue, 23 Apr 2019 06:41:18 -0700 Subject: [PATCH] Update proxy release pipeline following Spinnaker 1.13 release The image name in the manifest needs to be the same as the name that Spinnaker trigger catches. With the new release, Spinnaker now correctly recognizes gcr.io/${PROJECT_ID}/proxy as the image name. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=244845037 --- .../registry/proxy/kubernetes/proxy-deployment-alpha.yaml | 2 +- .../proxy/kubernetes/proxy-deployment-crash-canary.yaml | 2 +- .../registry/proxy/kubernetes/proxy-deployment-crash.yaml | 2 +- .../kubernetes/proxy-deployment-production-canary.yaml | 2 +- .../proxy/kubernetes/proxy-deployment-production.yaml | 2 +- .../proxy/kubernetes/proxy-deployment-sandbox-canary.yaml | 2 +- .../proxy/kubernetes/proxy-deployment-sandbox.yaml | 2 +- release/cloudbuild-proxy.yaml | 7 ------- 8 files changed, 7 insertions(+), 14 deletions(-) diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml index bb362f947..00a1d3a88 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: proxy - image: gcr.io/GCP_PROJECT/proxy:latest + image: gcr.io/GCP_PROJECT/proxy ports: - containerPort: 30000 name: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-crash-canary.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-crash-canary.yaml index 97765733a..793aaa0f6 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-crash-canary.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-crash-canary.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: proxy-canary - image: gcr.io/GCP_PROJECT/proxy:latest + image: gcr.io/GCP_PROJECT/proxy ports: - containerPort: 30000 name: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-crash.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-crash.yaml index b9aece5f0..61adf3179 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-crash.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-crash.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: proxy - image: gcr.io/GCP_PROJECT/proxy:latest + image: gcr.io/GCP_PROJECT/proxy ports: - containerPort: 30000 name: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml index 955005c5d..6503591b8 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: proxy-canary - image: gcr.io/GCP_PROJECT/proxy:latest + image: gcr.io/GCP_PROJECT/proxy ports: - containerPort: 30000 name: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml index 6c1c548d6..5bd4f22b2 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: proxy - image: gcr.io/GCP_PROJECT/proxy:latest + image: gcr.io/GCP_PROJECT/proxy ports: - containerPort: 30000 name: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml index 22096b5da..7f805f3bd 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: proxy-canary - image: gcr.io/GCP_PROJECT/proxy:latest + image: gcr.io/GCP_PROJECT/proxy ports: - containerPort: 30000 name: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml index cdb1d3d32..16b37d390 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: proxy - image: gcr.io/GCP_PROJECT/proxy:latest + image: gcr.io/GCP_PROJECT/proxy ports: - containerPort: 30000 name: health-check diff --git a/release/cloudbuild-proxy.yaml b/release/cloudbuild-proxy.yaml index 0f731c165..3121eeef6 100644 --- a/release/cloudbuild-proxy.yaml +++ b/release/cloudbuild-proxy.yaml @@ -40,13 +40,6 @@ steps: - name: 'gcr.io/${PROJECT_ID}/builder:latest' entrypoint: /bin/bash args: ['-c', 'mv java/google/registry/proxy/kubernetes/* .'] -# Replace the tag "latest" with the git tag that triggered this build. This is due to a bug in -# Spinnaker where the tag is appended to the image name when the deployment pipeline is triggered -# by GCB pubsub messages. The bug is fixed in https://github.com/spinnaker/echo/pull/498 and we can -# remove this step and the "latest" tag in the manifests when Spinnaker 1.13 is deployed. -- name: 'gcr.io/${PROJECT_ID}/builder:latest' - entrypoint: /bin/bash - args: ['-c', 'sed -i s/:latest/:${TAG_NAME}/ proxy-*.yaml'] # Push the image. We can't let Cloud Build's default processing do that for us # because we need to push the image before we can sign it in the following # step.