
Currently Ceph namespace job cleaner uses a fixed name. This leads to helm delete fails to clean up Ceph package. This fix randomizes the job name to avoid name conflicts. DocImpact Closes-Bug: #1707670 Change-Id: I7ac7b7482b945a9a836f6f69df0ef8cebc37bafb
60 lines
2.2 KiB
YAML
60 lines
2.2 KiB
YAML
# 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.
|
|
|
|
{{- if .Values.manifests_enabled.client_secrets }}
|
|
---
|
|
apiVersion: batch/v1
|
|
kind: Job
|
|
metadata:
|
|
name: ceph-namespace-client-key-cleaner-{{ randAlphaNum 5 | lower }}
|
|
annotations:
|
|
"helm.sh/hook": pre-delete
|
|
spec:
|
|
template:
|
|
spec:
|
|
restartPolicy: OnFailure
|
|
containers:
|
|
- name: ceph-namespace-client-keys-cleaner
|
|
image: {{ .Values.images.ceph_config_helper }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
{{- if .Values.pod.resources.enabled }}
|
|
resources:
|
|
requests:
|
|
memory: {{ .Values.pod.resources.jobs.secret_provisioning.requests.memory | quote }}
|
|
cpu: {{ .Values.pod.resources.jobs.secret_provisioning.requests.cpu | quote }}
|
|
limits:
|
|
memory: {{ .Values.pod.resources.jobs.secret_provisioning.limits.memory | quote }}
|
|
cpu: {{ .Values.pod.resources.jobs.secret_provisioning.limits.cpu | quote }}
|
|
{{- end }}
|
|
env:
|
|
- name: DEPLOYMENT_NAMESPACE
|
|
valueFrom:
|
|
fieldRef:
|
|
fieldPath: metadata.namespace
|
|
- name: PVC_CEPH_STORAGECLASS_USER_SECRET_NAME
|
|
value: {{ .Values.storageclass.user_secret_name }}
|
|
command:
|
|
- /opt/ceph/ceph-namespace-client-key-cleaner.sh
|
|
volumeMounts:
|
|
- name: ceph-bin
|
|
mountPath: /opt/ceph/ceph-namespace-client-key-cleaner.sh
|
|
subPath: ceph-namespace-client-key-cleaner.sh
|
|
readOnly: true
|
|
volumes:
|
|
- name: ceph-bin
|
|
configMap:
|
|
name: ceph-bin
|
|
defaultMode: 0555
|
|
{{- end }}
|