Added Helm Toolkit Labels

- Added labels for application and component for HTK on the Airship
  components.
- Updated timeouts for all components.

Change-Id: Ib242ca935b21fb3a6821c10f32b43cbb16fbebf1

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: []

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
+            release_group: airship-kubernetes-calico-etcd
-            component: 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: []
 ...

deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml

@@ -106,16 +106,14 @@ data:
   wait:
     timeout: 600
     labels:
-      application: kubernetes
+      release_group: airship-kubernetes-apiserver
-      component: kubernetes-apiserver-anchor
   upgrade:
     no_hooks: false
     pre:
       delete:
         - type: job
           labels:
-            application: kubernetes
+            release_group: airship-kubernetes-apiserver
-            component: kubernetes-apiserver-anchor
   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: []
 ...

deployment_files/global/v1.0demo/software/charts/kubernetes/core/controller-manager.yaml

@@ -81,16 +81,14 @@ data:
   wait:
     timeout: 600
     labels:
-      application: kubernetes
+      release_group: airship-kubernetes-controller-manager
-      component: kubernetes-controller-manager-anchor
   upgrade:
     no_hooks: false
     pre:
       delete:
         - type: job
           labels:
-            application: kubernetes
+            release_group: airship-kubernetes-controller-manager
-            component: kubernetes-controller-manager-anchor
   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: []
 ...

deployment_files/global/v1.0demo/software/charts/kubernetes/core/scheduler.yaml

@@ -58,16 +58,14 @@ data:
   wait:
     timeout: 600
     labels:
-      application: kubernetes
+      release_group: airship-kubernetes-scheduler
-      component: kubernetes-scheduler-anchor
   upgrade:
     no_hooks: false
     pre:
       delete:
         - type: job
           labels:
-            application: kubernetes
+            release_group: airship-kubernetes-scheduler
-            component: kubernetes-scheduler-anchor
   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: []
 ...

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
+            release_group: airship-coredns
-            component: coredns
   values:
     conf:
       coredns:
@@ -119,8 +120,6 @@ data:
   chart_name: coredns-htk
   release: coredns-htk
   namespace: coredns-htk
-  wait:
-    timeout: 100
   values: {}
   dependencies: []
 ...

deployment_files/global/v1.0demo/software/charts/kubernetes/etcd/etcd.yaml

@@ -76,21 +76,14 @@ data:
   wait:
     timeout: 600
     labels:
-      application: kubernetes
+      release_group: airship-kubernetes-etcd
-      component: etcd
   upgrade:
     no_hooks: false
     pre:
       delete:
         - type: job
           labels:
-            application: kubernetes
+            release_group: airship-kubernetes-etcd
-            component: etcd-anchor
-      delete:
-        - type: job
-          labels:
-            application: kubernetes
-            component: 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: []
 ...

deployment_files/global/v1.0demo/software/charts/kubernetes/haproxy/haproxy.yaml

@@ -33,16 +33,14 @@ data:
   wait:
     timeout: 600
     labels:
-      application: kubernetes
+      release_group: airship-haproxy
-      component: haproxy-anchor
   upgrade:
     no_hooks: false
     pre:
       delete:
         - type: job
           labels:
-            application: kubernetes
+            release_group: airship-haproxy
-            component: haproxy-anchor
   values:
     conf:
       anchor:
@@ -94,8 +92,6 @@ data:
   chart_name: haproxy-htk
   release: haproxy-htk
   namespace: haproxy-htk
-  wait:
-    timeout: 100
   values: {}
   dependencies: []
 ...

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: []

deployment_files/global/v1.0demo/software/charts/kubernetes/proxy/kubernetes-proxy.yaml

@@ -30,16 +30,14 @@ data:
   wait:
     timeout: 600
     labels:
-      application: kubernetes
+      release_group: airship-kubernetes-proxy
-      component: proxy
   upgrade:
     no_hooks: false
     pre:
       delete:
         - type: job
           labels:
-            application: kubernetes
+            release_group: airship-kubernetes-proxy
-            component: 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: []
 ...

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: []
 ...

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: []
 ...

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: []

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: []
 ...

deployment_files/global/v1.0demo/software/charts/ucp/core/postgresql.yaml

@@ -53,8 +53,7 @@ data:
   wait:
     timeout: 600
     labels:
-      application: postgresql
+      release_group: airship-ucp-postgresql
-      component: server
   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: []
 ...

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: []
 ...

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: []
 ...

