openstack/openstack-helm-infra
Code Issues Proposed changes

Remove hook-delete-policy default settings from HTK

Browse Source 
These hooks were added as part of a previous change, however tiller
does not handle these correctly, and jobs get deleted without being
recreated. This change removes the hook from default htk annotations.

Change-Id: I2aa7bb241ebbb7b54c5dc9cf21cd5ba290b7e5fd
This commit is contained in:
Gage Hugo 2021-04-23 14:50:08 -05:00
parent 33b2f3043f
commit 4ed2a6fe53
10 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helm-toolkit/Chart.yaml
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.11 version: 0.2.12
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:

1
helm-toolkit/templates/manifests/_job-bootstrap.tpl
View File

@ -45,7 +45,6 @@ kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "bootstrap" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "bootstrap" | quote }}
annotations: annotations:
"helm.sh/hook-delete-policy": before-hook-creation
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}
{{- end }} {{- end }}

1
helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
View File

@ -46,7 +46,6 @@ kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "db-init" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "db-init" | quote }}
annotations: annotations:
"helm.sh/hook-delete-policy": before-hook-creation
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}
{{- end }} {{- end }}

1
helm-toolkit/templates/manifests/_job-db-sync.tpl
View File

@ -43,7 +43,6 @@ kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "db-sync" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "db-sync" | quote }}
annotations: annotations:
"helm.sh/hook-delete-policy": before-hook-creation
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}
{{- end }} {{- end }}

1
helm-toolkit/templates/manifests/_job-ks-endpoints.tpl
View File

@ -46,7 +46,6 @@ kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "ks-endpoints" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "ks-endpoints" | quote }}
annotations: annotations:
"helm.sh/hook-delete-policy": before-hook-creation
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}
{{- end }} {{- end }}

1
helm-toolkit/templates/manifests/_job-ks-service.tpl
View File

@ -46,7 +46,6 @@ kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceNamePretty "ks-service" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "ks-service" | quote }}
annotations: annotations:
"helm.sh/hook-delete-policy": before-hook-creation
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}
{{- end }} {{- end }}

1
helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
View File

@ -46,7 +46,6 @@ kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceUserPretty "ks-user" | quote }} name: {{ printf "%s-%s" $serviceUserPretty "ks-user" | quote }}
annotations: annotations:
"helm.sh/hook-delete-policy": before-hook-creation
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}
{{- end }} {{- end }}

1
helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
View File

@ -33,7 +33,6 @@ kind: Job
metadata: metadata:
name: {{ printf "%s-%s" $serviceUserPretty "rabbit-init" | quote }} name: {{ printf "%s-%s" $serviceUserPretty "rabbit-init" | quote }}
annotations: annotations:
"helm.sh/hook-delete-policy": before-hook-creation
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}
{{- end }} {{- end }}

1
helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl
View File

@ -41,7 +41,6 @@ metadata:
name: {{ printf "%s-%s" $serviceNamePretty "s3-bucket" | quote }} name: {{ printf "%s-%s" $serviceNamePretty "s3-bucket" | quote }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
"helm.sh/hook-delete-policy": before-hook-creation
{{- if $jobAnnotations }} {{- if $jobAnnotations }}
{{ toYaml $jobAnnotations | indent 4 }} {{ toYaml $jobAnnotations | indent 4 }}
{{- end }} {{- end }}

1
releasenotes/notes/helm-toolkit.yaml
View File

@ -18,4 +18,5 @@ helm-toolkit:
- 0.2.9 Jobs; put labels only in the template spec - 0.2.9 Jobs; put labels only in the template spec
- 0.2.10 Add more S3 configuration options - 0.2.10 Add more S3 configuration options
- 0.2.11 Revert S3 User & Bucket job scripts to v0.2.9 - 0.2.11 Revert S3 User & Bucket job scripts to v0.2.9
- 0.2.12 Remove hook-delete-policy
... ...