From 8b29037cecbd2adf4faec5e0f38cc990a8c2611d Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Mon, 9 Dec 2024 17:26:42 -0600 Subject: [PATCH] Move values overrides to a separate directory This is the action item to implement the spec: doc/source/specs/2025.1/chart_versioning.rst Also add overrides env variables - OSH_VALUES_OVERRIDES_PATH - OSH_INFRA_VALUES_OVERRIDES_PATH This commit temporarily disables all jobs that involve scripts in the OSH git repo because they need to be updated to work with the new values_overrides structure in the OSH-infra repo. Once this is merged I4974785c904cf7c8730279854e3ad9b6b7c35498 all these disabled test jobs must be enabled. Depends-On: I327103c18fc0e10e989a17f69b3bff9995c45eb4 Change-Id: I7bfdef3ea2128bbb4e26e3a00161fe30ce29b8e7 --- Makefile | 12 ++++++++--- roles/osh-run-script-set/defaults/main.yaml | 5 +++-- roles/osh-run-script-set/tasks/main.yaml | 2 ++ roles/osh-run-script/defaults/main.yaml | 5 +++-- roles/osh-run-script/tasks/main.yaml | 2 ++ tools/deployment/ceph/ceph-adapter-rook.sh | 2 +- tools/deployment/ceph/ceph-ns-activate.sh | 4 ++-- tools/deployment/ceph/ceph-radosgw.sh | 4 ++-- tools/deployment/ceph/ceph.sh | 4 ++-- tools/deployment/ceph/ceph_legacy.sh | 4 ++-- .../deployment/common/daemonjob-controller.sh | 4 ++-- tools/deployment/common/ldap.sh | 4 ++-- tools/deployment/common/memcached.sh | 4 ++-- tools/deployment/common/metacontroller.sh | 4 ++-- tools/deployment/common/rabbitmq.sh | 4 ++-- tools/deployment/db/mariadb-backup.sh | 2 +- .../deployment/db/mariadb-operator-cluster.sh | 8 ++++---- tools/deployment/db/mariadb.sh | 4 ++-- tools/deployment/db/postgresql.sh | 4 ++-- tools/deployment/logging/elasticsearch.sh | 4 ++-- tools/deployment/logging/fluentbit.sh | 4 ++-- tools/deployment/logging/fluentd.sh | 4 ++-- tools/deployment/logging/kibana.sh | 4 ++-- tools/deployment/monitoring/grafana.sh | 4 ++-- .../monitoring/kube-state-metrics.sh | 4 ++-- tools/deployment/monitoring/mysql-exporter.sh | 4 ++-- tools/deployment/monitoring/nagios.sh | 4 ++-- tools/deployment/monitoring/node-exporter.sh | 4 ++-- .../monitoring/openstack-exporter.sh | 4 ++-- .../deployment/monitoring/process-exporter.sh | 4 ++-- tools/deployment/monitoring/prometheus.sh | 4 ++-- tools/deployment/openstack/keystone.sh | 4 ++-- .../ceph-client}/apparmor.yaml | 0 .../ceph-mon}/apparmor.yaml | 0 .../ceph-osd}/apparmor.yaml | 0 .../ceph-provisioners}/apparmor.yaml | 0 .../ceph-rgw}/2023.1-ubuntu_focal.yaml | 0 .../ceph-rgw}/2024.1-ubuntu_jammy.yaml | 0 .../ceph-rgw}/2024.2-ubuntu_jammy.yaml | 0 .../ceph-rgw}/apparmor.yaml | 0 .../ceph-rgw}/netpol.yaml | 0 .../ceph-rgw}/tls.yaml | 0 .../daemonjob-controller}/apparmor.yaml | 0 .../elastic-apm-server}/apparmor.yaml | 0 .../elastic-filebeat}/apparmor.yaml | 0 .../elasticsearch}/2023.1-ubuntu_focal.yaml | 0 .../elasticsearch}/2024.1-ubuntu_jammy.yaml | 0 .../elasticsearch}/2024.2-ubuntu_jammy.yaml | 0 .../elasticsearch}/apparmor.yaml | 0 .../elasticsearch}/local-storage.yaml | 0 .../elasticsearch}/remote-cluster.yaml | 0 .../elasticsearch}/tls.yaml | 0 .../fluentd}/2023.1-ubuntu_focal.yaml | 0 .../fluentd}/2024.1-ubuntu_jammy.yaml | 0 .../fluentd}/2024.2-ubuntu_jammy.yaml | 0 .../fluentd}/apparmor.yaml | 0 .../fluentd}/tls.yaml | 0 .../gnocchi}/2023.2-ubuntu-jammy.yaml | 0 .../grafana}/2024.1-ubuntu_jammy.yaml | 0 .../grafana}/2024.2-ubuntu_jammy.yaml | 0 .../grafana}/apparmor.yaml | 0 .../grafana}/calico.yaml | 0 .../grafana}/ceph.yaml | 0 .../grafana}/containers.yaml | 0 .../grafana}/coredns.yaml | 0 .../grafana}/elasticsearch.yaml | 0 .../grafana}/home_dashboard.yaml | 0 .../grafana}/kubernetes.yaml | 0 .../grafana}/nginx.yaml | 0 .../grafana}/nodes.yaml | 0 .../grafana}/openstack.yaml | 0 .../grafana}/persistentvolume.yaml | 0 .../grafana}/prometheus.yaml | 0 .../grafana}/sqlite3.yaml | 0 .../grafana}/tls.yaml | 0 .../kibana}/2023.1-ubuntu_focal.yaml | 0 .../kibana}/2024.1-ubuntu_jammy.yaml | 0 .../kibana}/2024.2-ubuntu_jammy.yaml | 0 .../kibana}/apparmor.yaml | 0 .../kibana}/tls.yaml | 0 .../2023.1-ubuntu_focal.yaml | 0 .../2024.1-ubuntu_jammy.yaml | 0 .../2024.2-ubuntu_jammy.yaml | 0 .../apparmor.yaml | 0 .../libvirt}/2023.1-ubuntu_focal.yaml | 0 .../libvirt}/2023.1-ubuntu_jammy.yaml | 0 .../libvirt}/2023.2-ubuntu_jammy.yaml | 0 .../libvirt}/2024.1-ubuntu_jammy.yaml | 0 .../libvirt}/2024.2-ubuntu_jammy.yaml | 0 .../libvirt}/apparmor.yaml | 0 .../cinder-external-ceph-backend.yaml | 0 .../libvirt}/netpol.yaml | 0 .../libvirt}/node_overrides.yaml | 0 .../libvirt}/ovn.yaml | 0 .../libvirt}/ssl.yaml | 0 .../local-storage}/local-storage.yaml | 0 .../mariadb-backup}/2023.1-ubuntu_focal.yaml | 0 .../mariadb-backup}/2023.2-ubuntu_jammy.yaml | 0 .../mariadb-backup}/2024.1-ubuntu_jammy.yaml | 0 .../mariadb-backup}/2024.2-ubuntu_jammy.yaml | 0 .../mariadb-backup}/apparmor.yaml | 0 .../mariadb-backup}/backups.yaml | 0 .../mariadb-backup}/staggered-backups.yaml | 0 .../mariadb-backup}/tls.yaml | 0 .../mariadb-backup}/ubuntu_focal.yaml | 0 .../mariadb-cluster}/2023.1-ubuntu_focal.yaml | 0 .../mariadb-cluster}/2023.2-ubuntu_jammy.yaml | 0 .../mariadb-cluster}/2024.1-ubuntu_jammy.yaml | 0 .../mariadb-cluster}/2024.2-ubuntu_jammy.yaml | 0 .../mariadb-cluster}/apparmor.yaml | 0 .../mariadb-cluster}/downscaled.yaml | 0 .../mariadb-cluster}/local-storage.yaml | 0 .../mariadb-cluster}/netpol.yaml | 0 .../mariadb-cluster}/prometheus.yaml | 0 .../mariadb-cluster}/tls.yaml | 0 .../mariadb-cluster}/ubuntu_focal.yaml | 0 .../mariadb-cluster}/upscaled.yaml | 0 .../mariadb}/2023.1-ubuntu_focal.yaml | 0 .../mariadb}/2024.1-ubuntu_jammy.yaml | 0 .../mariadb}/2024.2-ubuntu_jammy.yaml | 0 .../mariadb}/apparmor.yaml | 0 .../mariadb}/backups.yaml | 0 .../mariadb}/local-storage.yaml | 0 .../mariadb}/netpol.yaml | 0 .../mariadb}/staggered-backups.yaml | 0 .../mariadb}/tls.yaml | 0 .../mariadb}/ubuntu_focal.yaml | 0 .../mariadb}/wait-for-cluster.yaml | 0 .../memcached}/apparmor.yaml | 0 .../memcached}/netpol.yaml | 0 .../metacontroller}/apparmor.yaml | 0 .../nagios}/apparmor.yaml | 0 .../nagios}/elasticsearch-objects.yaml | 0 .../nagios}/openstack-objects.yaml | 0 .../nagios}/postgresql-objects.yaml | 0 .../nagios}/tls.yaml | 0 .../openvswitch}/apparmor.yaml | 0 .../openvswitch}/dpdk-ubuntu_focal.yaml | 0 .../openvswitch}/dpdk-ubuntu_jammy.yaml | 0 .../openvswitch}/netpol.yaml | 0 .../openvswitch}/ovn.yaml | 0 .../openvswitch}/ubuntu_focal.yaml | 0 .../openvswitch}/ubuntu_jammy.yaml | 0 .../openvswitch}/vswitchd-probes.yaml | 0 .../ovn}/ubuntu_focal.yaml | 0 .../ovn}/ubuntu_jammy.yaml | 0 .../postgresql}/2024.1-ubuntu_jammy.yaml | 0 .../postgresql}/2024.2-ubuntu_jammy.yaml | 0 .../postgresql}/apparmor.yaml | 0 .../postgresql}/backups.yaml | 0 .../postgresql}/netpol.yaml | 0 .../postgresql}/staggered-backups.yaml | 0 .../postgresql}/tls.yaml | 0 .../powerdns}/2023.1-ubuntu_focal.yaml | 0 .../powerdns}/2024.1-ubuntu_jammy.yaml | 0 .../powerdns}/2024.2-ubuntu_jammy.yaml | 0 .../prometheus-alertmanager}/apparmor.yaml | 0 .../apparmor.yaml | 0 .../apparmor.yaml | 0 .../2023.1-ubuntu_focal.yaml | 0 .../2023.2-ubuntu_jammy.yaml | 0 .../2024.1-ubuntu_jammy.yaml | 0 .../2024.2-ubuntu_jammy.yaml | 0 .../prometheus-mysql-exporter}/apparmor.yaml | 0 .../prometheus.yaml | 0 .../prometheus-mysql-exporter}/tls.yaml | 0 .../prometheus-node-exporter}/apparmor.yaml | 0 .../apparmor.yaml | 0 .../netpol.yaml | 0 .../prometheus-openstack-exporter}/tls.yaml | 0 .../apparmor.yaml | 0 .../prometheus}/2023.1-ubuntu_focal.yaml | 0 .../prometheus}/2024.1-ubuntu_jammy.yaml | 0 .../prometheus}/2024.2-ubuntu_jammy.yaml | 0 .../prometheus}/alertmanager.yaml | 0 .../prometheus}/apparmor.yaml | 0 .../prometheus}/ceph.yaml | 0 .../prometheus}/elasticsearch.yaml | 0 .../prometheus}/kubernetes.yaml | 0 .../prometheus}/local-storage.yaml | 0 .../prometheus}/nodes.yaml | 0 .../prometheus}/openstack.yaml | 0 .../prometheus}/postgresql.yaml | 0 .../prometheus}/tls.yaml | 0 .../rabbitmq}/2023.1-ubuntu_focal.yaml | 0 .../rabbitmq}/2023.1-ubuntu_jammy.yaml | 0 .../rabbitmq}/2023.2-ubuntu_jammy.yaml | 0 .../rabbitmq}/2024.1-ubuntu_jammy.yaml | 0 .../rabbitmq}/2024.2-ubuntu_jammy.yaml | 0 .../rabbitmq}/apparmor.yaml | 0 .../rabbitmq}/builtin-metrics.yaml | 0 .../rabbitmq}/netpol.yaml | 0 .../rabbitmq}/rabbitmq-exporter.yaml | 0 .../rabbitmq}/tls.yaml | 0 .../rabbitmq}/yoga-ubuntu_focal.yaml | 0 .../rabbitmq}/zed-ubuntu_focal.yaml | 0 .../rabbitmq}/zed-ubuntu_jammy.yaml | 0 zuul.d/project.yaml | 20 +++++++++---------- 198 files changed, 83 insertions(+), 71 deletions(-) rename {ceph-client/values_overrides => values_overrides/ceph-client}/apparmor.yaml (100%) rename {ceph-mon/values_overrides => values_overrides/ceph-mon}/apparmor.yaml (100%) rename {ceph-osd/values_overrides => values_overrides/ceph-osd}/apparmor.yaml (100%) rename {ceph-provisioners/values_overrides => values_overrides/ceph-provisioners}/apparmor.yaml (100%) rename {ceph-rgw/values_overrides => values_overrides/ceph-rgw}/2023.1-ubuntu_focal.yaml (100%) rename {ceph-rgw/values_overrides => values_overrides/ceph-rgw}/2024.1-ubuntu_jammy.yaml (100%) rename {ceph-rgw/values_overrides => values_overrides/ceph-rgw}/2024.2-ubuntu_jammy.yaml (100%) rename {ceph-rgw/values_overrides => values_overrides/ceph-rgw}/apparmor.yaml (100%) rename {ceph-rgw/values_overrides => values_overrides/ceph-rgw}/netpol.yaml (100%) rename {ceph-rgw/values_overrides => values_overrides/ceph-rgw}/tls.yaml (100%) rename {daemonjob-controller/values_overrides => values_overrides/daemonjob-controller}/apparmor.yaml (100%) rename {elastic-apm-server/values_overrides => values_overrides/elastic-apm-server}/apparmor.yaml (100%) rename {elastic-filebeat/values_overrides => values_overrides/elastic-filebeat}/apparmor.yaml (100%) rename {elasticsearch/values_overrides => values_overrides/elasticsearch}/2023.1-ubuntu_focal.yaml (100%) rename {elasticsearch/values_overrides => values_overrides/elasticsearch}/2024.1-ubuntu_jammy.yaml (100%) rename {elasticsearch/values_overrides => values_overrides/elasticsearch}/2024.2-ubuntu_jammy.yaml (100%) rename {elasticsearch/values_overrides => values_overrides/elasticsearch}/apparmor.yaml (100%) rename {elasticsearch/values_overrides => values_overrides/elasticsearch}/local-storage.yaml (100%) rename {elasticsearch/values_overrides => values_overrides/elasticsearch}/remote-cluster.yaml (100%) rename {elasticsearch/values_overrides => values_overrides/elasticsearch}/tls.yaml (100%) rename {fluentd/values_overrides => values_overrides/fluentd}/2023.1-ubuntu_focal.yaml (100%) rename {fluentd/values_overrides => values_overrides/fluentd}/2024.1-ubuntu_jammy.yaml (100%) rename {fluentd/values_overrides => values_overrides/fluentd}/2024.2-ubuntu_jammy.yaml (100%) rename {fluentd/values_overrides => values_overrides/fluentd}/apparmor.yaml (100%) rename {fluentd/values_overrides => values_overrides/fluentd}/tls.yaml (100%) rename {gnocchi/values_overrides => values_overrides/gnocchi}/2023.2-ubuntu-jammy.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/2024.1-ubuntu_jammy.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/2024.2-ubuntu_jammy.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/apparmor.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/calico.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/ceph.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/containers.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/coredns.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/elasticsearch.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/home_dashboard.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/kubernetes.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/nginx.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/nodes.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/openstack.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/persistentvolume.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/prometheus.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/sqlite3.yaml (100%) rename {grafana/values_overrides => values_overrides/grafana}/tls.yaml (100%) rename {kibana/values_overrides => values_overrides/kibana}/2023.1-ubuntu_focal.yaml (100%) rename {kibana/values_overrides => values_overrides/kibana}/2024.1-ubuntu_jammy.yaml (100%) rename {kibana/values_overrides => values_overrides/kibana}/2024.2-ubuntu_jammy.yaml (100%) rename {kibana/values_overrides => values_overrides/kibana}/apparmor.yaml (100%) rename {kibana/values_overrides => values_overrides/kibana}/tls.yaml (100%) rename {kubernetes-keystone-webhook/values_overrides => values_overrides/kubernetes-keystone-webhook}/2023.1-ubuntu_focal.yaml (100%) rename {kubernetes-keystone-webhook/values_overrides => values_overrides/kubernetes-keystone-webhook}/2024.1-ubuntu_jammy.yaml (100%) rename {kubernetes-keystone-webhook/values_overrides => values_overrides/kubernetes-keystone-webhook}/2024.2-ubuntu_jammy.yaml (100%) rename {kubernetes-node-problem-detector/values_overrides => values_overrides/kubernetes-node-problem-detector}/apparmor.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/2023.1-ubuntu_focal.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/2023.1-ubuntu_jammy.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/2023.2-ubuntu_jammy.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/2024.1-ubuntu_jammy.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/2024.2-ubuntu_jammy.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/apparmor.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/cinder-external-ceph-backend.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/netpol.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/node_overrides.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/ovn.yaml (100%) rename {libvirt/values_overrides => values_overrides/libvirt}/ssl.yaml (100%) rename {local-storage/values_overrides => values_overrides/local-storage}/local-storage.yaml (100%) rename {mariadb-backup/values_overrides => values_overrides/mariadb-backup}/2023.1-ubuntu_focal.yaml (100%) rename {mariadb-backup/values_overrides => values_overrides/mariadb-backup}/2023.2-ubuntu_jammy.yaml (100%) rename {mariadb-backup/values_overrides => values_overrides/mariadb-backup}/2024.1-ubuntu_jammy.yaml (100%) rename {mariadb-backup/values_overrides => values_overrides/mariadb-backup}/2024.2-ubuntu_jammy.yaml (100%) rename {mariadb-backup/values_overrides => values_overrides/mariadb-backup}/apparmor.yaml (100%) rename {mariadb-backup/values_overrides => values_overrides/mariadb-backup}/backups.yaml (100%) rename {mariadb-backup/values_overrides => values_overrides/mariadb-backup}/staggered-backups.yaml (100%) rename {mariadb-backup/values_overrides => values_overrides/mariadb-backup}/tls.yaml (100%) rename {mariadb-backup/values_overrides => values_overrides/mariadb-backup}/ubuntu_focal.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/2023.1-ubuntu_focal.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/2023.2-ubuntu_jammy.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/2024.1-ubuntu_jammy.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/2024.2-ubuntu_jammy.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/apparmor.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/downscaled.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/local-storage.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/netpol.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/prometheus.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/tls.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/ubuntu_focal.yaml (100%) rename {mariadb-cluster/values_overrides => values_overrides/mariadb-cluster}/upscaled.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/2023.1-ubuntu_focal.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/2024.1-ubuntu_jammy.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/2024.2-ubuntu_jammy.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/apparmor.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/backups.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/local-storage.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/netpol.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/staggered-backups.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/tls.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/ubuntu_focal.yaml (100%) rename {mariadb/values_overrides => values_overrides/mariadb}/wait-for-cluster.yaml (100%) rename {memcached/values_overrides => values_overrides/memcached}/apparmor.yaml (100%) rename {memcached/values_overrides => values_overrides/memcached}/netpol.yaml (100%) rename {metacontroller/values_overrides => values_overrides/metacontroller}/apparmor.yaml (100%) rename {nagios/values_overrides => values_overrides/nagios}/apparmor.yaml (100%) rename {nagios/values_overrides => values_overrides/nagios}/elasticsearch-objects.yaml (100%) rename {nagios/values_overrides => values_overrides/nagios}/openstack-objects.yaml (100%) rename {nagios/values_overrides => values_overrides/nagios}/postgresql-objects.yaml (100%) rename {nagios/values_overrides => values_overrides/nagios}/tls.yaml (100%) rename {openvswitch/values_overrides => values_overrides/openvswitch}/apparmor.yaml (100%) rename {openvswitch/values_overrides => values_overrides/openvswitch}/dpdk-ubuntu_focal.yaml (100%) rename {openvswitch/values_overrides => values_overrides/openvswitch}/dpdk-ubuntu_jammy.yaml (100%) rename {openvswitch/values_overrides => values_overrides/openvswitch}/netpol.yaml (100%) rename {openvswitch/values_overrides => values_overrides/openvswitch}/ovn.yaml (100%) rename {openvswitch/values_overrides => values_overrides/openvswitch}/ubuntu_focal.yaml (100%) rename {openvswitch/values_overrides => values_overrides/openvswitch}/ubuntu_jammy.yaml (100%) rename {openvswitch/values_overrides => values_overrides/openvswitch}/vswitchd-probes.yaml (100%) rename {ovn/values_overrides => values_overrides/ovn}/ubuntu_focal.yaml (100%) rename {ovn/values_overrides => values_overrides/ovn}/ubuntu_jammy.yaml (100%) rename {postgresql/values_overrides => values_overrides/postgresql}/2024.1-ubuntu_jammy.yaml (100%) rename {postgresql/values_overrides => values_overrides/postgresql}/2024.2-ubuntu_jammy.yaml (100%) rename {postgresql/values_overrides => values_overrides/postgresql}/apparmor.yaml (100%) rename {postgresql/values_overrides => values_overrides/postgresql}/backups.yaml (100%) rename {postgresql/values_overrides => values_overrides/postgresql}/netpol.yaml (100%) rename {postgresql/values_overrides => values_overrides/postgresql}/staggered-backups.yaml (100%) rename {postgresql/values_overrides => values_overrides/postgresql}/tls.yaml (100%) rename {powerdns/values_overrides => values_overrides/powerdns}/2023.1-ubuntu_focal.yaml (100%) rename {powerdns/values_overrides => values_overrides/powerdns}/2024.1-ubuntu_jammy.yaml (100%) rename {powerdns/values_overrides => values_overrides/powerdns}/2024.2-ubuntu_jammy.yaml (100%) rename {prometheus-alertmanager/values_overrides => values_overrides/prometheus-alertmanager}/apparmor.yaml (100%) rename {prometheus-blackbox-exporter/values_overrides => values_overrides/prometheus-blackbox-exporter}/apparmor.yaml (100%) rename {prometheus-kube-state-metrics/values_overrides => values_overrides/prometheus-kube-state-metrics}/apparmor.yaml (100%) rename {prometheus-mysql-exporter/values_overrides => values_overrides/prometheus-mysql-exporter}/2023.1-ubuntu_focal.yaml (100%) rename {prometheus-mysql-exporter/values_overrides => values_overrides/prometheus-mysql-exporter}/2023.2-ubuntu_jammy.yaml (100%) rename {prometheus-mysql-exporter/values_overrides => values_overrides/prometheus-mysql-exporter}/2024.1-ubuntu_jammy.yaml (100%) rename {prometheus-mysql-exporter/values_overrides => values_overrides/prometheus-mysql-exporter}/2024.2-ubuntu_jammy.yaml (100%) rename {prometheus-mysql-exporter/values_overrides => values_overrides/prometheus-mysql-exporter}/apparmor.yaml (100%) rename {prometheus-mysql-exporter/values_overrides => values_overrides/prometheus-mysql-exporter}/prometheus.yaml (100%) rename {prometheus-mysql-exporter/values_overrides => values_overrides/prometheus-mysql-exporter}/tls.yaml (100%) rename {prometheus-node-exporter/values_overrides => values_overrides/prometheus-node-exporter}/apparmor.yaml (100%) rename {prometheus-openstack-exporter/values_overrides => values_overrides/prometheus-openstack-exporter}/apparmor.yaml (100%) rename {prometheus-openstack-exporter/values_overrides => values_overrides/prometheus-openstack-exporter}/netpol.yaml (100%) rename {prometheus-openstack-exporter/values_overrides => values_overrides/prometheus-openstack-exporter}/tls.yaml (100%) rename {prometheus-process-exporter/values_overrides => values_overrides/prometheus-process-exporter}/apparmor.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/2023.1-ubuntu_focal.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/2024.1-ubuntu_jammy.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/2024.2-ubuntu_jammy.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/alertmanager.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/apparmor.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/ceph.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/elasticsearch.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/kubernetes.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/local-storage.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/nodes.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/openstack.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/postgresql.yaml (100%) rename {prometheus/values_overrides => values_overrides/prometheus}/tls.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/2023.1-ubuntu_focal.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/2023.1-ubuntu_jammy.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/2023.2-ubuntu_jammy.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/2024.1-ubuntu_jammy.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/2024.2-ubuntu_jammy.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/apparmor.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/builtin-metrics.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/netpol.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/rabbitmq-exporter.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/tls.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/yoga-ubuntu_focal.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/zed-ubuntu_focal.yaml (100%) rename {rabbitmq/values_overrides => values_overrides/rabbitmq}/zed-ubuntu_jammy.yaml (100%) diff --git a/Makefile b/Makefile index 51e0d49dd5..0d11458b91 100644 --- a/Makefile +++ b/Makefile @@ -24,10 +24,16 @@ ifdef PACKAGE_DIR PKG_ARGS += --destination $(PACKAGE_DIR) endif -EXCLUDES := helm-toolkit doc tests tools logs tmp roles playbooks releasenotes zuul.d -CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) +CHART_DIRS := $(subst /,,$(dir $(wildcard */Chart.yaml))) +CHARTS := $(sort helm-toolkit $(CHART_DIRS)) -.PHONY: $(EXCLUDES) $(CHARTS) +test: + echo > /tmp/charts + for c in $(CHARTS); do echo $$c >> /tmp/charts; done + echo > /tmp/chart_dirs + for c in $(CHART_DIRS); do echo $$c >> /tmp/chart_dirs; done + +.PHONY: $(CHARTS) all: $(CHARTS) diff --git a/roles/osh-run-script-set/defaults/main.yaml b/roles/osh-run-script-set/defaults/main.yaml index 6c1199f1cc..22e3eac497 100644 --- a/roles/osh-run-script-set/defaults/main.yaml +++ b/roles/osh-run-script-set/defaults/main.yaml @@ -16,6 +16,7 @@ kubeadm: pod_network_cidr: "10.244.0.0/16" osh_params: container_distro_name: ubuntu - container_distro_version: focal - # feature_gates: + container_distro_version: jammy +osh_values_overrides_path: "../openstack-helm/values_overrides" +osh_infra_values_overrides_path: "../openstack-helm-infra/values_overrides" ... diff --git a/roles/osh-run-script-set/tasks/main.yaml b/roles/osh-run-script-set/tasks/main.yaml index 8e282fa9d3..ef7841cddf 100644 --- a/roles/osh-run-script-set/tasks/main.yaml +++ b/roles/osh-run-script-set/tasks/main.yaml @@ -33,6 +33,8 @@ DOWNLOAD_OVERRIDES: "{{ download_overrides | default('') }}" OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}" + OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}" + OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}" OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}" CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}" CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}" diff --git a/roles/osh-run-script/defaults/main.yaml b/roles/osh-run-script/defaults/main.yaml index 6c1199f1cc..22e3eac497 100644 --- a/roles/osh-run-script/defaults/main.yaml +++ b/roles/osh-run-script/defaults/main.yaml @@ -16,6 +16,7 @@ kubeadm: pod_network_cidr: "10.244.0.0/16" osh_params: container_distro_name: ubuntu - container_distro_version: focal - # feature_gates: + container_distro_version: jammy +osh_values_overrides_path: "../openstack-helm/values_overrides" +osh_infra_values_overrides_path: "../openstack-helm-infra/values_overrides" ... diff --git a/roles/osh-run-script/tasks/main.yaml b/roles/osh-run-script/tasks/main.yaml index a874f2be89..7ea2c4df8c 100644 --- a/roles/osh-run-script/tasks/main.yaml +++ b/roles/osh-run-script/tasks/main.yaml @@ -30,6 +30,8 @@ DOWNLOAD_OVERRIDES: "{{ download_overrides | default('') }}" OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}" + OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}" + OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}" OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}" CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}" CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}" diff --git a/tools/deployment/ceph/ceph-adapter-rook.sh b/tools/deployment/ceph/ceph-adapter-rook.sh index 3fc6011b1d..bdf2bd0c92 100755 --- a/tools/deployment/ceph/ceph-adapter-rook.sh +++ b/tools/deployment/ceph/ceph-adapter-rook.sh @@ -17,7 +17,7 @@ set -xe #NOTE: Define variables : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"} -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} +: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"} helm upgrade --install ceph-adapter-rook ${OSH_INFRA_HELM_REPO}/ceph-adapter-rook \ --namespace=openstack diff --git a/tools/deployment/ceph/ceph-ns-activate.sh b/tools/deployment/ceph/ceph-ns-activate.sh index 642723ea92..4e7bd33b66 100755 --- a/tools/deployment/ceph/ceph-ns-activate.sh +++ b/tools/deployment/ceph/ceph-ns-activate.sh @@ -15,7 +15,7 @@ set -xe : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"} -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} +: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"} #NOTE: Deploy command tee /tmp/ceph-openstack-config.yaml </dev/null)} +: ${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA:=$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c grafana ${FEATURE_GATES} ${FEATURES} 2>/dev/null)} #NOTE: Deploy command helm upgrade --install grafana ${OSH_INFRA_HELM_REPO}/grafana \ diff --git a/tools/deployment/monitoring/kube-state-metrics.sh b/tools/deployment/monitoring/kube-state-metrics.sh index 132588d271..c917877300 100755 --- a/tools/deployment/monitoring/kube-state-metrics.sh +++ b/tools/deployment/monitoring/kube-state-metrics.sh @@ -15,8 +15,8 @@ set -xe : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"} -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_STATE_METRICS:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-kube-state-metrics ${FEATURES})"} +: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"} +: ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_STATE_METRICS:="$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c prometheus-kube-state-metrics ${FEATURES})"} #NOTE: Deploy command helm upgrade --install prometheus-kube-state-metrics \ diff --git a/tools/deployment/monitoring/mysql-exporter.sh b/tools/deployment/monitoring/mysql-exporter.sh index 0795394093..280d76bf8f 100755 --- a/tools/deployment/monitoring/mysql-exporter.sh +++ b/tools/deployment/monitoring/mysql-exporter.sh @@ -15,8 +15,8 @@ set -xe : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"} -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_MYSQL_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-mysql-exporter ${FEATURES})"} +: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"} +: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_MYSQL_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c prometheus-mysql-exporter ${FEATURES})"} #NOTE: Deploy command helm upgrade --install prometheus-mysql-exporter ${OSH_INFRA_HELM_REPO}/prometheus-mysql-exporter \ diff --git a/tools/deployment/monitoring/nagios.sh b/tools/deployment/monitoring/nagios.sh index 06ddbcd7a0..c43f8cfc8c 100755 --- a/tools/deployment/monitoring/nagios.sh +++ b/tools/deployment/monitoring/nagios.sh @@ -15,8 +15,8 @@ set -xe : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"} -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_INFRA_EXTRA_HELM_ARGS_NAGIOS:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c nagios ${FEATURES})"} +: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"} +: ${OSH_INFRA_EXTRA_HELM_ARGS_NAGIOS:="$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c nagios ${FEATURES})"} #NOTE: Deploy command helm upgrade --install nagios ${OSH_INFRA_HELM_REPO}/nagios \ diff --git a/tools/deployment/monitoring/node-exporter.sh b/tools/deployment/monitoring/node-exporter.sh index 6d2c3a5422..704605325d 100755 --- a/tools/deployment/monitoring/node-exporter.sh +++ b/tools/deployment/monitoring/node-exporter.sh @@ -15,8 +15,8 @@ set -xe : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"} -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_INFRA_EXTRA_HELM_ARGS_NODE_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-node-exporter ${FEATURES})"} +: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"} +: ${OSH_INFRA_EXTRA_HELM_ARGS_NODE_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c prometheus-node-exporter ${FEATURES})"} #NOTE: Deploy command helm upgrade --install prometheus-node-exporter \ diff --git a/tools/deployment/monitoring/openstack-exporter.sh b/tools/deployment/monitoring/openstack-exporter.sh index a95893a96b..004348b457 100755 --- a/tools/deployment/monitoring/openstack-exporter.sh +++ b/tools/deployment/monitoring/openstack-exporter.sh @@ -15,8 +15,8 @@ set -xe : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"} -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_INFRA_EXTRA_HELM_ARGS_OS_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-openstack-exporter ${FEATURES})"} +: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"} +: ${OSH_INFRA_EXTRA_HELM_ARGS_OS_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c prometheus-openstack-exporter ${FEATURES})"} tee /tmp/prometheus-openstack-exporter.yaml << EOF manifests: diff --git a/tools/deployment/monitoring/process-exporter.sh b/tools/deployment/monitoring/process-exporter.sh index ae71ecd8c3..1f27271723 100755 --- a/tools/deployment/monitoring/process-exporter.sh +++ b/tools/deployment/monitoring/process-exporter.sh @@ -15,8 +15,8 @@ set -xe : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"} -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -: ${OSH_INFRA_EXTRA_HELM_ARGS_PROCESS_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-process-exporter ${FEATURES})"} +: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"} +: ${OSH_INFRA_EXTRA_HELM_ARGS_PROCESS_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c prometheus-process-exporter ${FEATURES})"} #NOTE: Deploy command helm upgrade --install prometheus-process-exporter \ diff --git a/tools/deployment/monitoring/prometheus.sh b/tools/deployment/monitoring/prometheus.sh index 1217f873a1..2dfa20b36b 100755 --- a/tools/deployment/monitoring/prometheus.sh +++ b/tools/deployment/monitoring/prometheus.sh @@ -15,9 +15,9 @@ set -xe : ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"} -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} +: ${OSH_INFRA_VALUES_OVERRIDES_PATH:="../openstack-helm-infra/values_overrides"} FEATURE_GATES="alertmanager ceph elasticsearch kubernetes nodes openstack postgresql apparmor" -: ${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus ${FEATURE_GATES} ${FEATURES})"} +: ${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS:="$(helm osh get-values-overrides -p ${OSH_INFRA_VALUES_OVERRIDES_PATH} -c prometheus ${FEATURE_GATES} ${FEATURES})"} #NOTE: Deploy command helm upgrade --install prometheus ${OSH_INFRA_HELM_REPO}/prometheus \ diff --git a/tools/deployment/openstack/keystone.sh b/tools/deployment/openstack/keystone.sh index f136b39052..f285f90a65 100755 --- a/tools/deployment/openstack/keystone.sh +++ b/tools/deployment/openstack/keystone.sh @@ -15,8 +15,8 @@ set -xe : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_PATH:="../openstack-helm"} -: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_PATH} -c keystone ${FEATURES})"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} +: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c keystone ${FEATURES})"} # Install Keystone helm upgrade --install keystone ${OSH_HELM_REPO}/keystone \ diff --git a/ceph-client/values_overrides/apparmor.yaml b/values_overrides/ceph-client/apparmor.yaml similarity index 100% rename from ceph-client/values_overrides/apparmor.yaml rename to values_overrides/ceph-client/apparmor.yaml diff --git a/ceph-mon/values_overrides/apparmor.yaml b/values_overrides/ceph-mon/apparmor.yaml similarity index 100% rename from ceph-mon/values_overrides/apparmor.yaml rename to values_overrides/ceph-mon/apparmor.yaml diff --git a/ceph-osd/values_overrides/apparmor.yaml b/values_overrides/ceph-osd/apparmor.yaml similarity index 100% rename from ceph-osd/values_overrides/apparmor.yaml rename to values_overrides/ceph-osd/apparmor.yaml diff --git a/ceph-provisioners/values_overrides/apparmor.yaml b/values_overrides/ceph-provisioners/apparmor.yaml similarity index 100% rename from ceph-provisioners/values_overrides/apparmor.yaml rename to values_overrides/ceph-provisioners/apparmor.yaml diff --git a/ceph-rgw/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/ceph-rgw/2023.1-ubuntu_focal.yaml similarity index 100% rename from ceph-rgw/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/ceph-rgw/2023.1-ubuntu_focal.yaml diff --git a/ceph-rgw/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/ceph-rgw/2024.1-ubuntu_jammy.yaml similarity index 100% rename from ceph-rgw/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/ceph-rgw/2024.1-ubuntu_jammy.yaml diff --git a/ceph-rgw/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/ceph-rgw/2024.2-ubuntu_jammy.yaml similarity index 100% rename from ceph-rgw/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/ceph-rgw/2024.2-ubuntu_jammy.yaml diff --git a/ceph-rgw/values_overrides/apparmor.yaml b/values_overrides/ceph-rgw/apparmor.yaml similarity index 100% rename from ceph-rgw/values_overrides/apparmor.yaml rename to values_overrides/ceph-rgw/apparmor.yaml diff --git a/ceph-rgw/values_overrides/netpol.yaml b/values_overrides/ceph-rgw/netpol.yaml similarity index 100% rename from ceph-rgw/values_overrides/netpol.yaml rename to values_overrides/ceph-rgw/netpol.yaml diff --git a/ceph-rgw/values_overrides/tls.yaml b/values_overrides/ceph-rgw/tls.yaml similarity index 100% rename from ceph-rgw/values_overrides/tls.yaml rename to values_overrides/ceph-rgw/tls.yaml diff --git a/daemonjob-controller/values_overrides/apparmor.yaml b/values_overrides/daemonjob-controller/apparmor.yaml similarity index 100% rename from daemonjob-controller/values_overrides/apparmor.yaml rename to values_overrides/daemonjob-controller/apparmor.yaml diff --git a/elastic-apm-server/values_overrides/apparmor.yaml b/values_overrides/elastic-apm-server/apparmor.yaml similarity index 100% rename from elastic-apm-server/values_overrides/apparmor.yaml rename to values_overrides/elastic-apm-server/apparmor.yaml diff --git a/elastic-filebeat/values_overrides/apparmor.yaml b/values_overrides/elastic-filebeat/apparmor.yaml similarity index 100% rename from elastic-filebeat/values_overrides/apparmor.yaml rename to values_overrides/elastic-filebeat/apparmor.yaml diff --git a/elasticsearch/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/elasticsearch/2023.1-ubuntu_focal.yaml similarity index 100% rename from elasticsearch/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/elasticsearch/2023.1-ubuntu_focal.yaml diff --git a/elasticsearch/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/elasticsearch/2024.1-ubuntu_jammy.yaml similarity index 100% rename from elasticsearch/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/elasticsearch/2024.1-ubuntu_jammy.yaml diff --git a/elasticsearch/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/elasticsearch/2024.2-ubuntu_jammy.yaml similarity index 100% rename from elasticsearch/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/elasticsearch/2024.2-ubuntu_jammy.yaml diff --git a/elasticsearch/values_overrides/apparmor.yaml b/values_overrides/elasticsearch/apparmor.yaml similarity index 100% rename from elasticsearch/values_overrides/apparmor.yaml rename to values_overrides/elasticsearch/apparmor.yaml diff --git a/elasticsearch/values_overrides/local-storage.yaml b/values_overrides/elasticsearch/local-storage.yaml similarity index 100% rename from elasticsearch/values_overrides/local-storage.yaml rename to values_overrides/elasticsearch/local-storage.yaml diff --git a/elasticsearch/values_overrides/remote-cluster.yaml b/values_overrides/elasticsearch/remote-cluster.yaml similarity index 100% rename from elasticsearch/values_overrides/remote-cluster.yaml rename to values_overrides/elasticsearch/remote-cluster.yaml diff --git a/elasticsearch/values_overrides/tls.yaml b/values_overrides/elasticsearch/tls.yaml similarity index 100% rename from elasticsearch/values_overrides/tls.yaml rename to values_overrides/elasticsearch/tls.yaml diff --git a/fluentd/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/fluentd/2023.1-ubuntu_focal.yaml similarity index 100% rename from fluentd/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/fluentd/2023.1-ubuntu_focal.yaml diff --git a/fluentd/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/fluentd/2024.1-ubuntu_jammy.yaml similarity index 100% rename from fluentd/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/fluentd/2024.1-ubuntu_jammy.yaml diff --git a/fluentd/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/fluentd/2024.2-ubuntu_jammy.yaml similarity index 100% rename from fluentd/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/fluentd/2024.2-ubuntu_jammy.yaml diff --git a/fluentd/values_overrides/apparmor.yaml b/values_overrides/fluentd/apparmor.yaml similarity index 100% rename from fluentd/values_overrides/apparmor.yaml rename to values_overrides/fluentd/apparmor.yaml diff --git a/fluentd/values_overrides/tls.yaml b/values_overrides/fluentd/tls.yaml similarity index 100% rename from fluentd/values_overrides/tls.yaml rename to values_overrides/fluentd/tls.yaml diff --git a/gnocchi/values_overrides/2023.2-ubuntu-jammy.yaml b/values_overrides/gnocchi/2023.2-ubuntu-jammy.yaml similarity index 100% rename from gnocchi/values_overrides/2023.2-ubuntu-jammy.yaml rename to values_overrides/gnocchi/2023.2-ubuntu-jammy.yaml diff --git a/grafana/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/grafana/2024.1-ubuntu_jammy.yaml similarity index 100% rename from grafana/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/grafana/2024.1-ubuntu_jammy.yaml diff --git a/grafana/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/grafana/2024.2-ubuntu_jammy.yaml similarity index 100% rename from grafana/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/grafana/2024.2-ubuntu_jammy.yaml diff --git a/grafana/values_overrides/apparmor.yaml b/values_overrides/grafana/apparmor.yaml similarity index 100% rename from grafana/values_overrides/apparmor.yaml rename to values_overrides/grafana/apparmor.yaml diff --git a/grafana/values_overrides/calico.yaml b/values_overrides/grafana/calico.yaml similarity index 100% rename from grafana/values_overrides/calico.yaml rename to values_overrides/grafana/calico.yaml diff --git a/grafana/values_overrides/ceph.yaml b/values_overrides/grafana/ceph.yaml similarity index 100% rename from grafana/values_overrides/ceph.yaml rename to values_overrides/grafana/ceph.yaml diff --git a/grafana/values_overrides/containers.yaml b/values_overrides/grafana/containers.yaml similarity index 100% rename from grafana/values_overrides/containers.yaml rename to values_overrides/grafana/containers.yaml diff --git a/grafana/values_overrides/coredns.yaml b/values_overrides/grafana/coredns.yaml similarity index 100% rename from grafana/values_overrides/coredns.yaml rename to values_overrides/grafana/coredns.yaml diff --git a/grafana/values_overrides/elasticsearch.yaml b/values_overrides/grafana/elasticsearch.yaml similarity index 100% rename from grafana/values_overrides/elasticsearch.yaml rename to values_overrides/grafana/elasticsearch.yaml diff --git a/grafana/values_overrides/home_dashboard.yaml b/values_overrides/grafana/home_dashboard.yaml similarity index 100% rename from grafana/values_overrides/home_dashboard.yaml rename to values_overrides/grafana/home_dashboard.yaml diff --git a/grafana/values_overrides/kubernetes.yaml b/values_overrides/grafana/kubernetes.yaml similarity index 100% rename from grafana/values_overrides/kubernetes.yaml rename to values_overrides/grafana/kubernetes.yaml diff --git a/grafana/values_overrides/nginx.yaml b/values_overrides/grafana/nginx.yaml similarity index 100% rename from grafana/values_overrides/nginx.yaml rename to values_overrides/grafana/nginx.yaml diff --git a/grafana/values_overrides/nodes.yaml b/values_overrides/grafana/nodes.yaml similarity index 100% rename from grafana/values_overrides/nodes.yaml rename to values_overrides/grafana/nodes.yaml diff --git a/grafana/values_overrides/openstack.yaml b/values_overrides/grafana/openstack.yaml similarity index 100% rename from grafana/values_overrides/openstack.yaml rename to values_overrides/grafana/openstack.yaml diff --git a/grafana/values_overrides/persistentvolume.yaml b/values_overrides/grafana/persistentvolume.yaml similarity index 100% rename from grafana/values_overrides/persistentvolume.yaml rename to values_overrides/grafana/persistentvolume.yaml diff --git a/grafana/values_overrides/prometheus.yaml b/values_overrides/grafana/prometheus.yaml similarity index 100% rename from grafana/values_overrides/prometheus.yaml rename to values_overrides/grafana/prometheus.yaml diff --git a/grafana/values_overrides/sqlite3.yaml b/values_overrides/grafana/sqlite3.yaml similarity index 100% rename from grafana/values_overrides/sqlite3.yaml rename to values_overrides/grafana/sqlite3.yaml diff --git a/grafana/values_overrides/tls.yaml b/values_overrides/grafana/tls.yaml similarity index 100% rename from grafana/values_overrides/tls.yaml rename to values_overrides/grafana/tls.yaml diff --git a/kibana/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/kibana/2023.1-ubuntu_focal.yaml similarity index 100% rename from kibana/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/kibana/2023.1-ubuntu_focal.yaml diff --git a/kibana/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/kibana/2024.1-ubuntu_jammy.yaml similarity index 100% rename from kibana/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/kibana/2024.1-ubuntu_jammy.yaml diff --git a/kibana/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/kibana/2024.2-ubuntu_jammy.yaml similarity index 100% rename from kibana/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/kibana/2024.2-ubuntu_jammy.yaml diff --git a/kibana/values_overrides/apparmor.yaml b/values_overrides/kibana/apparmor.yaml similarity index 100% rename from kibana/values_overrides/apparmor.yaml rename to values_overrides/kibana/apparmor.yaml diff --git a/kibana/values_overrides/tls.yaml b/values_overrides/kibana/tls.yaml similarity index 100% rename from kibana/values_overrides/tls.yaml rename to values_overrides/kibana/tls.yaml diff --git a/kubernetes-keystone-webhook/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/kubernetes-keystone-webhook/2023.1-ubuntu_focal.yaml similarity index 100% rename from kubernetes-keystone-webhook/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/kubernetes-keystone-webhook/2023.1-ubuntu_focal.yaml diff --git a/kubernetes-keystone-webhook/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/kubernetes-keystone-webhook/2024.1-ubuntu_jammy.yaml similarity index 100% rename from kubernetes-keystone-webhook/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/kubernetes-keystone-webhook/2024.1-ubuntu_jammy.yaml diff --git a/kubernetes-keystone-webhook/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/kubernetes-keystone-webhook/2024.2-ubuntu_jammy.yaml similarity index 100% rename from kubernetes-keystone-webhook/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/kubernetes-keystone-webhook/2024.2-ubuntu_jammy.yaml diff --git a/kubernetes-node-problem-detector/values_overrides/apparmor.yaml b/values_overrides/kubernetes-node-problem-detector/apparmor.yaml similarity index 100% rename from kubernetes-node-problem-detector/values_overrides/apparmor.yaml rename to values_overrides/kubernetes-node-problem-detector/apparmor.yaml diff --git a/libvirt/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/libvirt/2023.1-ubuntu_focal.yaml similarity index 100% rename from libvirt/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/libvirt/2023.1-ubuntu_focal.yaml diff --git a/libvirt/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/libvirt/2023.1-ubuntu_jammy.yaml similarity index 100% rename from libvirt/values_overrides/2023.1-ubuntu_jammy.yaml rename to values_overrides/libvirt/2023.1-ubuntu_jammy.yaml diff --git a/libvirt/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/libvirt/2023.2-ubuntu_jammy.yaml similarity index 100% rename from libvirt/values_overrides/2023.2-ubuntu_jammy.yaml rename to values_overrides/libvirt/2023.2-ubuntu_jammy.yaml diff --git a/libvirt/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/libvirt/2024.1-ubuntu_jammy.yaml similarity index 100% rename from libvirt/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/libvirt/2024.1-ubuntu_jammy.yaml diff --git a/libvirt/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/libvirt/2024.2-ubuntu_jammy.yaml similarity index 100% rename from libvirt/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/libvirt/2024.2-ubuntu_jammy.yaml diff --git a/libvirt/values_overrides/apparmor.yaml b/values_overrides/libvirt/apparmor.yaml similarity index 100% rename from libvirt/values_overrides/apparmor.yaml rename to values_overrides/libvirt/apparmor.yaml diff --git a/libvirt/values_overrides/cinder-external-ceph-backend.yaml b/values_overrides/libvirt/cinder-external-ceph-backend.yaml similarity index 100% rename from libvirt/values_overrides/cinder-external-ceph-backend.yaml rename to values_overrides/libvirt/cinder-external-ceph-backend.yaml diff --git a/libvirt/values_overrides/netpol.yaml b/values_overrides/libvirt/netpol.yaml similarity index 100% rename from libvirt/values_overrides/netpol.yaml rename to values_overrides/libvirt/netpol.yaml diff --git a/libvirt/values_overrides/node_overrides.yaml b/values_overrides/libvirt/node_overrides.yaml similarity index 100% rename from libvirt/values_overrides/node_overrides.yaml rename to values_overrides/libvirt/node_overrides.yaml diff --git a/libvirt/values_overrides/ovn.yaml b/values_overrides/libvirt/ovn.yaml similarity index 100% rename from libvirt/values_overrides/ovn.yaml rename to values_overrides/libvirt/ovn.yaml diff --git a/libvirt/values_overrides/ssl.yaml b/values_overrides/libvirt/ssl.yaml similarity index 100% rename from libvirt/values_overrides/ssl.yaml rename to values_overrides/libvirt/ssl.yaml diff --git a/local-storage/values_overrides/local-storage.yaml b/values_overrides/local-storage/local-storage.yaml similarity index 100% rename from local-storage/values_overrides/local-storage.yaml rename to values_overrides/local-storage/local-storage.yaml diff --git a/mariadb-backup/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/mariadb-backup/2023.1-ubuntu_focal.yaml similarity index 100% rename from mariadb-backup/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/mariadb-backup/2023.1-ubuntu_focal.yaml diff --git a/mariadb-backup/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/mariadb-backup/2023.2-ubuntu_jammy.yaml similarity index 100% rename from mariadb-backup/values_overrides/2023.2-ubuntu_jammy.yaml rename to values_overrides/mariadb-backup/2023.2-ubuntu_jammy.yaml diff --git a/mariadb-backup/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/mariadb-backup/2024.1-ubuntu_jammy.yaml similarity index 100% rename from mariadb-backup/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/mariadb-backup/2024.1-ubuntu_jammy.yaml diff --git a/mariadb-backup/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/mariadb-backup/2024.2-ubuntu_jammy.yaml similarity index 100% rename from mariadb-backup/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/mariadb-backup/2024.2-ubuntu_jammy.yaml diff --git a/mariadb-backup/values_overrides/apparmor.yaml b/values_overrides/mariadb-backup/apparmor.yaml similarity index 100% rename from mariadb-backup/values_overrides/apparmor.yaml rename to values_overrides/mariadb-backup/apparmor.yaml diff --git a/mariadb-backup/values_overrides/backups.yaml b/values_overrides/mariadb-backup/backups.yaml similarity index 100% rename from mariadb-backup/values_overrides/backups.yaml rename to values_overrides/mariadb-backup/backups.yaml diff --git a/mariadb-backup/values_overrides/staggered-backups.yaml b/values_overrides/mariadb-backup/staggered-backups.yaml similarity index 100% rename from mariadb-backup/values_overrides/staggered-backups.yaml rename to values_overrides/mariadb-backup/staggered-backups.yaml diff --git a/mariadb-backup/values_overrides/tls.yaml b/values_overrides/mariadb-backup/tls.yaml similarity index 100% rename from mariadb-backup/values_overrides/tls.yaml rename to values_overrides/mariadb-backup/tls.yaml diff --git a/mariadb-backup/values_overrides/ubuntu_focal.yaml b/values_overrides/mariadb-backup/ubuntu_focal.yaml similarity index 100% rename from mariadb-backup/values_overrides/ubuntu_focal.yaml rename to values_overrides/mariadb-backup/ubuntu_focal.yaml diff --git a/mariadb-cluster/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/mariadb-cluster/2023.1-ubuntu_focal.yaml similarity index 100% rename from mariadb-cluster/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/mariadb-cluster/2023.1-ubuntu_focal.yaml diff --git a/mariadb-cluster/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/mariadb-cluster/2023.2-ubuntu_jammy.yaml similarity index 100% rename from mariadb-cluster/values_overrides/2023.2-ubuntu_jammy.yaml rename to values_overrides/mariadb-cluster/2023.2-ubuntu_jammy.yaml diff --git a/mariadb-cluster/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/mariadb-cluster/2024.1-ubuntu_jammy.yaml similarity index 100% rename from mariadb-cluster/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/mariadb-cluster/2024.1-ubuntu_jammy.yaml diff --git a/mariadb-cluster/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/mariadb-cluster/2024.2-ubuntu_jammy.yaml similarity index 100% rename from mariadb-cluster/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/mariadb-cluster/2024.2-ubuntu_jammy.yaml diff --git a/mariadb-cluster/values_overrides/apparmor.yaml b/values_overrides/mariadb-cluster/apparmor.yaml similarity index 100% rename from mariadb-cluster/values_overrides/apparmor.yaml rename to values_overrides/mariadb-cluster/apparmor.yaml diff --git a/mariadb-cluster/values_overrides/downscaled.yaml b/values_overrides/mariadb-cluster/downscaled.yaml similarity index 100% rename from mariadb-cluster/values_overrides/downscaled.yaml rename to values_overrides/mariadb-cluster/downscaled.yaml diff --git a/mariadb-cluster/values_overrides/local-storage.yaml b/values_overrides/mariadb-cluster/local-storage.yaml similarity index 100% rename from mariadb-cluster/values_overrides/local-storage.yaml rename to values_overrides/mariadb-cluster/local-storage.yaml diff --git a/mariadb-cluster/values_overrides/netpol.yaml b/values_overrides/mariadb-cluster/netpol.yaml similarity index 100% rename from mariadb-cluster/values_overrides/netpol.yaml rename to values_overrides/mariadb-cluster/netpol.yaml diff --git a/mariadb-cluster/values_overrides/prometheus.yaml b/values_overrides/mariadb-cluster/prometheus.yaml similarity index 100% rename from mariadb-cluster/values_overrides/prometheus.yaml rename to values_overrides/mariadb-cluster/prometheus.yaml diff --git a/mariadb-cluster/values_overrides/tls.yaml b/values_overrides/mariadb-cluster/tls.yaml similarity index 100% rename from mariadb-cluster/values_overrides/tls.yaml rename to values_overrides/mariadb-cluster/tls.yaml diff --git a/mariadb-cluster/values_overrides/ubuntu_focal.yaml b/values_overrides/mariadb-cluster/ubuntu_focal.yaml similarity index 100% rename from mariadb-cluster/values_overrides/ubuntu_focal.yaml rename to values_overrides/mariadb-cluster/ubuntu_focal.yaml diff --git a/mariadb-cluster/values_overrides/upscaled.yaml b/values_overrides/mariadb-cluster/upscaled.yaml similarity index 100% rename from mariadb-cluster/values_overrides/upscaled.yaml rename to values_overrides/mariadb-cluster/upscaled.yaml diff --git a/mariadb/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/mariadb/2023.1-ubuntu_focal.yaml similarity index 100% rename from mariadb/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/mariadb/2023.1-ubuntu_focal.yaml diff --git a/mariadb/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/mariadb/2024.1-ubuntu_jammy.yaml similarity index 100% rename from mariadb/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/mariadb/2024.1-ubuntu_jammy.yaml diff --git a/mariadb/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/mariadb/2024.2-ubuntu_jammy.yaml similarity index 100% rename from mariadb/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/mariadb/2024.2-ubuntu_jammy.yaml diff --git a/mariadb/values_overrides/apparmor.yaml b/values_overrides/mariadb/apparmor.yaml similarity index 100% rename from mariadb/values_overrides/apparmor.yaml rename to values_overrides/mariadb/apparmor.yaml diff --git a/mariadb/values_overrides/backups.yaml b/values_overrides/mariadb/backups.yaml similarity index 100% rename from mariadb/values_overrides/backups.yaml rename to values_overrides/mariadb/backups.yaml diff --git a/mariadb/values_overrides/local-storage.yaml b/values_overrides/mariadb/local-storage.yaml similarity index 100% rename from mariadb/values_overrides/local-storage.yaml rename to values_overrides/mariadb/local-storage.yaml diff --git a/mariadb/values_overrides/netpol.yaml b/values_overrides/mariadb/netpol.yaml similarity index 100% rename from mariadb/values_overrides/netpol.yaml rename to values_overrides/mariadb/netpol.yaml diff --git a/mariadb/values_overrides/staggered-backups.yaml b/values_overrides/mariadb/staggered-backups.yaml similarity index 100% rename from mariadb/values_overrides/staggered-backups.yaml rename to values_overrides/mariadb/staggered-backups.yaml diff --git a/mariadb/values_overrides/tls.yaml b/values_overrides/mariadb/tls.yaml similarity index 100% rename from mariadb/values_overrides/tls.yaml rename to values_overrides/mariadb/tls.yaml diff --git a/mariadb/values_overrides/ubuntu_focal.yaml b/values_overrides/mariadb/ubuntu_focal.yaml similarity index 100% rename from mariadb/values_overrides/ubuntu_focal.yaml rename to values_overrides/mariadb/ubuntu_focal.yaml diff --git a/mariadb/values_overrides/wait-for-cluster.yaml b/values_overrides/mariadb/wait-for-cluster.yaml similarity index 100% rename from mariadb/values_overrides/wait-for-cluster.yaml rename to values_overrides/mariadb/wait-for-cluster.yaml diff --git a/memcached/values_overrides/apparmor.yaml b/values_overrides/memcached/apparmor.yaml similarity index 100% rename from memcached/values_overrides/apparmor.yaml rename to values_overrides/memcached/apparmor.yaml diff --git a/memcached/values_overrides/netpol.yaml b/values_overrides/memcached/netpol.yaml similarity index 100% rename from memcached/values_overrides/netpol.yaml rename to values_overrides/memcached/netpol.yaml diff --git a/metacontroller/values_overrides/apparmor.yaml b/values_overrides/metacontroller/apparmor.yaml similarity index 100% rename from metacontroller/values_overrides/apparmor.yaml rename to values_overrides/metacontroller/apparmor.yaml diff --git a/nagios/values_overrides/apparmor.yaml b/values_overrides/nagios/apparmor.yaml similarity index 100% rename from nagios/values_overrides/apparmor.yaml rename to values_overrides/nagios/apparmor.yaml diff --git a/nagios/values_overrides/elasticsearch-objects.yaml b/values_overrides/nagios/elasticsearch-objects.yaml similarity index 100% rename from nagios/values_overrides/elasticsearch-objects.yaml rename to values_overrides/nagios/elasticsearch-objects.yaml diff --git a/nagios/values_overrides/openstack-objects.yaml b/values_overrides/nagios/openstack-objects.yaml similarity index 100% rename from nagios/values_overrides/openstack-objects.yaml rename to values_overrides/nagios/openstack-objects.yaml diff --git a/nagios/values_overrides/postgresql-objects.yaml b/values_overrides/nagios/postgresql-objects.yaml similarity index 100% rename from nagios/values_overrides/postgresql-objects.yaml rename to values_overrides/nagios/postgresql-objects.yaml diff --git a/nagios/values_overrides/tls.yaml b/values_overrides/nagios/tls.yaml similarity index 100% rename from nagios/values_overrides/tls.yaml rename to values_overrides/nagios/tls.yaml diff --git a/openvswitch/values_overrides/apparmor.yaml b/values_overrides/openvswitch/apparmor.yaml similarity index 100% rename from openvswitch/values_overrides/apparmor.yaml rename to values_overrides/openvswitch/apparmor.yaml diff --git a/openvswitch/values_overrides/dpdk-ubuntu_focal.yaml b/values_overrides/openvswitch/dpdk-ubuntu_focal.yaml similarity index 100% rename from openvswitch/values_overrides/dpdk-ubuntu_focal.yaml rename to values_overrides/openvswitch/dpdk-ubuntu_focal.yaml diff --git a/openvswitch/values_overrides/dpdk-ubuntu_jammy.yaml b/values_overrides/openvswitch/dpdk-ubuntu_jammy.yaml similarity index 100% rename from openvswitch/values_overrides/dpdk-ubuntu_jammy.yaml rename to values_overrides/openvswitch/dpdk-ubuntu_jammy.yaml diff --git a/openvswitch/values_overrides/netpol.yaml b/values_overrides/openvswitch/netpol.yaml similarity index 100% rename from openvswitch/values_overrides/netpol.yaml rename to values_overrides/openvswitch/netpol.yaml diff --git a/openvswitch/values_overrides/ovn.yaml b/values_overrides/openvswitch/ovn.yaml similarity index 100% rename from openvswitch/values_overrides/ovn.yaml rename to values_overrides/openvswitch/ovn.yaml diff --git a/openvswitch/values_overrides/ubuntu_focal.yaml b/values_overrides/openvswitch/ubuntu_focal.yaml similarity index 100% rename from openvswitch/values_overrides/ubuntu_focal.yaml rename to values_overrides/openvswitch/ubuntu_focal.yaml diff --git a/openvswitch/values_overrides/ubuntu_jammy.yaml b/values_overrides/openvswitch/ubuntu_jammy.yaml similarity index 100% rename from openvswitch/values_overrides/ubuntu_jammy.yaml rename to values_overrides/openvswitch/ubuntu_jammy.yaml diff --git a/openvswitch/values_overrides/vswitchd-probes.yaml b/values_overrides/openvswitch/vswitchd-probes.yaml similarity index 100% rename from openvswitch/values_overrides/vswitchd-probes.yaml rename to values_overrides/openvswitch/vswitchd-probes.yaml diff --git a/ovn/values_overrides/ubuntu_focal.yaml b/values_overrides/ovn/ubuntu_focal.yaml similarity index 100% rename from ovn/values_overrides/ubuntu_focal.yaml rename to values_overrides/ovn/ubuntu_focal.yaml diff --git a/ovn/values_overrides/ubuntu_jammy.yaml b/values_overrides/ovn/ubuntu_jammy.yaml similarity index 100% rename from ovn/values_overrides/ubuntu_jammy.yaml rename to values_overrides/ovn/ubuntu_jammy.yaml diff --git a/postgresql/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/postgresql/2024.1-ubuntu_jammy.yaml similarity index 100% rename from postgresql/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/postgresql/2024.1-ubuntu_jammy.yaml diff --git a/postgresql/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/postgresql/2024.2-ubuntu_jammy.yaml similarity index 100% rename from postgresql/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/postgresql/2024.2-ubuntu_jammy.yaml diff --git a/postgresql/values_overrides/apparmor.yaml b/values_overrides/postgresql/apparmor.yaml similarity index 100% rename from postgresql/values_overrides/apparmor.yaml rename to values_overrides/postgresql/apparmor.yaml diff --git a/postgresql/values_overrides/backups.yaml b/values_overrides/postgresql/backups.yaml similarity index 100% rename from postgresql/values_overrides/backups.yaml rename to values_overrides/postgresql/backups.yaml diff --git a/postgresql/values_overrides/netpol.yaml b/values_overrides/postgresql/netpol.yaml similarity index 100% rename from postgresql/values_overrides/netpol.yaml rename to values_overrides/postgresql/netpol.yaml diff --git a/postgresql/values_overrides/staggered-backups.yaml b/values_overrides/postgresql/staggered-backups.yaml similarity index 100% rename from postgresql/values_overrides/staggered-backups.yaml rename to values_overrides/postgresql/staggered-backups.yaml diff --git a/postgresql/values_overrides/tls.yaml b/values_overrides/postgresql/tls.yaml similarity index 100% rename from postgresql/values_overrides/tls.yaml rename to values_overrides/postgresql/tls.yaml diff --git a/powerdns/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/powerdns/2023.1-ubuntu_focal.yaml similarity index 100% rename from powerdns/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/powerdns/2023.1-ubuntu_focal.yaml diff --git a/powerdns/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/powerdns/2024.1-ubuntu_jammy.yaml similarity index 100% rename from powerdns/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/powerdns/2024.1-ubuntu_jammy.yaml diff --git a/powerdns/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/powerdns/2024.2-ubuntu_jammy.yaml similarity index 100% rename from powerdns/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/powerdns/2024.2-ubuntu_jammy.yaml diff --git a/prometheus-alertmanager/values_overrides/apparmor.yaml b/values_overrides/prometheus-alertmanager/apparmor.yaml similarity index 100% rename from prometheus-alertmanager/values_overrides/apparmor.yaml rename to values_overrides/prometheus-alertmanager/apparmor.yaml diff --git a/prometheus-blackbox-exporter/values_overrides/apparmor.yaml b/values_overrides/prometheus-blackbox-exporter/apparmor.yaml similarity index 100% rename from prometheus-blackbox-exporter/values_overrides/apparmor.yaml rename to values_overrides/prometheus-blackbox-exporter/apparmor.yaml diff --git a/prometheus-kube-state-metrics/values_overrides/apparmor.yaml b/values_overrides/prometheus-kube-state-metrics/apparmor.yaml similarity index 100% rename from prometheus-kube-state-metrics/values_overrides/apparmor.yaml rename to values_overrides/prometheus-kube-state-metrics/apparmor.yaml diff --git a/prometheus-mysql-exporter/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/prometheus-mysql-exporter/2023.1-ubuntu_focal.yaml similarity index 100% rename from prometheus-mysql-exporter/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/prometheus-mysql-exporter/2023.1-ubuntu_focal.yaml diff --git a/prometheus-mysql-exporter/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/prometheus-mysql-exporter/2023.2-ubuntu_jammy.yaml similarity index 100% rename from prometheus-mysql-exporter/values_overrides/2023.2-ubuntu_jammy.yaml rename to values_overrides/prometheus-mysql-exporter/2023.2-ubuntu_jammy.yaml diff --git a/prometheus-mysql-exporter/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/prometheus-mysql-exporter/2024.1-ubuntu_jammy.yaml similarity index 100% rename from prometheus-mysql-exporter/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/prometheus-mysql-exporter/2024.1-ubuntu_jammy.yaml diff --git a/prometheus-mysql-exporter/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/prometheus-mysql-exporter/2024.2-ubuntu_jammy.yaml similarity index 100% rename from prometheus-mysql-exporter/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/prometheus-mysql-exporter/2024.2-ubuntu_jammy.yaml diff --git a/prometheus-mysql-exporter/values_overrides/apparmor.yaml b/values_overrides/prometheus-mysql-exporter/apparmor.yaml similarity index 100% rename from prometheus-mysql-exporter/values_overrides/apparmor.yaml rename to values_overrides/prometheus-mysql-exporter/apparmor.yaml diff --git a/prometheus-mysql-exporter/values_overrides/prometheus.yaml b/values_overrides/prometheus-mysql-exporter/prometheus.yaml similarity index 100% rename from prometheus-mysql-exporter/values_overrides/prometheus.yaml rename to values_overrides/prometheus-mysql-exporter/prometheus.yaml diff --git a/prometheus-mysql-exporter/values_overrides/tls.yaml b/values_overrides/prometheus-mysql-exporter/tls.yaml similarity index 100% rename from prometheus-mysql-exporter/values_overrides/tls.yaml rename to values_overrides/prometheus-mysql-exporter/tls.yaml diff --git a/prometheus-node-exporter/values_overrides/apparmor.yaml b/values_overrides/prometheus-node-exporter/apparmor.yaml similarity index 100% rename from prometheus-node-exporter/values_overrides/apparmor.yaml rename to values_overrides/prometheus-node-exporter/apparmor.yaml diff --git a/prometheus-openstack-exporter/values_overrides/apparmor.yaml b/values_overrides/prometheus-openstack-exporter/apparmor.yaml similarity index 100% rename from prometheus-openstack-exporter/values_overrides/apparmor.yaml rename to values_overrides/prometheus-openstack-exporter/apparmor.yaml diff --git a/prometheus-openstack-exporter/values_overrides/netpol.yaml b/values_overrides/prometheus-openstack-exporter/netpol.yaml similarity index 100% rename from prometheus-openstack-exporter/values_overrides/netpol.yaml rename to values_overrides/prometheus-openstack-exporter/netpol.yaml diff --git a/prometheus-openstack-exporter/values_overrides/tls.yaml b/values_overrides/prometheus-openstack-exporter/tls.yaml similarity index 100% rename from prometheus-openstack-exporter/values_overrides/tls.yaml rename to values_overrides/prometheus-openstack-exporter/tls.yaml diff --git a/prometheus-process-exporter/values_overrides/apparmor.yaml b/values_overrides/prometheus-process-exporter/apparmor.yaml similarity index 100% rename from prometheus-process-exporter/values_overrides/apparmor.yaml rename to values_overrides/prometheus-process-exporter/apparmor.yaml diff --git a/prometheus/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/prometheus/2023.1-ubuntu_focal.yaml similarity index 100% rename from prometheus/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/prometheus/2023.1-ubuntu_focal.yaml diff --git a/prometheus/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/prometheus/2024.1-ubuntu_jammy.yaml similarity index 100% rename from prometheus/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/prometheus/2024.1-ubuntu_jammy.yaml diff --git a/prometheus/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/prometheus/2024.2-ubuntu_jammy.yaml similarity index 100% rename from prometheus/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/prometheus/2024.2-ubuntu_jammy.yaml diff --git a/prometheus/values_overrides/alertmanager.yaml b/values_overrides/prometheus/alertmanager.yaml similarity index 100% rename from prometheus/values_overrides/alertmanager.yaml rename to values_overrides/prometheus/alertmanager.yaml diff --git a/prometheus/values_overrides/apparmor.yaml b/values_overrides/prometheus/apparmor.yaml similarity index 100% rename from prometheus/values_overrides/apparmor.yaml rename to values_overrides/prometheus/apparmor.yaml diff --git a/prometheus/values_overrides/ceph.yaml b/values_overrides/prometheus/ceph.yaml similarity index 100% rename from prometheus/values_overrides/ceph.yaml rename to values_overrides/prometheus/ceph.yaml diff --git a/prometheus/values_overrides/elasticsearch.yaml b/values_overrides/prometheus/elasticsearch.yaml similarity index 100% rename from prometheus/values_overrides/elasticsearch.yaml rename to values_overrides/prometheus/elasticsearch.yaml diff --git a/prometheus/values_overrides/kubernetes.yaml b/values_overrides/prometheus/kubernetes.yaml similarity index 100% rename from prometheus/values_overrides/kubernetes.yaml rename to values_overrides/prometheus/kubernetes.yaml diff --git a/prometheus/values_overrides/local-storage.yaml b/values_overrides/prometheus/local-storage.yaml similarity index 100% rename from prometheus/values_overrides/local-storage.yaml rename to values_overrides/prometheus/local-storage.yaml diff --git a/prometheus/values_overrides/nodes.yaml b/values_overrides/prometheus/nodes.yaml similarity index 100% rename from prometheus/values_overrides/nodes.yaml rename to values_overrides/prometheus/nodes.yaml diff --git a/prometheus/values_overrides/openstack.yaml b/values_overrides/prometheus/openstack.yaml similarity index 100% rename from prometheus/values_overrides/openstack.yaml rename to values_overrides/prometheus/openstack.yaml diff --git a/prometheus/values_overrides/postgresql.yaml b/values_overrides/prometheus/postgresql.yaml similarity index 100% rename from prometheus/values_overrides/postgresql.yaml rename to values_overrides/prometheus/postgresql.yaml diff --git a/prometheus/values_overrides/tls.yaml b/values_overrides/prometheus/tls.yaml similarity index 100% rename from prometheus/values_overrides/tls.yaml rename to values_overrides/prometheus/tls.yaml diff --git a/rabbitmq/values_overrides/2023.1-ubuntu_focal.yaml b/values_overrides/rabbitmq/2023.1-ubuntu_focal.yaml similarity index 100% rename from rabbitmq/values_overrides/2023.1-ubuntu_focal.yaml rename to values_overrides/rabbitmq/2023.1-ubuntu_focal.yaml diff --git a/rabbitmq/values_overrides/2023.1-ubuntu_jammy.yaml b/values_overrides/rabbitmq/2023.1-ubuntu_jammy.yaml similarity index 100% rename from rabbitmq/values_overrides/2023.1-ubuntu_jammy.yaml rename to values_overrides/rabbitmq/2023.1-ubuntu_jammy.yaml diff --git a/rabbitmq/values_overrides/2023.2-ubuntu_jammy.yaml b/values_overrides/rabbitmq/2023.2-ubuntu_jammy.yaml similarity index 100% rename from rabbitmq/values_overrides/2023.2-ubuntu_jammy.yaml rename to values_overrides/rabbitmq/2023.2-ubuntu_jammy.yaml diff --git a/rabbitmq/values_overrides/2024.1-ubuntu_jammy.yaml b/values_overrides/rabbitmq/2024.1-ubuntu_jammy.yaml similarity index 100% rename from rabbitmq/values_overrides/2024.1-ubuntu_jammy.yaml rename to values_overrides/rabbitmq/2024.1-ubuntu_jammy.yaml diff --git a/rabbitmq/values_overrides/2024.2-ubuntu_jammy.yaml b/values_overrides/rabbitmq/2024.2-ubuntu_jammy.yaml similarity index 100% rename from rabbitmq/values_overrides/2024.2-ubuntu_jammy.yaml rename to values_overrides/rabbitmq/2024.2-ubuntu_jammy.yaml diff --git a/rabbitmq/values_overrides/apparmor.yaml b/values_overrides/rabbitmq/apparmor.yaml similarity index 100% rename from rabbitmq/values_overrides/apparmor.yaml rename to values_overrides/rabbitmq/apparmor.yaml diff --git a/rabbitmq/values_overrides/builtin-metrics.yaml b/values_overrides/rabbitmq/builtin-metrics.yaml similarity index 100% rename from rabbitmq/values_overrides/builtin-metrics.yaml rename to values_overrides/rabbitmq/builtin-metrics.yaml diff --git a/rabbitmq/values_overrides/netpol.yaml b/values_overrides/rabbitmq/netpol.yaml similarity index 100% rename from rabbitmq/values_overrides/netpol.yaml rename to values_overrides/rabbitmq/netpol.yaml diff --git a/rabbitmq/values_overrides/rabbitmq-exporter.yaml b/values_overrides/rabbitmq/rabbitmq-exporter.yaml similarity index 100% rename from rabbitmq/values_overrides/rabbitmq-exporter.yaml rename to values_overrides/rabbitmq/rabbitmq-exporter.yaml diff --git a/rabbitmq/values_overrides/tls.yaml b/values_overrides/rabbitmq/tls.yaml similarity index 100% rename from rabbitmq/values_overrides/tls.yaml rename to values_overrides/rabbitmq/tls.yaml diff --git a/rabbitmq/values_overrides/yoga-ubuntu_focal.yaml b/values_overrides/rabbitmq/yoga-ubuntu_focal.yaml similarity index 100% rename from rabbitmq/values_overrides/yoga-ubuntu_focal.yaml rename to values_overrides/rabbitmq/yoga-ubuntu_focal.yaml diff --git a/rabbitmq/values_overrides/zed-ubuntu_focal.yaml b/values_overrides/rabbitmq/zed-ubuntu_focal.yaml similarity index 100% rename from rabbitmq/values_overrides/zed-ubuntu_focal.yaml rename to values_overrides/rabbitmq/zed-ubuntu_focal.yaml diff --git a/rabbitmq/values_overrides/zed-ubuntu_jammy.yaml b/values_overrides/rabbitmq/zed-ubuntu_jammy.yaml similarity index 100% rename from rabbitmq/values_overrides/zed-ubuntu_jammy.yaml rename to values_overrides/rabbitmq/zed-ubuntu_jammy.yaml diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index e967b30db2..8b794312ef 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -25,16 +25,16 @@ - openstack-helm-infra-logging - openstack-helm-infra-monitoring - openstack-helm-infra-metacontroller - - 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-2024-1-ubuntu_jammy - - openstack-helm-infra-tls-2024-1-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-compute-kit-2024-2-ubuntu_jammy - - openstack-helm-infra-ceph-migrate + # - 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-2024-1-ubuntu_jammy + # - openstack-helm-infra-tls-2024-1-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-compute-kit-2024-2-ubuntu_jammy + # - openstack-helm-infra-ceph-migrate gate: jobs: - openstack-helm-lint