From 05f2f45971abcf483189358d663e2b46c3fc2fe8 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Fri, 19 Jul 2024 08:01:12 -0500 Subject: [PATCH] Add 2024.1 overrides to some charts - Add 2024.1 overrides to those charts where there are overrides for previous releases. - Update some jobs to use 2024.1 overrides. - Update default images in grafana, postgresql, nagios, ceph-rgw, ceph-provisioners, kubernetes-node-problem-detector - Install tzdata package on K8s nodes. This is necessary for kubernetes-node-problem-detector chart which mounts /etc/localtime from hosts. Change-Id: I343995c422b8d35fa902d22abf8fdd4d0f6f7334 --- ceph-provisioners/Chart.yaml | 2 +- ceph-provisioners/values.yaml | 2 +- ceph-rgw/Chart.yaml | 2 +- ceph-rgw/values.yaml | 6 +-- .../values_overrides/2024.1-ubuntu_jammy.yaml | 19 ++++++++++ elasticsearch/Chart.yaml | 2 +- .../values_overrides/2024.1-ubuntu_jammy.yaml | 18 +++++++++ fluentd/Chart.yaml | 2 +- .../values_overrides/2024.1-ubuntu_jammy.yaml | 17 +++++++++ grafana/Chart.yaml | 2 +- grafana/values.yaml | 4 +- .../values_overrides/2024.1-ubuntu_jammy.yaml | 18 +++++++++ kibana/Chart.yaml | 2 +- .../values_overrides/2024.1-ubuntu_jammy.yaml | 18 +++++++++ kubernetes-keystone-webhook/Chart.yaml | 2 +- .../values_overrides/2024.1-ubuntu_jammy.yaml | 17 +++++++++ kubernetes-node-problem-detector/Chart.yaml | 2 +- kubernetes-node-problem-detector/values.yaml | 2 +- mariadb/Chart.yaml | 2 +- .../2024.1-ubuntu_jammy.yaml | 0 nagios/Chart.yaml | 2 +- nagios/values.yaml | 2 +- postgresql/Chart.yaml | 2 +- postgresql/values.yaml | 4 +- .../values_overrides/2024.1-ubuntu_jammy.yaml | 17 +++++++++ powerdns/Chart.yaml | 2 +- .../values_overrides/2024.1-ubuntu_jammy.yaml | 17 +++++++++ prometheus-mysql-exporter/Chart.yaml | 2 +- .../2023.1-ubuntu_focal.yaml | 0 .../2023.2-ubuntu_jammy.yaml | 0 .../values_overrides/2024.1-ubuntu_jammy.yaml | 18 +++++++++ .../apparmor.yaml | 0 .../prometheus.yaml | 0 .../tls.yaml | 0 prometheus/Chart.yaml | 2 +- .../values_overrides/2024.1-ubuntu_jammy.yaml | 17 +++++++++ releasenotes/notes/ceph-provisioners.yaml | 1 + releasenotes/notes/ceph-rgw.yaml | 2 + releasenotes/notes/elasticsearch.yaml | 1 + releasenotes/notes/fluentd.yaml | 1 + releasenotes/notes/grafana.yaml | 1 + releasenotes/notes/kibana.yaml | 1 + .../notes/kubernetes-keystone-webhook.yaml | 1 + .../kubernetes-node-problem-detector.yaml | 1 + releasenotes/notes/mariadb.yaml | 1 + releasenotes/notes/nagios.yaml | 1 + releasenotes/notes/postgresql.yaml | 1 + releasenotes/notes/powerdns.yaml | 1 + .../notes/prometheus-mysql-exporter.yaml | 1 + releasenotes/notes/prometheus.yaml | 1 + roles/deploy-env/tasks/prerequisites.yaml | 3 ++ tools/debug_sleep.sh | 3 ++ tools/deployment/db/mariadb.sh | 1 + zuul.d/jobs.yaml | 37 ++++++++++--------- zuul.d/project.yaml | 10 ++--- 55 files changed, 246 insertions(+), 47 deletions(-) create mode 100644 ceph-rgw/values_overrides/2024.1-ubuntu_jammy.yaml create mode 100644 elasticsearch/values_overrides/2024.1-ubuntu_jammy.yaml create mode 100644 fluentd/values_overrides/2024.1-ubuntu_jammy.yaml create mode 100644 grafana/values_overrides/2024.1-ubuntu_jammy.yaml create mode 100644 kibana/values_overrides/2024.1-ubuntu_jammy.yaml create mode 100644 kubernetes-keystone-webhook/values_overrides/2024.1-ubuntu_jammy.yaml rename {prometheus-mysql-exporter/value_overrides => mariadb/values_overrides}/2024.1-ubuntu_jammy.yaml (100%) create mode 100644 postgresql/values_overrides/2024.1-ubuntu_jammy.yaml create mode 100644 powerdns/values_overrides/2024.1-ubuntu_jammy.yaml rename prometheus-mysql-exporter/{value_overrides => values_overrides}/2023.1-ubuntu_focal.yaml (100%) rename prometheus-mysql-exporter/{value_overrides => values_overrides}/2023.2-ubuntu_jammy.yaml (100%) create mode 100644 prometheus-mysql-exporter/values_overrides/2024.1-ubuntu_jammy.yaml rename prometheus-mysql-exporter/{value_overrides => values_overrides}/apparmor.yaml (100%) rename prometheus-mysql-exporter/{value_overrides => values_overrides}/prometheus.yaml (100%) rename prometheus-mysql-exporter/{value_overrides => values_overrides}/tls.yaml (100%) create mode 100644 prometheus/values_overrides/2024.1-ubuntu_jammy.yaml create mode 100755 tools/debug_sleep.sh diff --git a/ceph-provisioners/Chart.yaml b/ceph-provisioners/Chart.yaml index 895c06cc0..9cf6a550a 100644 --- a/ceph-provisioners/Chart.yaml +++ b/ceph-provisioners/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceph Provisioner name: ceph-provisioners -version: 0.1.31 +version: 0.1.32 home: https://github.com/ceph/ceph ... diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index 12ea0b02c..f7c572707 100644 --- a/ceph-provisioners/values.yaml +++ b/ceph-provisioners/values.yaml @@ -32,7 +32,7 @@ images: ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:uubuntu_jammy_18.2.2-1-20240312' ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_jammy_18.2.2-1-20240312' ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' - ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:change_770201_ubuntu_bionic-20210113' + ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:ubuntu_jammy_18.2.2-1-20240312' csi_provisioner: 'registry.k8s.io/sig-storage/csi-provisioner:v3.1.0' csi_snapshotter: 'registry.k8s.io/sig-storage/csi-snapshotter:v6.0.0' csi_attacher: 'registry.k8s.io/sig-storage/csi-attacher:v3.4.0' diff --git a/ceph-rgw/Chart.yaml b/ceph-rgw/Chart.yaml index 700f29a81..54958164b 100644 --- a/ceph-rgw/Chart.yaml +++ b/ceph-rgw/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceph RadosGW name: ceph-rgw -version: 0.1.35 +version: 0.1.37 home: https://github.com/ceph/ceph ... diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml index acaa7bce7..c8ee0a22e 100644 --- a/ceph-rgw/values.yaml +++ b/ceph-rgw/values.yaml @@ -32,9 +32,9 @@ images: image_repo_sync: 'docker.io/library/docker:17.07.0' rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' - ks_endpoints: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal' - ks_service: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal' - ks_user: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal' + ks_endpoints: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy' + ks_service: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy' + ks_user: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy' local_registry: active: false exclude: diff --git a/ceph-rgw/values_overrides/2024.1-ubuntu_jammy.yaml b/ceph-rgw/values_overrides/2024.1-ubuntu_jammy.yaml new file mode 100644 index 000000000..1acc2b9df --- /dev/null +++ b/ceph-rgw/values_overrides/2024.1-ubuntu_jammy.yaml @@ -0,0 +1,19 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +images: + tags: + ks_endpoints: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy' + ks_service: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy' + ks_user: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy' +... diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index a44fc9208..b7b959ac9 100644 --- a/elasticsearch/Chart.yaml +++ b/elasticsearch/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v8.9.0 description: OpenStack-Helm ElasticSearch name: elasticsearch -version: 0.3.5 +version: 0.3.6 home: https://www.elastic.co/ sources: - https://github.com/elastic/elasticsearch diff --git a/elasticsearch/values_overrides/2024.1-ubuntu_jammy.yaml b/elasticsearch/values_overrides/2024.1-ubuntu_jammy.yaml new file mode 100644 index 000000000..908e3de41 --- /dev/null +++ b/elasticsearch/values_overrides/2024.1-ubuntu_jammy.yaml @@ -0,0 +1,18 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +images: + tags: + memory_init: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy + helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy +... diff --git a/fluentd/Chart.yaml b/fluentd/Chart.yaml index 5f97bcba6..1b72b2e5a 100644 --- a/fluentd/Chart.yaml +++ b/fluentd/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v1.10.1 description: OpenStack-Helm Fluentd name: fluentd -version: 0.1.11 +version: 0.1.12 home: https://www.fluentd.org/ sources: - https://github.com/fluent/fluentd diff --git a/fluentd/values_overrides/2024.1-ubuntu_jammy.yaml b/fluentd/values_overrides/2024.1-ubuntu_jammy.yaml new file mode 100644 index 000000000..efba1791d --- /dev/null +++ b/fluentd/values_overrides/2024.1-ubuntu_jammy.yaml @@ -0,0 +1,17 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +images: + tags: + helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy +... diff --git a/grafana/Chart.yaml b/grafana/Chart.yaml index a8d3040f2..f2d07b582 100644 --- a/grafana/Chart.yaml +++ b/grafana/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v9.2.10 description: OpenStack-Helm Grafana name: grafana -version: 0.1.26 +version: 0.1.27 home: https://grafana.com/ sources: - https://github.com/grafana/grafana diff --git a/grafana/values.yaml b/grafana/values.yaml index 6caf58456..af723333e 100644 --- a/grafana/values.yaml +++ b/grafana/values.yaml @@ -20,8 +20,8 @@ images: grafana: docker.io/grafana/grafana:9.2.10 mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal - db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic - grafana_db_session_sync: docker.io/openstackhelm/heat:stein-ubuntu_bionic + db_init: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy + grafana_db_session_sync: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy selenium_tests: docker.io/openstackhelm/osh-selenium:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 grafana_image_renderer: docker.io/grafana/grafana-image-renderer:3.10.5 diff --git a/grafana/values_overrides/2024.1-ubuntu_jammy.yaml b/grafana/values_overrides/2024.1-ubuntu_jammy.yaml new file mode 100644 index 000000000..124f3b2ae --- /dev/null +++ b/grafana/values_overrides/2024.1-ubuntu_jammy.yaml @@ -0,0 +1,18 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +images: + tags: + db_init: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy + grafana_db_session_sync: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy +... diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml index 81b65cbcb..479d217b4 100644 --- a/kibana/Chart.yaml +++ b/kibana/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v8.9.0 description: OpenStack-Helm Kibana name: kibana -version: 0.1.15 +version: 0.1.16 home: https://www.elastic.co/products/kibana sources: - https://github.com/elastic/kibana diff --git a/kibana/values_overrides/2024.1-ubuntu_jammy.yaml b/kibana/values_overrides/2024.1-ubuntu_jammy.yaml new file mode 100644 index 000000000..da943640d --- /dev/null +++ b/kibana/values_overrides/2024.1-ubuntu_jammy.yaml @@ -0,0 +1,18 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +images: + tags: + register_kibana_indexes: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy + flush_kibana_metadata: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy +... diff --git a/kubernetes-keystone-webhook/Chart.yaml b/kubernetes-keystone-webhook/Chart.yaml index 63715ba2c..ee5587e34 100644 --- a/kubernetes-keystone-webhook/Chart.yaml +++ b/kubernetes-keystone-webhook/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v0.2.0 description: OpenStack-Helm Kubernetes keystone webhook name: kubernetes-keystone-webhook -version: 0.1.9 +version: 0.1.10 home: https://github.com/kubernetes/cloud-provider-openstack sources: - https://opendev.org/openstack/openstack-helm-infra diff --git a/kubernetes-keystone-webhook/values_overrides/2024.1-ubuntu_jammy.yaml b/kubernetes-keystone-webhook/values_overrides/2024.1-ubuntu_jammy.yaml new file mode 100644 index 000000000..4b5f3b607 --- /dev/null +++ b/kubernetes-keystone-webhook/values_overrides/2024.1-ubuntu_jammy.yaml @@ -0,0 +1,17 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +images: + tags: + scripted_test: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy +... diff --git a/kubernetes-node-problem-detector/Chart.yaml b/kubernetes-node-problem-detector/Chart.yaml index b8de99b29..5578c45fe 100644 --- a/kubernetes-node-problem-detector/Chart.yaml +++ b/kubernetes-node-problem-detector/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Kubernetes Node Problem Detector name: kubernetes-node-problem-detector -version: 0.1.9 +version: 0.1.10 home: https://github.com/kubernetes/node-problem-detector sources: - https://github.com/kubernetes/node-problem-detector diff --git a/kubernetes-node-problem-detector/values.yaml b/kubernetes-node-problem-detector/values.yaml index d5141a26f..073c4a907 100644 --- a/kubernetes-node-problem-detector/values.yaml +++ b/kubernetes-node-problem-detector/values.yaml @@ -17,7 +17,7 @@ --- images: tags: - node_problem_detector: docker.io/openstackhelm/node-problem-detector:latest-ubuntu_bionic + node_problem_detector: docker.io/openstackhelm/node-problem-detector:latest-ubuntu_jammy dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 pull_policy: IfNotPresent diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml index 260894666..49433d4b8 100644 --- a/mariadb/Chart.yaml +++ b/mariadb/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v10.6.7 description: OpenStack-Helm MariaDB name: mariadb -version: 0.2.42 +version: 0.2.43 home: https://mariadb.com/kb/en/ icon: http://badges.mariadb.org/mariadb-badge-180x60.png sources: diff --git a/prometheus-mysql-exporter/value_overrides/2024.1-ubuntu_jammy.yaml b/mariadb/values_overrides/2024.1-ubuntu_jammy.yaml similarity index 100% rename from prometheus-mysql-exporter/value_overrides/2024.1-ubuntu_jammy.yaml rename to mariadb/values_overrides/2024.1-ubuntu_jammy.yaml diff --git a/nagios/Chart.yaml b/nagios/Chart.yaml index a62aabac1..58cc15d84 100644 --- a/nagios/Chart.yaml +++ b/nagios/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Nagios name: nagios -version: 0.1.11 +version: 0.1.12 home: https://www.nagios.org sources: - https://opendev.org/openstack/openstack-helm-addons diff --git a/nagios/values.yaml b/nagios/values.yaml index c79ca9ffc..dc449b687 100644 --- a/nagios/values.yaml +++ b/nagios/values.yaml @@ -18,7 +18,7 @@ images: tags: apache_proxy: docker.io/library/httpd:2.4 - nagios: docker.io/openstackhelm/nagios:latest-ubuntu_bionic + nagios: docker.io/openstackhelm/nagios:latest-ubuntu_jammy dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 selenium_tests: docker.io/openstackhelm/osh-selenium:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 diff --git a/postgresql/Chart.yaml b/postgresql/Chart.yaml index c019c93dc..2036a568a 100644 --- a/postgresql/Chart.yaml +++ b/postgresql/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v14.5 description: OpenStack-Helm PostgreSQL name: postgresql -version: 0.1.21 +version: 0.1.22 home: https://www.postgresql.org sources: - https://github.com/postgres/postgres diff --git a/postgresql/values.yaml b/postgresql/values.yaml index 2a119c4fe..f6b5756f2 100644 --- a/postgresql/values.yaml +++ b/postgresql/values.yaml @@ -158,10 +158,10 @@ images: postgresql: "docker.io/library/postgres:14.5" dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/library/docker:17.07.0 - ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic + ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy prometheus_postgresql_exporter: docker.io/wrouesnel/postgres_exporter:v0.4.6 prometheus_postgresql_exporter_create_user: "docker.io/library/postgres:14.5" - postgresql_backup: "quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_bionic" + postgresql_backup: "quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_jammy" pull_policy: "IfNotPresent" local_registry: active: false diff --git a/postgresql/values_overrides/2024.1-ubuntu_jammy.yaml b/postgresql/values_overrides/2024.1-ubuntu_jammy.yaml new file mode 100644 index 000000000..8e1d505be --- /dev/null +++ b/postgresql/values_overrides/2024.1-ubuntu_jammy.yaml @@ -0,0 +1,17 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +images: + tags: + ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy +... diff --git a/powerdns/Chart.yaml b/powerdns/Chart.yaml index 1120b5625..110edc6cc 100644 --- a/powerdns/Chart.yaml +++ b/powerdns/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v4.1.10 description: OpenStack-Helm PowerDNS name: powerdns -version: 0.1.8 +version: 0.1.9 home: https://www.powerdns.com/ maintainers: - name: OpenStack-Helm Authors diff --git a/powerdns/values_overrides/2024.1-ubuntu_jammy.yaml b/powerdns/values_overrides/2024.1-ubuntu_jammy.yaml new file mode 100644 index 000000000..fcb89a48c --- /dev/null +++ b/powerdns/values_overrides/2024.1-ubuntu_jammy.yaml @@ -0,0 +1,17 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +images: + tags: + db_init: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy +... diff --git a/prometheus-mysql-exporter/Chart.yaml b/prometheus-mysql-exporter/Chart.yaml index 4a0777a31..953d942b4 100644 --- a/prometheus-mysql-exporter/Chart.yaml +++ b/prometheus-mysql-exporter/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v0.12.1 description: OpenStack-Helm Prometheus mysql-exporter name: prometheus-mysql-exporter -version: 0.0.3 +version: 0.0.4 home: https://mariadb.com/kb/en/ icon: http://badges.mariadb.org/mariadb-badge-180x60.png sources: diff --git a/prometheus-mysql-exporter/value_overrides/2023.1-ubuntu_focal.yaml b/prometheus-mysql-exporter/values_overrides/2023.1-ubuntu_focal.yaml similarity index 100% rename from prometheus-mysql-exporter/value_overrides/2023.1-ubuntu_focal.yaml rename to prometheus-mysql-exporter/values_overrides/2023.1-ubuntu_focal.yaml diff --git a/prometheus-mysql-exporter/value_overrides/2023.2-ubuntu_jammy.yaml b/prometheus-mysql-exporter/values_overrides/2023.2-ubuntu_jammy.yaml similarity index 100% rename from prometheus-mysql-exporter/value_overrides/2023.2-ubuntu_jammy.yaml rename to prometheus-mysql-exporter/values_overrides/2023.2-ubuntu_jammy.yaml diff --git a/prometheus-mysql-exporter/values_overrides/2024.1-ubuntu_jammy.yaml b/prometheus-mysql-exporter/values_overrides/2024.1-ubuntu_jammy.yaml new file mode 100644 index 000000000..6c87b7078 --- /dev/null +++ b/prometheus-mysql-exporter/values_overrides/2024.1-ubuntu_jammy.yaml @@ -0,0 +1,18 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +images: + tags: + prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy + ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy +... diff --git a/prometheus-mysql-exporter/value_overrides/apparmor.yaml b/prometheus-mysql-exporter/values_overrides/apparmor.yaml similarity index 100% rename from prometheus-mysql-exporter/value_overrides/apparmor.yaml rename to prometheus-mysql-exporter/values_overrides/apparmor.yaml diff --git a/prometheus-mysql-exporter/value_overrides/prometheus.yaml b/prometheus-mysql-exporter/values_overrides/prometheus.yaml similarity index 100% rename from prometheus-mysql-exporter/value_overrides/prometheus.yaml rename to prometheus-mysql-exporter/values_overrides/prometheus.yaml diff --git a/prometheus-mysql-exporter/value_overrides/tls.yaml b/prometheus-mysql-exporter/values_overrides/tls.yaml similarity index 100% rename from prometheus-mysql-exporter/value_overrides/tls.yaml rename to prometheus-mysql-exporter/values_overrides/tls.yaml diff --git a/prometheus/Chart.yaml b/prometheus/Chart.yaml index 4b74ed82b..00caa4532 100644 --- a/prometheus/Chart.yaml +++ b/prometheus/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v2.25.0 description: OpenStack-Helm Prometheus name: prometheus -version: 0.1.16 +version: 0.1.17 home: https://prometheus.io/ sources: - https://github.com/prometheus/prometheus diff --git a/prometheus/values_overrides/2024.1-ubuntu_jammy.yaml b/prometheus/values_overrides/2024.1-ubuntu_jammy.yaml new file mode 100644 index 000000000..efba1791d --- /dev/null +++ b/prometheus/values_overrides/2024.1-ubuntu_jammy.yaml @@ -0,0 +1,17 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +images: + tags: + helm_tests: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy +... diff --git a/releasenotes/notes/ceph-provisioners.yaml b/releasenotes/notes/ceph-provisioners.yaml index ee34ffddd..7e35beab8 100644 --- a/releasenotes/notes/ceph-provisioners.yaml +++ b/releasenotes/notes/ceph-provisioners.yaml @@ -31,4 +31,5 @@ ceph-provisioners: - 0.1.29 Update Ceph images to patched 18.2.2 and restore debian-reef repo - 0.1.30 Specify CSI drivername in values.yaml - 0.1.31 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.32 Update ceph_rbd_provisioner image to 18.2.2 ... diff --git a/releasenotes/notes/ceph-rgw.yaml b/releasenotes/notes/ceph-rgw.yaml index e99798ffe..a180303c7 100644 --- a/releasenotes/notes/ceph-rgw.yaml +++ b/releasenotes/notes/ceph-rgw.yaml @@ -36,4 +36,6 @@ ceph-rgw: - 0.1.33 Update Ceph images to Jammy and Reef 18.2.1 - 0.1.34 Update Ceph images to patched 18.2.2 and restore debian-reef repo - 0.1.35 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.36 Add 2024.1 Ubuntu Jammy overrides + - 0.1.37 Update heat image default tag to 2024.1-ubuntu_jammy ... diff --git a/releasenotes/notes/elasticsearch.yaml b/releasenotes/notes/elasticsearch.yaml index 056ec5146..199490552 100644 --- a/releasenotes/notes/elasticsearch.yaml +++ b/releasenotes/notes/elasticsearch.yaml @@ -46,4 +46,5 @@ elasticsearch: - 0.3.3 Update es curator to 8.0.10 - 0.3.4 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default - 0.3.5 Remove gateway node role + - 0.3.6 Add 2024.1 Ubuntu Jammy overrides ... diff --git a/releasenotes/notes/fluentd.yaml b/releasenotes/notes/fluentd.yaml index bfea30dba..b342c87fc 100644 --- a/releasenotes/notes/fluentd.yaml +++ b/releasenotes/notes/fluentd.yaml @@ -12,4 +12,5 @@ fluentd: - 0.1.9 Set sticky bit for tmp - 0.1.10 Add 2023.1 Ubuntu Focal overrides - 0.1.11 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.12 Add 2024.1 Ubuntu Jammy overrides ... diff --git a/releasenotes/notes/grafana.yaml b/releasenotes/notes/grafana.yaml index 97b68a727..3071b2558 100644 --- a/releasenotes/notes/grafana.yaml +++ b/releasenotes/notes/grafana.yaml @@ -27,4 +27,5 @@ grafana: - 0.1.24 Add image rendering sidecar - 0.1.25 Add value for rendering sidecar feature - 0.1.26 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.27 Update default images tags. Add 2024.1-ubuntu_jammy overrides. ... diff --git a/releasenotes/notes/kibana.yaml b/releasenotes/notes/kibana.yaml index 26172c00b..4d8137876 100644 --- a/releasenotes/notes/kibana.yaml +++ b/releasenotes/notes/kibana.yaml @@ -16,4 +16,5 @@ kibana: - 0.1.13 Update Kibana to 8.9.0 - 0.1.14 Add 2023.1 Ubuntu Focal overrides - 0.1.15 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.16 Add 2024.1 Ubuntu Jammy overrides ... diff --git a/releasenotes/notes/kubernetes-keystone-webhook.yaml b/releasenotes/notes/kubernetes-keystone-webhook.yaml index ca3bd5d55..620de870d 100644 --- a/releasenotes/notes/kubernetes-keystone-webhook.yaml +++ b/releasenotes/notes/kubernetes-keystone-webhook.yaml @@ -10,4 +10,5 @@ kubernetes-keystone-webhook: - 0.1.7 Added OCI registry authentication - 0.1.8 Add 2023.1 Ubuntu Focal overrides - 0.1.9 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.10 Add 2024.1 Ubuntu Jammy overrides ... diff --git a/releasenotes/notes/kubernetes-node-problem-detector.yaml b/releasenotes/notes/kubernetes-node-problem-detector.yaml index 4a05c93a7..f311822b8 100644 --- a/releasenotes/notes/kubernetes-node-problem-detector.yaml +++ b/releasenotes/notes/kubernetes-node-problem-detector.yaml @@ -10,4 +10,5 @@ kubernetes-node-problem-detector: - 0.1.7 Added OCI registry authentication - 0.1.8 Replace node-role.kubernetes.io/master with control-plane - 0.1.9 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.10 Update node_problem_detector to latest-ubuntu_jammy ... diff --git a/releasenotes/notes/mariadb.yaml b/releasenotes/notes/mariadb.yaml index 27b3c8b6e..6f110f681 100644 --- a/releasenotes/notes/mariadb.yaml +++ b/releasenotes/notes/mariadb.yaml @@ -58,4 +58,5 @@ mariadb: - 0.2.40 Start.py allows to create mariadb-service-primary service and endpoint - 0.2.41 Switch to primary service instead of ingress by default - 0.2.42 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.2.43 Add 2024.1 Ubuntu Jammy overrides ... diff --git a/releasenotes/notes/nagios.yaml b/releasenotes/notes/nagios.yaml index c33052e4a..3e1600190 100644 --- a/releasenotes/notes/nagios.yaml +++ b/releasenotes/notes/nagios.yaml @@ -12,4 +12,5 @@ nagios: - 0.1.9 Make using selenium v4 syntax optional - 0.1.10 Correct selenium v3 syntax - 0.1.11 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.12 Update nagios image tag to latest-ubuntu_jammy ... diff --git a/releasenotes/notes/postgresql.yaml b/releasenotes/notes/postgresql.yaml index 741bb16c6..f7fea0de5 100644 --- a/releasenotes/notes/postgresql.yaml +++ b/releasenotes/notes/postgresql.yaml @@ -22,4 +22,5 @@ postgresql: - 0.1.19 Added staggered backups support - 0.1.20 Added throttling remote backups - 0.1.21 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.22 Update default images tags. Add 2024.1-ubuntu_jammy overrides. ... diff --git a/releasenotes/notes/powerdns.yaml b/releasenotes/notes/powerdns.yaml index d66d4c444..aec9d0862 100644 --- a/releasenotes/notes/powerdns.yaml +++ b/releasenotes/notes/powerdns.yaml @@ -9,4 +9,5 @@ powerdns: - 0.1.6 Added OCI registry authentication - 0.1.7 Add 2023.1 Ubuntu Focal overrides - 0.1.8 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.9 Add 2024.1 Ubuntu Jammy overrides ... diff --git a/releasenotes/notes/prometheus-mysql-exporter.yaml b/releasenotes/notes/prometheus-mysql-exporter.yaml index 883632093..fd4f18715 100644 --- a/releasenotes/notes/prometheus-mysql-exporter.yaml +++ b/releasenotes/notes/prometheus-mysql-exporter.yaml @@ -3,4 +3,5 @@ prometheus-mysql-exporter: - 0.0.1 Initial Chart - 0.0.2 Add 2024.1 overrides - 0.0.3 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.0.4 Fix typo in the values_overrides directory name ... diff --git a/releasenotes/notes/prometheus.yaml b/releasenotes/notes/prometheus.yaml index 9d8c1a8f8..b8bd49355 100644 --- a/releasenotes/notes/prometheus.yaml +++ b/releasenotes/notes/prometheus.yaml @@ -17,4 +17,5 @@ prometheus: - 0.1.14 Added feature to launch Prometheus with custom script - 0.1.15 Add 2023.1 Ubuntu Focal overrides - 0.1.16 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.17 Add 2024.1 Ubuntu Jammy overrides ... diff --git a/roles/deploy-env/tasks/prerequisites.yaml b/roles/deploy-env/tasks/prerequisites.yaml index 7b6d4e97d..fcdadb5d0 100644 --- a/roles/deploy-env/tasks/prerequisites.yaml +++ b/roles/deploy-env/tasks/prerequisites.yaml @@ -63,6 +63,9 @@ - socat - tcpdump - telnet + # needed for kubernetes-node-problem-detector chart + # which mounts /etc/localtime from the host + - tzdata - util-linux - uuid-runtime - vim diff --git a/tools/debug_sleep.sh b/tools/debug_sleep.sh new file mode 100755 index 000000000..3fe0f1216 --- /dev/null +++ b/tools/debug_sleep.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +sleep 86400 diff --git a/tools/deployment/db/mariadb.sh b/tools/deployment/db/mariadb.sh index b09d46db9..8d229c4d3 100755 --- a/tools/deployment/db/mariadb.sh +++ b/tools/deployment/db/mariadb.sh @@ -24,6 +24,7 @@ set -xe helm upgrade --install mariadb ${OSH_INFRA_HELM_REPO}/mariadb \ --namespace=${NAMESPACE} \ ${MONITORING_HELM_ARGS:="--set monitoring.prometheus.enabled=true"} \ + --timeout=600s \ ${OSH_INFRA_EXTRA_HELM_ARGS:=} \ ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB} diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 35a56c4d6..aaa70b55a 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -79,6 +79,7 @@ pre-run: - playbooks/prepare-hosts.yaml - playbooks/mount-volumes.yaml + - playbooks/inject-keys.yaml post-run: playbooks/osh-infra-collect-logs.yaml run: - playbooks/deploy-env.yaml @@ -116,12 +117,12 @@ - job: name: openstack-helm-infra-logging parent: openstack-helm-infra-deploy - nodeset: openstack-helm-3nodes-ubuntu_focal + nodeset: openstack-helm-3nodes-ubuntu_jammy vars: osh_params: - openstack_release: "2023.1" + openstack_release: "2024.1" container_distro_name: ubuntu - container_distro_version: focal + container_distro_version: jammy gate_scripts: - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/prepare-charts.sh @@ -137,12 +138,12 @@ - job: name: openstack-helm-infra-monitoring parent: openstack-helm-infra-deploy - nodeset: openstack-helm-1node-ubuntu_focal + nodeset: openstack-helm-1node-ubuntu_jammy vars: osh_params: - openstack_release: "2023.1" + openstack_release: "2024.1" container_distro_name: ubuntu - container_distro_version: focal + container_distro_version: jammy gate_scripts: - ./tools/deployment/common/prepare-k8s.sh - ./tools/deployment/common/prepare-charts.sh @@ -169,11 +170,11 @@ - job: name: openstack-helm-infra-metacontroller parent: openstack-helm-infra-deploy - nodeset: openstack-helm-1node-ubuntu_focal + nodeset: openstack-helm-1node-ubuntu_jammy vars: osh_params: container_distro_name: ubuntu - container_distro_version: focal + container_distro_version: jammy feature_gates: apparmor gate_scripts: - ./tools/deployment/common/prepare-k8s.sh @@ -182,17 +183,17 @@ - ./tools/deployment/common/daemonjob-controller.sh - job: - name: openstack-helm-infra-mariadb-operator-2023-1-ubuntu_focal + name: openstack-helm-infra-mariadb-operator-2024-1-ubuntu_jammy parent: openstack-helm-infra-deploy - nodeset: openstack-helm-3nodes-ubuntu_focal + nodeset: openstack-helm-3nodes-ubuntu_jammy pre-run: - playbooks/prepare-hosts.yaml - playbooks/mount-volumes.yaml vars: osh_params: - openstack_release: "2023.1" + openstack_release: "2024.1" container_distro_name: ubuntu - container_distro_version: focal + container_distro_version: jammy feature_gates: "ldap,prometheus,backups" gate_scripts: - ./tools/deployment/common/prepare-k8s.sh @@ -217,7 +218,7 @@ - ^tools/.* - job: - name: openstack-helm-infra-compute-kit-dpdk-2023-2-ubuntu_jammy + name: openstack-helm-infra-compute-kit-dpdk-2024-1-ubuntu_jammy description: | Run the openstack-helm compute-kit job with DPDK enabled. We use single node environment to run this job which means @@ -235,7 +236,7 @@ size: "2M" number: 2048 osh_params: - openstack_release: "2023.2" + openstack_release: "2024.1" container_distro_name: ubuntu container_distro_version: jammy feature_gates: dpdk @@ -244,8 +245,8 @@ - ^openvswitch/.* - job: - name: openstack-helm-infra-compute-kit-ovn-2023-2-ubuntu_jammy - parent: openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy + name: openstack-helm-infra-compute-kit-ovn-2024-1-ubuntu_jammy + parent: openstack-helm-compute-kit-ovn-2024-1-ubuntu_jammy files: - ^helm-toolkit/.* - ^roles/.* @@ -255,8 +256,8 @@ - ^ovn/.* - job: - name: openstack-helm-infra-compute-kit-2023-2-ubuntu_jammy - parent: openstack-helm-compute-kit-2023-2-ubuntu_jammy + name: openstack-helm-infra-compute-kit-2024-1-ubuntu_jammy + parent: openstack-helm-compute-kit-2024-1-ubuntu_jammy files: - ^helm-toolkit/.* - ^roles/.* diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index ac8d9d5a8..0ffeee6d9 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -25,13 +25,13 @@ - openstack-helm-infra-logging - openstack-helm-infra-monitoring - openstack-helm-infra-metacontroller - - openstack-helm-infra-mariadb-operator-2023-1-ubuntu_focal - - openstack-helm-infra-compute-kit-ovn-2023-2-ubuntu_jammy - - openstack-helm-infra-compute-kit-2023-2-ubuntu_jammy - - openstack-helm-infra-cinder-2023-1-ubuntu_focal + - openstack-helm-infra-mariadb-operator-2024-1-ubuntu_jammy + - openstack-helm-infra-compute-kit-ovn-2024-1-ubuntu_jammy + - openstack-helm-infra-compute-kit-2024-1-ubuntu_jammy + - openstack-helm-infra-cinder-2023-1-ubuntu_focal # legacy Ceph - openstack-helm-infra-cinder-2024-1-ubuntu_jammy - openstack-helm-infra-tls-2024-1-ubuntu_jammy - - openstack-helm-infra-compute-kit-dpdk-2023-2-ubuntu_jammy + - openstack-helm-infra-compute-kit-dpdk-2024-1-ubuntu_jammy # 32GB node - openstack-helm-infra-keystone-cilium-2024-1-ubuntu_jammy - openstack-helm-infra-keystone-flannel-2024-1-ubuntu_jammy - openstack-helm-infra-ceph-migrate