deployment_files/global/v1.0demo/software/charts/ucp/deckhand/deckhand.yaml

@@ -121,8 +121,7 @@ data:
   wait:
     timeout: 600
     labels:
-      application: deckhand
+      release_group: airship-ucp-deckhand
-      component: api
   install:
     no_hooks: false
   upgrade:
@@ -131,28 +130,7 @@ data:
       delete:
         - type: job
           labels:
-            application: deckhand
+            release_group: airship-ucp-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
       create: []
     post:
       create: []
@@ -191,8 +169,6 @@ data:
   chart_name: deckhand-htk
   release: deckhand-htk
   namespace: deckhand-htk
-  wait:
-    timeout: 100
   values: {}
   dependencies: []
 ...

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: []

deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml

@@ -138,8 +138,7 @@ data:
   wait:
     timeout: 600
     labels:
-      application: drydock
+      release_group: airship-drydock
-      component: api
   install:
     no_hooks: false
   upgrade:
@@ -148,28 +147,7 @@ data:
       delete:
         - type: job
           labels:
-            application: drydock
+            release_group: airship-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
   values:
     replicas:
       drydock: 1
@@ -212,8 +190,6 @@ data:
   chart_name: drydock-htk
   release: drydock-htk
   namespace: drydock-htk
-  wait:
-    timeout: 100
   values: {}
   dependencies: []
 ...

deployment_files/global/v1.0demo/software/charts/ucp/drydock/maas.yaml

@@ -159,8 +159,7 @@ data:
   wait:
     timeout: 600
     labels:
-      application: maas
+      release_group: airship-maas
-      component: region
   install:
     no_hooks: false
   upgrade:
@@ -169,32 +168,7 @@ data:
       delete:
         - type: job
           labels:
-            application: maas
+            release_group: airship-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
   values:
     labels:
       rack:
@@ -247,8 +221,6 @@ data:
   chart_name: maas-htk
   release: maas-htk
   namespace: maas-htk
-  wait:
-    timeout: 100
   values: {}
   dependencies: []
 ...

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
+            release_group: airship-ucp-keystone
-        - type: job
-          labels:
-            job-name: keystone-db-init
     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: []
 ...

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: []
 ...

deployment_files/global/v1.0demo/software/charts/ucp/promenade/promenade.yaml

@@ -78,8 +78,7 @@ data:
   wait:
     timeout: 600
     labels:
-      application: promenade
+      release_group: airship-ucp-promenade
-      component: api
   install:
     no_hooks: false
   upgrade:
@@ -88,8 +87,7 @@ data:
       delete:
         - type: job
           labels:
-            application: promenade
+            release_group: airship-ucp-promenade
-            component: api
   values:
     conf:
       paste:
@@ -123,8 +121,6 @@ data:
   chart_name: promenade-htk
   release: promenade-htk
   namespace: promenade-htk
-  wait:
-    timeout: 100
   values: {}
   dependencies: []
 ...

deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml

@@ -204,8 +204,7 @@ data:
   wait:
     timeout: 600
     labels:
-      application: shipyard
+      release_group: airship-ucp-shipyard
-      component: api
   install:
     no_hooks: false
   upgrade:
@@ -214,52 +213,7 @@ data:
       delete:
         - type: job
           labels:
-            application: airflow
+            release_group: airship-ucp-shipyard
-            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
   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: []
 ...

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:

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:

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: []
 ...

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: []
 ...

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: []
 ...

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: []
 ...

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: []
 ...

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: []
 ...

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: []
 ...

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: []

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: []
 ...

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: []
 ...

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: []
 ...

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: []

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: []
 ...

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: []
 ...

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: []
 ...

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: []
 ...

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: []
 ...

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: []

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: []
 ...

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: []
 ...

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
+            release_group: airship-ucp-keystone
-        - type: job
-          labels:
-            job-name: keystone-db-init
     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: []
 ...

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: []
 ...

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: []
 ...

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'
+            release_group: airship-ucp-shipyard
-        - type: 'job'
-          labels:
-            application: 'airflow'
   values:
     endpoints:
       postgresql_airflow_db:
@@ -283,7 +284,6 @@ data:
   chart_name: shipyard-htk
   release: shipyard-htk
   namespace: shipyard-htk
-  timeout: 100
   values: {}
   dependencies: []
 ...

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: