From b4111dd2dc97e8e75af67dfd30da678db78815e5 Mon Sep 17 00:00:00 2001 From: Aaron Sheffield Date: Wed, 13 Jun 2018 09:50:52 -0500 Subject: [PATCH] Added Helm Toolkit Labels - Added labels for application and component for HTK on the Airship components. - Updated timeouts for all components. Change-Id: Ib242ca935b21fb3a6821c10f32b43cbb16fbebf1 --- .../container-networking/calico.yaml | 11 ++-- .../kubernetes/container-networking/etcd.yaml | 7 ++- .../charts/kubernetes/core/apiserver.yaml | 8 +-- .../kubernetes/core/controller-manager.yaml | 8 +-- .../charts/kubernetes/core/scheduler.yaml | 8 +-- .../charts/kubernetes/dns/coredns.yaml | 7 ++- .../software/charts/kubernetes/etcd/etcd.yaml | 13 +---- .../charts/kubernetes/haproxy/haproxy.yaml | 8 +-- .../charts/kubernetes/ingress/ingress.yaml | 11 +++- .../kubernetes/proxy/kubernetes-proxy.yaml | 8 +-- .../software/charts/ucp/armada/armada.yaml | 11 +++- .../software/charts/ucp/armada/tiller.yaml | 11 +++- .../software/charts/ucp/core/ingress.yaml | 9 +++- .../software/charts/ucp/core/mariadb.yaml | 10 +++- .../software/charts/ucp/core/postgresql.yaml | 7 +-- .../software/charts/ucp/core/rabbitmq.yaml | 10 +++- .../charts/ucp/deckhand/barbican.yaml | 10 +++- .../charts/ucp/deckhand/deckhand.yaml | 28 +--------- .../charts/ucp/divingbell/divingbell.yaml | 6 +-- .../software/charts/ucp/drydock/drydock.yaml | 28 +--------- .../software/charts/ucp/drydock/maas.yaml | 32 +----------- .../charts/ucp/keystone/keystone.yaml | 10 ++-- .../charts/ucp/keystone/memcached.yaml | 10 +++- .../charts/ucp/promenade/promenade.yaml | 8 +-- .../charts/ucp/shipyard/shipyard.yaml | 52 +------------------ .../ucp/storage_provisioner/nfs-prov.yaml | 10 +++- .../container-networking/calico.yaml | 10 +++- .../kubernetes/container-networking/etcd.yaml | 11 ++-- .../charts/kubernetes/core/apiserver.yaml | 11 ++-- .../kubernetes/core/controller-manager.yaml | 11 ++-- .../charts/kubernetes/core/scheduler.yaml | 11 ++-- .../charts/kubernetes/dns/coredns.yaml | 11 ++-- .../software/charts/kubernetes/etcd/etcd.yaml | 11 ++-- .../charts/kubernetes/haproxy/haproxy.yaml | 11 ++-- .../charts/kubernetes/ingress/ingress.yaml | 11 +++- .../kubernetes/proxy/kubernetes-proxy.yaml | 11 ++-- .../software/charts/ucp/armada/armada.yaml | 11 +++- .../software/charts/ucp/armada/tiller.yaml | 11 +++- .../software/charts/ucp/core/ingress.yaml | 9 +++- .../software/charts/ucp/core/mariadb.yaml | 10 +++- .../software/charts/ucp/core/postgresql.yaml | 10 +++- .../software/charts/ucp/core/rabbitmq.yaml | 10 +++- .../charts/ucp/deckhand/barbican.yaml | 10 +++- .../charts/ucp/deckhand/deckhand.yaml | 9 ++-- .../charts/ucp/divingbell/divingbell.yaml | 11 +++- .../software/charts/ucp/drydock/drydock.yaml | 9 ++-- .../software/charts/ucp/drydock/maas.yaml | 9 ++-- .../charts/ucp/keystone/keystone.yaml | 10 ++-- .../charts/ucp/keystone/memcached.yaml | 10 +++- .../charts/ucp/promenade/promenade.yaml | 10 +++- .../charts/ucp/shipyard/shipyard.yaml | 12 ++--- .../ucp/storage_provisioner/nfs-prov.yaml | 10 +++- 52 files changed, 326 insertions(+), 285 deletions(-) diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/calico.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/calico.yaml index 96e412c6..7c5914ea 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/calico.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/calico.yaml @@ -85,11 +85,17 @@ data: namespace: kube-system protected: continue_processing: false - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-kubernetes-calico upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-kubernetes-calico values: conf: cni_network_config: @@ -155,6 +161,5 @@ data: chart_name: calico-htk release: calico-htk namespace: calico-htk - timeout: 100 values: {} dependencies: [] diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/etcd.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/etcd.yaml index 41ec7808..8076106a 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/etcd.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/container-networking/etcd.yaml @@ -83,14 +83,15 @@ data: continue_processing: false wait: timeout: 600 + labels: + release_group: airship-kubernetes-calico-etcd upgrade: no_hooks: false pre: delete: - type: job labels: - application: kubernetes - component: calico-etcd + release_group: airship-kubernetes-calico-etcd values: labels: anchor: @@ -136,8 +137,6 @@ data: chart_name: kubernetes-calico-etcd-htk release: kubernetes-calico-etcd-htk namespace: kubernetes-calico-etcd-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml index ae9845c9..adfce255 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml @@ -106,16 +106,14 @@ data: wait: timeout: 600 labels: - application: kubernetes - component: kubernetes-apiserver-anchor + release_group: airship-kubernetes-apiserver upgrade: no_hooks: false pre: delete: - type: job labels: - application: kubernetes - component: kubernetes-apiserver-anchor + release_group: airship-kubernetes-apiserver values: apiserver: etcd: @@ -142,8 +140,6 @@ data: chart_name: kubernetes-apiserver-htk release: kubernetes-apiserver-htk namespace: kubernetes-apiserver-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/core/controller-manager.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/core/controller-manager.yaml index 8fdd6bb8..fcbca52b 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/core/controller-manager.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/core/controller-manager.yaml @@ -81,16 +81,14 @@ data: wait: timeout: 600 labels: - application: kubernetes - component: kubernetes-controller-manager-anchor + release_group: airship-kubernetes-controller-manager upgrade: no_hooks: false pre: delete: - type: job labels: - application: kubernetes - component: kubernetes-controller-manager-anchor + release_group: airship-kubernetes-controller-manager values: network: kubernetes_netloc: 127.0.0.1:6553 @@ -116,8 +114,6 @@ data: chart_name: kubernetes-controller-manager-htk release: kubernetes-controller-manager-htk namespace: kubernetes-controller-manager-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/core/scheduler.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/core/scheduler.yaml index f1b1a836..49c3e745 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/core/scheduler.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/core/scheduler.yaml @@ -58,16 +58,14 @@ data: wait: timeout: 600 labels: - application: kubernetes - component: kubernetes-scheduler-anchor + release_group: airship-kubernetes-scheduler upgrade: no_hooks: false pre: delete: - type: job labels: - application: kubernetes - component: kubernetes-scheduler-anchor + release_group: airship-kubernetes-scheduler values: network: kubernetes_netloc: 127.0.0.1:6553 @@ -93,8 +91,6 @@ data: chart_name: kubernetes-scheduler-htk release: kubernetes-scheduler-htk namespace: kubernetes-scheduler-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml index 7a94bb1d..3d2a37ca 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/dns/coredns.yaml @@ -69,14 +69,15 @@ data: namespace: kube-system wait: timeout: 600 + labels: + release_group: airship-coredns upgrade: no_hooks: false pre: delete: - type: job labels: - application: kubernetes - component: coredns + release_group: airship-coredns values: conf: coredns: @@ -119,8 +120,6 @@ data: chart_name: coredns-htk release: coredns-htk namespace: coredns-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/etcd/etcd.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/etcd/etcd.yaml index b11ba383..d48ee8d3 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/etcd/etcd.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/etcd/etcd.yaml @@ -76,21 +76,14 @@ data: wait: timeout: 600 labels: - application: kubernetes - component: etcd + release_group: airship-kubernetes-etcd upgrade: no_hooks: false pre: delete: - type: job labels: - application: kubernetes - component: etcd-anchor - delete: - - type: job - labels: - application: kubernetes - component: etcd + release_group: airship-kubernetes-etcd values: anchor: etcdctl_endpoint: kubernetes-etcd.kube-system.svc.cluster.local @@ -134,8 +127,6 @@ data: chart_name: kubernetes-etcd-htk release: kubernetes-etcd-htk namespace: kubernetes-etcd-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/haproxy/haproxy.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/haproxy/haproxy.yaml index a4d41c5f..0d5427fc 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/haproxy/haproxy.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/haproxy/haproxy.yaml @@ -33,16 +33,14 @@ data: wait: timeout: 600 labels: - application: kubernetes - component: haproxy-anchor + release_group: airship-haproxy upgrade: no_hooks: false pre: delete: - type: job labels: - application: kubernetes - component: haproxy-anchor + release_group: airship-haproxy values: conf: anchor: @@ -94,8 +92,6 @@ data: chart_name: haproxy-htk release: haproxy-htk namespace: haproxy-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/ingress/ingress.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/ingress/ingress.yaml index b2904031..ed0a893c 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/ingress/ingress.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/ingress/ingress.yaml @@ -19,11 +19,19 @@ data: chart_name: ingress-kube-system release: ingress-kube-system namespace: kube-system - timeout: 300 + wait: + timeout: 300 + labels: + release_group: airship-ingress-kube-system install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ingress-kube-system values: labels: server: @@ -65,6 +73,5 @@ data: chart_name: ingress-kube-system-htk release: ingress-kube-system-htk namespace: ingress-kube-system-htk - timeout: 100 values: {} dependencies: [] diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/proxy/kubernetes-proxy.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/proxy/kubernetes-proxy.yaml index da24c095..523e55ad 100644 --- a/deployment_files/global/v1.0demo/software/charts/kubernetes/proxy/kubernetes-proxy.yaml +++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/proxy/kubernetes-proxy.yaml @@ -30,16 +30,14 @@ data: wait: timeout: 600 labels: - application: kubernetes - component: proxy + release_group: airship-kubernetes-proxy upgrade: no_hooks: false pre: delete: - type: job labels: - application: kubernetes - component: proxy + release_group: airship-kubernetes-proxy values: network: kubernetes_netloc: 127.0.0.1:6553 @@ -65,8 +63,6 @@ data: chart_name: kubernetes-proxy-htk release: kubernetes-proxy-htk namespace: kubernetes-proxy-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/armada/armada.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/armada/armada.yaml index 944a6d27..8cf14cb9 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/armada/armada.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/armada/armada.yaml @@ -69,11 +69,19 @@ data: chart_name: armada release: ucp-armada namespace: ucp - timeout: 100 + wait: + timeout: 100 + labels: + release_group: airship-ucp-armada install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-armada values: replicas: api: 1 @@ -106,7 +114,6 @@ data: chart_name: armada-htk release: armada-htk namespace: armada-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/armada/tiller.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/armada/tiller.yaml index 0a9ed04e..df5e83d9 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/armada/tiller.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/armada/tiller.yaml @@ -28,11 +28,19 @@ data: chart_name: tiller release: ucp-tiller namespace: kube-system - timeout: 100 + wait: + timeout: 100 + labels: + release_group: airship-ucp-tiller install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-tiller values: {} dependencies: - tiller-htk @@ -57,7 +65,6 @@ data: chart_name: tiller-htk release: tiller-htk namespace: tiller-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/ingress.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/ingress.yaml index 776679c8..fc110ea3 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/core/ingress.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/core/ingress.yaml @@ -19,13 +19,19 @@ data: chart_name: ingress release: ingress namespace: ucp - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-ingress install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ingress values: labels: server: @@ -64,6 +70,5 @@ data: chart_name: ucp-ingress-htk release: ucp-ingress-htk namespace: ucp-ingress-htk - timeout: 100 values: {} dependencies: [] diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml index a91b1997..ff6bb457 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml @@ -51,10 +51,19 @@ data: chart_name: ucp-mariadb release: ucp-mariadb namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-mariadb install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-mariadb values: labels: server: @@ -89,7 +98,6 @@ data: chart_name: mariadb-htk release: mariadb-htk namespace: mariadb-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/postgresql.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/postgresql.yaml index bd4c0461..15d9052a 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/core/postgresql.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/core/postgresql.yaml @@ -53,8 +53,7 @@ data: wait: timeout: 600 labels: - application: postgresql - component: server + release_group: airship-ucp-postgresql install: no_hooks: false upgrade: @@ -63,7 +62,7 @@ data: delete: - type: job labels: - application: postgresq + release_group: airship-ucp-postgresql create: [] post: create: [] @@ -97,8 +96,6 @@ data: chart_name: postgres-htk release: postgres-htk namespace: postgres-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/rabbitmq.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/rabbitmq.yaml index a6e7e891..cf2db222 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/core/rabbitmq.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/core/rabbitmq.yaml @@ -58,10 +58,19 @@ data: chart_name: ucp-rabbitmq release: ucp-rabbitmq namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-rabbitmq install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-rabbitmq values: pod: replicas: @@ -96,7 +105,6 @@ data: chart_name: ucp-rabbitmq-htk release: ucp-rabbitmq-htk namespace: ucp-rabbitmq-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/barbican.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/barbican.yaml index 9a48bbff..7d71df27 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/barbican.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/barbican.yaml @@ -130,12 +130,19 @@ data: chart_name: ucp-barbican release: ucp-barbican namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-barbican install: no_hooks: false upgrade: no_hooks: false pre: - delete: [] + delete: + - type: job + labels: + release_group: airship-ucp-barbican create: [] post: create: [] @@ -176,7 +183,6 @@ data: chart_name: ucp-barbican-htk release: ucp-barbican-htk namespace: ucp-barbican-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/deckhand.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/deckhand.yaml index b9163622..7be5fb76 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/deckhand.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/deckhand/deckhand.yaml @@ -121,8 +121,7 @@ data: wait: timeout: 600 labels: - application: deckhand - component: api + release_group: airship-ucp-deckhand install: no_hooks: false upgrade: @@ -131,28 +130,7 @@ data: delete: - type: job labels: - application: deckhand - component: api - - type: job - labels: - application: deckhand - component: ks-service - - type: job - labels: - application: deckhand - component: ks-endpoints - - type: job - labels: - application: deckhand - component: ks-user - - type: job - labels: - application: deckhand - component: db-init - - type: job - labels: - application: deckhand - component: db-sync + release_group: airship-ucp-deckhand create: [] post: create: [] @@ -191,8 +169,6 @@ data: chart_name: deckhand-htk release: deckhand-htk namespace: deckhand-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/divingbell/divingbell.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/divingbell/divingbell.yaml index 903ca404..c7a3117e 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/divingbell/divingbell.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/divingbell/divingbell.yaml @@ -22,7 +22,7 @@ data: wait: timeout: 300 labels: - application: divingbell + release_group: airship-divingbell install: no_hooks: false upgrade: @@ -31,7 +31,7 @@ data: delete: - type: job labels: - application: divingbell + release_group: airship-divingbell values: conf: sysctl: @@ -89,7 +89,5 @@ data: chart_name: ucp-divingbell-htk release: ucp-divingbell-htk namespace: ucp-divingbell-htk - wait: - timeout: 100 values: {} dependencies: [] diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml index 8a65c547..5c64bc17 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml @@ -138,8 +138,7 @@ data: wait: timeout: 600 labels: - application: drydock - component: api + release_group: airship-drydock install: no_hooks: false upgrade: @@ -148,28 +147,7 @@ data: delete: - type: job labels: - application: drydock - component: api - - type: job - labels: - application: drydock - component: db-sync - - type: job - labels: - application: drydock - component: db-init - - type: job - labels: - application: drydock - component: ks-endpoints - - type: job - labels: - application: drydock - component: ks-service - - type: job - labels: - application: drydock - component: ks-user + release_group: airship-drydock values: replicas: drydock: 1 @@ -212,8 +190,6 @@ data: chart_name: drydock-htk release: drydock-htk namespace: drydock-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml index cfa1c742..5def2b7c 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml @@ -159,8 +159,7 @@ data: wait: timeout: 600 labels: - application: maas - component: region + release_group: airship-maas install: no_hooks: false upgrade: @@ -169,32 +168,7 @@ data: delete: - type: job labels: - application: maas - component: region - - type: job - labels: - application: maas - component: db-sync - - type: job - labels: - application: maas - component: db-init - - type: job - labels: - application: maas - component: bootstrap-admin-user - - type: job - labels: - application: maas - component: rack - - type: job - labels: - application: maas - component: export-api-key - - type: job - labels: - application: maas - component: import-resources + release_group: airship-maas values: labels: rack: @@ -247,8 +221,6 @@ data: chart_name: maas-htk release: maas-htk namespace: maas-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/keystone/keystone.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/keystone/keystone.yaml index b85b3430..79eb5c1b 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/keystone/keystone.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/keystone/keystone.yaml @@ -110,6 +110,10 @@ data: chart_name: ucp-keystone release: ucp-keystone namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-keystone install: no_hooks: false upgrade: @@ -118,10 +122,7 @@ data: delete: - type: job labels: - job-name: keystone-db-sync - - type: job - labels: - job-name: keystone-db-init + release_group: airship-ucp-keystone post: create: [] values: @@ -158,7 +159,6 @@ data: chart_name: ucp-keystone-htk release: ucp-keystone-htk namespace: ucp-keystone-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/keystone/memcached.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/keystone/memcached.yaml index f1bfbc31..f5b4f415 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/keystone/memcached.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/keystone/memcached.yaml @@ -34,10 +34,19 @@ data: chart_name: ucp-keystone-memcached release: ucp-keystone-memcached namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-keystone-memcached install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-keystone-memcached values: labels: server: @@ -66,7 +75,6 @@ data: chart_name: ucp-memcached-htk release: ucp-memcached-htk namespace: ucp-memcached-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/promenade/promenade.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/promenade/promenade.yaml index 0729f740..b441353c 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/promenade/promenade.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/promenade/promenade.yaml @@ -78,8 +78,7 @@ data: wait: timeout: 600 labels: - application: promenade - component: api + release_group: airship-ucp-promenade install: no_hooks: false upgrade: @@ -88,8 +87,7 @@ data: delete: - type: job labels: - application: promenade - component: api + release_group: airship-ucp-promenade values: conf: paste: @@ -123,8 +121,6 @@ data: chart_name: promenade-htk release: promenade-htk namespace: promenade-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml index 0e611d88..b245a848 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml @@ -204,8 +204,7 @@ data: wait: timeout: 600 labels: - application: shipyard - component: api + release_group: airship-ucp-shipyard install: no_hooks: false upgrade: @@ -214,52 +213,7 @@ data: delete: - type: job labels: - application: airflow - component: worker - - type: job - labels: - application: airflow - component: flower - - type: job - labels: - application: airflow - component: web - - type: job - labels: - application: airflow - component: db-sync - - type: job - labels: - application: airflow - component: db-init - - type: job - labels: - application: airflow - component: scheduler - - type: job - labels: - application: shipyard - component: api - - type: job - labels: - application: shipyard - component: db-init - - type: job - labels: - application: shipyard - component: db-sync - - type: job - labels: - application: shipyard - component: ks-endpoint - - type: job - labels: - application: shipyard - component: ks-service - - type: job - labels: - application: shipyard - component: ks-user + release_group: airship-ucp-shipyard values: endpoints: postgresql_airflow_db: @@ -330,8 +284,6 @@ data: chart_name: shipyard-htk release: shipyard-htk namespace: shipyard-htk - wait: - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/storage_provisioner/nfs-prov.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/storage_provisioner/nfs-prov.yaml index 78eac5f8..691f6d54 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/storage_provisioner/nfs-prov.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/storage_provisioner/nfs-prov.yaml @@ -29,13 +29,19 @@ data: namespace: kube-system protected: continue_processing: false - timeout: 900 wait: timeout: 900 + labels: + release_group: airship-nfs-provisioner install: no_hooks: false upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-nfs-provisioner values: labels: nfs: diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/calico.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/calico.yaml index 96e412c6..8d5a8e83 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/calico.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/calico.yaml @@ -85,11 +85,17 @@ data: namespace: kube-system protected: continue_processing: false - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-kubernetes-calico upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-kubernetes-calico values: conf: cni_network_config: diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/etcd.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/etcd.yaml index f45a2995..8076106a 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/etcd.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/container-networking/etcd.yaml @@ -81,11 +81,17 @@ data: namespace: kube-system protected: continue_processing: false - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-kubernetes-calico-etcd upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-kubernetes-calico-etcd values: labels: anchor: @@ -131,7 +137,6 @@ data: chart_name: kubernetes-calico-etcd-htk release: kubernetes-calico-etcd-htk namespace: kubernetes-calico-etcd-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml index 84187a32..adfce255 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml @@ -103,11 +103,17 @@ data: namespace: kube-system protected: continue_processing: false - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-kubernetes-apiserver upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-kubernetes-apiserver values: apiserver: etcd: @@ -134,7 +140,6 @@ data: chart_name: kubernetes-apiserver-htk release: kubernetes-apiserver-htk namespace: kubernetes-apiserver-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/core/controller-manager.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/core/controller-manager.yaml index 3a1c9654..fcbca52b 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/core/controller-manager.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/core/controller-manager.yaml @@ -78,11 +78,17 @@ data: namespace: kube-system protected: continue_processing: false - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-kubernetes-controller-manager upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-kubernetes-controller-manager values: network: kubernetes_netloc: 127.0.0.1:6553 @@ -108,7 +114,6 @@ data: chart_name: kubernetes-controller-manager-htk release: kubernetes-controller-manager-htk namespace: kubernetes-controller-manager-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/core/scheduler.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/core/scheduler.yaml index ac5a03da..49c3e745 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/core/scheduler.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/core/scheduler.yaml @@ -55,11 +55,17 @@ data: namespace: kube-system protected: continue_processing: false - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-kubernetes-scheduler upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-kubernetes-scheduler values: network: kubernetes_netloc: 127.0.0.1:6553 @@ -85,7 +91,6 @@ data: chart_name: kubernetes-scheduler-htk release: kubernetes-scheduler-htk namespace: kubernetes-scheduler-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/dns/coredns.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/dns/coredns.yaml index 96d56003..3d2a37ca 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/dns/coredns.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/dns/coredns.yaml @@ -67,11 +67,17 @@ data: chart_name: coredns release: coredns namespace: kube-system - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-coredns upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-coredns values: conf: coredns: @@ -114,7 +120,6 @@ data: chart_name: coredns-htk release: coredns-htk namespace: coredns-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/etcd/etcd.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/etcd/etcd.yaml index 785a5396..d48ee8d3 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/etcd/etcd.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/etcd/etcd.yaml @@ -73,11 +73,17 @@ data: namespace: kube-system protected: continue_processing: false - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-kubernetes-etcd upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-kubernetes-etcd values: anchor: etcdctl_endpoint: kubernetes-etcd.kube-system.svc.cluster.local @@ -121,7 +127,6 @@ data: chart_name: kubernetes-etcd-htk release: kubernetes-etcd-htk namespace: kubernetes-etcd-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/haproxy/haproxy.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/haproxy/haproxy.yaml index a438f62c..0d5427fc 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/haproxy/haproxy.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/haproxy/haproxy.yaml @@ -30,11 +30,17 @@ data: namespace: kube-system protected: continue_processing: false - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-haproxy upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-haproxy values: conf: anchor: @@ -86,7 +92,6 @@ data: chart_name: haproxy-htk release: haproxy-htk namespace: haproxy-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/ingress/ingress.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/ingress/ingress.yaml index b2904031..ed0a893c 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/ingress/ingress.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/ingress/ingress.yaml @@ -19,11 +19,19 @@ data: chart_name: ingress-kube-system release: ingress-kube-system namespace: kube-system - timeout: 300 + wait: + timeout: 300 + labels: + release_group: airship-ingress-kube-system install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ingress-kube-system values: labels: server: @@ -65,6 +73,5 @@ data: chart_name: ingress-kube-system-htk release: ingress-kube-system-htk namespace: ingress-kube-system-htk - timeout: 100 values: {} dependencies: [] diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/proxy/kubernetes-proxy.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/proxy/kubernetes-proxy.yaml index ffd09686..523e55ad 100644 --- a/deployment_files/global/v1.0dev/software/charts/kubernetes/proxy/kubernetes-proxy.yaml +++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/proxy/kubernetes-proxy.yaml @@ -27,11 +27,17 @@ data: chart_name: proxy release: kubernetes-proxy namespace: kube-system - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-kubernetes-proxy upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-kubernetes-proxy values: network: kubernetes_netloc: 127.0.0.1:6553 @@ -57,7 +63,6 @@ data: chart_name: kubernetes-proxy-htk release: kubernetes-proxy-htk namespace: kubernetes-proxy-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml index 944a6d27..8cf14cb9 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml @@ -69,11 +69,19 @@ data: chart_name: armada release: ucp-armada namespace: ucp - timeout: 100 + wait: + timeout: 100 + labels: + release_group: airship-ucp-armada install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-armada values: replicas: api: 1 @@ -106,7 +114,6 @@ data: chart_name: armada-htk release: armada-htk namespace: armada-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/armada/tiller.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/armada/tiller.yaml index 0a9ed04e..df5e83d9 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/armada/tiller.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/armada/tiller.yaml @@ -28,11 +28,19 @@ data: chart_name: tiller release: ucp-tiller namespace: kube-system - timeout: 100 + wait: + timeout: 100 + labels: + release_group: airship-ucp-tiller install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-tiller values: {} dependencies: - tiller-htk @@ -57,7 +65,6 @@ data: chart_name: tiller-htk release: tiller-htk namespace: tiller-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/core/ingress.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/core/ingress.yaml index 776679c8..fc110ea3 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/core/ingress.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/core/ingress.yaml @@ -19,13 +19,19 @@ data: chart_name: ingress release: ingress namespace: ucp - timeout: 600 wait: timeout: 600 + labels: + release_group: airship-ingress install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ingress values: labels: server: @@ -64,6 +70,5 @@ data: chart_name: ucp-ingress-htk release: ucp-ingress-htk namespace: ucp-ingress-htk - timeout: 100 values: {} dependencies: [] diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml index a91b1997..ff6bb457 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/core/mariadb.yaml @@ -51,10 +51,19 @@ data: chart_name: ucp-mariadb release: ucp-mariadb namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-mariadb install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-mariadb values: labels: server: @@ -89,7 +98,6 @@ data: chart_name: mariadb-htk release: mariadb-htk namespace: mariadb-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/core/postgresql.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/core/postgresql.yaml index 392d1267..15d9052a 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/core/postgresql.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/core/postgresql.yaml @@ -50,12 +50,19 @@ data: chart_name: ucp-postgresql release: ucp-postgresql namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-postgresql install: no_hooks: false upgrade: no_hooks: false pre: - delete: [] + delete: + - type: job + labels: + release_group: airship-ucp-postgresql create: [] post: create: [] @@ -89,7 +96,6 @@ data: chart_name: postgres-htk release: postgres-htk namespace: postgres-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/core/rabbitmq.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/core/rabbitmq.yaml index a6e7e891..cf2db222 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/core/rabbitmq.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/core/rabbitmq.yaml @@ -58,10 +58,19 @@ data: chart_name: ucp-rabbitmq release: ucp-rabbitmq namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-rabbitmq install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-rabbitmq values: pod: replicas: @@ -96,7 +105,6 @@ data: chart_name: ucp-rabbitmq-htk release: ucp-rabbitmq-htk namespace: ucp-rabbitmq-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/barbican.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/barbican.yaml index 9a48bbff..7d71df27 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/barbican.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/barbican.yaml @@ -130,12 +130,19 @@ data: chart_name: ucp-barbican release: ucp-barbican namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-barbican install: no_hooks: false upgrade: no_hooks: false pre: - delete: [] + delete: + - type: job + labels: + release_group: airship-ucp-barbican create: [] post: create: [] @@ -176,7 +183,6 @@ data: chart_name: ucp-barbican-htk release: ucp-barbican-htk namespace: ucp-barbican-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/deckhand.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/deckhand.yaml index c30609b9..7be5fb76 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/deckhand.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/deckhand/deckhand.yaml @@ -118,15 +118,19 @@ data: chart_name: ucp-deckhand release: ucp-deckhand namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-deckhand install: no_hooks: false upgrade: no_hooks: false pre: delete: - - type: 'job' + - type: job labels: - application: 'deckhand' + release_group: airship-ucp-deckhand create: [] post: create: [] @@ -165,7 +169,6 @@ data: chart_name: deckhand-htk release: deckhand-htk namespace: deckhand-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/divingbell/divingbell.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/divingbell/divingbell.yaml index aca0052a..c7a3117e 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/divingbell/divingbell.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/divingbell/divingbell.yaml @@ -19,11 +19,19 @@ data: chart_name: divingbell release: divingbell namespace: ucp - timeout: 300 + wait: + timeout: 300 + labels: + release_group: airship-divingbell install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-divingbell values: conf: sysctl: @@ -81,6 +89,5 @@ data: chart_name: ucp-divingbell-htk release: ucp-divingbell-htk namespace: ucp-divingbell-htk - timeout: 100 values: {} dependencies: [] diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/drydock/drydock.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/drydock/drydock.yaml index daae83d7..5c64bc17 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/drydock/drydock.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/drydock/drydock.yaml @@ -135,15 +135,19 @@ data: chart_name: drydock release: drydock namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-drydock install: no_hooks: false upgrade: no_hooks: false pre: delete: - - type: 'job' + - type: job labels: - application: 'drydock' + release_group: airship-drydock values: replicas: drydock: 1 @@ -186,7 +190,6 @@ data: chart_name: drydock-htk release: drydock-htk namespace: drydock-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/drydock/maas.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/drydock/maas.yaml index 21e6aea4..5def2b7c 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/drydock/maas.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/drydock/maas.yaml @@ -156,15 +156,19 @@ data: chart_name: maas release: maas namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-maas install: no_hooks: false upgrade: no_hooks: false pre: delete: - - type: 'job' + - type: job labels: - application: 'maas' + release_group: airship-maas values: labels: rack: @@ -217,7 +221,6 @@ data: chart_name: maas-htk release: maas-htk namespace: maas-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/keystone/keystone.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/keystone/keystone.yaml index b85b3430..79eb5c1b 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/keystone/keystone.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/keystone/keystone.yaml @@ -110,6 +110,10 @@ data: chart_name: ucp-keystone release: ucp-keystone namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-keystone install: no_hooks: false upgrade: @@ -118,10 +122,7 @@ data: delete: - type: job labels: - job-name: keystone-db-sync - - type: job - labels: - job-name: keystone-db-init + release_group: airship-ucp-keystone post: create: [] values: @@ -158,7 +159,6 @@ data: chart_name: ucp-keystone-htk release: ucp-keystone-htk namespace: ucp-keystone-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/keystone/memcached.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/keystone/memcached.yaml index f1bfbc31..f5b4f415 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/keystone/memcached.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/keystone/memcached.yaml @@ -34,10 +34,19 @@ data: chart_name: ucp-keystone-memcached release: ucp-keystone-memcached namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-keystone-memcached install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-keystone-memcached values: labels: server: @@ -66,7 +75,6 @@ data: chart_name: ucp-memcached-htk release: ucp-memcached-htk namespace: ucp-memcached-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/promenade/promenade.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/promenade/promenade.yaml index 7b957030..b441353c 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/promenade/promenade.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/promenade/promenade.yaml @@ -75,10 +75,19 @@ data: chart_name: promenade release: ucp-promenade namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-promenade install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-ucp-promenade values: conf: paste: @@ -112,7 +121,6 @@ data: chart_name: promenade-htk release: promenade-htk namespace: promenade-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml index 93c2fbda..b245a848 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml @@ -201,18 +201,19 @@ data: chart_name: shipyard release: ucp-shipyard namespace: ucp + wait: + timeout: 600 + labels: + release_group: airship-ucp-shipyard install: no_hooks: false upgrade: no_hooks: false pre: delete: - - type: 'job' + - type: job labels: - application: 'shipyard' - - type: 'job' - labels: - application: 'airflow' + release_group: airship-ucp-shipyard values: endpoints: postgresql_airflow_db: @@ -283,7 +284,6 @@ data: chart_name: shipyard-htk release: shipyard-htk namespace: shipyard-htk - timeout: 100 values: {} dependencies: [] ... diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/storage_provisioner/nfs-prov.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/storage_provisioner/nfs-prov.yaml index 78eac5f8..691f6d54 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/storage_provisioner/nfs-prov.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/storage_provisioner/nfs-prov.yaml @@ -29,13 +29,19 @@ data: namespace: kube-system protected: continue_processing: false - timeout: 900 wait: timeout: 900 + labels: + release_group: airship-nfs-provisioner install: no_hooks: false upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + release_group: airship-nfs-provisioner values: labels: nfs: