diff --git a/cloudbuild-proxy.yaml b/cloudbuild-proxy.yaml index e6ae403a0..113acfc0b 100644 --- a/cloudbuild-proxy.yaml +++ b/cloudbuild-proxy.yaml @@ -29,14 +29,40 @@ steps: - ':proxy:deployJar' - '-x' - 'autoLintGradle' - - '-PrepositoryUrl=gcs://domain-registry-maven-repository' dir: 'gradle' # Build the docker image. - name: 'gcr.io/cloud-builders/docker' args: ['build', '--tag', 'gcr.io/${PROJECT_ID}/proxy:${TAG_NAME}', '.'] dir: 'gradle/proxy' +# Move config files to the working directory. This is necessary because of Spinnaker limitations. +# It will concantinate `location' and `path' in the artifact field to construct the artifact +# path, even though the artifact is always uploaded to the `location', and `path' can be a regular +# expression. +- name: 'alpine' + args: ['sh', '-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: 'alpine' + args: ['sh', '-c', 'sed -i s/:latest/:${TAG_NAME}/ proxy-*.yaml'] +# Replace project name. +- name: 'alpine' + args: ['sh', '-c', 'sed -i s/GCP_PROJECT/${PROJECT_ID}/ proxy-*.yaml'] # Images to upload to GCR. images: ['gcr.io/${PROJECT_ID}/proxy:${TAG_NAME}'] +# Config files to upload to GCS. +artifacts: + objects: + location: 'gs://${PROJECT_ID}-deploy/${TAG_NAME}' + # This cannot be regexs because of how Spinnaker constructs artifact paths. + paths: + - 'proxy-deployment-sandbox.yaml' + - 'proxy-deployment-production.yaml' + - 'proxy-deployment-sandbox-canary.yaml' + - 'proxy-deployment-production-canary.yaml' + - 'proxy-service.yaml' + - 'proxy-service-canary.yaml' timeout: 3600s options: machineType: 'N1_HIGHCPU_8' diff --git a/java/google/registry/proxy/BUILD b/java/google/registry/proxy/BUILD index 2d02ee8f3..0ba6acbcf 100644 --- a/java/google/registry/proxy/BUILD +++ b/java/google/registry/proxy/BUILD @@ -78,5 +78,4 @@ container_push( image = ":proxy_image", registry = "gcr.io", repository = "GCP_PROJECT/IMAGE_NAME", - tag = "bazel", ) diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml index cc2294c4f..bb362f947 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/IMAGE_NAME:bazel + image: gcr.io/GCP_PROJECT/proxy:latest 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 1a39ebdca..b9aece5f0 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/IMAGE_NAME:bazel + image: gcr.io/GCP_PROJECT/proxy:latest 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 f17202c2f..955005c5d 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/IMAGE_NAME:bazel + image: gcr.io/GCP_PROJECT/proxy:latest 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 200ac6c17..6c1c548d6 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/IMAGE_NAME:bazel + image: gcr.io/GCP_PROJECT/proxy:latest 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 796bd0b9e..22096b5da 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/IMAGE_NAME:bazel + image: gcr.io/GCP_PROJECT/proxy:latest 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 069d04898..cdb1d3d32 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/IMAGE_NAME:bazel + image: gcr.io/GCP_PROJECT/proxy:latest ports: - containerPort: 30000 name: health-check