Helm 3 - Fix Job labels

If labels are not specified on a Job, kubernetes defaults them
to include the labels of their underlying Pod template. Helm 3
injects metadata into all resources [0] including a
`app.kubernetes.io/managed-by: Helm` label. Thus when kubernetes
sees a Job's labels they are no longer empty and thus do not get
defaulted to the underlying Pod template's labels. This is a
problem since Job labels are depended on by
- Armada pre-upgrade delete hooks
- Armada wait logic configurations
- kubernetes-entrypoint dependencies

Thus for each Job template this adds labels matching the
underlying Pod template to retain the same labels that were
present with Helm 2.

[0]: https://github.com/helm/helm/pull/7649

Change-Id: I3b6b25fcc6a1af4d56f3e2b335615074e2f04b6d
This commit is contained in:
Sean Eagan 2021-09-29 16:33:44 -05:00
parent 0fa7e0fb7e
commit b1a247e7f5
77 changed files with 155 additions and 16 deletions

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v3.4.0 appVersion: v3.4.0
description: OpenStack-Helm Calico description: OpenStack-Helm Calico
name: calico name: calico
version: 0.1.2 version: 0.1.3
home: https://github.com/projectcalico/calico home: https://github.com/projectcalico/calico
icon: https://camo.githubusercontent.com/64c8b5ed6ac97553ae367348e8a59a24e2ed5bdc/687474703a2f2f646f63732e70726f6a65637463616c69636f2e6f72672f696d616765732f66656c69782e706e67 icon: https://camo.githubusercontent.com/64c8b5ed6ac97553ae367348e8a59a24e2ed5bdc/687474703a2f2f646f63732e70726f6a65637463616c69636f2e6f72672f696d616765732f66656c69782e706e67
sources: sources:

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: calico-settings name: calico-settings
labels:
{{ tuple $envAll "calico" "calico_settings" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceph Client description: OpenStack-Helm Ceph Client
name: ceph-client name: ceph-client
version: 0.1.22 version: 0.1.23
home: https://github.com/ceph/ceph-client home: https://github.com/ceph/ceph-client
... ...

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-client-bootstrap name: ceph-client-bootstrap
labels:
{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-rbd-pool name: ceph-rbd-pool
labels:
{{ tuple $envAll "ceph" "rbd-pool" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceph Mon description: OpenStack-Helm Ceph Mon
name: ceph-mon name: ceph-mon
version: 0.1.12 version: 0.1.13
home: https://github.com/ceph/ceph home: https://github.com/ceph/ceph
... ...

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-bootstrap name: ceph-bootstrap
labels:
{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -52,6 +52,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ $jobName }} name: {{ $jobName }}
labels:
{{ tuple $envAll "ceph" $jobName | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -49,6 +49,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-storage-keys-generator name: ceph-storage-keys-generator
labels:
{{ tuple $envAll "ceph" "storage-keys-generator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceph OSD description: OpenStack-Helm Ceph OSD
name: ceph-osd name: ceph-osd
version: 0.1.30 version: 0.1.31
home: https://github.com/ceph/ceph home: https://github.com/ceph/ceph
... ...

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-osd-bootstrap name: ceph-osd-bootstrap
labels:
{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -68,6 +68,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}
labels:
{{ tuple $envAll "ceph-upgrade" "post-apply" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceph Provisioner description: OpenStack-Helm Ceph Provisioner
name: ceph-provisioners name: ceph-provisioners
version: 0.1.13 version: 0.1.14
home: https://github.com/ceph/ceph home: https://github.com/ceph/ceph
... ...

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-client-bootstrap name: ceph-client-bootstrap
labels:
{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -80,6 +80,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-cephfs-client-key-generator name: ceph-cephfs-client-key-generator
labels:
{{ tuple $envAll "ceph" "cephfs-client-key-generator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -88,6 +88,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}
labels:
{{ tuple $envAll "ceph" "client-ceph-config-generator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
template: template:
metadata: metadata:

View File

@ -51,6 +51,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}
labels:
{{ tuple $envAll "ceph" "client-key-cleaner" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
"helm.sh/hook": pre-delete "helm.sh/hook": pre-delete
spec: spec:

View File

@ -88,6 +88,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}
labels:
{{ tuple $envAll "ceph" "client-key-generator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
template: template:
metadata: metadata:

View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceph RadosGW description: OpenStack-Helm Ceph RadosGW
name: ceph-rgw name: ceph-rgw
version: 0.1.15 version: 0.1.16
home: https://github.com/ceph/ceph home: https://github.com/ceph/ceph
... ...

View File

@ -50,6 +50,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-rgw-bootstrap name: ceph-rgw-bootstrap
labels:
{{ tuple $envAll "ceph" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -51,6 +51,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-rgw-placement-targets name: ceph-rgw-placement-targets
labels:
{{ tuple $envAll "ceph" "rgw-placement-targets" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -51,6 +51,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-rgw-restart name: ceph-rgw-restart
labels:
{{ tuple $envAll "ceph" "rgw-restart" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -50,6 +50,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-rgw-storage-init name: ceph-rgw-storage-init
labels:
{{ tuple $envAll "ceph" "rgw-storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
template: template:
metadata: metadata:

View File

@ -52,6 +52,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: ceph-rgw-s3-admin name: ceph-rgw-s3-admin
labels:
{{ tuple $envAll "ceph" "rgw-s3-admin" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v7.6.2 appVersion: v7.6.2
description: OpenStack-Helm ElasticSearch description: OpenStack-Helm ElasticSearch
name: elasticsearch name: elasticsearch
version: 0.2.11 version: 0.2.12
home: https://www.elastic.co/ home: https://www.elastic.co/
sources: sources:
- https://github.com/elastic/elasticsearch - https://github.com/elastic/elasticsearch

View File

@ -25,6 +25,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: create-elasticsearch-templates name: create-elasticsearch-templates
labels:
{{ tuple $envAll "elasticsearch" "create-templates" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v3.0.3 appVersion: v3.0.3
description: OpenStack-Helm Gnocchi description: OpenStack-Helm Gnocchi
name: gnocchi name: gnocchi
version: 0.1.2 version: 0.1.3
home: https://gnocchi.xyz/ home: https://gnocchi.xyz/
icon: https://gnocchi.xyz/_static/gnocchi-logo.png icon: https://gnocchi.xyz/_static/gnocchi-logo.png
sources: sources:

View File

@ -48,6 +48,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ print "gnocchi-clean" }} name: {{ print "gnocchi-clean" }}
labels:
{{ tuple $envAll "gnocchi" "clean" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
"helm.sh/hook": pre-delete "helm.sh/hook": pre-delete
"helm.sh/hook-delete-policy": hook-succeeded "helm.sh/hook-delete-policy": hook-succeeded

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: gnocchi-db-init-indexer name: gnocchi-db-init-indexer
labels:
{{ tuple $envAll "gnocchi" "db-init-indexer" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
template: template:
metadata: metadata:

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: gnocchi-db-sync name: gnocchi-db-sync
labels:
{{ tuple $envAll "gnocchi" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
template: template:
metadata: metadata:

View File

@ -50,6 +50,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: gnocchi-storage-init name: gnocchi-storage-init
labels:
{{ tuple $envAll "gnocchi" "storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
template: template:
metadata: metadata:

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v7.4.5 appVersion: v7.4.5
description: OpenStack-Helm Grafana description: OpenStack-Helm Grafana
name: grafana name: grafana
version: 0.1.9 version: 0.1.10
home: https://grafana.com/ home: https://grafana.com/
sources: sources:
- https://github.com/grafana/grafana - https://github.com/grafana/grafana

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: grafana-db-init-session name: grafana-db-init-session
labels:
{{ tuple $envAll "grafana" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: grafana-db-init name: grafana-db-init
labels:
{{ tuple $envAll "grafana" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: grafana-db-session-sync name: grafana-db-session-sync
labels:
{{ tuple $envAll "grafana" "db-session-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: grafana-set-admin-user name: grafana-set-admin-user
labels:
{{ tuple $envAll "grafana" "set-admin-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Helm-Toolkit description: OpenStack-Helm Helm-Toolkit
name: helm-toolkit name: helm-toolkit
version: 0.2.22 version: 0.2.23
home: https://docs.openstack.org/openstack-helm home: https://docs.openstack.org/openstack-helm
icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
sources: sources:

View File

@ -44,6 +44,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "bootstrap" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "bootstrap" | quote }}
labels:
{{ tuple $envAll $serviceName "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}

View File

@ -45,6 +45,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "db-drop" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "db-drop" | quote }}
labels:
{{ tuple $envAll $serviceName "db-drop" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
"helm.sh/hook": pre-delete "helm.sh/hook": pre-delete
"helm.sh/hook-delete-policy": hook-succeeded "helm.sh/hook-delete-policy": hook-succeeded

View File

@ -45,6 +45,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "db-init" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "db-init" | quote }}
labels:
{{ tuple $envAll $serviceName "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}

View File

@ -42,6 +42,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "db-sync" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "db-sync" | quote }}
labels:
{{ tuple $envAll $serviceName "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}

View File

@ -45,6 +45,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "ks-endpoints" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "ks-endpoints" | quote }}
labels:
{{ tuple $envAll $serviceName "ks-endpoints" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}

View File

@ -45,6 +45,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "ks-service" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "ks-service" | quote }}
labels:
{{ tuple $envAll $serviceName "ks-service" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}

View File

@ -45,6 +45,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceUserPretty "ks-user" | quote }} name: {{ printf "%s-%s" $serviceUserPretty "ks-user" | quote }}
labels:
{{ tuple $envAll $serviceName "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}

View File

@ -35,6 +35,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceUserPretty "rabbit-init" | quote }} name: {{ printf "%s-%s" $serviceUserPretty "rabbit-init" | quote }}
labels:
{{ tuple $envAll $serviceName "rabbit-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}

View File

@ -41,6 +41,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "s3-bucket" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "s3-bucket" | quote }}
labels:
{{ tuple $envAll $serviceName "s3-bucket" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
{{- if $jobAnnotations }} {{- if $jobAnnotations }}

View File

@ -38,6 +38,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "s3-user" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "s3-user" | quote }}
labels:
{{ tuple $envAll $serviceName "s3-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
"helm.sh/hook-delete-policy": before-hook-creation "helm.sh/hook-delete-policy": before-hook-creation
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}

View File

@ -38,6 +38,11 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "image-repo-sync" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "image-repo-sync" | quote }}
labels:
{{ tuple $envAll $serviceName "image-repo-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if $jobLabels }}
{{ toYaml $jobLabels | indent 4 }}
{{- end }}
annotations: annotations:
"helm.sh/hook-delete-policy": before-hook-creation "helm.sh/hook-delete-policy": before-hook-creation
{{- if $jobAnnotations }} {{- if $jobAnnotations }}

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v7.1.0 appVersion: v7.1.0
description: OpenStack-Helm Kibana description: OpenStack-Helm Kibana
name: kibana name: kibana
version: 0.1.6 version: 0.1.7
home: https://www.elastic.co/products/kibana home: https://www.elastic.co/products/kibana
sources: sources:
- https://github.com/elastic/kibana - https://github.com/elastic/kibana

View File

@ -34,6 +34,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: flush-kibana-metadata name: flush-kibana-metadata
labels:
{{ tuple $envAll "kibana" "flush_kibana_metadata" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
backoffLimit: {{ .Values.jobs.flush_kibana_metadata.backoffLimit }} backoffLimit: {{ .Values.jobs.flush_kibana_metadata.backoffLimit }}
template: template:

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: register-kibana-indexes name: register-kibana-indexes
labels:
{{ tuple $envAll "kibana" "register_kibana_indexes" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
"helm.sh/hook": post-install,post-upgrade "helm.sh/hook": post-install,post-upgrade
"helm.sh/hook-delete-policy": before-hook-creation "helm.sh/hook-delete-policy": before-hook-creation

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v10.2.31 appVersion: v10.2.31
description: OpenStack-Helm MariaDB description: OpenStack-Helm MariaDB
name: mariadb name: mariadb
version: 0.2.7 version: 0.2.8
home: https://mariadb.com/kb/en/ home: https://mariadb.com/kb/en/
icon: http://badges.mariadb.org/mariadb-badge-180x60.png icon: http://badges.mariadb.org/mariadb-badge-180x60.png
sources: sources:

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: exporter-create-sql-user name: exporter-create-sql-user
labels:
{{ tuple $envAll "prometheus-mysql-exporter" "create-sql-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- if .Values.helm3_hook }} {{- if .Values.helm3_hook }}
annotations: annotations:
"helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook": "post-install,post-upgrade"

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v9.6 appVersion: v9.6
description: OpenStack-Helm PostgreSQL description: OpenStack-Helm PostgreSQL
name: postgresql name: postgresql
version: 0.1.9 version: 0.1.10
home: https://www.postgresql.org home: https://www.postgresql.org
sources: sources:
- https://github.com/postgres/postgres - https://github.com/postgres/postgres

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: prometheus-postgresql-exporter-create-user name: prometheus-postgresql-exporter-create-user
labels:
{{ tuple $envAll "prometheus_postgresql_exporter" "create_user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
template: template:
metadata: metadata:

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v4.1.10 appVersion: v4.1.10
description: OpenStack-Helm PowerDNS description: OpenStack-Helm PowerDNS
name: powerdns name: powerdns
version: 0.1.2 version: 0.1.3
home: https://www.powerdns.com/ home: https://www.powerdns.com/
maintainers: maintainers:
- name: OpenStack-Helm Authors - name: OpenStack-Helm Authors

View File

@ -23,6 +23,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ $serviceAccountName }} name: {{ $serviceAccountName }}
labels:
{{ tuple $envAll "powerdns" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
template: template:
metadata: metadata:

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack Metrics Exporter for Prometheus description: OpenStack Metrics Exporter for Prometheus
name: prometheus-openstack-exporter name: prometheus-openstack-exporter
version: 0.1.4 version: 0.1.5
home: https://github.com/openstack/openstack-helm-infra home: https://github.com/openstack/openstack-helm-infra
sources: sources:
- https://opendev.org/openstack/openstack-helm-infra - https://opendev.org/openstack/openstack-helm-infra

View File

@ -22,6 +22,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: prometheus-openstack-exporter-ks-user name: prometheus-openstack-exporter-ks-user
labels:
{{ tuple $envAll "prometheus-openstack-exporter" "ks-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
template: template:
metadata: metadata:

View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v2.0.0 appVersion: v2.0.0
description: OpenStack-Helm Docker Registry description: OpenStack-Helm Docker Registry
name: registry name: registry
version: 0.1.3 version: 0.1.4
home: https://github.com/kubernetes/ingress home: https://github.com/kubernetes/ingress
sources: sources:
- https://opendev.org/openstack/openstack-helm - https://opendev.org/openstack/openstack-helm

View File

@ -23,6 +23,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: docker-bootstrap name: docker-bootstrap
labels:
{{ tuple $envAll "docker" "bootstrap" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

View File

@ -3,4 +3,5 @@ calico:
- 0.1.0 Initial Chart - 0.1.0 Initial Chart
- 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0" - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
- 0.1.2 Use full image ref for docker official images - 0.1.2 Use full image ref for docker official images
- 0.1.3 Helm 3 - Fix Job labels
... ...

View File

@ -23,4 +23,5 @@ ceph-client:
- 0.1.20 Export crash dumps when Ceph daemons crash - 0.1.20 Export crash dumps when Ceph daemons crash
- 0.1.21 Fix Ceph checkDNS script - 0.1.21 Fix Ceph checkDNS script
- 0.1.22 Set pg_num_min in all cases - 0.1.22 Set pg_num_min in all cases
- 0.1.23 Helm 3 - Fix Job labels
... ...

View File

@ -13,4 +13,5 @@ ceph-mon:
- 0.1.10 Export crash dumps when Ceph daemons crash - 0.1.10 Export crash dumps when Ceph daemons crash
- 0.1.11 Correct mon-check executing binary and logic - 0.1.11 Correct mon-check executing binary and logic
- 0.1.12 Fix Ceph checkDNS script - 0.1.12 Fix Ceph checkDNS script
- 0.1.13 Helm 3 - Fix Job labels
... ...

View File

@ -31,4 +31,5 @@ ceph-osd:
- 0.1.28 Change var crash mount propagation to HostToContainer - 0.1.28 Change var crash mount propagation to HostToContainer
- 0.1.29 Fix Ceph checkDNS script - 0.1.29 Fix Ceph checkDNS script
- 0.1.30 Ceph OSD log-runner container should run as ceph user - 0.1.30 Ceph OSD log-runner container should run as ceph user
- 0.1.31 Helm 3 - Fix Job labels
... ...

View File

@ -13,4 +13,5 @@ ceph-provisioners:
- 0.1.11 Limit Ceph Provisioner Container Security Contexts - 0.1.11 Limit Ceph Provisioner Container Security Contexts
- 0.1.12 Add ceph mon v2 port for ceph csi provisioner - 0.1.12 Add ceph mon v2 port for ceph csi provisioner
- 0.1.13 Fix ceph-provisioner rbd-healer error - 0.1.13 Fix ceph-provisioner rbd-healer error
- 0.1.14 Helm 3 - Fix Job labels
... ...

View File

@ -16,4 +16,5 @@ ceph-rgw:
- 0.1.13 Add configmap hash for keystone rgw - 0.1.13 Add configmap hash for keystone rgw
- 0.1.14 Disable crash dumps for rgw - 0.1.14 Disable crash dumps for rgw
- 0.1.15 Correct rgw placement target functions - 0.1.15 Correct rgw placement target functions
- 0.1.16 Helm 3 - Fix Job labels
... ...

View File

@ -21,4 +21,5 @@ elasticsearch:
- 0.2.9 Removed repo verification check from helm-test - 0.2.9 Removed repo verification check from helm-test
- 0.2.10 Enable TLS path between Prometheus-elasticsearch-exporter and Elasticsearch - 0.2.10 Enable TLS path between Prometheus-elasticsearch-exporter and Elasticsearch
- 0.2.11 Enable TLS path between Curator and Elasticsearch - 0.2.11 Enable TLS path between Curator and Elasticsearch
- 0.2.12 Helm 3 - Fix Job labels
... ...

View File

@ -3,4 +3,5 @@ gnocchi:
- 0.1.0 Initial Chart - 0.1.0 Initial Chart
- 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0" - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
- 0.1.2 Use full image ref for docker official images - 0.1.2 Use full image ref for docker official images
- 0.1.3 Helm 3 - Fix Job labels
... ...

View File

@ -10,4 +10,5 @@ grafana:
- 0.1.7 Update Grafana version and Selenium script - 0.1.7 Update Grafana version and Selenium script
- 0.1.8 Use full image ref for docker official images - 0.1.8 Use full image ref for docker official images
- 0.1.9 Add Alertmanager dashboard to Grafana - 0.1.9 Add Alertmanager dashboard to Grafana
- 0.1.10 Helm 3 - Fix Job labels
... ...

View File

@ -29,4 +29,5 @@ helm-toolkit:
- 0.2.20 Modify the template of rbac_role to make secrets accessible - 0.2.20 Modify the template of rbac_role to make secrets accessible
- 0.2.21 Fix issue with db backup error return code being eaten - 0.2.21 Fix issue with db backup error return code being eaten
- 0.2.22 Add ability to set labels to add to resources - 0.2.22 Add ability to set labels to add to resources
- 0.2.23 Helm 3 - Fix Job labels
... ...

View File

@ -7,4 +7,5 @@ kibana:
- 0.1.4 Enable TLS for Kibana ingress path - 0.1.4 Enable TLS for Kibana ingress path
- 0.1.5 Use full image ref for docker official images - 0.1.5 Use full image ref for docker official images
- 0.1.6 Remove Kibana indices before pod start up - 0.1.6 Remove Kibana indices before pod start up
- 0.1.7 Helm 3 - Fix Job labels
... ...

View File

@ -23,4 +23,5 @@ mariadb:
- 0.2.5 Added helm hook for post-install and post-upgrade in prometheus exporter job. - 0.2.5 Added helm hook for post-install and post-upgrade in prometheus exporter job.
- 0.2.6 Update log format stream for mariadb - 0.2.6 Update log format stream for mariadb
- 0.2.7 add ingress resources - 0.2.7 add ingress resources
- 0.2.8 Helm 3 - Fix Job labels
... ...

View File

@ -10,4 +10,5 @@ postgresql:
- 0.1.7 postgres archive cleanup script - 0.1.7 postgres archive cleanup script
- 0.1.8 Add tls to Postgresql - 0.1.8 Add tls to Postgresql
- 0.1.9 Use full image ref for docker official images - 0.1.9 Use full image ref for docker official images
- 0.1.10 Helm 3 - Fix Job labels
... ...

View File

@ -3,4 +3,5 @@ powerdns:
- 0.1.0 Initial Chart - 0.1.0 Initial Chart
- 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0" - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
- 0.1.2 Use full image ref for docker official images - 0.1.2 Use full image ref for docker official images
- 0.1.3 Helm 3 - Fix Job labels
... ...

View File

@ -5,4 +5,5 @@ prometheus-openstack-exporter:
- 0.1.2 Unpin prometheus-openstack-exporter image - 0.1.2 Unpin prometheus-openstack-exporter image
- 0.1.3 Add possibility to use overrides for some charts - 0.1.3 Add possibility to use overrides for some charts
- 0.1.4 Use full image ref for docker official images - 0.1.4 Use full image ref for docker official images
- 0.1.5 Helm 3 - Fix Job labels
... ...

View File

@ -4,4 +4,5 @@ registry:
- 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0" - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
- 0.1.2 Update to container image repo k8s.gcr.io - 0.1.2 Update to container image repo k8s.gcr.io
- 0.1.3 Use full image ref for docker official images - 0.1.3 Use full image ref for docker official images
- 0.1.4 Helm 3 - Fix Job labels
... ...