diff --git a/tools/deployment/armada/020-armada-render-manifests.sh b/tools/deployment/armada/020-armada-render-manifests.sh index fd597375ba..b1f4f359d0 100755 --- a/tools/deployment/armada/020-armada-render-manifests.sh +++ b/tools/deployment/armada/020-armada-render-manifests.sh @@ -33,6 +33,7 @@ fi export CEPH_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh) export CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" +export RELEASE_UUID=$(uuidgen) export TUNNEL_DEVICE=$(ip -4 route list 0/0 | awk '{ print $5; exit }') export OSH_INFRA_PATH export OSH_PATH diff --git a/tools/deployment/armada/manifests/armada-ceph.yaml b/tools/deployment/armada/manifests/armada-ceph.yaml index 3a74e25d9f..34747aed49 100644 --- a/tools/deployment/armada/manifests/armada-ceph.yaml +++ b/tools/deployment/armada/manifests/armada-ceph.yaml @@ -37,6 +37,7 @@ data: labels: release_group: osh-ceph-ingress-controller values: + release_uuid: ${RELEASE_UUID} labels: server: node_selector_key: openstack-control-plane @@ -78,6 +79,7 @@ data: labels: release_group: osh-ceph-mon values: + release_uuid: ${RELEASE_UUID} endpoints: ceph_mon: namespace: ceph @@ -138,6 +140,7 @@ data: labels: release_group: osh-ceph-osd values: + release_uuid: ${RELEASE_UUID} endpoints: ceph_mon: namespace: ceph @@ -199,6 +202,7 @@ data: labels: release_group: osh-ceph-client values: + release_uuid: ${RELEASE_UUID} endpoints: ceph_mon: namespace: ceph @@ -258,6 +262,7 @@ data: labels: release_group: osh-ceph-provisioners values: + release_uuid: ${RELEASE_UUID} endpoints: ceph_mon: namespace: ceph diff --git a/tools/deployment/armada/manifests/armada-cluster-ingress.yaml b/tools/deployment/armada/manifests/armada-cluster-ingress.yaml index 9e85b4acf8..5a3ceb8017 100644 --- a/tools/deployment/armada/manifests/armada-cluster-ingress.yaml +++ b/tools/deployment/armada/manifests/armada-cluster-ingress.yaml @@ -37,6 +37,7 @@ data: labels: release_group: osh-ingress-kube-system values: + release_uuid: ${RELEASE_UUID} labels: server: node_selector_key: openstack-control-plane diff --git a/tools/deployment/armada/manifests/armada-lma.yaml b/tools/deployment/armada/manifests/armada-lma.yaml index 38de6e3a6f..1ffb6fef65 100644 --- a/tools/deployment/armada/manifests/armada-lma.yaml +++ b/tools/deployment/armada/manifests/armada-lma.yaml @@ -37,6 +37,7 @@ data: labels: release_group: osh-infra-osh-infra-ingress-controller values: + release_uuid: ${RELEASE_UUID} labels: node_selector_key: openstack-control-plane node_selector_value: enabled @@ -74,6 +75,7 @@ data: labels: release_group: osh-infra-osh-infra-ceph-config values: + release_uuid: ${RELEASE_UUID} endpoints: ceph_mon: namespace: ceph @@ -121,6 +123,7 @@ data: labels: release_group: osh-infra-radosgw-osh-infra values: + release_uuid: ${RELEASE_UUID} endpoints: object_store: namespace: osh-infra @@ -182,6 +185,7 @@ data: labels: release_group: osh-infra-osh-infra-ldap values: + release_uuid: ${RELEASE_UUID} labels: server: node_selector_key: openstack-control-plane @@ -221,6 +225,7 @@ data: labels: release_group: osh-infra-osh-infra-mariadb values: + release_uuid: ${RELEASE_UUID} pod: replicas: server: 1 @@ -272,6 +277,7 @@ data: release_group: osh-infra-elasticsearch component: test values: + release_uuid: ${RELEASE_UUID} endpoints: elasticsearch: auth: @@ -341,6 +347,7 @@ data: release_group: osh-infra-fluent-logging component: test values: + release_uuid: ${RELEASE_UUID} conf: fluentbit: - service: @@ -914,6 +921,7 @@ data: labels: release_group: osh-infra-kibana values: + release_uuid: ${RELEASE_UUID} conf: create_kibana_indexes: indexes: @@ -976,6 +984,7 @@ data: release_group: osh-infra-prometheus component: test values: + release_uuid: ${RELEASE_UUID} endpoints: monitoring: auth: @@ -1021,6 +1030,7 @@ data: labels: release_group: osh-infra-prometheus-kube-state-metrics values: + release_uuid: ${RELEASE_UUID} labels: kube_state_metrics: node_selector_key: openstack-control-plane @@ -1058,6 +1068,7 @@ data: labels: release_group: osh-infra-prometheus-node-exporter values: + release_uuid: ${RELEASE_UUID} labels: node_exporter: node_selector_key: openstack-control-plane @@ -1095,6 +1106,7 @@ data: labels: release_group: osh-infra-prometheus-alertmanager values: + release_uuid: ${RELEASE_UUID} pod: replicas: alertmanager: 1 @@ -1135,6 +1147,7 @@ data: labels: release_group: osh-infra-nagios values: + release_uuid: ${RELEASE_UUID} endpoints: monitoring: auth: @@ -1185,6 +1198,7 @@ data: release_group: osh-infra-grafana component: test values: + release_uuid: ${RELEASE_UUID} endpoints: monitoring: auth: diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml index 1334a7bac4..9188e0d4b7 100644 --- a/tools/deployment/armada/manifests/armada-osh.yaml +++ b/tools/deployment/armada/manifests/armada-osh.yaml @@ -37,6 +37,7 @@ data: labels: release_group: osh-openstack-ingress-controller values: + release_uuid: ${RELEASE_UUID} labels: server: node_selector_key: openstack-control-plane @@ -78,6 +79,7 @@ data: labels: release_group: osh-openstack-ceph-config values: + release_uuid: ${RELEASE_UUID} labels: jobs: node_selector_key: openstack-control-plane @@ -129,6 +131,7 @@ data: labels: release_group: osh-mariadb values: + release_uuid: ${RELEASE_UUID} endpoints: oslo_db: auth: @@ -174,6 +177,7 @@ data: labels: release_group: osh-memcached values: + release_uuid: ${RELEASE_UUID} labels: server: node_selector_key: openstack-control-plane @@ -220,6 +224,7 @@ data: release_group: osh-rabbitmq component: test values: + release_uuid: ${RELEASE_UUID} endpoints: oslo_messaging: auth: @@ -272,6 +277,7 @@ data: release_group: osh-keystone component: test values: + release_uuid: ${RELEASE_UUID} conf: logging: loggers: @@ -400,6 +406,7 @@ data: labels: release_group: osh-radosgw-openstack values: + release_uuid: ${RELEASE_UUID} endpoints: identity: namespace: openstack @@ -470,6 +477,7 @@ data: release_group: osh-glance component: test values: + release_uuid: ${RELEASE_UUID} conf: logging: loggers: @@ -613,6 +621,7 @@ data: release_group: osh-cinder component: test values: + release_uuid: ${RELEASE_UUID} endpoints: fluentd: namespace: osh-infra @@ -756,6 +765,7 @@ data: labels: release_group: osh-openvswitch values: + release_uuid: ${RELEASE_UUID} labels: ovs: node_selector_key: openvswitch @@ -784,6 +794,7 @@ data: upgrade: no_hooks: False values: + release_uuid: ${RELEASE_UUID} labels: agent: libvirt: @@ -853,6 +864,7 @@ data: application: nova component: cell-setup values: + release_uuid: ${RELEASE_UUID} endpoints: fluentd: namespace: osh-infra @@ -1057,6 +1069,7 @@ data: application: neutron component: ks-endpoints values: + release_uuid: ${RELEASE_UUID} endpoints: fluentd: namespace: osh-infra @@ -1234,6 +1247,7 @@ data: release_group: osh-heat component: test values: + release_uuid: ${RELEASE_UUID} conf: logging: loggers: @@ -1378,6 +1392,7 @@ data: labels: release_group: osh-prometheus-openstack-exporter values: + release_uuid: ${RELEASE_UUID} endpoints: identity: auth: