From bb3ff98d53c38a2ba70f506a8b6dc36207baa207 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Wed, 12 Sep 2018 08:07:19 -0600 Subject: [PATCH] Add release uuid to pods and rc objects This PS adds the ability to attach a release uuid to pods and rc objects as desired. A follow up ps will add the ability to add arbitary annotations to the same objects. Change-Id: Iceedba457a03387f6fc44eb763a00fd57f9d84a5 Signed-off-by: Pete Birley --- calico/templates/daemonset-calico-etcd.yaml | 2 ++ calico/templates/daemonset-calico-node.yaml | 2 ++ .../deployment-calico-kube-controllers.yaml | 2 ++ calico/templates/job-calico-settings.yaml | 2 ++ ceph-client/templates/deployment-mds.yaml | 2 ++ ceph-client/templates/deployment-mgr.yaml | 2 ++ ceph-client/templates/job-bootstrap.yaml | 2 ++ ceph-client/templates/job-rbd-pool.yaml | 2 ++ ceph-mon/templates/cronjob-checkPGs.yaml | 2 ++ ceph-mon/templates/daemonset-mon.yaml | 2 ++ ceph-mon/templates/deployment-moncheck.yaml | 2 ++ ceph-mon/templates/job-bootstrap.yaml | 2 ++ ceph-mon/templates/job-keyring.yaml | 2 ++ .../templates/job-storage-admin-keys.yaml | 2 ++ ceph-osd/templates/daemonset-osd.yaml | 2 ++ .../deployment-cephfs-provisioner.yaml | 2 ++ .../templates/deployment-rbd-provisioner.yaml | 2 ++ .../templates/job-bootstrap.yaml | 2 ++ .../templates/job-cephfs-client-key.yaml | 2 ++ ceph-rgw/templates/deployment-rgw.yaml | 2 ++ ceph-rgw/templates/job-s3-admin.yaml | 2 ++ elasticsearch/templates/cron-job-curator.yaml | 2 ++ .../templates/deployment-client.yaml | 2 ++ .../templates/deployment-master.yaml | 2 ++ .../job-register-snapshot-repository.yaml | 2 ++ elasticsearch/templates/pod-helm-tests.yaml | 1 + elasticsearch/templates/statefulset-data.yaml | 2 ++ etcd/templates/deployment.yaml | 2 ++ .../templates/daemonset-kube-flannel-ds.yaml | 2 ++ .../templates/daemonset-fluent-bit.yaml | 2 ++ .../templates/deployment-fluentd.yaml | 2 ++ .../templates/job-elasticsearch-template.yaml | 2 ++ fluent-logging/templates/pod-helm-tests.yaml | 1 + grafana/templates/deployment.yaml | 2 ++ grafana/templates/job-db-init-session.yaml | 2 ++ grafana/templates/job-db-init.yaml | 2 ++ grafana/templates/job-db-session-sync.yaml | 2 ++ grafana/templates/pod-helm-tests.yaml | 1 + .../templates/snippets/_release_uuid.tpl | 31 +++++++++++++++++++ ingress/templates/deployment-error.yaml | 2 ++ ingress/templates/deployment-ingress.yaml | 2 ++ kibana/templates/deployment.yaml | 2 ++ kube-dns/templates/deployment-kube-dns.yaml | 2 ++ .../templates/deployment.yaml | 2 ++ ldap/templates/statefulset.yaml | 2 ++ libvirt/templates/daemonset-libvirt.yaml | 2 ++ mariadb/templates/deployment-error.yaml | 2 ++ mariadb/templates/deployment-ingress.yaml | 2 ++ mariadb/templates/statefulset.yaml | 2 ++ memcached/templates/deployment.yaml | 2 ++ mongodb/templates/statefulset.yaml | 2 ++ nagios/templates/deployment.yaml | 2 ++ nfs-provisioner/templates/deployment.yaml | 2 ++ openvswitch/templates/daemonset-ovs-db.yaml | 2 ++ .../templates/daemonset-ovs-vswitchd.yaml | 2 ++ postgresql/templates/statefulset.yaml | 2 ++ .../templates/statefulset.yaml | 2 ++ .../templates/deployment.yaml | 2 ++ .../templates/daemonset.yaml | 2 ++ .../templates/deployment.yaml | 2 ++ .../templates/daemonset.yaml | 2 ++ prometheus/templates/pod-helm-tests.yaml | 1 + prometheus/templates/statefulset.yaml | 2 ++ rabbitmq/templates/pod-test.yaml | 1 + rabbitmq/templates/statefulset.yaml | 2 ++ redis/templates/deployment.yaml | 2 ++ .../templates/daemonset-registry-proxy.yaml | 2 ++ registry/templates/deployment-registry.yaml | 2 ++ registry/templates/job-bootstrap.yaml | 2 ++ tiller/templates/deployment-tiller.yaml | 2 ++ 70 files changed, 164 insertions(+) create mode 100644 helm-toolkit/templates/snippets/_release_uuid.tpl diff --git a/calico/templates/daemonset-calico-etcd.yaml b/calico/templates/daemonset-calico-etcd.yaml index cdd8f88ab5..d3c0c8a788 100644 --- a/calico/templates/daemonset-calico-etcd.yaml +++ b/calico/templates/daemonset-calico-etcd.yaml @@ -27,6 +27,8 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: calico-etcd + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: k8s-app: calico-etcd {{ tuple $envAll "calico" "etcd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} diff --git a/calico/templates/daemonset-calico-node.yaml b/calico/templates/daemonset-calico-node.yaml index 194e38d2c0..c5c9f48b24 100644 --- a/calico/templates/daemonset-calico-node.yaml +++ b/calico/templates/daemonset-calico-node.yaml @@ -71,6 +71,8 @@ apiVersion: apps/v1 metadata: name: calico-node namespace: kube-system + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: k8s-app: calico-node {{ tuple $envAll "calico" "node" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} diff --git a/calico/templates/deployment-calico-kube-controllers.yaml b/calico/templates/deployment-calico-kube-controllers.yaml index f1bb575df5..9a779f6f97 100644 --- a/calico/templates/deployment-calico-kube-controllers.yaml +++ b/calico/templates/deployment-calico-kube-controllers.yaml @@ -57,6 +57,8 @@ kind: Deployment metadata: name: calico-kube-policy-controllers namespace: {{ .Release.Namespace }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: k8s-app: calico-kube-policy-controllers {{ tuple $envAll "calico" "kube-controller" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} diff --git a/calico/templates/job-calico-settings.yaml b/calico/templates/job-calico-settings.yaml index 49a9378037..44e211e539 100644 --- a/calico/templates/job-calico-settings.yaml +++ b/calico/templates/job-calico-settings.yaml @@ -24,6 +24,8 @@ apiVersion: batch/v1 kind: Job metadata: name: calico-settings + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/ceph-client/templates/deployment-mds.yaml b/ceph-client/templates/deployment-mds.yaml index 2118048e34..63fc0b4ddb 100644 --- a/ceph-client/templates/deployment-mds.yaml +++ b/ceph-client/templates/deployment-mds.yaml @@ -24,6 +24,8 @@ kind: Deployment apiVersion: apps/v1 metadata: name: ceph-mds + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "ceph" "mds" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/ceph-client/templates/deployment-mgr.yaml b/ceph-client/templates/deployment-mgr.yaml index d81f7fda8c..8ad23aeecf 100644 --- a/ceph-client/templates/deployment-mgr.yaml +++ b/ceph-client/templates/deployment-mgr.yaml @@ -24,6 +24,8 @@ kind: Deployment apiVersion: apps/v1 metadata: name: ceph-mgr + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "ceph" "mgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/ceph-client/templates/job-bootstrap.yaml b/ceph-client/templates/job-bootstrap.yaml index 72a935973b..5f249ff8c8 100644 --- a/ceph-client/templates/job-bootstrap.yaml +++ b/ceph-client/templates/job-bootstrap.yaml @@ -24,6 +24,8 @@ apiVersion: batch/v1 kind: Job metadata: name: ceph-client-bootstrap + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/ceph-client/templates/job-rbd-pool.yaml b/ceph-client/templates/job-rbd-pool.yaml index 961321259b..bc19135d94 100644 --- a/ceph-client/templates/job-rbd-pool.yaml +++ b/ceph-client/templates/job-rbd-pool.yaml @@ -24,6 +24,8 @@ apiVersion: batch/v1 kind: Job metadata: name: ceph-rbd-pool + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/ceph-mon/templates/cronjob-checkPGs.yaml b/ceph-mon/templates/cronjob-checkPGs.yaml index 6399fcb2fb..a2645b2838 100644 --- a/ceph-mon/templates/cronjob-checkPGs.yaml +++ b/ceph-mon/templates/cronjob-checkPGs.yaml @@ -24,6 +24,8 @@ apiVersion: batch/v1beta1 kind: CronJob metadata: name: {{ $serviceAccountName }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: schedule: {{ .Values.jobs.pool_checkPGs.cron | quote }} successfulJobsHistoryLimit: {{ .Values.jobs.pool_checkPGs.history.successJob }} diff --git a/ceph-mon/templates/daemonset-mon.yaml b/ceph-mon/templates/daemonset-mon.yaml index 6bc81a5b2a..5977a837c4 100644 --- a/ceph-mon/templates/daemonset-mon.yaml +++ b/ceph-mon/templates/daemonset-mon.yaml @@ -50,6 +50,8 @@ kind: DaemonSet apiVersion: apps/v1 metadata: name: ceph-mon + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "ceph" "mon" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/ceph-mon/templates/deployment-moncheck.yaml b/ceph-mon/templates/deployment-moncheck.yaml index 70f8e109ae..8ad19aa885 100644 --- a/ceph-mon/templates/deployment-moncheck.yaml +++ b/ceph-mon/templates/deployment-moncheck.yaml @@ -24,6 +24,8 @@ kind: Deployment apiVersion: apps/v1 metadata: name: ceph-mon-check + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "ceph" "moncheck" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/ceph-mon/templates/job-bootstrap.yaml b/ceph-mon/templates/job-bootstrap.yaml index 76665038fd..07a1a79929 100644 --- a/ceph-mon/templates/job-bootstrap.yaml +++ b/ceph-mon/templates/job-bootstrap.yaml @@ -24,6 +24,8 @@ apiVersion: batch/v1 kind: Job metadata: name: ceph-bootstrap + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/ceph-mon/templates/job-keyring.yaml b/ceph-mon/templates/job-keyring.yaml index 30fb49e95b..cdc582bf14 100644 --- a/ceph-mon/templates/job-keyring.yaml +++ b/ceph-mon/templates/job-keyring.yaml @@ -53,6 +53,8 @@ apiVersion: batch/v1 kind: Job metadata: name: ceph-{{ $jobName }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/ceph-mon/templates/job-storage-admin-keys.yaml b/ceph-mon/templates/job-storage-admin-keys.yaml index 9f6f1e280b..72e87f00cd 100644 --- a/ceph-mon/templates/job-storage-admin-keys.yaml +++ b/ceph-mon/templates/job-storage-admin-keys.yaml @@ -51,6 +51,8 @@ apiVersion: batch/v1 kind: Job metadata: name: ceph-storage-keys-generator + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/ceph-osd/templates/daemonset-osd.yaml b/ceph-osd/templates/daemonset-osd.yaml index 2d4b6db5da..b722efcad0 100644 --- a/ceph-osd/templates/daemonset-osd.yaml +++ b/ceph-osd/templates/daemonset-osd.yaml @@ -26,6 +26,8 @@ kind: DaemonSet apiVersion: apps/v1 metadata: name: ceph-osd + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "ceph" "osd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml b/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml index 5096de8902..3adb914618 100644 --- a/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml +++ b/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml @@ -131,6 +131,8 @@ kind: Deployment apiVersion: apps/v1 metadata: name: ceph-cephfs-provisioner + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "cephfs" "provisioner" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/ceph-provisioners/templates/deployment-rbd-provisioner.yaml b/ceph-provisioners/templates/deployment-rbd-provisioner.yaml index dd0788b3d8..8bdd2a5d08 100644 --- a/ceph-provisioners/templates/deployment-rbd-provisioner.yaml +++ b/ceph-provisioners/templates/deployment-rbd-provisioner.yaml @@ -121,6 +121,8 @@ kind: Deployment apiVersion: apps/v1 metadata: name: ceph-rbd-provisioner + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "rbd" "provisioner" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/ceph-provisioners/templates/job-bootstrap.yaml b/ceph-provisioners/templates/job-bootstrap.yaml index 30e45ff5ca..0358f9030a 100644 --- a/ceph-provisioners/templates/job-bootstrap.yaml +++ b/ceph-provisioners/templates/job-bootstrap.yaml @@ -24,6 +24,8 @@ apiVersion: batch/v1 kind: Job metadata: name: ceph-client-bootstrap + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/ceph-provisioners/templates/job-cephfs-client-key.yaml b/ceph-provisioners/templates/job-cephfs-client-key.yaml index be5f747796..22a9b6e034 100644 --- a/ceph-provisioners/templates/job-cephfs-client-key.yaml +++ b/ceph-provisioners/templates/job-cephfs-client-key.yaml @@ -82,6 +82,8 @@ apiVersion: batch/v1 kind: Job metadata: name: ceph-cephfs-client-key-generator + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/ceph-rgw/templates/deployment-rgw.yaml b/ceph-rgw/templates/deployment-rgw.yaml index 47fcd19d88..d5f7fc01df 100644 --- a/ceph-rgw/templates/deployment-rgw.yaml +++ b/ceph-rgw/templates/deployment-rgw.yaml @@ -24,6 +24,8 @@ kind: Deployment apiVersion: apps/v1 metadata: name: ceph-rgw + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "ceph" "rgw" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/ceph-rgw/templates/job-s3-admin.yaml b/ceph-rgw/templates/job-s3-admin.yaml index b3cdd35c94..71c246c59e 100644 --- a/ceph-rgw/templates/job-s3-admin.yaml +++ b/ceph-rgw/templates/job-s3-admin.yaml @@ -54,6 +54,8 @@ apiVersion: batch/v1 kind: Job metadata: name: ceph-rgw-s3-admin + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/elasticsearch/templates/cron-job-curator.yaml b/elasticsearch/templates/cron-job-curator.yaml index 343ba78a07..3861d24b9c 100644 --- a/elasticsearch/templates/cron-job-curator.yaml +++ b/elasticsearch/templates/cron-job-curator.yaml @@ -26,6 +26,8 @@ apiVersion: batch/v1beta1 kind: CronJob metadata: name: elastic-curator + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: schedule: {{ .Values.conf.curator.schedule | quote }} jobTemplate: diff --git a/elasticsearch/templates/deployment-client.yaml b/elasticsearch/templates/deployment-client.yaml index ee6beef608..d455ceb3f8 100644 --- a/elasticsearch/templates/deployment-client.yaml +++ b/elasticsearch/templates/deployment-client.yaml @@ -63,6 +63,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: elasticsearch-client + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "elasticsearch" "client" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/elasticsearch/templates/deployment-master.yaml b/elasticsearch/templates/deployment-master.yaml index 1abd509f20..7cd0dd10c0 100644 --- a/elasticsearch/templates/deployment-master.yaml +++ b/elasticsearch/templates/deployment-master.yaml @@ -61,6 +61,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: elasticsearch-master + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "elasticsearch" "master" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/elasticsearch/templates/job-register-snapshot-repository.yaml b/elasticsearch/templates/job-register-snapshot-repository.yaml index c4d1e76369..7e8d806838 100644 --- a/elasticsearch/templates/job-register-snapshot-repository.yaml +++ b/elasticsearch/templates/job-register-snapshot-repository.yaml @@ -27,6 +27,8 @@ apiVersion: batch/v1 kind: Job metadata: name: elasticsearch-register-snapshot-repository + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/elasticsearch/templates/pod-helm-tests.yaml b/elasticsearch/templates/pod-helm-tests.yaml index 86179f1f53..3a6164a729 100644 --- a/elasticsearch/templates/pod-helm-tests.yaml +++ b/elasticsearch/templates/pod-helm-tests.yaml @@ -26,6 +26,7 @@ metadata: {{ tuple $envAll "elasticsearch" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: "helm.sh/hook": test-success + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: restartPolicy: Never containers: diff --git a/elasticsearch/templates/statefulset-data.yaml b/elasticsearch/templates/statefulset-data.yaml index fb038a0bf3..4c3c2a31c6 100644 --- a/elasticsearch/templates/statefulset-data.yaml +++ b/elasticsearch/templates/statefulset-data.yaml @@ -61,6 +61,8 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: elasticsearch-data + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "elasticsearch" "data" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/etcd/templates/deployment.yaml b/etcd/templates/deployment.yaml index 31817a0135..12620731a1 100644 --- a/etcd/templates/deployment.yaml +++ b/etcd/templates/deployment.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ $rcControllerName | quote }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "etcd" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/flannel/templates/daemonset-kube-flannel-ds.yaml b/flannel/templates/daemonset-kube-flannel-ds.yaml index 0c6e274aa6..94ad5f635a 100644 --- a/flannel/templates/daemonset-kube-flannel-ds.yaml +++ b/flannel/templates/daemonset-kube-flannel-ds.yaml @@ -62,6 +62,8 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: kube-flannel-ds + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: tier: node app: flannel diff --git a/fluent-logging/templates/daemonset-fluent-bit.yaml b/fluent-logging/templates/daemonset-fluent-bit.yaml index 4c59d51b05..c82cef8a8e 100644 --- a/fluent-logging/templates/daemonset-fluent-bit.yaml +++ b/fluent-logging/templates/daemonset-fluent-bit.yaml @@ -76,6 +76,8 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: fluentbit + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "fluentbit" "daemon" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/fluent-logging/templates/deployment-fluentd.yaml b/fluent-logging/templates/deployment-fluentd.yaml index bfcc8bdcd1..d622fca971 100644 --- a/fluent-logging/templates/deployment-fluentd.yaml +++ b/fluent-logging/templates/deployment-fluentd.yaml @@ -76,6 +76,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: fluentd + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "fluentd" "internal" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/fluent-logging/templates/job-elasticsearch-template.yaml b/fluent-logging/templates/job-elasticsearch-template.yaml index f24cdd40af..94c4e33363 100644 --- a/fluent-logging/templates/job-elasticsearch-template.yaml +++ b/fluent-logging/templates/job-elasticsearch-template.yaml @@ -27,6 +27,8 @@ apiVersion: batch/v1 kind: Job metadata: name: elasticsearch-template + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/fluent-logging/templates/pod-helm-tests.yaml b/fluent-logging/templates/pod-helm-tests.yaml index a004d99259..0df1495cfe 100644 --- a/fluent-logging/templates/pod-helm-tests.yaml +++ b/fluent-logging/templates/pod-helm-tests.yaml @@ -26,6 +26,7 @@ metadata: {{ tuple $envAll "fluent-logging" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: "helm.sh/hook": test-success + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: restartPolicy: Never containers: diff --git a/grafana/templates/deployment.yaml b/grafana/templates/deployment.yaml index 13f603c02f..a50b743348 100644 --- a/grafana/templates/deployment.yaml +++ b/grafana/templates/deployment.yaml @@ -26,6 +26,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: grafana + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "grafana" "dashboard" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/grafana/templates/job-db-init-session.yaml b/grafana/templates/job-db-init-session.yaml index 8cf250c132..1b159fb099 100644 --- a/grafana/templates/job-db-init-session.yaml +++ b/grafana/templates/job-db-init-session.yaml @@ -24,6 +24,8 @@ apiVersion: batch/v1 kind: Job metadata: name: grafana-db-init-session + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/grafana/templates/job-db-init.yaml b/grafana/templates/job-db-init.yaml index 58f29619b2..4a89572b85 100644 --- a/grafana/templates/job-db-init.yaml +++ b/grafana/templates/job-db-init.yaml @@ -24,6 +24,8 @@ apiVersion: batch/v1 kind: Job metadata: name: grafana-db-init + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/grafana/templates/job-db-session-sync.yaml b/grafana/templates/job-db-session-sync.yaml index 79db0d992b..6db743478a 100644 --- a/grafana/templates/job-db-session-sync.yaml +++ b/grafana/templates/job-db-session-sync.yaml @@ -24,6 +24,8 @@ apiVersion: batch/v1 kind: Job metadata: name: grafana-db-session-sync + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/grafana/templates/pod-helm-tests.yaml b/grafana/templates/pod-helm-tests.yaml index 30971fe40e..a61befe416 100644 --- a/grafana/templates/pod-helm-tests.yaml +++ b/grafana/templates/pod-helm-tests.yaml @@ -26,6 +26,7 @@ metadata: {{ tuple $envAll "grafana" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: "helm.sh/hook": test-success + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: restartPolicy: Never containers: diff --git a/helm-toolkit/templates/snippets/_release_uuid.tpl b/helm-toolkit/templates/snippets/_release_uuid.tpl new file mode 100644 index 0000000000..de408af2cf --- /dev/null +++ b/helm-toolkit/templates/snippets/_release_uuid.tpl @@ -0,0 +1,31 @@ +{{/* +Copyright 2017 The Openstack-Helm Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +{{/* +abstract: | + Reneders an attonation key and value for a release +values: | + release_uuid: null +usage: | + {{ tuple . | include "helm-toolkit.snippets.release_uuid" }} +return: | + "openstackhelm.openstack.org/release_uuid": "" +*/}} + +{{- define "helm-toolkit.snippets.release_uuid" -}} +{{- $envAll := index . 0 -}} +"openstackhelm.openstack.org/release_uuid": {{ $envAll.Values.release_uuid | default "" | quote }} +{{- end -}} diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml index 1cac43cd26..842dbb49c3 100644 --- a/ingress/templates/deployment-error.yaml +++ b/ingress/templates/deployment-error.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: ingress-error-pages + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "ingress" "error-pages" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index 0d96315040..e388b7cd60 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -155,6 +155,8 @@ kind: DaemonSet {{- end }} metadata: name: ingress + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "ingress" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} app: ingress-api diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml index 3ba32d749c..8bba187ce5 100644 --- a/kibana/templates/deployment.yaml +++ b/kibana/templates/deployment.yaml @@ -26,6 +26,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: kibana + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "kibana" "dashboard" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/kube-dns/templates/deployment-kube-dns.yaml b/kube-dns/templates/deployment-kube-dns.yaml index 27ff06b81a..055f247430 100644 --- a/kube-dns/templates/deployment-kube-dns.yaml +++ b/kube-dns/templates/deployment-kube-dns.yaml @@ -20,6 +20,8 @@ limitations under the License. apiVersion: apps/v1 kind: Deployment metadata: + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: k8s-app: kube-dns {{ tuple $envAll "kubernetes" "dns" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} diff --git a/kubernetes-keystone-webhook/templates/deployment.yaml b/kubernetes-keystone-webhook/templates/deployment.yaml index 4f5c56010b..7a6ae2a447 100644 --- a/kubernetes-keystone-webhook/templates/deployment.yaml +++ b/kubernetes-keystone-webhook/templates/deployment.yaml @@ -21,6 +21,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: kubernetes-keystone-webhook + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "kubernetes-keystone-webhook" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/ldap/templates/statefulset.yaml b/ldap/templates/statefulset.yaml index 8e8d0819bf..989c087031 100644 --- a/ldap/templates/statefulset.yaml +++ b/ldap/templates/statefulset.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: ldap + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "ldap" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/libvirt/templates/daemonset-libvirt.yaml b/libvirt/templates/daemonset-libvirt.yaml index 5bfdd5329f..229d574332 100644 --- a/libvirt/templates/daemonset-libvirt.yaml +++ b/libvirt/templates/daemonset-libvirt.yaml @@ -29,6 +29,8 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: libvirt + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "libvirt" "libvirt" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/mariadb/templates/deployment-error.yaml b/mariadb/templates/deployment-error.yaml index 87d4c16160..c310324cb4 100644 --- a/mariadb/templates/deployment-error.yaml +++ b/mariadb/templates/deployment-error.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: mariadb-ingress-error-pages + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "mariadb" "ingress-error-pages" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/mariadb/templates/deployment-ingress.yaml b/mariadb/templates/deployment-ingress.yaml index 4bfc147fe8..053a08f91f 100644 --- a/mariadb/templates/deployment-ingress.yaml +++ b/mariadb/templates/deployment-ingress.yaml @@ -119,6 +119,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: mariadb-ingress + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "mariadb" "ingress" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml index 7165493eb2..f8683c35bd 100644 --- a/mariadb/templates/statefulset.yaml +++ b/mariadb/templates/statefulset.yaml @@ -25,6 +25,8 @@ kind: StatefulSet metadata: # NOTE(portdirect): the statefulset name must match the POD_NAME_PREFIX env var for discovery to work name: {{ tuple "oslo_db" "direct" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "mariadb" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index bab66830f5..f1919b3498 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -26,6 +26,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ $rcControllerName | quote }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "memcached" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/mongodb/templates/statefulset.yaml b/mongodb/templates/statefulset.yaml index a0bb88140d..0fe5d9a208 100644 --- a/mongodb/templates/statefulset.yaml +++ b/mongodb/templates/statefulset.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: mongodb + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "mongodb" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/nagios/templates/deployment.yaml b/nagios/templates/deployment.yaml index d838802e07..09b0302520 100644 --- a/nagios/templates/deployment.yaml +++ b/nagios/templates/deployment.yaml @@ -63,6 +63,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: nagios + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "nagios" "monitoring" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/nfs-provisioner/templates/deployment.yaml b/nfs-provisioner/templates/deployment.yaml index 07f2dcee8c..198d8116e2 100644 --- a/nfs-provisioner/templates/deployment.yaml +++ b/nfs-provisioner/templates/deployment.yaml @@ -95,6 +95,8 @@ kind: Deployment apiVersion: apps/v1 metadata: name: nfs-provisioner + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "nfs" "provisioner" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/openvswitch/templates/daemonset-ovs-db.yaml b/openvswitch/templates/daemonset-ovs-db.yaml index 6275d71a8b..4147702cad 100644 --- a/openvswitch/templates/daemonset-ovs-db.yaml +++ b/openvswitch/templates/daemonset-ovs-db.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: openvswitch-db + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "openvswitch" "openvswitch-vswitchd-db" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/openvswitch/templates/daemonset-ovs-vswitchd.yaml b/openvswitch/templates/daemonset-ovs-vswitchd.yaml index f792ed05ab..ce55003cf7 100644 --- a/openvswitch/templates/daemonset-ovs-vswitchd.yaml +++ b/openvswitch/templates/daemonset-ovs-vswitchd.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: openvswitch-vswitchd + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "openvswitch" "openvswitch-vswitchd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/postgresql/templates/statefulset.yaml b/postgresql/templates/statefulset.yaml index b7a106a4fd..9ac641579f 100644 --- a/postgresql/templates/statefulset.yaml +++ b/postgresql/templates/statefulset.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: postgresql + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "postgresql" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/prometheus-alertmanager/templates/statefulset.yaml b/prometheus-alertmanager/templates/statefulset.yaml index 403f54ce21..3e8a0015b5 100644 --- a/prometheus-alertmanager/templates/statefulset.yaml +++ b/prometheus-alertmanager/templates/statefulset.yaml @@ -27,6 +27,8 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: alertmanager + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "alertmanager" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/prometheus-kube-state-metrics/templates/deployment.yaml b/prometheus-kube-state-metrics/templates/deployment.yaml index 31662a9151..cbaae0c000 100644 --- a/prometheus-kube-state-metrics/templates/deployment.yaml +++ b/prometheus-kube-state-metrics/templates/deployment.yaml @@ -93,6 +93,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: kube-state-metrics + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "kube-state-metrics" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/prometheus-node-exporter/templates/daemonset.yaml b/prometheus-node-exporter/templates/daemonset.yaml index de45f94aa0..90678191f7 100644 --- a/prometheus-node-exporter/templates/daemonset.yaml +++ b/prometheus-node-exporter/templates/daemonset.yaml @@ -37,6 +37,8 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: node-exporter + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} namespace: {{ .Values.endpoints.node_metrics.namespace }} labels: {{ tuple $envAll "node_exporter" "metrics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} diff --git a/prometheus-openstack-exporter/templates/deployment.yaml b/prometheus-openstack-exporter/templates/deployment.yaml index 0f77e8cd5d..3f16c105eb 100644 --- a/prometheus-openstack-exporter/templates/deployment.yaml +++ b/prometheus-openstack-exporter/templates/deployment.yaml @@ -25,6 +25,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: prometheus-openstack-exporter + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "prometheus-openstack-exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/prometheus-process-exporter/templates/daemonset.yaml b/prometheus-process-exporter/templates/daemonset.yaml index 10619e441f..126fd5e608 100644 --- a/prometheus-process-exporter/templates/daemonset.yaml +++ b/prometheus-process-exporter/templates/daemonset.yaml @@ -37,6 +37,8 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: process-exporter + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "process_exporter" "metrics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/prometheus/templates/pod-helm-tests.yaml b/prometheus/templates/pod-helm-tests.yaml index ab2142a139..f19c2a2e58 100644 --- a/prometheus/templates/pod-helm-tests.yaml +++ b/prometheus/templates/pod-helm-tests.yaml @@ -25,6 +25,7 @@ metadata: labels: {{ tuple $envAll "prometheus" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} "helm.sh/hook": test-success spec: restartPolicy: Never diff --git a/prometheus/templates/statefulset.yaml b/prometheus/templates/statefulset.yaml index 83dc5b5b2a..0a3dc1665f 100644 --- a/prometheus/templates/statefulset.yaml +++ b/prometheus/templates/statefulset.yaml @@ -69,6 +69,8 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: prometheus + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "prometheus" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/rabbitmq/templates/pod-test.yaml b/rabbitmq/templates/pod-test.yaml index c46d14c2e0..46d45ab6a4 100644 --- a/rabbitmq/templates/pod-test.yaml +++ b/rabbitmq/templates/pod-test.yaml @@ -27,6 +27,7 @@ metadata: labels: {{ tuple $envAll "rabbitmq" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} "helm.sh/hook": test-success spec: serviceAccountName: {{ $serviceAccountName }} diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml index 95745e3fb5..bbd35cc67f 100644 --- a/rabbitmq/templates/statefulset.yaml +++ b/rabbitmq/templates/statefulset.yaml @@ -60,6 +60,8 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: {{ $rcControllerName | quote }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "rabbitmq" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/redis/templates/deployment.yaml b/redis/templates/deployment.yaml index 32ce9c409d..98cd1b721c 100644 --- a/redis/templates/deployment.yaml +++ b/redis/templates/deployment.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: redis + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "redis" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/registry/templates/daemonset-registry-proxy.yaml b/registry/templates/daemonset-registry-proxy.yaml index 920928af79..1fe262b471 100644 --- a/registry/templates/daemonset-registry-proxy.yaml +++ b/registry/templates/daemonset-registry-proxy.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: docker-registry-proxy + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "docker" "registry-proxy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/registry/templates/deployment-registry.yaml b/registry/templates/deployment-registry.yaml index b517fb7922..1f11d22182 100644 --- a/registry/templates/deployment-registry.yaml +++ b/registry/templates/deployment-registry.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: docker-registry + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "docker" "registry" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/registry/templates/job-bootstrap.yaml b/registry/templates/job-bootstrap.yaml index a546cd74e5..d0f56cf09e 100644 --- a/registry/templates/job-bootstrap.yaml +++ b/registry/templates/job-bootstrap.yaml @@ -25,6 +25,8 @@ apiVersion: batch/v1 kind: Job metadata: name: docker-bootstrap + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/tiller/templates/deployment-tiller.yaml b/tiller/templates/deployment-tiller.yaml index 3d865f2746..1ef301a7e8 100644 --- a/tiller/templates/deployment-tiller.yaml +++ b/tiller/templates/deployment-tiller.yaml @@ -36,6 +36,8 @@ subjects: apiVersion: apps/v1 kind: Deployment metadata: + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: app: helm name: tiller