From 9f23510653ef83eb422531e3ebf8f940b4fa1c3e Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Mon, 22 Oct 2018 13:04:50 -0500 Subject: [PATCH] global: Add labels to OSH charts for Airskiff site The Airskiff site needs the ability to override charts that have multiple replicas or utilize Prometheus. This commit adds labels to OpenStack-Helm charts and chart groups that will be overriden in the Airskiff site. Charts are labeled with name and component selectors to match existing labels on select charts and leave the `airship-seaworthy` site unaffected. Change-Id: I24d69afe70fbee35d3b21b8803eb64a81ed5376e --- .../software/charts/osh/openstack-compute-kit/chart-group.yaml | 2 ++ .../charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml | 3 +++ .../charts/osh/openstack-compute-kit/nova-rabbitmq.yaml | 3 +++ global/software/charts/osh/openstack-glance/chart-group.yaml | 3 +++ global/software/charts/osh/openstack-glance/glance.yaml | 1 + global/software/charts/osh/openstack-glance/rabbitmq.yaml | 3 +++ global/software/charts/osh/openstack-heat/chart-group.yaml | 3 +++ global/software/charts/osh/openstack-heat/rabbitmq.yaml | 3 +++ .../charts/osh/openstack-ingress-controller/chart-group.yaml | 3 +++ .../charts/osh/openstack-ingress-controller/ingress.yaml | 3 +++ global/software/charts/osh/openstack-keystone/chart-group.yaml | 3 +++ global/software/charts/osh/openstack-keystone/rabbitmq.yaml | 3 +++ global/software/charts/osh/openstack-mariadb/chart-group.yaml | 3 +++ global/software/charts/osh/openstack-mariadb/mariadb.yaml | 3 +++ 14 files changed, 39 insertions(+) diff --git a/global/software/charts/osh/openstack-compute-kit/chart-group.yaml b/global/software/charts/osh/openstack-compute-kit/chart-group.yaml index fd889fbab..c861780e7 100644 --- a/global/software/charts/osh/openstack-compute-kit/chart-group.yaml +++ b/global/software/charts/osh/openstack-compute-kit/chart-group.yaml @@ -3,6 +3,8 @@ schema: armada/ChartGroup/v1 metadata: schema: metadata/Document/v1 name: openstack-compute-kit + labels: + name: openstack-compute-kit-chart-group-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml b/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml index d993e5547..e4e9ca045 100644 --- a/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml +++ b/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml @@ -3,6 +3,9 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: neutron-rabbitmq + labels: + name: neutron-rabbitmq-global + component: neutron layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml b/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml index 639ed5402..f53608669 100644 --- a/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml +++ b/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml @@ -3,6 +3,9 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: nova-rabbitmq + labels: + name: nova-rabbitmq-global + component: nova layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-glance/chart-group.yaml b/global/software/charts/osh/openstack-glance/chart-group.yaml index bad0e1e1c..593dac409 100644 --- a/global/software/charts/osh/openstack-glance/chart-group.yaml +++ b/global/software/charts/osh/openstack-glance/chart-group.yaml @@ -3,6 +3,9 @@ schema: armada/ChartGroup/v1 metadata: schema: metadata/Document/v1 name: openstack-glance + labels: + name: openstack-glance-chart-group-global + component: glance layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-glance/glance.yaml b/global/software/charts/osh/openstack-glance/glance.yaml index 9fb60b5e7..346d6df38 100644 --- a/global/software/charts/osh/openstack-glance/glance.yaml +++ b/global/software/charts/osh/openstack-glance/glance.yaml @@ -4,6 +4,7 @@ metadata: schema: metadata/Document/v1 name: glance labels: + name: glance-global component: glance layeringDefinition: abstract: false diff --git a/global/software/charts/osh/openstack-glance/rabbitmq.yaml b/global/software/charts/osh/openstack-glance/rabbitmq.yaml index a43184c0d..2176de00c 100644 --- a/global/software/charts/osh/openstack-glance/rabbitmq.yaml +++ b/global/software/charts/osh/openstack-glance/rabbitmq.yaml @@ -3,6 +3,9 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: glance-rabbitmq + labels: + name: glance-rabbitmq-global + component: glance layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-heat/chart-group.yaml b/global/software/charts/osh/openstack-heat/chart-group.yaml index 36bee7e92..02507afb1 100644 --- a/global/software/charts/osh/openstack-heat/chart-group.yaml +++ b/global/software/charts/osh/openstack-heat/chart-group.yaml @@ -3,6 +3,9 @@ schema: armada/ChartGroup/v1 metadata: schema: metadata/Document/v1 name: openstack-heat + labels: + name: openstack-heat-chart-group-global + component: heat layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-heat/rabbitmq.yaml b/global/software/charts/osh/openstack-heat/rabbitmq.yaml index be92ad54c..f1414f4d6 100644 --- a/global/software/charts/osh/openstack-heat/rabbitmq.yaml +++ b/global/software/charts/osh/openstack-heat/rabbitmq.yaml @@ -3,6 +3,9 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: heat-rabbitmq + labels: + name: heat-rabbitmq-global + component: heat layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-ingress-controller/chart-group.yaml b/global/software/charts/osh/openstack-ingress-controller/chart-group.yaml index 431942a97..2fa34840a 100644 --- a/global/software/charts/osh/openstack-ingress-controller/chart-group.yaml +++ b/global/software/charts/osh/openstack-ingress-controller/chart-group.yaml @@ -3,6 +3,9 @@ schema: armada/ChartGroup/v1 metadata: schema: metadata/Document/v1 name: openstack-ingress-controller + labels: + name: openstack-ingress-controller-chart-group-global + component: ingress layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-ingress-controller/ingress.yaml b/global/software/charts/osh/openstack-ingress-controller/ingress.yaml index f8fe4b1aa..d1719f89d 100644 --- a/global/software/charts/osh/openstack-ingress-controller/ingress.yaml +++ b/global/software/charts/osh/openstack-ingress-controller/ingress.yaml @@ -3,6 +3,9 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: openstack-ingress-controller + labels: + name: openstack-ingress-controller-global + component: ingress layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-keystone/chart-group.yaml b/global/software/charts/osh/openstack-keystone/chart-group.yaml index 007be8ef4..bcc066e15 100644 --- a/global/software/charts/osh/openstack-keystone/chart-group.yaml +++ b/global/software/charts/osh/openstack-keystone/chart-group.yaml @@ -3,6 +3,9 @@ schema: armada/ChartGroup/v1 metadata: schema: metadata/Document/v1 name: openstack-keystone + labels: + name: openstack-keystone-chart-group-global + component: keystone layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-keystone/rabbitmq.yaml b/global/software/charts/osh/openstack-keystone/rabbitmq.yaml index 05e4801d6..18ed65b81 100644 --- a/global/software/charts/osh/openstack-keystone/rabbitmq.yaml +++ b/global/software/charts/osh/openstack-keystone/rabbitmq.yaml @@ -3,6 +3,9 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: keystone-rabbitmq + labels: + name: keystone-rabbitmq-global + component: keystone layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-mariadb/chart-group.yaml b/global/software/charts/osh/openstack-mariadb/chart-group.yaml index 5e218fb0b..994d022d2 100644 --- a/global/software/charts/osh/openstack-mariadb/chart-group.yaml +++ b/global/software/charts/osh/openstack-mariadb/chart-group.yaml @@ -3,6 +3,9 @@ schema: armada/ChartGroup/v1 metadata: schema: metadata/Document/v1 name: openstack-mariadb + labels: + name: openstack-mariadb-chart-group-global + component: mariadb layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/osh/openstack-mariadb/mariadb.yaml b/global/software/charts/osh/openstack-mariadb/mariadb.yaml index d93ef70a0..4a75da22e 100644 --- a/global/software/charts/osh/openstack-mariadb/mariadb.yaml +++ b/global/software/charts/osh/openstack-mariadb/mariadb.yaml @@ -3,6 +3,9 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: openstack-mariadb + labels: + name: openstack-mariadb-global + component: mariadb layeringDefinition: abstract: false layer: global