Skip to content

Commit

Permalink
Merge "prepare for release v0.0.42 - zuul bump to 11.1.0"
Browse files Browse the repository at this point in the history
  • Loading branch information
Microzuul CI authored and Gerrit Code Review committed Sep 12, 2024
2 parents 27ecd36 + 18b6308 commit b13ad38
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
16 changes: 8 additions & 8 deletions controllers/libs/base/static/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions controllers/static/zuul/scheduler-init-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion controllers/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion doc/reference/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b13ad38

Please sign in to comment.