From 18b6308d13b79e1e7893378ed64b8c4b3842b5b8 Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Thu, 12 Sep 2024 09:15:50 +0200 Subject: [PATCH] prepare for release v0.0.42 - zuul bump to 11.1.0 Change-Id: Ie51cb150f1a7204ab604bee2264883c3318cc487 --- controllers/libs/base/static/images.yaml | 16 ++++++++-------- .../static/zuul/scheduler-init-container.sh | 3 +-- controllers/utils.go | 2 +- doc/reference/CHANGELOG.md | 8 +++++++- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/controllers/libs/base/static/images.yaml b/controllers/libs/base/static/images.yaml index 361c9482..1b8d11c4 100644 --- a/controllers/libs/base/static/images.yaml +++ b/controllers/libs/base/static/images.yaml @@ -4,20 +4,20 @@ images: - name: zuul-scheduler container: quay.io/software-factory/zuul-scheduler - version: 11.0.1-2 - source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-scheduler.container?id=634663bc1017b5ad187b27ac71673aa0570a06e1 + version: 11.1.0-1 + source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-scheduler.container?id=a86d9df43b75693c8a85f9963cdca93331bace7c - name: zuul-executor container: quay.io/software-factory/zuul-executor - version: 11.0.1-2 - source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-executor.container?id=89ae4f17a1924b7fc53d1ac7736ef79270fbc7a7 + version: 11.1.0-1 + source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-executor.container?id=a86d9df43b75693c8a85f9963cdca93331bace7c - name: zuul-merger container: quay.io/software-factory/zuul-merger - version: 11.0.1-2 - source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-merger.container?id=5f5c93b30f688c230f5df834f5c7af50f02fc0d8 + version: 11.1.0-1 + source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-merger.container?id=a86d9df43b75693c8a85f9963cdca93331bace7c - name: zuul-web container: quay.io/software-factory/zuul-web - version: 11.0.1-2 - source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-web.container?id=d27a5fb4981d1f69e1c6c95f35d7af8710be1e32 + version: 11.1.0-1 + source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-web.container?id=a86d9df43b75693c8a85f9963cdca93331bace7c - name: nodepool-launcher container: quay.io/software-factory/nodepool-launcher version: 10.0.0-3 diff --git a/controllers/static/zuul/scheduler-init-container.sh b/controllers/static/zuul/scheduler-init-container.sh index 1c839b52..52f6b473 100644 --- a/controllers/static/zuul/scheduler-init-container.sh +++ b/controllers/static/zuul/scheduler-init-container.sh @@ -3,8 +3,7 @@ set -ex # Update the CA Trust chain -mkdir -p /etc/pki/ca-trust/extracted/{pem,java,edk2,openssl} -update-ca-trust +update-ca-trust extract -o /etc/pki/ca-trust/extracted # This is needed when we mount the local zuul source from the host # to bypass the git ownership verification diff --git a/controllers/utils.go b/controllers/utils.go index bf111744..0457d3bf 100644 --- a/controllers/utils.go +++ b/controllers/utils.go @@ -44,7 +44,7 @@ const ( CustomSSLSecretName = "sf-ssl-cert" CorporateCACerts = "corporate-ca-certs" UpdateCATrustAnchorsPath = "/usr/share/pki/ca-trust-source/anchors/" - UpdateCATrustCommand = "set -x && mkdir -p /etc/pki/ca-trust/extracted/{pem,java,edk2,openssl} && update-ca-trust" + UpdateCATrustCommand = "set -x && update-ca-trust extract -o /etc/pki/ca-trust/extracted" ) //go:embed static/fetch-config-repo.sh diff --git a/doc/reference/CHANGELOG.md b/doc/reference/CHANGELOG.md index 0c392128..a0a22c0e 100644 --- a/doc/reference/CHANGELOG.md +++ b/doc/reference/CHANGELOG.md @@ -7,11 +7,17 @@ All notable changes to this project will be documented in this file. ### Added ### Removed ### Changed +### Fixed +### Security + +## [v0.0.42] - 2024-09-12 +### Changed + +- Zuul version has been bumped to 11.1.0 (https://zuul-ci.org/docs/zuul/latest/releasenotes.html#relnotes-11-1-0) - zookeeper - increase certificate validity duration to 25 years to avoid renewal burden - logjuicer: install corporate-ca-certs to support external SF. -### Fixed ### Security - httpd-gateway: bump to latest container image (https://catalog.redhat.com/software/containers/ubi8/httpd-24/6065b844aee24f523c207943)