openstack/openstack-helm
Code Issues Proposed changes

Gate: Update armada manifests to delete all release jobs on upgrade

Browse Source 
This PS updates the armada manifests to delete all jobs for a release
via the `release_group` label. It also extends this to cover charts that
do not currently have jobs contained, to allow simple future expansion
of services.

Change-Id: I28bd9e2c2ebc22ca9c4319970c657298281e28d2
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-07-02 12:19:47 +01:00
parent db06d2bc3a
commit d2434c26bd
4 changed files with 137 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tools/deployment/armada/multinode/armada-ceph.yaml
View File

@ -31,6 +31,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-ceph-ingress-controller
values:
labels:
server:
@ -71,36 +76,7 @@ data:
delete:
- type: job
labels:
application: ceph-mon
component: bootstrap
- type: job
labels:
application: ceph-mon
component: cephfs-client-key-generator
- type: job
labels:
application: ceph-mon
component: mds-keyring-generator
- type: job
labels:
application: ceph-mon
component: osd-keyring-generator
- type: job
labels:
application: ceph-mon
component: rgw-keyring-generator
- type: job
labels:
application: ceph-mon
component: mon-keyring-generator
- type: job
labels:
application: ceph-mon
component: mgr-keyring-generator
- type: job
labels:
application: ceph-mon
component: storage-keys-generator
release_group: osh-ceph-mon
values:
endpoints:
identity:
@ -168,6 +144,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-ceph-osd
values:
endpoints:
identity:
@ -239,16 +220,7 @@ data:
delete:
- type: job
labels:
application: ceph-client
component: bootstrap
- type: job
labels:
application: ceph-client
component: cephfs-client-key-generator
- type: job
labels:
application: ceph-client
component: rbd-pool
release_group: osh-ceph-client
values:
endpoints:
identity:

5
tools/deployment/armada/multinode/armada-cluster-ingress.yaml
View File

@ -31,6 +31,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-ingress-kube-system
values:
labels:
server:

64
tools/deployment/armada/multinode/armada-lma.yaml
View File

@ -31,6 +31,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-osh-infra-ingress-controller
values:
labels:
node_selector_key: openstack-control-plane
@ -67,12 +72,7 @@ data:
delete:
- type: job
labels:
application: ceph
component: client-key-generator
- type: job
labels:
application: ceph
component: client-key-cleaner
release_group: osh-infra-osh-infra-ceph-config
values:
endpoints:
identity:
@ -123,7 +123,12 @@ data:
install:
no_hooks: false
upgrade:
no_hooks: false
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-osh-infra-ldap
values:
labels:
server:
@ -158,6 +163,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-osh-infra-mariadb
values:
pod:
replicas:
@ -200,6 +210,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-elasticsearch
values:
endpoints:
elasticsearch:
@ -244,6 +259,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-fluent-logging
values:
endpoints:
elasticsearch:
@ -293,6 +313,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-kibana
values:
endpoints:
elasticsearch:
@ -334,6 +359,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-prometheus
values:
labels:
prometheus:
@ -369,6 +399,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-prometheus-kube-state-metrics
values:
labels:
kube_state_metrics:
@ -401,6 +436,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-prometheus-node-exporter
values:
labels:
node_exporter:
@ -433,6 +473,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-prometheus-alertmanager
values:
labels:
alertmanager:
@ -465,6 +510,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-infra-grafana
values:
endpoints:
oslo_db:

183
tools/deployment/armada/multinode/armada-osh.yaml
View File

@ -31,6 +31,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-openstack-ingress-controller
values:
labels:
server:
@ -71,12 +76,7 @@ data:
delete:
- type: job
labels:
application: ceph
component: client-key-generator
- type: job
labels:
application: ceph
component: client-key-cleaner
release_group: osh-openstack-ceph-config
values:
labels:
jobs:
@ -128,6 +128,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-mariadb
values:
endpoints:
oslo_db:
@ -168,6 +173,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-memcached
values:
labels:
server:
@ -203,6 +213,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-keystone-rabbitmq
values:
endpoints:
oslo_messaging:
@ -253,28 +268,7 @@ data:
delete:
- type: job
labels:
application: keystone
component: bootstrap
- type: job
labels:
application: keystone
component: credential-setup
- type: job
labels:
application: keystone
component: db-init
- type: job
labels:
application: keystone
component: db-sync
- type: job
labels:
application: keystone
component: fernet-setup
- type: job
labels:
application: keystone
component: domain-manage
release_group: osh-keystone
values:
endpoints:
identity:
@ -340,16 +334,7 @@ data:
delete:
- type: job
labels:
application: ceph
component: ks-user
- type: job
labels:
application: ceph
component: ks-service
- type: job
labels:
application: ceph
component: ks-endpoints
release_group: osh-radosgw-openstack
values:
endpoints:
identity:
@ -410,6 +395,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-glance-rabbitmq
values:
endpoints:
oslo_messaging:
@ -460,28 +450,7 @@ data:
delete:
- type: job
labels:
application: glance
component: db-init
- type: job
labels:
application: glance
component: db-sync
- type: job
labels:
application: glance
component: ks-user
- type: job
labels:
application: glance
component: ks-service
- type: job
labels:
application: glance
component: ks-endpoints
- type: job
labels:
application: glance
component: storage-init
release_group: osh-glance
values:
endpoints:
identity:
@ -547,6 +516,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-cinder-rabbitmq
values:
endpoints:
oslo_messaging:
@ -597,28 +571,7 @@ data:
delete:
- type: job
labels:
application: cinder
component: db-init
- type: job
labels:
application: cinder
component: db-sync
- type: job
labels:
application: cinder
component: ks-user
- type: job
labels:
application: cinder
component: ks-service
- type: job
labels:
application: cinder
component: ks-endpoints
- type: job
labels:
application: cinder
component: storage-init
release_group: osh-cinder
values:
endpoints:
identity:
@ -696,6 +649,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-openvswitch
values:
labels:
ovs:
@ -751,6 +709,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-nova-rabbitmq
values:
endpoints:
oslo_messaging:
@ -951,6 +914,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-neutron-rabbitmq
values:
endpoints:
oslo_messaging:
@ -1121,6 +1089,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-heat-rabbitmq
values:
endpoints:
oslo_messaging:
@ -1171,24 +1144,7 @@ data:
delete:
- type: job
labels:
application: heat
component: db-init
- type: job
labels:
application: heat
component: db-sync
- type: job
labels:
application: heat
component: ks-user
- type: job
labels:
application: heat
component: ks-service
- type: job
labels:
application: heat
component: ks-endpoints
release_group: osh-heat
values:
endpoints:
identity:
@ -1266,6 +1222,11 @@ data:
no_hooks: False
upgrade:
no_hooks: False
pre:
delete:
- type: job
labels:
release_group: osh-barbican-rabbitmq
values:
endpoints:
oslo_messaging:
@ -1316,24 +1277,7 @@ data:
delete:
- type: job
labels:
application: barbican
component: db-init
- type: job
labels:
application: barbican
component: db-sync
- type: job
labels:
application: barbican
component: ks-user
- type: job
labels:
application: barbican
component: ks-service
- type: job
labels:
application: barbican
component: ks-endpoints
release_group: osh-barbican
values:
endpoints:
identity:
@ -1399,8 +1343,7 @@ data:
delete:
- type: job
labels:
application: prometheus-openstack-exporter
component: ks-user
release_group: osh-prometheus-openstack-exporter
values:
endpoints:
identity: