Armada Check: Add release uuid value to charts

This simply adds the release uuid value to the chart overrids in
the Armada manifests, which allows for validation that the release
uuid is appropriately added as an annotation to the resulting pods

Change-Id: I53dc31ed9849ea321064184817549c0e90c34378
This commit is contained in:
Steve Wilkerson 2019-01-30 08:50:58 -06:00
parent c863bb0cec
commit 47d9c8a72c
5 changed files with 36 additions and 0 deletions

View File

@ -33,6 +33,7 @@ fi
export CEPH_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh) export CEPH_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
export CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" 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 TUNNEL_DEVICE=$(ip -4 route list 0/0 | awk '{ print $5; exit }')
export OSH_INFRA_PATH export OSH_INFRA_PATH
export OSH_PATH export OSH_PATH

View File

@ -37,6 +37,7 @@ data:
labels: labels:
release_group: osh-ceph-ingress-controller release_group: osh-ceph-ingress-controller
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
server: server:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
@ -78,6 +79,7 @@ data:
labels: labels:
release_group: osh-ceph-mon release_group: osh-ceph-mon
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
ceph_mon: ceph_mon:
namespace: ceph namespace: ceph
@ -138,6 +140,7 @@ data:
labels: labels:
release_group: osh-ceph-osd release_group: osh-ceph-osd
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
ceph_mon: ceph_mon:
namespace: ceph namespace: ceph
@ -199,6 +202,7 @@ data:
labels: labels:
release_group: osh-ceph-client release_group: osh-ceph-client
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
ceph_mon: ceph_mon:
namespace: ceph namespace: ceph
@ -258,6 +262,7 @@ data:
labels: labels:
release_group: osh-ceph-provisioners release_group: osh-ceph-provisioners
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
ceph_mon: ceph_mon:
namespace: ceph namespace: ceph

View File

@ -37,6 +37,7 @@ data:
labels: labels:
release_group: osh-ingress-kube-system release_group: osh-ingress-kube-system
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
server: server:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane

View File

@ -37,6 +37,7 @@ data:
labels: labels:
release_group: osh-infra-osh-infra-ingress-controller release_group: osh-infra-osh-infra-ingress-controller
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
@ -74,6 +75,7 @@ data:
labels: labels:
release_group: osh-infra-osh-infra-ceph-config release_group: osh-infra-osh-infra-ceph-config
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
ceph_mon: ceph_mon:
namespace: ceph namespace: ceph
@ -121,6 +123,7 @@ data:
labels: labels:
release_group: osh-infra-radosgw-osh-infra release_group: osh-infra-radosgw-osh-infra
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
object_store: object_store:
namespace: osh-infra namespace: osh-infra
@ -182,6 +185,7 @@ data:
labels: labels:
release_group: osh-infra-osh-infra-ldap release_group: osh-infra-osh-infra-ldap
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
server: server:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
@ -221,6 +225,7 @@ data:
labels: labels:
release_group: osh-infra-osh-infra-mariadb release_group: osh-infra-osh-infra-mariadb
values: values:
release_uuid: ${RELEASE_UUID}
pod: pod:
replicas: replicas:
server: 1 server: 1
@ -272,6 +277,7 @@ data:
release_group: osh-infra-elasticsearch release_group: osh-infra-elasticsearch
component: test component: test
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
elasticsearch: elasticsearch:
auth: auth:
@ -341,6 +347,7 @@ data:
release_group: osh-infra-fluent-logging release_group: osh-infra-fluent-logging
component: test component: test
values: values:
release_uuid: ${RELEASE_UUID}
conf: conf:
fluentbit: fluentbit:
- service: - service:
@ -914,6 +921,7 @@ data:
labels: labels:
release_group: osh-infra-kibana release_group: osh-infra-kibana
values: values:
release_uuid: ${RELEASE_UUID}
conf: conf:
create_kibana_indexes: create_kibana_indexes:
indexes: indexes:
@ -976,6 +984,7 @@ data:
release_group: osh-infra-prometheus release_group: osh-infra-prometheus
component: test component: test
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
monitoring: monitoring:
auth: auth:
@ -1021,6 +1030,7 @@ data:
labels: labels:
release_group: osh-infra-prometheus-kube-state-metrics release_group: osh-infra-prometheus-kube-state-metrics
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
kube_state_metrics: kube_state_metrics:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
@ -1058,6 +1068,7 @@ data:
labels: labels:
release_group: osh-infra-prometheus-node-exporter release_group: osh-infra-prometheus-node-exporter
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
node_exporter: node_exporter:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
@ -1095,6 +1106,7 @@ data:
labels: labels:
release_group: osh-infra-prometheus-alertmanager release_group: osh-infra-prometheus-alertmanager
values: values:
release_uuid: ${RELEASE_UUID}
pod: pod:
replicas: replicas:
alertmanager: 1 alertmanager: 1
@ -1135,6 +1147,7 @@ data:
labels: labels:
release_group: osh-infra-nagios release_group: osh-infra-nagios
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
monitoring: monitoring:
auth: auth:
@ -1185,6 +1198,7 @@ data:
release_group: osh-infra-grafana release_group: osh-infra-grafana
component: test component: test
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
monitoring: monitoring:
auth: auth:

View File

@ -37,6 +37,7 @@ data:
labels: labels:
release_group: osh-openstack-ingress-controller release_group: osh-openstack-ingress-controller
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
server: server:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
@ -78,6 +79,7 @@ data:
labels: labels:
release_group: osh-openstack-ceph-config release_group: osh-openstack-ceph-config
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
jobs: jobs:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
@ -129,6 +131,7 @@ data:
labels: labels:
release_group: osh-mariadb release_group: osh-mariadb
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
oslo_db: oslo_db:
auth: auth:
@ -174,6 +177,7 @@ data:
labels: labels:
release_group: osh-memcached release_group: osh-memcached
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
server: server:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
@ -220,6 +224,7 @@ data:
release_group: osh-rabbitmq release_group: osh-rabbitmq
component: test component: test
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
oslo_messaging: oslo_messaging:
auth: auth:
@ -272,6 +277,7 @@ data:
release_group: osh-keystone release_group: osh-keystone
component: test component: test
values: values:
release_uuid: ${RELEASE_UUID}
conf: conf:
logging: logging:
loggers: loggers:
@ -400,6 +406,7 @@ data:
labels: labels:
release_group: osh-radosgw-openstack release_group: osh-radosgw-openstack
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
identity: identity:
namespace: openstack namespace: openstack
@ -470,6 +477,7 @@ data:
release_group: osh-glance release_group: osh-glance
component: test component: test
values: values:
release_uuid: ${RELEASE_UUID}
conf: conf:
logging: logging:
loggers: loggers:
@ -613,6 +621,7 @@ data:
release_group: osh-cinder release_group: osh-cinder
component: test component: test
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
fluentd: fluentd:
namespace: osh-infra namespace: osh-infra
@ -756,6 +765,7 @@ data:
labels: labels:
release_group: osh-openvswitch release_group: osh-openvswitch
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
ovs: ovs:
node_selector_key: openvswitch node_selector_key: openvswitch
@ -784,6 +794,7 @@ data:
upgrade: upgrade:
no_hooks: False no_hooks: False
values: values:
release_uuid: ${RELEASE_UUID}
labels: labels:
agent: agent:
libvirt: libvirt:
@ -853,6 +864,7 @@ data:
application: nova application: nova
component: cell-setup component: cell-setup
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
fluentd: fluentd:
namespace: osh-infra namespace: osh-infra
@ -1057,6 +1069,7 @@ data:
application: neutron application: neutron
component: ks-endpoints component: ks-endpoints
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
fluentd: fluentd:
namespace: osh-infra namespace: osh-infra
@ -1234,6 +1247,7 @@ data:
release_group: osh-heat release_group: osh-heat
component: test component: test
values: values:
release_uuid: ${RELEASE_UUID}
conf: conf:
logging: logging:
loggers: loggers:
@ -1378,6 +1392,7 @@ data:
labels: labels:
release_group: osh-prometheus-openstack-exporter release_group: osh-prometheus-openstack-exporter
values: values:
release_uuid: ${RELEASE_UUID}
endpoints: endpoints:
identity: identity:
auth: auth: