[ceph-client] Fix ceph.conf update job labels, rendering
This change fixes two issues with the recently introduced [0] job that updates "ceph.conf" inside ceph-client-etc configmap with a discovered mon_host value: 1. adds missing metadata.labels to the job 2. allows the job to be disabled (fixes rendering when manifests.job_ns_client_ceph_config = false) 0: https://review.opendev.org/c/openstack/openstack-helm-infra/+/812159 Change-Id: I3a8f1878df4af5da52d3b88ca35ba0b97deb4c35
This commit is contained in:
parent
092e295a67
commit
1ccc3eb0db
@ -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.27
|
version: 0.1.28
|
||||||
home: https://github.com/ceph/ceph-client
|
home: https://github.com/ceph/ceph-client
|
||||||
...
|
...
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
---
|
|
||||||
{{/*
|
{{/*
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
@ -81,6 +80,8 @@ apiVersion: batch/v1
|
|||||||
kind: Job
|
kind: Job
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ $serviceAccountName }}
|
name: {{ $serviceAccountName }}
|
||||||
|
labels:
|
||||||
|
{{ tuple $envAll "ceph" "client-ceph-config-update" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
||||||
spec:
|
spec:
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
@ -134,4 +135,3 @@ spec:
|
|||||||
name: ceph-client-bin
|
name: ceph-client-bin
|
||||||
defaultMode: 0555
|
defaultMode: 0555
|
||||||
{{- end }}
|
{{- end }}
|
||||||
...
|
|
||||||
|
@ -28,4 +28,5 @@ ceph-client:
|
|||||||
- 0.1.25 Update htk requirements
|
- 0.1.25 Update htk requirements
|
||||||
- 0.1.26 Fix ceph-rbd-pool deletion race
|
- 0.1.26 Fix ceph-rbd-pool deletion race
|
||||||
- 0.1.27 Update ceph_mon config to ips from fqdn
|
- 0.1.27 Update ceph_mon config to ips from fqdn
|
||||||
|
- 0.1.28 Fix ceph.conf update job labels, rendering
|
||||||
...
|
...
|
||||||
|
Loading…
x
Reference in New Issue
Block a user