Skip to content

Commit

Permalink
Bump envoy when a new docker image is available
Browse files Browse the repository at this point in the history
  • Loading branch information
Amin Jamali committed Jun 9, 2020
1 parent db56eef commit 938fdf6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
15 changes: 9 additions & 6 deletions pipelines/diego-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ groups:
- github-release
- merge-master-into-develop
- validate-envoy-version
- update-envoy-blob
- name: dusts
jobs:
- upgrade-routability-tests-from-v1.0.0
Expand Down Expand Up @@ -83,6 +82,7 @@ groups:
- check-expired-bosh-certs
- check-expired-test-fixture-certs
- update-golang-packages
- update-envoy-blob
- name: time-rotor
jobs:
- bbl-up-time-rotor-gcp
Expand Down Expand Up @@ -340,13 +340,10 @@ jobs:
serial: true
plan:
- in_parallel:
- get: diego-release-master
passed: [merge-master-into-develop]
trigger: true
params:
submodules: none
- get: diego-ci
- get: diego-release
- get: envoyproxy-image
trigger: true
- task: create-envoy-blob
file: diego-ci/tasks/create_envoy_blob.build.yml
- task: update-envoy-blob
Expand Down Expand Up @@ -1869,6 +1866,12 @@ resources:
branch: bump-golang
private_key: {{cf-diego-private-key}}

- name: envoyproxy-image
type: docker-image
source:
repository: envoyproxy/envoy
tag: v1.14-latest

- name: diego-release-envoy-bump
type: git
source:
Expand Down
2 changes: 1 addition & 1 deletion tasks/create_envoy_blob.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ image_resource:
type: docker-image
source:
repository: envoyproxy/envoy
tag: v1.14.1
tag: v1.14-latest

run:
path: diego-ci/tasks/create_envoy_blob
6 changes: 6 additions & 0 deletions tasks/update_envoy_blob
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ bosh sync-blobs
old_envoy_version=$(ls -1 blobs/proxy/envoy*.tgz | xargs basename | sed 's/envoy-\(.*\).tgz/\1/g')
new_envoy_version=$(../envoy-binary/envoy --version | grep -vE '^$' | awk '{print $3}' | cut -d/ -f1)

if [[ "$old_envoy_version" == "$new_envoy_version" ]]; then
echo "$new_envoy_version is currently the latest version."
exit 0
fi


bosh remove-blob proxy/envoy-${old_envoy_version}.tgz
bosh add-blob ../envoy-binary/envoy.tgz proxy/envoy-${new_envoy_version}.tgz
sed -i "s/envoy.*\.tgz/envoy-${new_envoy_version}\.tgz/g" packages/proxy/*
Expand Down

0 comments on commit 938fdf6

Please sign in to comment.