From a6dd3e5ca3590f2fb47ca26b0f29cddb00570b1d Mon Sep 17 00:00:00 2001 From: CFN-CI <102803133+CFN-CI@users.noreply.github.com> Date: Thu, 21 Dec 2023 15:01:37 +0000 Subject: [PATCH] release v13.4.0+2.8.5 --- .final_builds/jobs/haproxy/index.yml | 4 +++ .final_builds/packages/haproxy/index.yml | 4 +++ ci/release_notes.md | 7 ----- manifests/haproxy.yml | 6 ++-- releases/haproxy/haproxy-13.4.0+2.8.5.yml | 38 +++++++++++++++++++++++ releases/haproxy/index.yml | 2 ++ 6 files changed, 51 insertions(+), 10 deletions(-) delete mode 100644 ci/release_notes.md create mode 100644 releases/haproxy/haproxy-13.4.0+2.8.5.yml diff --git a/.final_builds/jobs/haproxy/index.yml b/.final_builds/jobs/haproxy/index.yml index 601e7043..f539e856 100644 --- a/.final_builds/jobs/haproxy/index.yml +++ b/.final_builds/jobs/haproxy/index.yml @@ -267,6 +267,10 @@ builds: version: f2f92dd0f8243fd854aeabbb0695237bbf7eeedec33e0fbfbb6af5e07d89a27d blobstore_id: 4cfe0bd2-3176-4a39-4c5f-c4ad1982ce2d sha1: sha256:263ac91d11d41ca859945aaebdb99989557eed0e2dbdecf08b4f419860a59c6c + f6df39cc23d32c215a04809d24944e4632f763ee0bb736239f6daaa7f9e01749: + version: f6df39cc23d32c215a04809d24944e4632f763ee0bb736239f6daaa7f9e01749 + blobstore_id: d1775430-cb7b-4244-40ed-e692f98454e9 + sha1: sha256:8edad0da767fa608780177fa310ffa027952748b3b98a1d4222c129745fb395e f7c3224b863c0f98e13cd8d0df72460895b020f82de69c0266252c3dc0724a10: version: f7c3224b863c0f98e13cd8d0df72460895b020f82de69c0266252c3dc0724a10 blobstore_id: 8dadb4c6-6cb2-4c1b-6090-0eadc41be85b diff --git a/.final_builds/packages/haproxy/index.yml b/.final_builds/packages/haproxy/index.yml index 6fddb9a4..2fa6d4b6 100644 --- a/.final_builds/packages/haproxy/index.yml +++ b/.final_builds/packages/haproxy/index.yml @@ -79,6 +79,10 @@ builds: version: 8d9eafdda0a5ee5d5e0c7110c9a3c76d1030713045cca5bfd26bcdf80da9aa21 blobstore_id: 1987123d-7868-45fe-40a6-7519f741c0e5 sha1: sha256:22a6b728e964648aada2aa532edcd99d33dead5cdf00a7201ddb6a9204562191 + 927f5c6a57ae06b20c899eb33d74dc2a6137a860a0f745711fe65fe5e2024452: + version: 927f5c6a57ae06b20c899eb33d74dc2a6137a860a0f745711fe65fe5e2024452 + blobstore_id: dfa983d0-ff83-4ba7-65ac-4b2032043dd6 + sha1: sha256:45eee0f59d9c56dae2e3355d499fcc8966014b2d16a24893dea701a98c5b79e4 9c86ced8448e9810347630666c9299bb41d80038: version: 9c86ced8448e9810347630666c9299bb41d80038 blobstore_id: a2978bf6-3f04-4b00-8c16-f39ff7b5cbf3 diff --git a/ci/release_notes.md b/ci/release_notes.md deleted file mode 100644 index 13050867..00000000 --- a/ci/release_notes.md +++ /dev/null @@ -1,7 +0,0 @@ -# New Features -- HAProxy now supports [retries](https://github.com/cloudfoundry/haproxy-boshrelease/blob/master/jobs/haproxy/spec#L264) on failed backend connections. (@domdom82) -- HAProxy now supports [redispatching](https://github.com/cloudfoundry/haproxy-boshrelease/blob/master/jobs/haproxy/spec#L261) connection retries to different backend servers (@domdom82) - -# Upgrades - -- `HAProxy` has been upgraded from v2.8.4 to v2.8.5 diff --git a/manifests/haproxy.yml b/manifests/haproxy.yml index 998e1ddb..93e8c3a9 100644 --- a/manifests/haproxy.yml +++ b/manifests/haproxy.yml @@ -40,6 +40,6 @@ releases: url: https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.1.19 sha1: 669baca975c6def518c7e736dbf189cfb438475b - name: haproxy - version: 13.3.0+2.8.4 - url: https://github.com/cloudfoundry/haproxy-boshrelease/releases/download/v13.3.0+2.8.4/haproxy-13.3.0+2.8.4.tgz - sha1: c329197c77f5cd0917c24f0301bcf32215f1ba9e + version: 13.4.0+2.8.5 + url: https://github.com/cloudfoundry/haproxy-boshrelease/releases/download/v13.4.0+2.8.5/haproxy-13.4.0+2.8.5.tgz + sha1: 6331b5595b1c06e316542a15d371e23f52b2b44d diff --git a/releases/haproxy/haproxy-13.4.0+2.8.5.yml b/releases/haproxy/haproxy-13.4.0+2.8.5.yml new file mode 100644 index 00000000..1452f2f0 --- /dev/null +++ b/releases/haproxy/haproxy-13.4.0+2.8.5.yml @@ -0,0 +1,38 @@ +name: haproxy +version: 13.4.0+2.8.5 +commit_hash: e331cc3 +uncommitted_changes: false +jobs: +- name: haproxy + version: f6df39cc23d32c215a04809d24944e4632f763ee0bb736239f6daaa7f9e01749 + fingerprint: f6df39cc23d32c215a04809d24944e4632f763ee0bb736239f6daaa7f9e01749 + sha1: sha256:8edad0da767fa608780177fa310ffa027952748b3b98a1d4222c129745fb395e + packages: + - haproxy + - ttar +- name: keepalived + version: db24c81e600a163a0dc2c7fd02165fae9a0483a08e33baf39222fa8cf701d63a + fingerprint: db24c81e600a163a0dc2c7fd02165fae9a0483a08e33baf39222fa8cf701d63a + sha1: sha256:92d8f1996f108950d19400fb0af33350892599b3f921a0a81f7baebacacc11fb + packages: + - keepalived +packages: +- name: haproxy + version: 927f5c6a57ae06b20c899eb33d74dc2a6137a860a0f745711fe65fe5e2024452 + fingerprint: 927f5c6a57ae06b20c899eb33d74dc2a6137a860a0f745711fe65fe5e2024452 + sha1: sha256:45eee0f59d9c56dae2e3355d499fcc8966014b2d16a24893dea701a98c5b79e4 + dependencies: [] +- name: keepalived + version: 7536e81aca1b578a9d250aa493dbe8fc673abb6980a3815005ee9cf192c9e0e8 + fingerprint: 7536e81aca1b578a9d250aa493dbe8fc673abb6980a3815005ee9cf192c9e0e8 + sha1: sha256:df59c350e3fc2a215d3fb182514f05089d1342e33bd68936923f11280ff4a0b7 + dependencies: [] +- name: ttar + version: 8cdfde2f1ddc5f1c22b003002a473fbb1455e02b14167401d7fdd5856fec77b5 + fingerprint: 8cdfde2f1ddc5f1c22b003002a473fbb1455e02b14167401d7fdd5856fec77b5 + sha1: sha256:fbae990ea3ed13523b62d7a8ccea6c485c680aa40fbb78c11e4f7cfc92c1863f + dependencies: [] +license: + version: eba49a3e88a4329d6b7943df92467659a9badda7319648d5e78d45d7f1a19bc4 + fingerprint: eba49a3e88a4329d6b7943df92467659a9badda7319648d5e78d45d7f1a19bc4 + sha1: sha256:4462ba848d0f1d9489aab87c79816652cce6d3467153c5e78a6db13931a6b602 diff --git a/releases/haproxy/index.yml b/releases/haproxy/index.yml index c9050c42..de25c6a9 100644 --- a/releases/haproxy/index.yml +++ b/releases/haproxy/index.yml @@ -177,6 +177,8 @@ builds: version: 11.15.0 e29ec34b-40c5-43ed-992d-c8a0177978b8: version: 8.0.5 + e5141e5d-a6de-447f-426b-1807e35aa646: + version: 13.4.0+2.8.5 e6661160-264c-4c74-a1f6-7fd4bb3855dd: version: 8.0.11 e7e1994d-1d05-4aad-66e8-b8e1910da29b: