Make crd-manager chart kustomize friendly (#1572)

Signed-off-by: Tamal Saha <[email protected]>
kubedb · Feb 17, 2025 · 4493500 · 4493500
1 parent 38dfeee
commit 4493500
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 5 deletions.
diff --git a/apis/installer/v1alpha1/kubedb_crd_manager_types.go b/apis/installer/v1alpha1/kubedb_crd_manager_types.go
@@ -71,10 +71,11 @@ type KubedbCrdManagerSpec struct {
 	Tolerations []core.Toleration `json:"tolerations"`
 	// If specified, the pod's scheduling constraints
 	// +optional
-	Affinity         *core.Affinity     `json:"affinity"`
-	ServiceAccount   ServiceAccountSpec `json:"serviceAccount"`
-	FeatureGates     map[string]bool    `json:"featureGates"`
-	RemoveUnusedCRDs bool               `json:"removeUnusedCRDs"`
+	Affinity                *core.Affinity     `json:"affinity"`
+	ServiceAccount          ServiceAccountSpec `json:"serviceAccount"`
+	FeatureGates            map[string]bool    `json:"featureGates"`
+	RemoveUnusedCRDs        bool               `json:"removeUnusedCRDs"`
+	TTLSecondsAfterFinished int                `json:"ttlSecondsAfterFinished"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/charts/kubedb-crd-manager/README.md b/charts/kubedb-crd-manager/README.md
@@ -62,6 +62,7 @@ The following table lists the configurable parameters of the `kubedb-crd-manager
 | nodeSelector               |                                                                                                                                                                                                                                                 | <code>{}</code>                                                                                                                                |
 | tolerations                |                                                                                                                                                                                                                                                 | <code>[]</code>                                                                                                                                |
 | affinity                   |                                                                                                                                                                                                                                                 | <code>{}</code>                                                                                                                                |
+| ttlSecondsAfterFinished    |                                                                                                                                                                                                                                                 | <code>120</code>                                                                                                                               |
 | serviceAccount.create      | Specifies whether a service account should be created                                                                                                                                                                                           | <code>true</code>                                                                                                                              |
 | serviceAccount.annotations | Annotations to add to the service account                                                                                                                                                                                                       | <code>{}</code>                                                                                                                                |
 | serviceAccount.name        | The name of the service account to use. If not set and create is true, a name is generated using the fullname template                                                                                                                          | <code></code>                                                                                                                                  |

diff --git a/charts/kubedb-crd-manager/templates/job.yaml b/charts/kubedb-crd-manager/templates/job.yaml
@@ -31,7 +31,13 @@ metadata:
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
 spec:
   backoffLimit: 3
-  ttlSecondsAfterFinished: 300
+  {{- if ge (int .Values.ttlSecondsAfterFinished) 0 }}
+  ttlSecondsAfterFinished: {{ .Values.ttlSecondsAfterFinished }}
+  {{- end }}
+  manualSelector: true
+  selector:
+    matchLabels:
+      {{- include "kubedb-crd-manager.labels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}

diff --git a/charts/kubedb-crd-manager/templates/serviceaccount.yaml b/charts/kubedb-crd-manager/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "kubedb-crd-manager.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kubedb-crd-manager.labels" . | nindent 4 }}
   annotations:

diff --git a/charts/kubedb-crd-manager/values.openapiv3_schema.yaml b/charts/kubedb-crd-manager/values.openapiv3_schema.yaml
@@ -1390,10 +1390,13 @@ properties:
           type: string
       type: object
     type: array
+  ttlSecondsAfterFinished:
+    type: integer
 required:
 - featureGates
 - image
 - imagePullPolicy
 - removeUnusedCRDs
 - serviceAccount
+- ttlSecondsAfterFinished
 type: object
diff --git a/charts/kubedb-crd-manager/values.yaml b/charts/kubedb-crd-manager/values.yaml
@@ -59,6 +59,8 @@ tolerations: []
 
 affinity: {}
 
+ttlSecondsAfterFinished: 120
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true

diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml
@@ -4275,13 +4275,16 @@ properties:
               type: string
           type: object
         type: array
+      ttlSecondsAfterFinished:
+        type: integer
     required:
     - enabled
     - featureGates
     - image
     - imagePullPolicy
     - removeUnusedCRDs
     - serviceAccount
+    - ttlSecondsAfterFinished
     type: object
   kubedb-kubestash-catalog:
     properties: