From d7191d435216b4648361c21ec03264f6f87297c4 Mon Sep 17 00:00:00 2001 From: Bryan Strassner Date: Fri, 9 Nov 2018 14:25:54 -0600 Subject: [PATCH] Add labels to Airship/Undercloud components In support of flexibility for document replacement at a site level Change-Id: Idfcb159be2f84d28093cc93214c5c929777361d2 --- global/software/charts/kubernetes/core/apiserver.yaml | 2 ++ .../software/charts/kubernetes/core/controller-manager.yaml | 2 ++ global/software/charts/kubernetes/core/scheduler.yaml | 2 ++ global/software/charts/kubernetes/haproxy/haproxy.yaml | 2 ++ global/software/charts/kubernetes/ingress/ingress.yaml | 1 + global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml | 2 ++ global/software/charts/ucp/armada/armada.yaml | 2 ++ global/software/charts/ucp/armada/tiller.yaml | 2 ++ global/software/charts/ucp/core/ingress.yaml | 2 ++ global/software/charts/ucp/core/mariadb.yaml | 2 ++ global/software/charts/ucp/core/postgresql.yaml | 2 ++ global/software/charts/ucp/core/rabbitmq.yaml | 2 ++ global/software/charts/ucp/deckhand/barbican.yaml | 2 ++ global/software/charts/ucp/deckhand/deckhand.yaml | 2 ++ global/software/charts/ucp/divingbell/divingbell.yaml | 4 ++-- global/software/charts/ucp/drydock/drydock.yaml | 2 ++ global/software/charts/ucp/drydock/maas.yaml | 4 ++-- global/software/charts/ucp/keystone/keystone.yaml | 1 + global/software/charts/ucp/keystone/memcached.yaml | 2 ++ global/software/charts/ucp/promenade/promenade.yaml | 4 ++-- global/software/charts/ucp/shipyard/shipyard.yaml | 2 ++ .../ucp-openstack-exporter/prometheus-openstack-exporter.yaml | 2 ++ 22 files changed, 42 insertions(+), 6 deletions(-) diff --git a/global/software/charts/kubernetes/core/apiserver.yaml b/global/software/charts/kubernetes/core/apiserver.yaml index 41b477011..e493e3ab8 100644 --- a/global/software/charts/kubernetes/core/apiserver.yaml +++ b/global/software/charts/kubernetes/core/apiserver.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: kubernetes-apiserver + labels: + name: kubernetes-apiserver-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/kubernetes/core/controller-manager.yaml b/global/software/charts/kubernetes/core/controller-manager.yaml index e555ba0f7..74a05527a 100644 --- a/global/software/charts/kubernetes/core/controller-manager.yaml +++ b/global/software/charts/kubernetes/core/controller-manager.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: kubernetes-controller-manager + labels: + name: kubernetes-controller-manager-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/kubernetes/core/scheduler.yaml b/global/software/charts/kubernetes/core/scheduler.yaml index 0cce14586..d506055aa 100644 --- a/global/software/charts/kubernetes/core/scheduler.yaml +++ b/global/software/charts/kubernetes/core/scheduler.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: kubernetes-scheduler + labels: + name: kubernetes-scheduler-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/kubernetes/haproxy/haproxy.yaml b/global/software/charts/kubernetes/haproxy/haproxy.yaml index 3b43ffef4..9f458446f 100644 --- a/global/software/charts/kubernetes/haproxy/haproxy.yaml +++ b/global/software/charts/kubernetes/haproxy/haproxy.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: haproxy + labels: + name: haproxy-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/kubernetes/ingress/ingress.yaml b/global/software/charts/kubernetes/ingress/ingress.yaml index e6ba2deef..65c55748b 100644 --- a/global/software/charts/kubernetes/ingress/ingress.yaml +++ b/global/software/charts/kubernetes/ingress/ingress.yaml @@ -5,6 +5,7 @@ metadata: name: global-ingress-kube-system labels: ingress: kube-system + name: ingress-kube-system-global layeringDefinition: abstract: true layer: global diff --git a/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml b/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml index cb19d1e23..3ba13e3a8 100644 --- a/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml +++ b/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: kubernetes-proxy + labels: + name: kubernetes-proxy-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/armada/armada.yaml b/global/software/charts/ucp/armada/armada.yaml index adf82297a..e32397cd3 100644 --- a/global/software/charts/ucp/armada/armada.yaml +++ b/global/software/charts/ucp/armada/armada.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-armada + labels: + name: ucp-armada-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/armada/tiller.yaml b/global/software/charts/ucp/armada/tiller.yaml index df5e83d90..cf02539b3 100644 --- a/global/software/charts/ucp/armada/tiller.yaml +++ b/global/software/charts/ucp/armada/tiller.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-tiller + labels: + name: ucp-tiller-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/core/ingress.yaml b/global/software/charts/ucp/core/ingress.yaml index 935718bfb..8818c305d 100644 --- a/global/software/charts/ucp/core/ingress.yaml +++ b/global/software/charts/ucp/core/ingress.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-ingress + labels: + name: ucp-ingress-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/core/mariadb.yaml b/global/software/charts/ucp/core/mariadb.yaml index f225c8dac..55a5a3568 100644 --- a/global/software/charts/ucp/core/mariadb.yaml +++ b/global/software/charts/ucp/core/mariadb.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-mariadb + labels: + name: ucp-mariadb-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/core/postgresql.yaml b/global/software/charts/ucp/core/postgresql.yaml index 85845ff6b..3bd707e28 100644 --- a/global/software/charts/ucp/core/postgresql.yaml +++ b/global/software/charts/ucp/core/postgresql.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-postgresql + labels: + name: ucp-postgresql-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/core/rabbitmq.yaml b/global/software/charts/ucp/core/rabbitmq.yaml index 0ad06c129..de4d564ef 100644 --- a/global/software/charts/ucp/core/rabbitmq.yaml +++ b/global/software/charts/ucp/core/rabbitmq.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-rabbitmq + labels: + name: ucp-rabbitmq-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/deckhand/barbican.yaml b/global/software/charts/ucp/deckhand/barbican.yaml index 961c12cdd..ff66b7014 100644 --- a/global/software/charts/ucp/deckhand/barbican.yaml +++ b/global/software/charts/ucp/deckhand/barbican.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-barbican + labels: + name: ucp-barbican-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/deckhand/deckhand.yaml b/global/software/charts/ucp/deckhand/deckhand.yaml index 0cddf879f..553b2b3bc 100644 --- a/global/software/charts/ucp/deckhand/deckhand.yaml +++ b/global/software/charts/ucp/deckhand/deckhand.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-deckhand + labels: + name: ucp-deckhand-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/divingbell/divingbell.yaml b/global/software/charts/ucp/divingbell/divingbell.yaml index 2e30ea9d5..630e5fe6a 100644 --- a/global/software/charts/ucp/divingbell/divingbell.yaml +++ b/global/software/charts/ucp/divingbell/divingbell.yaml @@ -3,11 +3,11 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-divingbell-global + labels: + name: ucp-divingbell-global layeringDefinition: abstract: true layer: global - labels: - name: ucp-divingbell-global storagePolicy: cleartext substitutions: # Chart source diff --git a/global/software/charts/ucp/drydock/drydock.yaml b/global/software/charts/ucp/drydock/drydock.yaml index cb013e47d..9fda08092 100644 --- a/global/software/charts/ucp/drydock/drydock.yaml +++ b/global/software/charts/ucp/drydock/drydock.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-drydock + labels: + name: ucp-drydock-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/drydock/maas.yaml b/global/software/charts/ucp/drydock/maas.yaml index 52936236b..735851bfd 100644 --- a/global/software/charts/ucp/drydock/maas.yaml +++ b/global/software/charts/ucp/drydock/maas.yaml @@ -3,11 +3,11 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-maas-global + labels: + name: ucp-maas-global layeringDefinition: abstract: true layer: global - labels: - name: ucp-maas-global storagePolicy: cleartext substitutions: # Chart source diff --git a/global/software/charts/ucp/keystone/keystone.yaml b/global/software/charts/ucp/keystone/keystone.yaml index 5b6355f03..f09a45860 100644 --- a/global/software/charts/ucp/keystone/keystone.yaml +++ b/global/software/charts/ucp/keystone/keystone.yaml @@ -4,6 +4,7 @@ metadata: schema: metadata/Document/v1 name: ucp-keystone labels: + name: ucp-keystone-global component: keystone layeringDefinition: abstract: false diff --git a/global/software/charts/ucp/keystone/memcached.yaml b/global/software/charts/ucp/keystone/memcached.yaml index be7fad9c0..0ee000580 100644 --- a/global/software/charts/ucp/keystone/memcached.yaml +++ b/global/software/charts/ucp/keystone/memcached.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-keystone-memcached + labels: + name: ucp-keystone-memcached-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/promenade/promenade.yaml b/global/software/charts/ucp/promenade/promenade.yaml index 9f708ef5a..f71f6d48e 100644 --- a/global/software/charts/ucp/promenade/promenade.yaml +++ b/global/software/charts/ucp/promenade/promenade.yaml @@ -3,11 +3,11 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-promenade-global + labels: + name: ucp-promenade-global layeringDefinition: abstract: true layer: global - labels: - name: ucp-promenade-global storagePolicy: cleartext substitutions: diff --git a/global/software/charts/ucp/shipyard/shipyard.yaml b/global/software/charts/ucp/shipyard/shipyard.yaml index f9fc1d4cd..0b0d0f9f1 100644 --- a/global/software/charts/ucp/shipyard/shipyard.yaml +++ b/global/software/charts/ucp/shipyard/shipyard.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-shipyard + labels: + name: ucp-shipyard-global layeringDefinition: abstract: false layer: global diff --git a/global/software/charts/ucp/ucp-openstack-exporter/prometheus-openstack-exporter.yaml b/global/software/charts/ucp/ucp-openstack-exporter/prometheus-openstack-exporter.yaml index 10c8bdd58..b0fb0b0bb 100644 --- a/global/software/charts/ucp/ucp-openstack-exporter/prometheus-openstack-exporter.yaml +++ b/global/software/charts/ucp/ucp-openstack-exporter/prometheus-openstack-exporter.yaml @@ -3,6 +3,8 @@ schema: armada/Chart/v1 metadata: schema: metadata/Document/v1 name: ucp-prometheus-openstack-exporter + labels: + name: ucp-prometheus-openstack-exporter-global layeringDefinition: abstract: false layer: global