Skip to content

Commit

Permalink
bump zuul image release - use of updated zuul-client
Browse files Browse the repository at this point in the history
This change adds the capability to simply run privileged zuul-client command from
any zuul pods without providing an auth token.

Change-Id: I030530929c17cf2a71d9e4316f3ba13ce32ce455
  • Loading branch information
morucci committed Jul 10, 2024
1 parent 8ef89fd commit 2365c00
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 16 deletions.
32 changes: 16 additions & 16 deletions controllers/libs/base/static/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,52 @@
images:
- name: zuul-scheduler
container: quay.io/software-factory/zuul-scheduler
version: 10.1.0-2
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-scheduler.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
version: 10.1.0-3
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-scheduler.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: zuul-executor
container: quay.io/software-factory/zuul-executor
version: 10.1.0-2
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-executor.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
version: 10.1.0-3
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-executor.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: zuul-merger
container: quay.io/software-factory/zuul-merger
version: 10.1.0-2
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-merger.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
version: 10.1.0-3
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-merger.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: zuul-web
container: quay.io/software-factory/zuul-web
version: 10.1.0-2
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-web.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
version: 10.1.0-3
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-web.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: nodepool-launcher
container: quay.io/software-factory/nodepool-launcher
version: 10.0.0-3
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-launcher.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-launcher.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: nodepool-builder
container: quay.io/software-factory/nodepool-builder
version: 10.0.0-3
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-builder.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-builder.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: zookeeper
container: quay.io/software-factory/zookeeper
version: 3.8.4-2
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zookeeper.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zookeeper.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: git-server
container: quay.io/software-factory/git-deamon
version: 2.39.3-1
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/git-daemon.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/git-daemon.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: sshd
container: quay.io/software-factory/sshd
version: 0.1-4
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/sshd.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/sshd.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: purgelogs
container: quay.io/software-factory/purgelogs
version: 0.2.3-5
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/purgelogs.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/purgelogs.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: mariadb
container: quay.io/software-factory/mariadb
version: 11.4-ubi9-1
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/mariadb.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/mariadb.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: busybox
container: quay.io/software-factory/sf-op-busybox
version: 1.5-3
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/sf-op-busybox.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/sf-op-busybox.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
- name: httpd
container: registry.access.redhat.com/ubi8/httpd-24
version: 1-284.1696531168
Expand Down
3 changes: 3 additions & 0 deletions doc/reference/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
## [in development]

### Added

- Capability to simply run privileged zuul-client command from any zuul pods without providing an auth token

### Changed
### Deprecated
### Removed
Expand Down
19 changes: 19 additions & 0 deletions roles/health-check/zuul-client-from-zuul-pod/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Note that thanks to https://review.opendev.org/c/zuul/zuul-client/+/837908 we can
# run zuul-client from the zuul-scheduler (works from any zuul pods) w/o providing any auth token.
# We are ensuring this facility is working through that test case

- name: Create a autohold request with zuul-client and the generated config
ansible.builtin.command: |
kubectl exec -it zuul-scheduler-0 -c zuul-scheduler -- zuul-client autohold --tenant internal --project config --job config-update --reason CI_TEST
- name: Ensure autohold was set properly
ansible.builtin.command: |
kubectl exec -it zuul-scheduler-0 -c zuul-scheduler -- zuul-client autohold-list --tenant internal
register: _ah_list
failed_when: '"CI_TEST" not in _ah_list.stdout'

- name: Remove autohold
ansible.builtin.shell: >
echo "{{ _ah_list.stdout }}" |
grep -oE "0000[0-9]+" |
xargs kubectl exec -it zuul-scheduler-0 -c zuul-scheduler -- zuul-client autohold-delete --tenant internal
1 change: 1 addition & 0 deletions roles/run-tests/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
- name: validate-purgelogs
when: "{{ mode == 'olm' }}"
- name: zuul-client-api
- name: zuul-client-from-zuul-pod
- name: zuul-components
- name: test-external-ze
- name: test-log-forwarding
Expand Down

0 comments on commit 2365c00

Please sign in to comment.