From 1ccc3eb0db01a75cb3a90eaf84ff0d37d1ebbe29 Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Thu, 21 Oct 2021 13:14:06 -0700
Subject: [PATCH] [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
---
 ceph-client/Chart.yaml                               | 2 +-
 ceph-client/templates/job-ns-client-ceph-config.yaml | 4 ++--
 releasenotes/notes/ceph-client.yaml                  | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml
index 797d36f3e8..e09cf9bd0a 100644
--- a/ceph-client/Chart.yaml
+++ b/ceph-client/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 0.1.27
+version: 0.1.28
 home: https://github.com/ceph/ceph-client
 ...
diff --git a/ceph-client/templates/job-ns-client-ceph-config.yaml b/ceph-client/templates/job-ns-client-ceph-config.yaml
index c5948f7928..ec56ca0311 100644
--- a/ceph-client/templates/job-ns-client-ceph-config.yaml
+++ b/ceph-client/templates/job-ns-client-ceph-config.yaml
@@ -1,4 +1,3 @@
----
 {{/*
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -81,6 +80,8 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ $serviceAccountName }}
+  labels:
+{{ tuple $envAll "ceph" "client-ceph-config-update" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   template:
     metadata:
@@ -134,4 +135,3 @@ spec:
             name: ceph-client-bin
             defaultMode: 0555
 {{- end }}
-...
diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml
index ab99e0080f..7e21ad3601 100644
--- a/releasenotes/notes/ceph-client.yaml
+++ b/releasenotes/notes/ceph-client.yaml
@@ -28,4 +28,5 @@ ceph-client:
   - 0.1.25 Update htk requirements
   - 0.1.26 Fix ceph-rbd-pool deletion race
   - 0.1.27 Update ceph_mon config to ips from fqdn
+  - 0.1.28 Fix ceph.conf update job labels, rendering
 ...