From 39a89046638dc9307d585bfed38a283334117f9c Mon Sep 17 00:00:00 2001 From: Aaron Sheffield Date: Thu, 24 May 2018 11:44:05 -0500 Subject: [PATCH] Airship chart label updates - Add delete hooks via labels for Airship components. - Add waits via labels for Airship components. Change-Id: I6b63dcd6953adc069c25219de98f744c67214cde --- .../kubernetes/container-networking/etcd.yaml | 12 +++- .../charts/kubernetes/core/apiserver.yaml | 15 ++++- .../kubernetes/core/controller-manager.yaml | 15 ++++- .../charts/kubernetes/core/scheduler.yaml | 15 ++++- .../charts/kubernetes/dns/coredns.yaml | 12 +++- .../software/charts/kubernetes/etcd/etcd.yaml | 20 ++++++- .../charts/kubernetes/haproxy/haproxy.yaml | 15 ++++- .../kubernetes/proxy/kubernetes-proxy.yaml | 15 ++++- .../software/charts/ucp/core/postgresql.yaml | 13 ++++- .../charts/ucp/deckhand/deckhand.yaml | 33 ++++++++++- .../charts/ucp/divingbell/divingbell.yaml | 13 ++++- .../software/charts/ucp/drydock/drydock.yaml | 33 ++++++++++- .../software/charts/ucp/drydock/maas.yaml | 37 +++++++++++- .../charts/ucp/promenade/promenade.yaml | 14 ++++- .../charts/ucp/shipyard/shipyard.yaml | 58 +++++++++++++++++-- 15 files changed, 277 insertions(+), 43 deletions(-) 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 3c855a15..c7c0dfc1 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 @@ -79,11 +79,16 @@ data: chart_name: etcd release: kubernetes-calico-etcd namespace: kube-system - timeout: 600 wait: timeout: 600 upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + application: kubernetes + component: calico-etcd values: labels: anchor: @@ -129,7 +134,8 @@ data: chart_name: kubernetes-calico-etcd-htk release: kubernetes-calico-etcd-htk namespace: kubernetes-calico-etcd-htk - timeout: 100 + 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 24e44411..a1fd10f9 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 @@ -101,11 +101,19 @@ data: chart_name: apiserver release: kubernetes-apiserver namespace: kube-system - timeout: 600 wait: timeout: 600 + labels: + application: kubernetes + component: kubernetes-apiserver-anchor upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + application: kubernetes + component: kubernetes-apiserver-anchor values: apiserver: etcd: @@ -132,7 +140,8 @@ data: chart_name: kubernetes-apiserver-htk release: kubernetes-apiserver-htk namespace: kubernetes-apiserver-htk - timeout: 100 + 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 e118a92e..f732b302 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 @@ -76,11 +76,19 @@ data: chart_name: controller-manager release: kubernetes-controller-manager namespace: kube-system - timeout: 600 wait: timeout: 600 + labels: + application: kubernetes + component: kubernetes-controller-manager-anchor upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + application: kubernetes + component: kubernetes-controller-manager-anchor values: network: kubernetes_netloc: 127.0.0.1:6553 @@ -106,7 +114,8 @@ data: chart_name: kubernetes-controller-manager-htk release: kubernetes-controller-manager-htk namespace: kubernetes-controller-manager-htk - timeout: 100 + 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 38be5788..fcce6df7 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 @@ -53,11 +53,19 @@ data: chart_name: scheduler release: kubernetes-scheduler namespace: kube-system - timeout: 600 wait: timeout: 600 + labels: + application: kubernetes + component: kubernetes-scheduler-anchor upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + application: kubernetes + component: kubernetes-scheduler-anchor values: network: kubernetes_netloc: 127.0.0.1:6553 @@ -83,7 +91,8 @@ data: chart_name: kubernetes-scheduler-htk release: kubernetes-scheduler-htk namespace: kubernetes-scheduler-htk - timeout: 100 + 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 96d56003..7a94bb1d 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 @@ -67,11 +67,16 @@ data: chart_name: coredns release: coredns namespace: kube-system - timeout: 600 wait: timeout: 600 upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + application: kubernetes + component: coredns values: conf: coredns: @@ -114,7 +119,8 @@ data: chart_name: coredns-htk release: coredns-htk namespace: coredns-htk - timeout: 100 + 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 4ce966a1..16670b60 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 @@ -71,11 +71,24 @@ data: chart_name: etcd release: kubernetes-etcd namespace: kube-system - timeout: 600 wait: timeout: 600 + labels: + application: kubernetes + component: etcd upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + application: kubernetes + component: etcd-anchor + delete: + - type: job + labels: + application: kubernetes + component: etcd values: anchor: etcdctl_endpoint: kubernetes-etcd.kube-system.svc.cluster.local @@ -119,7 +132,8 @@ data: chart_name: kubernetes-etcd-htk release: kubernetes-etcd-htk namespace: kubernetes-etcd-htk - timeout: 100 + 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 142d91d6..58906a05 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 @@ -28,11 +28,19 @@ data: chart_name: haproxy release: haproxy namespace: kube-system - timeout: 600 wait: timeout: 600 + labels: + application: kubernetes + component: haproxy-anchor upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + application: kubernetes + component: haproxy-anchor values: conf: anchor: @@ -84,7 +92,8 @@ data: chart_name: haproxy-htk release: haproxy-htk namespace: haproxy-htk - timeout: 100 + wait: + 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 ffd09686..da24c095 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 @@ -27,11 +27,19 @@ data: chart_name: proxy release: kubernetes-proxy namespace: kube-system - timeout: 600 wait: timeout: 600 + labels: + application: kubernetes + component: proxy upgrade: - no_hooks: true + no_hooks: false + pre: + delete: + - type: job + labels: + application: kubernetes + component: proxy values: network: kubernetes_netloc: 127.0.0.1:6553 @@ -57,7 +65,8 @@ data: chart_name: kubernetes-proxy-htk release: kubernetes-proxy-htk namespace: kubernetes-proxy-htk - timeout: 100 + wait: + 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 392d1267..bd4c0461 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 @@ -50,12 +50,20 @@ data: chart_name: ucp-postgresql release: ucp-postgresql namespace: ucp + wait: + timeout: 600 + labels: + application: postgresql + component: server install: no_hooks: false upgrade: no_hooks: false pre: - delete: [] + delete: + - type: job + labels: + application: postgresq create: [] post: create: [] @@ -89,7 +97,8 @@ data: chart_name: postgres-htk release: postgres-htk namespace: postgres-htk - timeout: 100 + wait: + 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 c30609b9..b9163622 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 @@ -118,15 +118,41 @@ data: chart_name: ucp-deckhand release: ucp-deckhand namespace: ucp + wait: + timeout: 600 + labels: + application: deckhand + component: api install: no_hooks: false upgrade: no_hooks: false pre: delete: - - type: 'job' + - type: job labels: - application: 'deckhand' + 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 create: [] post: create: [] @@ -165,7 +191,8 @@ data: chart_name: deckhand-htk release: deckhand-htk namespace: deckhand-htk - timeout: 100 + 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 aca0052a..903ca404 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 @@ -19,11 +19,19 @@ data: chart_name: divingbell release: divingbell namespace: ucp - timeout: 300 + wait: + timeout: 300 + labels: + application: divingbell install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + application: divingbell values: conf: sysctl: @@ -81,6 +89,7 @@ data: chart_name: ucp-divingbell-htk release: ucp-divingbell-htk namespace: ucp-divingbell-htk - timeout: 100 + 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 daae83d7..8a65c547 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 @@ -135,15 +135,41 @@ data: chart_name: drydock release: drydock namespace: ucp + wait: + timeout: 600 + labels: + application: drydock + component: api install: no_hooks: false upgrade: no_hooks: false pre: delete: - - type: 'job' + - type: job labels: - application: 'drydock' + 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 values: replicas: drydock: 1 @@ -186,7 +212,8 @@ data: chart_name: drydock-htk release: drydock-htk namespace: drydock-htk - timeout: 100 + 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 21e6aea4..cfa1c742 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 @@ -156,15 +156,45 @@ data: chart_name: maas release: maas namespace: ucp + wait: + timeout: 600 + labels: + application: maas + component: region install: no_hooks: false upgrade: no_hooks: false pre: delete: - - type: 'job' + - type: job labels: - application: 'maas' + 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 values: labels: rack: @@ -217,7 +247,8 @@ data: chart_name: maas-htk release: maas-htk namespace: maas-htk - timeout: 100 + wait: + 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 7b957030..0729f740 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 @@ -75,10 +75,21 @@ data: chart_name: promenade release: ucp-promenade namespace: ucp + wait: + timeout: 600 + labels: + application: promenade + component: api install: no_hooks: false upgrade: no_hooks: false + pre: + delete: + - type: job + labels: + application: promenade + component: api values: conf: paste: @@ -112,7 +123,8 @@ data: chart_name: promenade-htk release: promenade-htk namespace: promenade-htk - timeout: 100 + 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 93c2fbda..0e611d88 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 @@ -201,18 +201,65 @@ data: chart_name: shipyard release: ucp-shipyard namespace: ucp + wait: + timeout: 600 + labels: + application: shipyard + component: api install: no_hooks: false upgrade: no_hooks: false pre: delete: - - type: 'job' + - type: job labels: - application: 'shipyard' - - type: 'job' + application: airflow + component: worker + - type: job labels: - application: 'airflow' + 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: @@ -283,7 +330,8 @@ data: chart_name: shipyard-htk release: shipyard-htk namespace: shipyard-htk - timeout: 100 + wait: + timeout: 100 values: {} dependencies: [] ...