From 8f8a80019a8ba13644f837a266e24c7802dd1df5 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Sat, 5 Aug 2017 14:29:32 -0500 Subject: [PATCH] Jobs: Add labels to all jobs This PS adds labels to all jobs in OpenStack-Helm, allowing them to be found by label searches. This makes management of large clusters using tools like Armada easier. Change-Id: I49b2cb7a94fab96958f187ca11e2c2a0c80ff843 --- barbican/templates/job-bootstrap.yaml | 3 +++ barbican/templates/job-db-init.yaml | 3 +++ barbican/templates/job-db-sync.yaml | 3 +++ barbican/templates/job-ks-endpoints.yaml | 3 +++ barbican/templates/job-ks-service.yaml | 3 +++ barbican/templates/job-ks-user.yaml | 3 +++ ceph/templates/job-bootstrap.yaml | 3 +++ ceph/templates/job-keyring.yaml | 10 +++++++--- ceph/templates/job-namespace-client-key-cleaner.yaml | 4 ++++ ceph/templates/job-namespace-client-key.yaml | 4 ++++ ceph/templates/job-storage-admin-keys.yaml | 4 ++++ cinder/templates/job-bootstrap.yaml | 3 +++ cinder/templates/job-db-init.yaml | 3 +++ cinder/templates/job-db-sync.yaml | 3 +++ cinder/templates/job-ks-endpoints.yaml | 3 +++ cinder/templates/job-ks-service.yaml | 3 +++ cinder/templates/job-ks-user.yaml | 3 +++ glance/templates/job-bootstrap.yaml | 3 +++ glance/templates/job-clean.yaml | 3 +++ glance/templates/job-db-init.yaml | 3 +++ glance/templates/job-db-sync.yaml | 3 +++ glance/templates/job-ks-endpoints.yaml | 3 +++ glance/templates/job-ks-service.yaml | 3 +++ glance/templates/job-ks-user.yaml | 3 +++ heat/templates/job-bootstrap.yaml | 3 +++ heat/templates/job-db-init.yaml | 3 +++ heat/templates/job-db-sync.yaml | 3 +++ heat/templates/job-ks-endpoints.yaml | 3 +++ heat/templates/job-ks-service.yaml | 3 +++ heat/templates/job-ks-user.yaml | 3 +++ horizon/templates/job-db-init.yaml | 2 ++ horizon/templates/job-db-sync.yaml | 3 ++- ingress/templates/deployment-error.yaml | 2 +- ingress/templates/deployment-ingress.yaml | 2 ++ keystone/templates/cron-job-credential-rotate.yaml | 3 +++ keystone/templates/cron-job-fernet-rotate.yaml | 3 +++ keystone/templates/job-bootstrap.yaml | 3 +++ keystone/templates/job-credential-setup.yaml | 3 +++ keystone/templates/job-db-init.yaml | 2 ++ keystone/templates/job-db-sync.yaml | 3 ++- keystone/templates/job-fernet-setup.yaml | 3 +++ magnum/templates/job-bootstrap.yaml | 3 +++ magnum/templates/job-db-init.yaml | 3 +++ magnum/templates/job-db-sync.yaml | 3 +++ magnum/templates/job-ks-endpoints.yaml | 3 +++ magnum/templates/job-ks-service.yaml | 3 +++ magnum/templates/job-ks-user.yaml | 3 +++ mistral/templates/job-bootstrap.yaml | 3 +++ mistral/templates/job-db-init.yaml | 3 +++ mistral/templates/job-db-sync.yaml | 3 +++ mistral/templates/job-ks-endpoints.yaml | 3 +++ mistral/templates/job-ks-service.yaml | 3 +++ mistral/templates/job-ks-user.yaml | 3 +++ neutron/templates/job-bootstrap.yaml | 3 +++ neutron/templates/job-db-init.yaml | 3 +++ neutron/templates/job-db-sync.yaml | 3 +++ neutron/templates/job-ks-endpoints.yaml | 3 +++ neutron/templates/job-ks-service.yaml | 3 +++ neutron/templates/job-ks-user.yaml | 3 +++ nova/templates/job-bootstrap.yaml | 3 +++ nova/templates/job-db-init.yaml | 3 +++ nova/templates/job-db-sync.yaml | 3 +++ nova/templates/job-ks-endpoints.yaml | 3 +++ nova/templates/job-ks-service.yaml | 3 +++ nova/templates/job-ks-user.yaml | 3 +++ senlin/templates/job-bootstrap.yaml | 3 +++ senlin/templates/job-db-init.yaml | 3 +++ senlin/templates/job-db-sync.yaml | 3 +++ senlin/templates/job-ks-endpoints.yaml | 3 +++ senlin/templates/job-ks-service.yaml | 3 +++ senlin/templates/job-ks-user.yaml | 3 +++ 71 files changed, 213 insertions(+), 6 deletions(-) diff --git a/barbican/templates/job-bootstrap.yaml b/barbican/templates/job-bootstrap.yaml index 0da4e555de..e251159065 100644 --- a/barbican/templates/job-bootstrap.yaml +++ b/barbican/templates/job-bootstrap.yaml @@ -24,6 +24,9 @@ metadata: name: barbican-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "barbican" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/barbican/templates/job-db-init.yaml b/barbican/templates/job-db-init.yaml index ae92f300fd..bb2f9e138c 100644 --- a/barbican/templates/job-db-init.yaml +++ b/barbican/templates/job-db-init.yaml @@ -19,6 +19,9 @@ metadata: name: barbican-db-init spec: template: + metadata: + labels: +{{ tuple $envAll "barbican" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/barbican/templates/job-db-sync.yaml b/barbican/templates/job-db-sync.yaml index b05d88dedc..c080222435 100644 --- a/barbican/templates/job-db-sync.yaml +++ b/barbican/templates/job-db-sync.yaml @@ -19,6 +19,9 @@ metadata: name: barbican-db-sync spec: template: + metadata: + labels: +{{ tuple $envAll "barbican" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/barbican/templates/job-ks-endpoints.yaml b/barbican/templates/job-ks-endpoints.yaml index 6300bc5e32..3687a8947a 100644 --- a/barbican/templates/job-ks-endpoints.yaml +++ b/barbican/templates/job-ks-endpoints.yaml @@ -19,6 +19,9 @@ metadata: name: barbican-ks-endpoints spec: template: + metadata: + labels: +{{ tuple $envAll "barbican" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/barbican/templates/job-ks-service.yaml b/barbican/templates/job-ks-service.yaml index c26a193337..a96e5f26f3 100644 --- a/barbican/templates/job-ks-service.yaml +++ b/barbican/templates/job-ks-service.yaml @@ -19,6 +19,9 @@ metadata: name: barbican-ks-service spec: template: + metadata: + labels: +{{ tuple $envAll "barbican" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/barbican/templates/job-ks-user.yaml b/barbican/templates/job-ks-user.yaml index 6c0e2d4e5c..630ad6fe08 100644 --- a/barbican/templates/job-ks-user.yaml +++ b/barbican/templates/job-ks-user.yaml @@ -19,6 +19,9 @@ metadata: name: barbican-ks-user spec: template: + metadata: + labels: +{{ tuple $envAll "barbican" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/ceph/templates/job-bootstrap.yaml b/ceph/templates/job-bootstrap.yaml index 95094fbdc1..8a67f5a68a 100644 --- a/ceph/templates/job-bootstrap.yaml +++ b/ceph/templates/job-bootstrap.yaml @@ -22,6 +22,9 @@ metadata: name: ceph-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/ceph/templates/job-keyring.yaml b/ceph/templates/job-keyring.yaml index 4d4938f731..2ab3d7a033 100644 --- a/ceph/templates/job-keyring.yaml +++ b/ceph/templates/job-keyring.yaml @@ -12,20 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- if .Values.manifests_enabled.storage_secrets }} {{- $envAll := . }} +{{- if .Values.manifests_enabled.storage_secrets }} {{- range $key1, $cephBootstrapKey := tuple "mds" "osd" "rgw" "mon" }} +{{- $jobName := print $cephBootstrapKey "-keyring-generator" }} --- apiVersion: batch/v1 kind: Job metadata: - name: ceph-{{ $cephBootstrapKey }}-keyring-generator + name: ceph-{{ $jobName }} spec: template: + metadata: + labels: +{{ tuple $envAll "ceph" $jobName | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure containers: - - name: ceph-secret-generator + - name: ceph-{{ $jobName }} image: {{ $envAll.Values.images.ceph_config_helper }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{- if $envAll.Values.pod.resources.enabled }} diff --git a/ceph/templates/job-namespace-client-key-cleaner.yaml b/ceph/templates/job-namespace-client-key-cleaner.yaml index f986de3608..52ea1570c8 100644 --- a/ceph/templates/job-namespace-client-key-cleaner.yaml +++ b/ceph/templates/job-namespace-client-key-cleaner.yaml @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- $envAll := . }} {{- if .Values.manifests_enabled.client_secrets }} --- apiVersion: batch/v1 @@ -22,6 +23,9 @@ metadata: "helm.sh/hook": pre-delete spec: template: + metadata: + labels: +{{ tuple $envAll "ceph" "client-key-cleaner" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure containers: diff --git a/ceph/templates/job-namespace-client-key.yaml b/ceph/templates/job-namespace-client-key.yaml index b8d03255b0..9814bda361 100644 --- a/ceph/templates/job-namespace-client-key.yaml +++ b/ceph/templates/job-namespace-client-key.yaml @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- $envAll := . }} {{- if .Values.manifests_enabled.client_secrets }} --- apiVersion: batch/v1 @@ -20,6 +21,9 @@ metadata: name: ceph-namespace-client-key-generator spec: template: + metadata: + labels: +{{ tuple $envAll "ceph" "client-key-generator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure containers: diff --git a/ceph/templates/job-storage-admin-keys.yaml b/ceph/templates/job-storage-admin-keys.yaml index af05a0f433..1f482ebc0f 100644 --- a/ceph/templates/job-storage-admin-keys.yaml +++ b/ceph/templates/job-storage-admin-keys.yaml @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- $envAll := . }} {{- if .Values.manifests_enabled.storage_secrets }} --- apiVersion: batch/v1 @@ -20,6 +21,9 @@ metadata: name: ceph-storage-keys-generator spec: template: + metadata: + labels: +{{ tuple $envAll "ceph" "storage-keys-generator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure containers: diff --git a/cinder/templates/job-bootstrap.yaml b/cinder/templates/job-bootstrap.yaml index 47137c0614..f9126d20dc 100644 --- a/cinder/templates/job-bootstrap.yaml +++ b/cinder/templates/job-bootstrap.yaml @@ -22,6 +22,9 @@ metadata: name: cinder-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "cinder" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml index f7f06f25e2..04bddf927d 100644 --- a/cinder/templates/job-db-init.yaml +++ b/cinder/templates/job-db-init.yaml @@ -21,6 +21,9 @@ metadata: name: cinder-db-init spec: template: + metadata: + labels: +{{ tuple $envAll "cinder" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml index 64c530849f..1106f90588 100644 --- a/cinder/templates/job-db-sync.yaml +++ b/cinder/templates/job-db-sync.yaml @@ -21,6 +21,9 @@ metadata: name: cinder-db-sync spec: template: + metadata: + labels: +{{ tuple $envAll "cinder" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/cinder/templates/job-ks-endpoints.yaml b/cinder/templates/job-ks-endpoints.yaml index 7b0fd6a45f..7fe2a45b8f 100644 --- a/cinder/templates/job-ks-endpoints.yaml +++ b/cinder/templates/job-ks-endpoints.yaml @@ -21,6 +21,9 @@ metadata: name: cinder-ks-endpoints spec: template: + metadata: + labels: +{{ tuple $envAll "cinder" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/cinder/templates/job-ks-service.yaml b/cinder/templates/job-ks-service.yaml index f36dfe337d..d2616713bf 100644 --- a/cinder/templates/job-ks-service.yaml +++ b/cinder/templates/job-ks-service.yaml @@ -21,6 +21,9 @@ metadata: name: cinder-ks-service spec: template: + metadata: + labels: +{{ tuple $envAll "cinder" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/cinder/templates/job-ks-user.yaml b/cinder/templates/job-ks-user.yaml index ada19af626..f25e1b6d0d 100644 --- a/cinder/templates/job-ks-user.yaml +++ b/cinder/templates/job-ks-user.yaml @@ -21,6 +21,9 @@ metadata: name: cinder-ks-user spec: template: + metadata: + labels: +{{ tuple $envAll "cinder" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/glance/templates/job-bootstrap.yaml b/glance/templates/job-bootstrap.yaml index ba18a9ddb1..53f884d35b 100644 --- a/glance/templates/job-bootstrap.yaml +++ b/glance/templates/job-bootstrap.yaml @@ -21,6 +21,9 @@ metadata: name: glance-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "glance" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/glance/templates/job-clean.yaml b/glance/templates/job-clean.yaml index 959d10eb5c..6f812a7d59 100644 --- a/glance/templates/job-clean.yaml +++ b/glance/templates/job-clean.yaml @@ -23,6 +23,9 @@ metadata: "helm.sh/hook": pre-delete spec: template: + metadata: + labels: +{{ tuple $envAll "glance" "clean" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure containers: diff --git a/glance/templates/job-db-init.yaml b/glance/templates/job-db-init.yaml index ba43b6b45e..9c5c9102f6 100644 --- a/glance/templates/job-db-init.yaml +++ b/glance/templates/job-db-init.yaml @@ -21,6 +21,9 @@ metadata: name: glance-db-init spec: template: + metadata: + labels: +{{ tuple $envAll "glance" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/glance/templates/job-db-sync.yaml b/glance/templates/job-db-sync.yaml index 55343f72dc..f82ea53b43 100644 --- a/glance/templates/job-db-sync.yaml +++ b/glance/templates/job-db-sync.yaml @@ -21,6 +21,9 @@ metadata: name: glance-db-sync spec: template: + metadata: + labels: +{{ tuple $envAll "glance" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/glance/templates/job-ks-endpoints.yaml b/glance/templates/job-ks-endpoints.yaml index 971d4e836b..3dea3d4dfb 100644 --- a/glance/templates/job-ks-endpoints.yaml +++ b/glance/templates/job-ks-endpoints.yaml @@ -21,6 +21,9 @@ metadata: name: glance-ks-endpoints spec: template: + metadata: + labels: +{{ tuple $envAll "glance" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/glance/templates/job-ks-service.yaml b/glance/templates/job-ks-service.yaml index 175f75161c..12ad0972a3 100644 --- a/glance/templates/job-ks-service.yaml +++ b/glance/templates/job-ks-service.yaml @@ -21,6 +21,9 @@ metadata: name: glance-ks-service spec: template: + metadata: + labels: +{{ tuple $envAll "glance" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/glance/templates/job-ks-user.yaml b/glance/templates/job-ks-user.yaml index 20ceacf566..8a09086b06 100644 --- a/glance/templates/job-ks-user.yaml +++ b/glance/templates/job-ks-user.yaml @@ -21,6 +21,9 @@ metadata: name: glance-ks-user spec: template: + metadata: + labels: +{{ tuple $envAll "glance" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/heat/templates/job-bootstrap.yaml b/heat/templates/job-bootstrap.yaml index d76037c345..7f8f7aab55 100644 --- a/heat/templates/job-bootstrap.yaml +++ b/heat/templates/job-bootstrap.yaml @@ -24,6 +24,9 @@ metadata: name: heat-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "heat" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml index 16ea8d5e2c..152dc8c96b 100644 --- a/heat/templates/job-db-init.yaml +++ b/heat/templates/job-db-init.yaml @@ -21,6 +21,9 @@ metadata: name: heat-db-init spec: template: + metadata: + labels: +{{ tuple $envAll "heat" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml index 31e024e410..2837742152 100644 --- a/heat/templates/job-db-sync.yaml +++ b/heat/templates/job-db-sync.yaml @@ -21,6 +21,9 @@ metadata: name: heat-db-sync spec: template: + metadata: + labels: +{{ tuple $envAll "heat" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/heat/templates/job-ks-endpoints.yaml b/heat/templates/job-ks-endpoints.yaml index 9d406be046..8a45ac6143 100644 --- a/heat/templates/job-ks-endpoints.yaml +++ b/heat/templates/job-ks-endpoints.yaml @@ -21,6 +21,9 @@ metadata: name: heat-ks-endpoints spec: template: + metadata: + labels: +{{ tuple $envAll "heat" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/heat/templates/job-ks-service.yaml b/heat/templates/job-ks-service.yaml index 762778d4cd..92ad1b7a44 100644 --- a/heat/templates/job-ks-service.yaml +++ b/heat/templates/job-ks-service.yaml @@ -21,6 +21,9 @@ metadata: name: heat-ks-service spec: template: + metadata: + labels: +{{ tuple $envAll "heat" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/heat/templates/job-ks-user.yaml b/heat/templates/job-ks-user.yaml index 202f22abc6..bd22e2eb2c 100644 --- a/heat/templates/job-ks-user.yaml +++ b/heat/templates/job-ks-user.yaml @@ -21,6 +21,9 @@ metadata: name: heat-ks-user spec: template: + metadata: + labels: +{{ tuple $envAll "heat" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/horizon/templates/job-db-init.yaml b/horizon/templates/job-db-init.yaml index a776b1ffbe..f771843917 100644 --- a/horizon/templates/job-db-init.yaml +++ b/horizon/templates/job-db-init.yaml @@ -24,6 +24,8 @@ metadata: spec: template: metadata: + labels: +{{ tuple $envAll "horizon" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/horizon/templates/job-db-sync.yaml b/horizon/templates/job-db-sync.yaml index a047ca5092..e44f3b6e0f 100644 --- a/horizon/templates/job-db-sync.yaml +++ b/horizon/templates/job-db-sync.yaml @@ -24,7 +24,8 @@ metadata: spec: template: metadata: - annotations: + labels: +{{ tuple $envAll "horizon" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml index 4c0a2e1c15..7db24543a8 100644 --- a/ingress/templates/deployment-error.yaml +++ b/ingress/templates/deployment-error.yaml @@ -26,7 +26,7 @@ spec: annotations: configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} labels: - app: ingress-error-pages +{{ tuple $envAll "ingress" "error-pages" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: nodeSelector: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index 7d679628b8..fbb845dea8 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -30,6 +30,8 @@ spec: {{- end }} template: metadata: + labels: +{{ tuple $envAll "ingress" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} annotations: configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} labels: diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml index e4dc1bc703..ba1897a903 100644 --- a/keystone/templates/cron-job-credential-rotate.yaml +++ b/keystone/templates/cron-job-credential-rotate.yaml @@ -25,6 +25,9 @@ spec: schedule: {{ .Values.jobs.credential_rotate.cron | quote }} concurrencyPolicy: Forbid jobTemplate: + metadata: + labels: +{{ tuple $envAll "keystone" "credential-rotate" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: template: spec: diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml index 31129ab4ea..20f96e044a 100644 --- a/keystone/templates/cron-job-fernet-rotate.yaml +++ b/keystone/templates/cron-job-fernet-rotate.yaml @@ -25,6 +25,9 @@ spec: schedule: {{ .Values.jobs.fernet_rotate.cron | quote }} concurrencyPolicy: Forbid jobTemplate: + metadata: + labels: +{{ tuple $envAll "keystone" "fernet-rotate" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: template: spec: diff --git a/keystone/templates/job-bootstrap.yaml b/keystone/templates/job-bootstrap.yaml index 7cf28454dc..03891e4100 100644 --- a/keystone/templates/job-bootstrap.yaml +++ b/keystone/templates/job-bootstrap.yaml @@ -24,6 +24,9 @@ metadata: name: keystone-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "keystone" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/keystone/templates/job-credential-setup.yaml b/keystone/templates/job-credential-setup.yaml index 30d4319f77..9a511801a7 100644 --- a/keystone/templates/job-credential-setup.yaml +++ b/keystone/templates/job-credential-setup.yaml @@ -22,6 +22,9 @@ metadata: name: keystone-credential-setup spec: template: + metadata: + labels: +{{ tuple $envAll "keystone" "credential-setup" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: initContainers: {{ tuple $envAll $dependencies $mounts_keystone_credential_setup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/keystone/templates/job-db-init.yaml b/keystone/templates/job-db-init.yaml index 79199cd66e..f260adfe5d 100644 --- a/keystone/templates/job-db-init.yaml +++ b/keystone/templates/job-db-init.yaml @@ -24,6 +24,8 @@ metadata: spec: template: metadata: + labels: +{{ tuple $envAll "keystone" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml index b56012846c..d2bf4c0b48 100644 --- a/keystone/templates/job-db-sync.yaml +++ b/keystone/templates/job-db-sync.yaml @@ -24,7 +24,8 @@ metadata: spec: template: metadata: - annotations: + labels: +{{ tuple $envAll "keystone" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml index 5792bdc3a3..a0396ba695 100644 --- a/keystone/templates/job-fernet-setup.yaml +++ b/keystone/templates/job-fernet-setup.yaml @@ -23,6 +23,9 @@ metadata: name: keystone-fernet-setup spec: template: + metadata: + labels: +{{ tuple $envAll "keystone" "fernet-setup" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: initContainers: {{ tuple $envAll $dependencies $mounts_keystone_fernet_setup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/magnum/templates/job-bootstrap.yaml b/magnum/templates/job-bootstrap.yaml index 966c918e41..c944e63906 100644 --- a/magnum/templates/job-bootstrap.yaml +++ b/magnum/templates/job-bootstrap.yaml @@ -24,6 +24,9 @@ metadata: name: magnum-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "magnum" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/magnum/templates/job-db-init.yaml b/magnum/templates/job-db-init.yaml index 85ad8be4b3..b0a16c3019 100644 --- a/magnum/templates/job-db-init.yaml +++ b/magnum/templates/job-db-init.yaml @@ -21,6 +21,9 @@ metadata: name: magnum-db-init spec: template: + metadata: + labels: +{{ tuple $envAll "magnum" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/magnum/templates/job-db-sync.yaml b/magnum/templates/job-db-sync.yaml index 551fc1ba44..9456510124 100644 --- a/magnum/templates/job-db-sync.yaml +++ b/magnum/templates/job-db-sync.yaml @@ -21,6 +21,9 @@ metadata: name: magnum-db-sync spec: template: + metadata: + labels: +{{ tuple $envAll "magnum" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/magnum/templates/job-ks-endpoints.yaml b/magnum/templates/job-ks-endpoints.yaml index ee4ea59de6..151b2963ab 100644 --- a/magnum/templates/job-ks-endpoints.yaml +++ b/magnum/templates/job-ks-endpoints.yaml @@ -21,6 +21,9 @@ metadata: name: magnum-ks-endpoints spec: template: + metadata: + labels: +{{ tuple $envAll "magnum" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/magnum/templates/job-ks-service.yaml b/magnum/templates/job-ks-service.yaml index d43c516e14..331e529d96 100644 --- a/magnum/templates/job-ks-service.yaml +++ b/magnum/templates/job-ks-service.yaml @@ -21,6 +21,9 @@ metadata: name: magnum-ks-service spec: template: + metadata: + labels: +{{ tuple $envAll "magnum" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/magnum/templates/job-ks-user.yaml b/magnum/templates/job-ks-user.yaml index 0519ad6568..2dea8873ee 100644 --- a/magnum/templates/job-ks-user.yaml +++ b/magnum/templates/job-ks-user.yaml @@ -21,6 +21,9 @@ metadata: name: magnum-ks-user spec: template: + metadata: + labels: +{{ tuple $envAll "magnum" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/mistral/templates/job-bootstrap.yaml b/mistral/templates/job-bootstrap.yaml index cf62d19dc5..f7d63def04 100644 --- a/mistral/templates/job-bootstrap.yaml +++ b/mistral/templates/job-bootstrap.yaml @@ -24,6 +24,9 @@ metadata: name: mistral-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "mistral" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/mistral/templates/job-db-init.yaml b/mistral/templates/job-db-init.yaml index 2e70f71242..6f5a48f68b 100644 --- a/mistral/templates/job-db-init.yaml +++ b/mistral/templates/job-db-init.yaml @@ -21,6 +21,9 @@ metadata: name: mistral-db-init spec: template: + metadata: + labels: +{{ tuple $envAll "mistral" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/mistral/templates/job-db-sync.yaml b/mistral/templates/job-db-sync.yaml index a222d3d070..b572789c8a 100644 --- a/mistral/templates/job-db-sync.yaml +++ b/mistral/templates/job-db-sync.yaml @@ -21,6 +21,9 @@ metadata: name: mistral-db-sync spec: template: + metadata: + labels: +{{ tuple $envAll "mistral" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/mistral/templates/job-ks-endpoints.yaml b/mistral/templates/job-ks-endpoints.yaml index ffbca4c396..b3c5caaffa 100644 --- a/mistral/templates/job-ks-endpoints.yaml +++ b/mistral/templates/job-ks-endpoints.yaml @@ -21,6 +21,9 @@ metadata: name: mistral-ks-endpoints spec: template: + metadata: + labels: +{{ tuple $envAll "mistral" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/mistral/templates/job-ks-service.yaml b/mistral/templates/job-ks-service.yaml index 1cbd211a2a..7f7b3ca92e 100644 --- a/mistral/templates/job-ks-service.yaml +++ b/mistral/templates/job-ks-service.yaml @@ -21,6 +21,9 @@ metadata: name: mistral-ks-service spec: template: + metadata: + labels: +{{ tuple $envAll "mistral" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/mistral/templates/job-ks-user.yaml b/mistral/templates/job-ks-user.yaml index 0286f568de..d676db0d00 100644 --- a/mistral/templates/job-ks-user.yaml +++ b/mistral/templates/job-ks-user.yaml @@ -21,6 +21,9 @@ metadata: name: mistral-ks-user spec: template: + metadata: + labels: +{{ tuple $envAll "mistral" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/neutron/templates/job-bootstrap.yaml b/neutron/templates/job-bootstrap.yaml index 52ebb5667f..f556ae1e3f 100644 --- a/neutron/templates/job-bootstrap.yaml +++ b/neutron/templates/job-bootstrap.yaml @@ -24,6 +24,9 @@ metadata: name: neutron-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "neutron" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/neutron/templates/job-db-init.yaml b/neutron/templates/job-db-init.yaml index 398c4831d6..86aaf52de5 100644 --- a/neutron/templates/job-db-init.yaml +++ b/neutron/templates/job-db-init.yaml @@ -21,6 +21,9 @@ metadata: name: neutron-db-init spec: template: + metadata: + labels: +{{ tuple $envAll "neutron" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml index 27b21e2052..67e6613a36 100644 --- a/neutron/templates/job-db-sync.yaml +++ b/neutron/templates/job-db-sync.yaml @@ -21,6 +21,9 @@ metadata: name: neutron-db-sync spec: template: + metadata: + labels: +{{ tuple $envAll "neutron" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/neutron/templates/job-ks-endpoints.yaml b/neutron/templates/job-ks-endpoints.yaml index 32c44ec1b8..a1acc78b1f 100644 --- a/neutron/templates/job-ks-endpoints.yaml +++ b/neutron/templates/job-ks-endpoints.yaml @@ -21,6 +21,9 @@ metadata: name: neutron-ks-endpoints spec: template: + metadata: + labels: +{{ tuple $envAll "neutron" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/neutron/templates/job-ks-service.yaml b/neutron/templates/job-ks-service.yaml index bcc4fc970a..444806d720 100644 --- a/neutron/templates/job-ks-service.yaml +++ b/neutron/templates/job-ks-service.yaml @@ -21,6 +21,9 @@ metadata: name: neutron-ks-service spec: template: + metadata: + labels: +{{ tuple $envAll "neutron" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/neutron/templates/job-ks-user.yaml b/neutron/templates/job-ks-user.yaml index 32211c20fa..013d1448bb 100644 --- a/neutron/templates/job-ks-user.yaml +++ b/neutron/templates/job-ks-user.yaml @@ -21,6 +21,9 @@ metadata: name: neutron-ks-user spec: template: + metadata: + labels: +{{ tuple $envAll "neutron" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/nova/templates/job-bootstrap.yaml b/nova/templates/job-bootstrap.yaml index 780d5730a0..891ae411a3 100644 --- a/nova/templates/job-bootstrap.yaml +++ b/nova/templates/job-bootstrap.yaml @@ -24,6 +24,9 @@ metadata: name: nova-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "nova" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/nova/templates/job-db-init.yaml b/nova/templates/job-db-init.yaml index 27bb170fb4..46b9a135dd 100644 --- a/nova/templates/job-db-init.yaml +++ b/nova/templates/job-db-init.yaml @@ -21,6 +21,9 @@ metadata: name: nova-db-init spec: template: + metadata: + labels: +{{ tuple $envAll "nova" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml index 493eb799c9..f417b3ccdd 100644 --- a/nova/templates/job-db-sync.yaml +++ b/nova/templates/job-db-sync.yaml @@ -21,6 +21,9 @@ metadata: name: nova-db-sync spec: template: + metadata: + labels: +{{ tuple $envAll "nova" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/nova/templates/job-ks-endpoints.yaml b/nova/templates/job-ks-endpoints.yaml index 02bdbb4403..b60276d702 100644 --- a/nova/templates/job-ks-endpoints.yaml +++ b/nova/templates/job-ks-endpoints.yaml @@ -21,6 +21,9 @@ metadata: name: nova-ks-endpoints spec: template: + metadata: + labels: +{{ tuple $envAll "nova" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/nova/templates/job-ks-service.yaml b/nova/templates/job-ks-service.yaml index 00f2322c7b..3a8d63ea7b 100644 --- a/nova/templates/job-ks-service.yaml +++ b/nova/templates/job-ks-service.yaml @@ -21,6 +21,9 @@ metadata: name: nova-ks-service spec: template: + metadata: + labels: +{{ tuple $envAll "nova" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/nova/templates/job-ks-user.yaml b/nova/templates/job-ks-user.yaml index 90b5f9157e..39e252a5eb 100644 --- a/nova/templates/job-ks-user.yaml +++ b/nova/templates/job-ks-user.yaml @@ -21,6 +21,9 @@ metadata: name: nova-ks-user spec: template: + metadata: + labels: +{{ tuple $envAll "nova" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/senlin/templates/job-bootstrap.yaml b/senlin/templates/job-bootstrap.yaml index 390f9c35b1..3fd695a158 100644 --- a/senlin/templates/job-bootstrap.yaml +++ b/senlin/templates/job-bootstrap.yaml @@ -24,6 +24,9 @@ metadata: name: senlin-bootstrap spec: template: + metadata: + labels: +{{ tuple $envAll "senlin" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/senlin/templates/job-db-init.yaml b/senlin/templates/job-db-init.yaml index fa30ab09aa..e7b73c1d55 100644 --- a/senlin/templates/job-db-init.yaml +++ b/senlin/templates/job-db-init.yaml @@ -21,6 +21,9 @@ metadata: name: senlin-db-init spec: template: + metadata: + labels: +{{ tuple $envAll "senlin" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/senlin/templates/job-db-sync.yaml b/senlin/templates/job-db-sync.yaml index a989702906..814b2551ca 100644 --- a/senlin/templates/job-db-sync.yaml +++ b/senlin/templates/job-db-sync.yaml @@ -21,6 +21,9 @@ metadata: name: senlin-db-sync spec: template: + metadata: + labels: +{{ tuple $envAll "senlin" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/senlin/templates/job-ks-endpoints.yaml b/senlin/templates/job-ks-endpoints.yaml index 2b68160137..813ebf7ae3 100644 --- a/senlin/templates/job-ks-endpoints.yaml +++ b/senlin/templates/job-ks-endpoints.yaml @@ -21,6 +21,9 @@ metadata: name: senlin-ks-endpoints spec: template: + metadata: + labels: +{{ tuple $envAll "senlin" "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/senlin/templates/job-ks-service.yaml b/senlin/templates/job-ks-service.yaml index 3a9be26387..66df33c694 100644 --- a/senlin/templates/job-ks-service.yaml +++ b/senlin/templates/job-ks-service.yaml @@ -21,6 +21,9 @@ metadata: name: senlin-ks-service spec: template: + metadata: + labels: +{{ tuple $envAll "senlin" "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: diff --git a/senlin/templates/job-ks-user.yaml b/senlin/templates/job-ks-user.yaml index 81fea81f6a..af2cedc92c 100644 --- a/senlin/templates/job-ks-user.yaml +++ b/senlin/templates/job-ks-user.yaml @@ -21,6 +21,9 @@ metadata: name: senlin-ks-user spec: template: + metadata: + labels: +{{ tuple $envAll "senlin" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: restartPolicy: OnFailure nodeSelector: