Skip to content

Commit 4fbbd8d

Browse files
Alex-WelshAlex-Welsh
committed
Merge branch 'stackhpc/master' into master-requirements
2 parents 6d03e94 + fb736ce commit 4fbbd8d

11 files changed

+59
-7
lines changed

‎.github/workflows/stackhpc-all-in-one.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,17 @@ jobs:
335335
env:
336336
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
337337

338+
- name: Run upgrade prerequisites
339+
run: |
340+
docker run -t --rm \
341+
-v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
342+
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
343+
${{ steps.kayobe_image.outputs.kayobe_image }} \
344+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/script-run.sh tools/upgrade-prerequisites.sh
345+
env:
346+
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
347+
if: inputs.upgrade
348+
338349
# If testing upgrade, checkout the current release branch
339350
# Stash changes to tracked files, and set clean=false to avoid removing untracked files.
340351
# Revert changes to RabbitMQ Queue types to avoid a merge conflict

‎.github/workflows/stackhpc-pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ jobs:
6969
matrix:
7070
include:
7171
# NOTE(upgrade): Keep these in sync with Kayobe's supported Ansible and Python versions (see release notes).
72-
- ansible: "2.17"
72+
- ansible: "2.18"
7373
python: "3.12"
74-
- ansible: "2.16"
74+
- ansible: "2.17"
7575
python: "3.10"
7676
name: Ansible ${{ matrix.ansible }} lint with Python ${{ matrix.python }}
7777
if: github.repository == 'stackhpc/stackhpc-kayobe-config'

‎etc/kayobe/ansible/octavia-amphora-image-register.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
- python3-venv
5252
- python3-dev
5353
RedHat: []
54-
common_required_pacakges:
54+
common_required_packages:
5555
- gcc
56-
required_packages: "{{ common_required_pacakges + os_family_required_packages[ansible_facts.os_family] }}"
56+
required_packages: "{{ common_required_packages + os_family_required_packages[ansible_facts.os_family] }}"
5757
ansible_host: "{{ hostvars[groups['controllers'][0]].ansible_host }}"
5858
ansible.builtin.package:
5959
name: "{{ required_packages }}"

‎etc/kayobe/cephadm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cephadm_ceph_release: "squid"
1212
cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}"
1313

1414
# Ceph container image tag.
15-
cephadm_image_tag: "v19.2.0"
15+
cephadm_image_tag: "v19.2.1"
1616

1717
# HAProxy container image.
1818
cephadm_haproxy_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/haproxy:{{ cephadm_haproxy_image_tag }}"

‎etc/kayobe/kolla-image-tags.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,9 @@ kolla_image_tags:
1313
ovn_sb_db_relay:
1414
rocky-9: master-rocky-9-20250305T111730
1515
ubuntu-noble: master-ubuntu-noble-20250305T111730
16+
prometheus:
17+
rocky-9: master-rocky-9-20250430T112026
18+
ubuntu-noble: master-ubuntu-noble-20250430T112026
19+
rabbitmq:
20+
rocky-9: master-rocky-9-20250502T080944
21+
ubuntu-noble: master-ubuntu-noble-20250502T080944

‎etc/kayobe/pulp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ stackhpc_pulp_images_kolla:
526526
- prometheus-mysqld-exporter
527527
- prometheus-node-exporter
528528
- prometheus-openstack-exporter
529-
- prometheus-v2-server
529+
- prometheus-server
530530
- proxysql
531531
- rabbitmq
532532
- redis

‎etc/kayobe/trivy/allowed-vulnerabilities.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,27 @@
1414
# - CVE-2023-31047
1515
fluentd_allowed_vulnerabilities:
1616
- CVE-2024-27280
17+
1718
grafana_allowed_vulnerabilities:
1819
- CVE-2024-8986
1920

21+
prometheus_blackbox_exporter_allowed_vulnerabilities:
22+
- CVE-2024-45337
23+
prometheus_memcached_exporter_allowed_vulnerabilities:
24+
- CVE-2024-45337
25+
prometheus_mysqld_exporter_allowed_vulnerabilities:
26+
- CVE-2024-45337
27+
prometheus_elasticsearch_exporter_allowed_vulnerabilities:
28+
- CVE-2024-45337
29+
prometheus_node_exporter_allowed_vulnerabilities:
30+
- CVE-2024-45337
31+
prometheus_openstack_exporter_allowed_vulnerabilities:
32+
- CVE-2024-45337
33+
prometheus_libvirt_exporter_allowed_vulnerabilities:
34+
- CVE-2024-45337
35+
prometheus_cadvisor_allowed_vulnerabilities:
36+
- CVE-2024-41110
37+
- CVE-2024-45337
2038

2139
###############################################################################
2240
# Dummy variable to allow Ansible to accept this file.

‎releasenotes/notes/bump-ceph-to-19-2-1-878ae64bf5420893.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
features:
3+
- |
4+
Bump Ceph to v19.2.1.
5+
fixes:
6+
- |
7+
Fixes `Ceph bug #66389 <https://tracker.ceph.com/issues/66389>`__
8+
causing Ubuntu Noble hosts to fail to populate OSDs, by upgrading
9+
to Ceph v19.2.1.

‎releasenotes/notes/prometheus-v3-68fd3d9d6cf3e420.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
features:
3+
- |
4+
Bumps the Prometheus container images to bring in Prometheus v3.

‎releasenotes/notes/rabbitmq-4.0-52657c95567fc457.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
features:
3+
- |
4+
Bumps the RabbitMQ container image tag to upgrade RabbitMQ to v4.0

0 commit comments

Comments
 (0)